producteca 2.0.46__tar.gz → 2.0.47__tar.gz

{producteca-2.0.46 → producteca-2.0.47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: producteca
-Version: 2.0.46
+Version: 2.0.47
 Summary: 
 Author: Chroma Agency, Matias Rivera
 Author-email: mrivera@chroma.agency

{producteca-2.0.46 → producteca-2.0.47}/producteca/abstract/abstract_dataclass.py

@@ -1,5 +1,6 @@
 from abc import ABC
 from ..config.config import ConfigProducteca
+from ..utils import clean_model_dump
 from dataclasses import dataclass
 from typing import Optional, Any
 
@@ -14,10 +15,11 @@ class BaseService(ABC):
         return repr(self._record)
 
     def to_dict(self):
-        return self._record.model_dump(by_alias=True)
+        return clean_model_dump(self._record)
 
     def to_json(self):
-        return self._record.model_dump_json(by_alias=True)
+        import json
+        return json.dumps(clean_model_dump(self._record))
 
     def __getattr__(self, key):
         return getattr(self._record, key)

{producteca-2.0.46 → producteca-2.0.47}/producteca/products/products.py

@@ -3,6 +3,7 @@ from pydantic import BaseModel, Field, ValidationError
 from dataclasses import dataclass
 from producteca.abstract.abstract_dataclass import BaseService
 from producteca.products.search_products import SearchProduct, SearchProductParams
+from producteca.utils import clean_model_dump
 import logging
 import requests
 
@@ -140,7 +141,7 @@ class ProductVariationBase(BaseModel):
     barcode: Optional[str] = None
     attributes: Union[List[Attribute], List] = []
     tags: Optional[List[str]] = []
-    buying_price: Optional[float] = Field(0, alias='buyingPrice')
+    buying_price: Optional[float] = Field(default=None, alias='buyingPrice')
     dimensions: Optional[Union[Dimensions, dict]] = Field(default_factory=Dimensions)
     brand: Optional[str] = ''
     notes: Optional[str] = ''
@@ -253,14 +254,15 @@ class ProductService(BaseService):
         return self
 
     def synchronize(self, payload) -> Union[Product, SynchronizeResponse]:
-
         endpoint_url = self.config.get_endpoint(f'{self.endpoint}/synchronize')
         headers = self.config.headers.copy()
         headers.update({"createifitdoesntexist": str(self.create_if_it_doesnt_exist).lower()})
         product_variation = ProductVariation(**payload)
         if not product_variation.code and not product_variation.sku:
             raise Exception("Sku or code should be provided to update the product")
-        data = product_variation.model_dump(by_alias=True, exclude_none=True)
+        # Hacer model_dump con limpieza automática de valores vacíos
+        data = clean_model_dump(product_variation)
+        _logger.info(f"Synchronizing product: {data}")
         response = requests.post(endpoint_url, json=data, headers=headers)
         if not response.ok:
             raise Exception(f"Error getting product {product_variation.sku} - {product_variation.code}\n {response.text}")
@@ -321,7 +323,7 @@ class ProductService(BaseService):
         endpoint: str = f'search/{self.endpoint}'
         headers = self.config.headers
         url = self.config.get_endpoint(endpoint)
-        response = requests.get(url, headers=headers, params=params.model_dump(by_alias=True, exclude_none=True))
+        response = requests.get(url, headers=headers, params=clean_model_dump(params))
         if not response.ok:
             raise Exception(f"error in searching products {response.text}")
         return SearchProduct(**response.json())

{producteca-2.0.46 → producteca-2.0.47}/producteca/sales_orders/sales_orders.py

@@ -5,6 +5,7 @@ from producteca.abstract.abstract_dataclass import BaseService
 from producteca.sales_orders.search_sale_orders import SearchSalesOrderParams, SearchSalesOrder
 from producteca.payments.payments import Payment
 from producteca.shipments.shipment import Shipment
+from producteca.utils import clean_model_dump
 from dataclasses import dataclass
 import logging
 _logger = logging.getLogger(__name__)
@@ -327,8 +328,8 @@ class SaleOrderService(BaseService):
         endpoint = f'{self.endpoint}/synchronize'
         url = self.config.get_endpoint(endpoint)
         # TODO: Check what can we sync, and what can we not sync
-        sync_body = SaleOrderSynchronize(**self._record.model_dump(by_alias=True))
-        response = requests.post(url, json=sync_body.model_dump(by_alias=True), headers=self.config.headers)
+        sync_body = SaleOrderSynchronize(**clean_model_dump(self._record))
+        response = requests.post(url, json=clean_model_dump(sync_body), headers=self.config.headers)
         if not response.ok:
             raise Exception(f"Synchronize error {response.status_code} {response.text}")
         sync_res = SaleOrderSyncResponse(**response.json()) # noqa
@@ -341,7 +342,7 @@ class SaleOrderService(BaseService):
         url = self.config.get_endpoint(endpoint)
         response = requests.put(url, headers=self.config.headers,
                                 json={"id": self._record.id,
-                                      "invoiceIntegration": SaleOrderInvoiceIntegrationPut(**self._record.invoice_integration.model_dump(by_alias=True)).model_dump()})
+                                      "invoiceIntegration": clean_model_dump(SaleOrderInvoiceIntegrationPut(**clean_model_dump(self._record.invoice_integration)))})
         if not response.ok:
             raise Exception(f"Error on resposne {response.text}")
         return response.ok
@@ -365,7 +366,7 @@ class SaleOrderService(BaseService):
             raise Exception("You need to add a record id")
         payment = Payment(**payload)
         url = self.config.get_endpoint(f"{self.endpoint}/{self._record.id}/payments")
-        res = requests.post(url, json=payment.model_dump(by_alias=True, exclude_none=True), headers=self.config.headers)
+        res = requests.post(url, json=clean_model_dump(payment), headers=self.config.headers)
         if not res.ok:
             raise Exception(f"Error on resposne {res.text}")
         return Payment(**res.json())
@@ -375,7 +376,7 @@ class SaleOrderService(BaseService):
             raise Exception("You need to add a record id")
         payment = Payment(**payload)
         url = self.config.get_endpoint(f"{self.endpoint}/{self._record.id}/payments/{payment_id}")
-        res = requests.put(url, json=payment.model_dump(by_alias=True, exclude_none=True), headers=self.config.headers)
+        res = requests.put(url, json=clean_model_dump(payment), headers=self.config.headers)
         if not res.ok:
             raise Exception(f"Error on payment update {res.text}")
         return Payment(**res.json())
@@ -385,7 +386,7 @@ class SaleOrderService(BaseService):
             raise Exception("You need to add a record id")
         shipment = Shipment(**payload)
         url = self.config.get_endpoint(f"{self.endpoint}/{self._record.id}/shipments")
-        res = requests.post(url, json=shipment.model_dump(by_alias=True, exclude_none=True), headers=self.config.headers)
+        res = requests.post(url, json=clean_model_dump(shipment), headers=self.config.headers)
         if not res.ok:
             raise Exception(f"Error on shipment add {res.text}")
         return Shipment(**res.json())
@@ -395,7 +396,7 @@ class SaleOrderService(BaseService):
             raise Exception("You need to add a record id")
         shipment = Shipment(**payload)
         url = self.config.get_endpoint(f"{self.endpoint}/{self._record.id}/shipments/{shipment_id}")
-        res = requests.put(url, json=shipment.model_dump(by_alias=True, exclude_none=True), headers=self.config.headers)
+        res = requests.put(url, json=clean_model_dump(shipment), headers=self.config.headers)
         if not res.ok:
             raise Exception(f"Error on shipment update {res.text}")
         return Shipment(**res.json())

producteca-2.0.47/producteca/utils.py

@@ -0,0 +1,43 @@
+"""
+Utility functions for the producteca package
+"""
+from typing import Any, Dict, List, Union
+from pydantic import BaseModel
+
+
+def exclude_empty_values(obj: Any) -> Any:
+    """Recursively remove None, empty lists, empty strings, and empty dicts
+    
+    Note: Preserves 0 values for numeric fields as they are valid prices/quantities
+    """
+    if isinstance(obj, dict):
+        filtered_dict = {}
+        for k, v in obj.items():
+            # Skip None, empty lists, empty strings, empty dicts
+            if v is None or v == [] or v == "" or v == {}:
+                continue
+            # Keep numeric 0 values - they are valid for prices, quantities, etc.
+            filtered_dict[k] = exclude_empty_values(v)
+        return filtered_dict
+    elif isinstance(obj, list):
+        filtered_list = [exclude_empty_values(item) for item in obj if item is not None]
+        return [item for item in filtered_list if item != [] and item != "" and item != {}]
+    else:
+        return obj
+
+
+def clean_model_dump(model: BaseModel, by_alias: bool = True, exclude_none: bool = True, **kwargs) -> Dict[str, Any]:
+    """
+    Enhanced model_dump that automatically cleans empty values
+    
+    Args:
+        model: Pydantic model instance
+        by_alias: Use field aliases in output
+        exclude_none: Exclude None values
+        **kwargs: Additional arguments to pass to model_dump
+    
+    Returns:
+        Clean dictionary with empty values removed
+    """
+    raw_data = model.model_dump(by_alias=by_alias, exclude_none=exclude_none, **kwargs)
+    return exclude_empty_values(raw_data)

{producteca-2.0.46 → producteca-2.0.47}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "producteca"
-version = "2.0.46"
+version = "2.0.47"
 description = ""
 authors = ["Chroma Agency, Matias Rivera <mrivera@chroma.agency>"]
 readme = "README.md"