Merge pull request #72 from ParclLabs/bugfix/limit

fix default limit

Author: jlealtru

parcllabs/__version__.py

@@ -1 +1 @@
-VERSION = "1.9.0"
+VERSION = "1.9.1"

parcllabs/parcllabs_client.py

@@ -53,6 +53,7 @@ def __init__(
         self.api_url = api_url
         self.account_info = {"est_session_credits_used": 0}
         self.num_workers = num_workers
+        self.limit = limit
         self.turbo_mode = turbo_mode
 
         self._initialize_services()

parcllabs/services/metrics/portfolio_size_service.py

@@ -1,5 +1,4 @@
 from typing import Any, Mapping, Optional, List
-from parcllabs.common import DEFAULT_LIMIT
 from parcllabs.services.parcllabs_service import ParclLabsService
 from parcllabs.services.validators import Validators
 

parcllabs/services/parcllabs_service.py

@@ -145,24 +145,23 @@ def _fetch(
         auto_paginate: bool = False,
     ):
         """
-        Fetch data for given Parcl IDs with specified parameters.
-
         This method handles the fetching of data based on the provided Parcl IDs and parameters.
         It supports both GET and POST requests, depending on the client's configuration and the number of Parcl IDs.
-
         Args:
             parcl_ids (List[int]): A list of Parcl IDs to fetch data for.
             params (Optional[Mapping[str, Any]]): Additional parameters for the request.
                 If not provided or None, no additional parameters will be used.
             auto_paginate (bool, optional): Whether to automatically handle pagination.
                 Defaults to False.
-
         Returns:
             The result of the fetch operation. The exact return type depends on the specific
             fetch method called (_fetch_post, _fetch_get, or _fetch_get_many_parcl_ids).
         """
+        params = self._clean_params(params) if params else {}
 
-        params = self._clean_params(params)
+        # Use client's default limit if no limit specified in params
+        if "limit" not in params or params["limit"] is None:
+            params["limit"] = self.client.limit
 
         if self.client.turbo_mode and self.full_post_url:
             # convert the list of parcl_ids into post body params, formatted

parcllabs/services/search.py

@@ -42,7 +42,6 @@ def retrieve(
         Retrieve parcl_id and metadata for geographic markets in the Parcl Labs API.
 
         Args:
-
             query (str, optional): The search query to filter results by.
             location_type (str, optional): The location type to filter results by.
             region (str, optional): The region to filter results by.
@@ -57,11 +56,10 @@ def retrieve(
             auto_paginate (bool, optional): Automatically paginate through the results.
 
         Returns:
-
             Any: The JSON response as a pandas DataFrame.
         """
 
-        params = {}
+        params = params or {}
 
         params = Validators.validate_input_str_param(
             param=location_type,
@@ -116,6 +114,8 @@ def retrieve(
 
         if limit:
             params["limit"] = self._validate_limit("GET", limit)
+        elif self.client.limit:
+            params["limit"] = self._validate_limit("GET", self.client.limit)
 
         results = self._fetch_get(
             url=self.full_url, params=params, auto_paginate=auto_paginate

tests/test_price_feed_service.py

@@ -102,14 +102,16 @@ def test_get(self, service):
 
     def test_fetch_get(self, service):
         with patch.object(service, "_fetch_get") as mock_fetch_get:
-            service._fetch([1], {"param": "test"})
+            params = {"param": "test", "limit": 100}
+            service._fetch([1], params)
             mock_fetch_get.assert_called_once()
 
     def test_fetch_post(self, service):
         service.client.turbo_mode = True
         service.full_post_url = "https://api.example.com/test_post"
         with patch.object(service, "_fetch_post") as mock_fetch_post:
-            service._fetch([1, 2], {"param": "test"})
+            params = {"param": "test", "limit": 100}
+            service._fetch([1, 2], params)
             mock_fetch_post.assert_called_once()
 
     def test_fetch_get_many_parcl_ids(self, service):

tests/test_search.py

@@ -18,6 +18,7 @@ def search_service():
     client_mock = MagicMock()
     client_mock.api_url = "https://api.parcllabs.com"
     client_mock.api_key = "test_api_key"
+    client_mock.limit = 100
     service = SearchMarkets(client=client_mock, url="/v1/search/markets")
     return service