Refactor to address PR review feedback, revert out-of-scope logic

Author: HyperNaser

serpapi/core.py

@@ -110,7 +110,7 @@ def search_archive(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any)
         r = self.request("GET", f"/searches/{ search_id }", params=params, assert_200=True, **request_kwargs)
         return SerpResults.from_http_response(r, client=self)
 
-    def locations(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any) -> Any:
+    def locations(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any) -> Dict[str, Any]:
         """Get a list of supported Google locations.
 
 
@@ -141,7 +141,7 @@ def locations(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any) -> A
         )
         return r.json()
 
-    def account(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any) -> Any:
+    def account(self, params: Optional[Dict[str, Any]] = None, **kwargs: Any) -> Dict[str, Any]:
         """Get SerpApi account information.
 
         :param api_key: the API Key to use for SerpApi.com.

serpapi/models.py

@@ -52,11 +52,10 @@ def as_dict(self) -> Dict[str, Any]:
     def next_page_url(self) -> Optional[str]:
         """The URL of the next page of results, if any."""
 
-        serpapi_pagination: Optional[Dict[str, Any]] = self.data.get("serpapi_pagination")
+        serpapi_pagination = self.data.get("serpapi_pagination")
 
         if serpapi_pagination:
-            next_url = serpapi_pagination.get("next")
-            return next_url if isinstance(next_url, str) else None
+            return serpapi_pagination.get("next")
         return None
 
     def next_page(self) -> Optional[Union["SerpResults", str]]:
@@ -78,11 +77,11 @@ def yield_pages(self, max_pages: int = 1_000) -> Iterator[Union["SerpResults", s
         """
 
         current_page_count = 0
-        current_page: Union["SerpResults", str, None] = self
+        current_page = self
         while current_page and current_page_count < max_pages:
             yield current_page
             current_page_count += 1
-            if isinstance(current_page, SerpResults) and current_page.next_page_url:
+            if current_page.next_page_url:
                 current_page = current_page.next_page()
             else:
                 break