разделил package quantity на брутто и нетто

Author: Miskler

src/openinflation_dataclass/__init__.py

@@ -1,6 +1,6 @@
 """Pydantic models for products, categories, and retail geolocation."""
 
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 
 from .card import Card, MetaData, WholesalePrice
 from .geolocation import AdministrativeUnit, RetailUnit, Schedule

src/openinflation_dataclass/card.py

@@ -68,9 +68,13 @@ class Card(NetworkModel):
     #   unit="LTR", available_count=29.2, package_quantity=0.5, package_unit="LTR"
     unit: Literal["PCE", "KGM", "LTR"] | None = None
     available_count: int | float | None = None
-    package_quantity: float | None = None
+    package_quantity_net: float | None = None
+    """Кол-во в нетто"""
+    package_quantity_gross: float | None = None
+    """Кол-во в брутто"""
     package_unit: Literal["KGM", "LTR"] | None = None
 
+    # All in meters
     dimension_height: float | None = None
     dimension_width: float | None = None
     dimension_depth: float | None = None
@@ -88,8 +92,12 @@ def validate_business_rules(self) -> Card:
 
         if is_piece_unit and has_count and not count_is_int:
             raise ValueError("For unit='PCE', available_count must be int.")
-        if (self.package_quantity is None) != (self.package_unit is None):
+        if (self.package_quantity_net is None) != (self.package_unit is None):
             raise ValueError(
-                "package_quantity and package_unit must be set together or both set to None."
+                "package_quantity_net and package_unit must be set together or both set to None."
+            )
+        if (self.package_quantity_gross is None) != (self.package_unit is None):
+            raise ValueError(
+                "package_quantity_gross and package_unit must be set together or both set to None."
             )
         return self

tests/test_models.py

@@ -42,7 +42,8 @@ def _build_card() -> Card:
         price_unit="RUB",
         unit="PCE",
         available_count=15,
-        package_quantity=1.0,
+        package_quantity_net=1.0,
+        package_quantity_gross=1.0,
         package_unit="LTR",
         categories_uid=["milk"],
         main_image="main-image.png",