schema for categories

Author: zhibindai26

parcllabs/schemas/schemas.py

@@ -291,6 +291,6 @@ class Config:
 class PropertyV2RetrieveParamCategories(BaseModel):
     """High level categories for PropertyV2RetrieveParams."""
 
-    property_filters: PropertyV2RetrieveParams = Field(default=None, description="Property filters")
-    event_filters: PropertyV2RetrieveParams = Field(default=None, description="Event filters")
-    owner_filters: PropertyV2RetrieveParams = Field(default=None, description="Owner filters")
+    property_filters: dict[str, Any] = Field(default_factory=dict, description="Property filters")
+    event_filters: dict[str, Any] = Field(default_factory=dict, description="Event filters")
+    owner_filters: dict[str, Any] = Field(default_factory=dict, description="Owner filters")

parcllabs/services/properties/property_v2.py

@@ -5,7 +5,7 @@
 import pandas as pd
 
 from parcllabs.enums import RequestLimits
-from parcllabs.schemas.schemas import PropertyV2RetrieveParams
+from parcllabs.schemas.schemas import PropertyV2RetrieveParamCategories, PropertyV2RetrieveParams
 from parcllabs.services.parcllabs_service import ParclLabsService
 from parcllabs.services.validators import Validators
 
@@ -315,6 +315,16 @@ def _validate_limit(self, limit: int | None) -> int:
 
         return limit
 
+    def _build_param_categories(
+        self, params: PropertyV2RetrieveParams
+    ) -> PropertyV2RetrieveParamCategories:
+        """Build parameter categories from validated Pydantic schema."""
+        return PropertyV2RetrieveParamCategories(
+            property_filters=self._build_property_filters(params),
+            event_filters=self._build_event_filters(params),
+            owner_filters=self._build_owner_filters(params),
+        )
+
     def retrieve(
         self,
         parcl_ids: list[int] | None = None,
@@ -434,10 +444,11 @@ def retrieve(
             ),
         )
 
-        # Build filters using validated parameters
-        data["property_filters"] = self._build_property_filters(input_params)
-        data["event_filters"] = self._build_event_filters(input_params)
-        data["owner_filters"] = self._build_owner_filters(input_params)
+        # Build parameter categories using validated parameters
+        param_categories = self._build_param_categories(input_params)
+
+        # Update data with categories
+        data.update(param_categories.model_dump(exclude_none=True))
 
         # Set limit
         request_params = input_params.params.copy()

tests/test_property_v2.py

@@ -349,8 +349,8 @@ def test_retrieve_with_geo_coordinates(
 
 @patch.object(PropertyV2Service, "_fetch_post")
 def test_retrieve_with_schema_validation_errors(
-    mock_fetch_post: Mock,
-    property_v2_service: PropertyV2Service,  # noqa: ARG001
+    mock_fetch_post: Mock,  # noqa: ARG001
+    property_v2_service: PropertyV2Service,
 ) -> None:
     """Test that retrieve method properly validates input using schema."""
     # This should raise a validation error due to invalid property type