GeneralManager 0.83.0__tar.gz → 0.83.1__tar.gz

{generalmanager-0.83.0/src/GeneralManager.egg-info → generalmanager-0.83.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.83.0
+Version: 0.83.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.83.0 → generalmanager-0.83.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.83.0"
+version = "0.83.1"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.83.0 → generalmanager-0.83.1/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.83.0
+Version: 0.83.1
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.83.0 → generalmanager-0.83.1}/src/general_manager/interface/capabilities/orm_utils/field_descriptors.py

@@ -155,6 +155,20 @@ def _orm_file_field_kind(
     return None
 
 
+def _field_default(field: DjangoField) -> object:
+    """Normalize concrete measurement defaults without evaluating runtime defaults."""
+    default = field.default
+    if (
+        not isinstance(field, MeasurementField)
+        or default is None
+        or default is models.NOT_PROVIDED
+        or callable(default)
+    ):
+        return default
+    measurement, _ = field._normalize_value(default)
+    return measurement
+
+
 def _to_snake_case(name: str) -> str:
     """Convert a CamelCase class name into snake_case."""
     snake = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
@@ -257,7 +271,7 @@ class _FieldDescriptorBuilder:
                     else not field.null
                 ),
                 is_editable=field.editable,
-                default=field.default,
+                default=_field_default(field),
                 is_derived=False,
                 accessor=_instance_attribute_accessor(field_name),
                 orm_field_kind=orm_field_kind,
@@ -286,7 +300,7 @@ class _FieldDescriptorBuilder:
                     else not field.null and field.default is models.NOT_PROVIDED
                 ),
                 is_editable=field.editable,
-                default=field.default,
+                default=_field_default(field),
                 is_derived=False,
                 accessor=_instance_attribute_accessor(field.name),
                 orm_field_kind=orm_field_kind,

{generalmanager-0.83.0 → generalmanager-0.83.1}/src/general_manager/measurement/measurement_field.py

@@ -740,10 +740,24 @@ class MeasurementField(MeasurementFieldBase):
                 does not make exact non-wrapped Pint subclasses part of this
                 field's stable API.
         """
+        measurement, magnitude = self._normalize_value(value)
+        setattr(instance, self.value_attr, magnitude)
+        setattr(
+            instance,
+            self.unit_attr,
+            str(measurement.unit) if measurement is not None else None,
+        )
+
+    def _normalize_value(
+        self, value: object
+    ) -> tuple[Measurement | None, Decimal | None]:
+        """Validate a value for storage or metadata without creating a model instance.
+
+        Return the measurement in its declared unit and its quantized base-unit
+        magnitude. This does not evaluate defaults or run model validators.
+        """
         if value is None:
-            setattr(instance, self.value_attr, None)
-            setattr(instance, self.unit_attr, None)
-            return
+            return None, None
         if isinstance(value, str):
             try:
                 value = Measurement.from_string(value)
@@ -776,8 +790,7 @@ class MeasurementField(MeasurementFieldBase):
                 {self.name: [f"Unit must be compatible with '{self.base_unit}'."]}
             ) from e
 
-        setattr(instance, self.value_attr, self._normalize_base_magnitude(base_mag))
-        setattr(instance, self.unit_attr, str(value.unit))
+        return value, self._normalize_base_magnitude(base_mag)
 
     def validate(
         self,