GeneralManager 0.9.0__tar.gz → 0.10.0__tar.gz

{generalmanager-0.9.0 → generalmanager-0.10.0}/GeneralManager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.9.0
+Version: 0.10.0
 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-Expression: MIT

{generalmanager-0.9.0 → generalmanager-0.10.0}/GeneralManager.egg-info/SOURCES.txt

@@ -11,14 +11,6 @@ src/general_manager/apps.py
 src/general_manager/api/graphql.py
 src/general_manager/api/mutation.py
 src/general_manager/api/property.py
-src/general_manager/auxiliary/__init__.py
-src/general_manager/auxiliary/argsToKwargs.py
-src/general_manager/auxiliary/filterParser.py
-src/general_manager/auxiliary/formatString.py
-src/general_manager/auxiliary/jsonEncoder.py
-src/general_manager/auxiliary/makeCacheKey.py
-src/general_manager/auxiliary/noneToZero.py
-src/general_manager/auxiliary/pathMapping.py
 src/general_manager/bucket/baseBucket.py
 src/general_manager/bucket/calculationBucket.py
 src/general_manager/bucket/databaseBucket.py
@@ -56,6 +48,14 @@ src/general_manager/permission/permissionDataManager.py
 src/general_manager/rule/__init__.py
 src/general_manager/rule/handler.py
 src/general_manager/rule/rule.py
+src/general_manager/utils/__init__.py
+src/general_manager/utils/argsToKwargs.py
+src/general_manager/utils/filterParser.py
+src/general_manager/utils/formatString.py
+src/general_manager/utils/jsonEncoder.py
+src/general_manager/utils/makeCacheKey.py
+src/general_manager/utils/noneToZero.py
+src/general_manager/utils/pathMapping.py
 src/general_manager/utils/testing.py
 tests/test_settings.py
 tests/test_urls.py

{generalmanager-0.9.0 → generalmanager-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.9.0
+Version: 0.10.0
 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-Expression: MIT

{generalmanager-0.9.0 → generalmanager-0.10.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.9.0"
+version = "0.10.0"
 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.9.0 → generalmanager-0.10.0}/src/general_manager/api/mutation.py

@@ -5,19 +5,19 @@ import graphene
 from general_manager.api.graphql import GraphQL
 from general_manager.manager.generalManager import GeneralManager
 
-from general_manager.auxiliary.formatString import snake_to_camel
+from general_manager.utils.formatString import snake_to_camel
 
 
 def graphQlMutation(needs_role: Optional[str] = None, auth_required: bool = False):
     """
     Decorator that transforms a function into a GraphQL mutation class and registers it for use in a Graphene-based API.
-    
+
     The decorated function must have type hints for all parameters (except `info`) and a return annotation. The decorator dynamically generates a mutation class with arguments and output fields based on the function's signature and return type. It also enforces authentication if `auth_required` is set to True, returning an error if the user is not authenticated.
-    
+
     Parameters:
         needs_role (Optional[str]): Reserved for future use to specify a required user role.
         auth_required (bool): If True, the mutation requires an authenticated user.
-    
+
     Returns:
         Callable: A decorator that registers the mutation and returns the original function.
     """

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/apps.py

@@ -30,7 +30,7 @@ class GeneralmanagerConfig(AppConfig):
     def ready(self):
         """
         Performs initialization tasks for the general_manager app when Django starts.
-        
+
         Sets up synchronization and schema validation for read-only interfaces, initializes attributes and property accessors for general manager classes, and configures the GraphQL schema and endpoint if enabled in settings.
         """
         self.handleReadOnlyInterface(GeneralManagerMeta.read_only_classes)
@@ -47,7 +47,7 @@ class GeneralmanagerConfig(AppConfig):
     ):
         """
         Configures synchronization and schema validation for the provided read-only interface classes.
-        
+
         Ensures that each read-only interface is synchronized before Django management commands run, and registers system checks to validate that their schemas are up to date.
         """
         GeneralmanagerConfig.patchReadOnlyInterfaceSync(read_only_classes)
@@ -72,7 +72,7 @@ class GeneralmanagerConfig(AppConfig):
     ):
         """
         Monkey-patches Django's management command runner to synchronize all provided read-only interfaces before executing any management command, except during autoreload subprocesses of 'runserver'.
-        
+
         For each class in `general_manager_classes`, the associated read-only interface's `syncData` method is called prior to command execution, ensuring data consistency before management operations.
         """
         from general_manager.interface.readOnlyInterface import ReadOnlyInterface
@@ -83,10 +83,10 @@ class GeneralmanagerConfig(AppConfig):
             # Ensure syncData is only called at real run of runserver
             """
             Executes a Django management command, synchronizing all registered read-only interfaces before execution unless running in an autoreload subprocess of 'runserver'.
-            
+
             Parameters:
                 argv (list): Command-line arguments for the management command.
-            
+
             Returns:
                 The result of the original management command execution.
             """
@@ -113,7 +113,7 @@ class GeneralmanagerConfig(AppConfig):
     ):
         """
         Initializes attributes and establishes dynamic relationships for GeneralManager classes.
-        
+
         For each class pending attribute initialization, assigns interface attributes and creates property accessors. Then, for all registered GeneralManager classes, connects input fields referencing other GeneralManager subclasses by adding GraphQL properties to enable filtered access to related objects.
         """
         logger.debug("Initializing GeneralManager classes...")
@@ -144,6 +144,8 @@ class GeneralmanagerConfig(AppConfig):
                         f"{general_manager_class.__name__.lower()}_list",
                         graphQlProperty(func),
                     )
+        for general_manager_class in all_classes:
+            GeneralmanagerConfig.checkPermissionClass(general_manager_class)
 
     @staticmethod
     def handleGraphQL(
@@ -177,10 +179,10 @@ class GeneralmanagerConfig(AppConfig):
     def addGraphqlUrl(schema):
         """
         Adds a GraphQL endpoint to the Django URL configuration using the provided schema.
-        
+
         Parameters:
             schema: The GraphQL schema to use for the endpoint.
-        
+
         Raises:
             Exception: If the ROOT_URLCONF setting is not defined in Django settings.
         """
@@ -196,3 +198,24 @@ class GeneralmanagerConfig(AppConfig):
                 GraphQLView.as_view(graphiql=True, schema=schema),
             )
         )
+
+    @staticmethod
+    def checkPermissionClass(general_manager_class: Type[GeneralManager]):
+        """
+        Checks if the class has a Permission attribute and if it is a subclass of BasePermission.
+        If so, it sets the Permission attribute on the class.
+        """
+        from general_manager.permission.basePermission import BasePermission
+        from general_manager.permission.managerBasedPermission import (
+            ManagerBasedPermission,
+        )
+
+        if hasattr(general_manager_class, "Permission"):
+            permission = general_manager_class.Permission
+            if not issubclass(permission, BasePermission):
+                raise TypeError(
+                    f"{permission.__name__} must be a subclass of BasePermission"
+                )
+            general_manager_class.Permission = permission
+        else:
+            general_manager_class.Permission = ManagerBasedPermission

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/bucket/calculationBucket.py

@@ -15,10 +15,11 @@ from general_manager.interface.baseInterface import (
 )
 from general_manager.bucket.baseBucket import Bucket
 from general_manager.manager.input import Input
-from general_manager.auxiliary.filterParser import parse_filters
+from general_manager.utils.filterParser import parse_filters
 
 if TYPE_CHECKING:
     from general_manager.manager.generalManager import GeneralManager
+    from general_manager.interface.calculationInterface import CalculationInterface
 
 
 class CalculationBucket(Bucket[GeneralManagerType]):
@@ -90,7 +91,11 @@ class CalculationBucket(Bucket[GeneralManagerType]):
         self._current_combinations = state.get("current_combinations")
 
     def __or__(
-        self, other: Bucket[GeneralManagerType] | GeneralManager[GeneralManagerType]
+        self,
+        other: (
+            Bucket[GeneralManagerType]
+            | GeneralManager[GeneralManagerType, CalculationInterface]
+        ),
     ) -> CalculationBucket[GeneralManagerType]:
         """
         Combines this CalculationBucket with another bucket or manager of the same type.
@@ -158,7 +163,7 @@ class CalculationBucket(Bucket[GeneralManagerType]):
     def filter(self, **kwargs: Any) -> CalculationBucket:
         """
         Returns a new CalculationBucket with additional filters applied.
-        
+
         Merges the provided filter criteria with existing filters to further restrict valid input combinations.
         """
         filters = self.filters.copy()
@@ -316,12 +321,12 @@ class CalculationBucket(Bucket[GeneralManagerType]):
     ) -> List[dict[str, Any]]:
         """
         Recursively generates all valid input combinations for the specified input fields, applying filters and exclusions.
-        
+
         Args:
             sorted_inputs: Input field names ordered to respect dependency constraints.
             filters: Mapping of input field names to filter definitions.
             excludes: Mapping of input field names to exclusion definitions.
-        
+
         Returns:
             A list of dictionaries, each representing a valid combination of input values that satisfy all filters and exclusions.
         """
@@ -329,7 +334,7 @@ class CalculationBucket(Bucket[GeneralManagerType]):
         def helper(index, current_combo):
             """
             Recursively generates all valid input combinations for calculation inputs.
-            
+
             Yields:
                 Dict[str, Any]: A dictionary representing a valid combination of input values, filtered and excluded according to the provided criteria.
             """

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/cache/cacheDecorator.py

@@ -4,7 +4,7 @@ from django.core.cache import cache as django_cache
 from general_manager.cache.cacheTracker import DependencyTracker
 from general_manager.cache.dependencyIndex import record_dependencies, Dependency
 from general_manager.cache.modelDependencyCollector import ModelDependencyCollector
-from general_manager.auxiliary.makeCacheKey import make_cache_key
+from general_manager.utils.makeCacheKey import make_cache_key
 
 
 class CacheBackend(Protocol):

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/interface/baseInterface.py

@@ -13,7 +13,7 @@ from typing import (
 from datetime import datetime
 from django.conf import settings
 from django.db.models import Model
-from general_manager.auxiliary import args_to_kwargs
+from general_manager.utils import args_to_kwargs
 
 if TYPE_CHECKING:
     from general_manager.manager.input import Input

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/interface/databaseBasedInterface.py

@@ -52,7 +52,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     ):
         """
         Initialize the interface and load the associated model instance.
-        
+
         If `search_date` is provided, loads the historical record as of that date; otherwise, loads the current record.
         """
         super().__init__(*args, **kwargs)
@@ -141,9 +141,9 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getAttributeTypes(cls) -> dict[str, AttributeTypedDict]:
         """
         Return a dictionary mapping attribute names to metadata describing their types and properties.
-        
+
         The dictionary includes all model fields, custom fields, foreign keys, many-to-many, and reverse relation fields. For each attribute, the metadata specifies its Python type (translated from Django field types when possible), whether it is required, editable, derived, and its default value. For related models with a general manager class, the type is set to that class.
-        
+
         Returns:
             dict[str, AttributeTypedDict]: Mapping of attribute names to their type information and metadata.
         """
@@ -309,7 +309,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
         model: Type[models.Model] | models.Model,
     ) -> tuple[list[str], list[str]]:
         """
-        Identifies custom fields on a model and their associated auxiliary fields to ignore.
+        Identifies custom fields on a model and their associated utils fields to ignore.
 
         Returns:
             A tuple containing a list of custom field names and a list of related field names
@@ -401,15 +401,15 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
         # Felder aus der Interface-Klasse sammeln
         """
         Dynamically generates a Django model class, its associated interface class, and a factory class from an interface definition.
-        
+
         This method collects fields and metadata from the provided interface class, creates a new Django model inheriting from the specified base model class, attaches custom validation rules if present, and constructs corresponding interface and factory classes. The updated attributes dictionary, the new interface class, and the newly created model class are returned for integration into the general manager framework.
-        
+
         Parameters:
             name: The name for the dynamically created model class.
             attrs: The attributes dictionary to be updated with the new interface and factory classes.
             interface: The interface base class defining the model structure and metadata.
             base_model_class: The base class to use for the new model (defaults to GeneralManagerModel).
-        
+
         Returns:
             tuple: A tuple containing the updated attributes dictionary, the new interface class, and the newly created model class.
         """

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/interface/databaseInterface.py

@@ -9,6 +9,7 @@ from general_manager.interface.databaseBasedInterface import (
     DBBasedInterface,
     GeneralManagerModel,
 )
+from django.db.models import NOT_PROVIDED
 
 
 class DatabaseInterface(DBBasedInterface[GeneralManagerModel]):
@@ -111,6 +112,8 @@ class DatabaseInterface(DBBasedInterface[GeneralManagerModel]):
             if isinstance(value, GeneralManager):
                 value = value.identification["id"]
                 key = f"{key}_id"
+            if value is NOT_PROVIDED:
+                continue
             try:
                 setattr(instance, key, value)
             except ValueError as e:
@@ -158,8 +161,8 @@ class DatabaseInterface(DBBasedInterface[GeneralManagerModel]):
         """
         instance.changed_by_id = creator_id
         instance.full_clean()
+        instance.save()
         if history_comment:
             update_change_reason(instance, history_comment)
-        instance.save()
 
         return instance.pk

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/manager/generalManager.py

@@ -20,12 +20,13 @@ class GeneralManager(
     Generic[GeneralManagerType, InterfaceType], metaclass=GeneralManagerMeta
 ):
     Interface: Type[InterfaceType]
+    Permission: Type[BasePermission]
     _attributes: dict[str, Any]
 
     def __init__(self, *args: Any, **kwargs: Any):
         """
         Initialize the manager by creating an interface instance with the provided arguments and storing its identification.
-        
+
         The identification is registered with the dependency tracker for tracking purposes.
         """
         self._interface = self.Interface(*args, **kwargs)
@@ -55,9 +56,9 @@ class GeneralManager(
     ) -> Bucket[GeneralManagerType]:
         """
         Combine this manager with another manager of the same class or a Bucket using the union operator.
-        
+
         If combined with a Bucket, returns the union of the Bucket and this manager. If combined with another manager of the same class, returns a Bucket containing both instances. Raises a TypeError for unsupported types.
-        
+
         Returns:
             Bucket[GeneralManagerType]: A Bucket containing the union of the involved managers.
         """
@@ -93,20 +94,19 @@ class GeneralManager(
     ) -> GeneralManager[GeneralManagerType, InterfaceType]:
         """
         Creates a new managed object using the underlying interface and returns a corresponding manager instance.
-        
+
         Performs a permission check if a `Permission` class is defined and permission checks are not ignored. Passes all provided arguments to the interface's `create` method.
-        
+
         Parameters:
             creator_id (int | None): Optional identifier for the creator of the object.
             history_comment (str | None): Optional comment for audit or history tracking.
             ignore_permission (bool): If True, skips the permission check.
-        
+
         Returns:
             GeneralManager[GeneralManagerType, InterfaceType]: A new manager instance for the created object.
         """
-        Permission: Type[BasePermission] | None = getattr(cls, "Permission", None)
-        if Permission is not None and not ignore_permission:
-            Permission.checkCreatePermission(kwargs, cls, creator_id)
+        if not ignore_permission:
+            cls.Permission.checkCreatePermission(kwargs, cls, creator_id)
         identification = cls.Interface.create(
             creator_id=creator_id, history_comment=history_comment, **kwargs
         )
@@ -122,19 +122,18 @@ class GeneralManager(
     ) -> GeneralManager[GeneralManagerType, InterfaceType]:
         """
         Update the underlying interface object with new data and return a new manager instance.
-        
+
         Parameters:
             creator_id (int | None): Optional identifier for the user performing the update.
             history_comment (str | None): Optional comment describing the update.
             ignore_permission (bool): If True, skips permission checks.
             **kwargs: Additional fields to update on the interface object.
-        
+
         Returns:
             GeneralManager[GeneralManagerType, InterfaceType]: A new manager instance reflecting the updated object.
         """
-        Permission: Type[BasePermission] | None = getattr(self, "Permission", None)
-        if Permission is not None and not ignore_permission:
-            Permission.checkUpdatePermission(kwargs, self, creator_id)
+        if not ignore_permission:
+            self.Permission.checkUpdatePermission(kwargs, self, creator_id)
         self._interface.update(
             creator_id=creator_id,
             history_comment=history_comment,
@@ -151,18 +150,17 @@ class GeneralManager(
     ) -> GeneralManager[GeneralManagerType, InterfaceType]:
         """
         Deactivates the underlying interface object and returns a new manager instance.
-        
+
         Parameters:
             creator_id (int | None): Optional identifier for the user performing the deactivation.
             history_comment (str | None): Optional comment describing the reason for deactivation.
             ignore_permission (bool): If True, skips permission checks.
-        
+
         Returns:
             GeneralManager[GeneralManagerType, InterfaceType]: A new instance representing the deactivated object.
         """
-        Permission: Type[BasePermission] | None = getattr(self, "Permission", None)
-        if Permission is not None and not ignore_permission:
-            Permission.checkDeletePermission(self, creator_id)
+        if not ignore_permission:
+            self.Permission.checkDeletePermission(self, creator_id)
         self._interface.deactivate(
             creator_id=creator_id, history_comment=history_comment
         )
@@ -190,12 +188,12 @@ class GeneralManager(
     def __parse_identification(kwargs: dict[str, Any]) -> dict[str, Any] | None:
         """
         Return a dictionary with all GeneralManager instances in the input replaced by their identification dictionaries.
-        
+
         For each key-value pair in the input, any GeneralManager instance is replaced by its identification. Lists and tuples are processed recursively, substituting contained GeneralManager instances with their identifications. Returns None if the resulting dictionary is empty.
-        
+
         Parameters:
             kwargs (dict[str, Any]): Dictionary to process.
-        
+
         Returns:
             dict[str, Any] | None: Processed dictionary with identifications, or None if empty.
         """

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/manager/meta.py

@@ -26,9 +26,9 @@ class GeneralManagerMeta(type):
     def __new__(mcs, name: str, bases: tuple[type, ...], attrs: dict[str, Any]) -> type:
         """
         Creates a new class using the metaclass, integrating interface hooks and registering the class for attribute initialization and tracking.
-        
+
         If the class definition includes an `Interface` attribute, validates it as a subclass of `InterfaceBase`, applies pre- and post-creation hooks from the interface, and registers the resulting class for attribute initialization and management. Regardless of interface presence, the new class is tracked for pending GraphQL interface creation.
-        
+
         Returns:
             The newly created class, potentially augmented with interface integration and registration logic.
         """
@@ -38,7 +38,7 @@ class GeneralManagerMeta(type):
         ) -> Type[GeneralManager]:
             """
             Create a new GeneralManager class using the standard metaclass instantiation process.
-            
+
             Returns:
                 The newly created GeneralManager subclass.
             """
@@ -59,6 +59,7 @@ class GeneralManagerMeta(type):
 
         else:
             new_class = createNewGeneralManagerClass(mcs, name, bases, attrs)
+
         if getattr(settings, "AUTOCREATE_GRAPHQL", False):
             mcs.pending_graphql_interfaces.append(new_class)
 
@@ -70,7 +71,7 @@ class GeneralManagerMeta(type):
     ):
         """
         Dynamically assigns property descriptors to a class for each specified attribute name.
-        
+
         For each attribute, creates a descriptor that:
         - Returns the field type from the class's interface when accessed on the class.
         - Retrieves the value from the instance's `_attributes` dictionary when accessed on an instance.
@@ -81,9 +82,10 @@ class GeneralManagerMeta(type):
         def desciptorMethod(attr_name: str, new_class: type):
             """
             Creates a property descriptor for an attribute, enabling dynamic access and callable resolution.
-            
+
             When accessed on the class, returns the field type from the associated interface. When accessed on an instance, retrieves the attribute value from the instance's `_attributes` dictionary, invoking it with the instance's interface if the value is callable. Raises `AttributeError` if the attribute is missing or if a callable attribute raises an exception.
             """
+
             class Descriptor(Generic[GeneralManagerType]):
                 def __init__(self, attr_name: str, new_class: Type[GeneralManager]):
                     self.attr_name = attr_name

{generalmanager-0.9.0 → generalmanager-0.10.0}/src/general_manager/measurement/measurement.py

@@ -4,7 +4,7 @@ from typing import Any, Callable
 import pint
 from decimal import Decimal, getcontext, InvalidOperation
 from operator import eq, ne, lt, le, gt, ge
-
+from pint.facets.plain import PlainQuantity
 
 # Set precision for Decimal
 getcontext().prec = 28
@@ -21,6 +21,16 @@ for currency in currency_units:
 
 class Measurement:
     def __init__(self, value: Decimal | float | int | str, unit: str):
+        """
+        Initialize a Measurement instance with a numeric value and unit.
+        
+        Parameters:
+            value (Decimal | float | int | str): The numeric value to be associated with the unit. Can be a Decimal, float, int, or a string convertible to Decimal.
+            unit (str): The unit of measurement as a string.
+        
+        Raises:
+            TypeError: If the value cannot be converted to a Decimal.
+        """
         if not isinstance(value, (Decimal, float, int)):
             try:
                 value = Decimal(str(value))
@@ -28,22 +38,37 @@ class Measurement:
                 raise TypeError("Value must be a Decimal, float, int or compatible.")
         if not isinstance(value, Decimal):
             value = Decimal(str(value))
-        self.__quantity = self.formatDecimal(value) * ureg.Quantity(1, unit)
+        self.__quantity = ureg.Quantity(self.formatDecimal(value), unit)
 
     def __getstate__(self):
+        """
+        Return a serializable state dictionary containing the magnitude and unit of the measurement.
+        
+        Returns:
+            dict: A dictionary with 'magnitude' as a string and 'unit' as a string, suitable for pickling or other serialization.
+        """
         state = {
-            "magnitude": str(self.quantity.magnitude),
-            "unit": str(self.quantity.units),
+            "magnitude": str(self.magnitude),
+            "unit": str(self.unit),
         }
         return state
 
     def __setstate__(self, state):
+        """
+        Restore the Measurement object from a serialized state dictionary.
+        
+        Parameters:
+            state (dict): A dictionary containing 'magnitude' as a string and 'unit' as a string.
+        """
         value = Decimal(state["magnitude"])
         unit = state["unit"]
-        self.__quantity = self.formatDecimal(value) * ureg.Quantity(1, unit)
+        self.__quantity = ureg.Quantity(self.formatDecimal(value), unit)
 
     @property
-    def quantity(self) -> pint.Quantity:
+    def quantity(self) -> PlainQuantity:
+        """
+        Return the internal quantity as a `PlainQuantity` object from the `pint` library.
+        """
         return self.__quantity
 
     @property
@@ -57,18 +82,24 @@ class Measurement:
     @classmethod
     def from_string(cls, value: str) -> Measurement:
         """
-        Creates a Measurement instance from a string in the format 'value unit'.
+        Parse a string of the form 'value unit' and return a Measurement instance.
         
-        Args:
-            value: A string containing a numeric value and a unit separated by a space (e.g., '10.5 kg').
+        Parameters:
+            value (str): String containing a numeric value and a unit, separated by a space (e.g., '10.5 kg').
         
         Returns:
-            A Measurement instance representing the parsed value and unit.
+            Measurement: The corresponding Measurement object.
         
         Raises:
             ValueError: If the input string does not contain exactly two parts separated by a space.
         """
         splitted = value.split(" ")
+        if len(splitted) == 1:
+            # If only one part, assume it's a dimensionless value
+            try:
+                return cls(Decimal(splitted[0]), "dimensionless")
+            except InvalidOperation:
+                raise ValueError("Invalid value for dimensionless measurement.")
         if len(splitted) != 2:
             raise ValueError("String must be in the format 'value unit'.")
         value, unit = splitted
@@ -86,12 +117,27 @@ class Measurement:
             return value
 
     def to(self, target_unit: str, exchange_rate: float | None = None):
+        """
+        Convert the measurement to a specified target unit, handling both currency and physical unit conversions.
+        
+        For currency units, an explicit exchange rate must be provided if converting between different currencies; otherwise, the original measurement is returned. For physical units, standard unit conversion is performed using the underlying unit registry.
+        
+        Parameters:
+            target_unit (str): The unit to convert the measurement to.
+            exchange_rate (float, optional): The exchange rate to use for currency conversion. Required if converting between different currencies.
+        
+        Returns:
+            Measurement: A new Measurement instance in the target unit.
+        
+        Raises:
+            ValueError: If converting between different currencies without providing an exchange rate.
+        """
         if self.is_currency():
-            if self.quantity.units == ureg(target_unit):
+            if self.unit == ureg(target_unit):
                 return self  # Same currency, no conversion needed
             elif exchange_rate is not None:
                 # Convert using the provided exchange rate
-                value = self.quantity.magnitude * Decimal(str(exchange_rate))
+                value = self.magnitude * Decimal(str(exchange_rate))
                 return Measurement(value, target_unit)
             else:
                 raise ValueError(
@@ -106,14 +152,25 @@ class Measurement:
 
     def is_currency(self):
         # Check if the unit is a defined currency
-        return str(self.quantity.units) in currency_units
+        """
+        Return True if the measurement's unit is one of the defined currency units.
+        """
+        return str(self.unit) in currency_units
 
     def __add__(self, other: Any) -> Measurement:
+        """
+        Add two Measurement instances, supporting both currency and physical units.
+        
+        Addition is allowed only if both operands are currencies of the same unit or both are physical units with compatible dimensions. Raises a TypeError if operands are of different types (currency vs. physical unit) or not Measurement instances, and raises a ValueError if units are incompatible.
+        
+        Returns:
+            Measurement: A new Measurement representing the sum.
+        """
         if not isinstance(other, Measurement):
             raise TypeError("Addition is only allowed between Measurement instances.")
         if self.is_currency() and other.is_currency():
             # Both are currencies
-            if self.quantity.units != other.quantity.units:
+            if self.unit != other.unit:
                 raise ValueError(
                     "Addition between different currencies is not allowed."
                 )
@@ -139,34 +196,49 @@ class Measurement:
             )
 
     def __sub__(self, other: Any) -> Measurement:
+        """
+        Subtracts another Measurement from this one, enforcing unit compatibility.
+        
+        Subtraction is allowed only between two currencies of the same unit or two physical units with compatible dimensions. Raises a TypeError if the operand is not a Measurement or if attempting to subtract a currency from a physical unit (or vice versa). Raises a ValueError if subtracting different currencies or incompatible physical units.
+        
+        Returns:
+            Measurement: The result of the subtraction as a new Measurement instance.
+        """
         if not isinstance(other, Measurement):
             raise TypeError(
                 "Subtraction is only allowed between Measurement instances."
             )
         if self.is_currency() and other.is_currency():
             # Both are currencies
-            if self.quantity.units != other.quantity.units:
+            if self.unit != other.unit:
                 raise ValueError(
                     "Subtraction between different currencies is not allowed."
                 )
             result_quantity = self.quantity - other.quantity
-            return Measurement(
-                Decimal(str(result_quantity.magnitude)), str(self.quantity.units)
-            )
+            return Measurement(Decimal(str(result_quantity.magnitude)), str(self.unit))
         elif not self.is_currency() and not other.is_currency():
             # Both are physical units
             if self.quantity.dimensionality != other.quantity.dimensionality:
                 raise ValueError("Units are not compatible for subtraction.")
             result_quantity = self.quantity - other.quantity
-            return Measurement(
-                Decimal(str(result_quantity.magnitude)), str(self.quantity.units)
-            )
+            return Measurement(Decimal(str(result_quantity.magnitude)), str(self.unit))
         else:
             raise TypeError(
                 "Subtraction between currency and physical unit is not allowed."
             )
 
     def __mul__(self, other: Any) -> Measurement:
+        """
+        Multiply this measurement by another measurement or a numeric value.
+        
+        Multiplication between two currency measurements is not allowed. If multiplied by another measurement, returns a new Measurement with the combined units. If multiplied by a numeric value, returns a new Measurement with the same unit and scaled magnitude.
+        
+        Returns:
+            Measurement: The result of the multiplication as a new Measurement instance.
+        
+        Raises:
+            TypeError: If attempting to multiply two currency measurements or if the operand is not a Measurement or numeric value.
+        """
         if isinstance(other, Measurement):
             if self.is_currency() or other.is_currency():
                 raise TypeError(
@@ -180,15 +252,21 @@ class Measurement:
             if not isinstance(other, Decimal):
                 other = Decimal(str(other))
             result_quantity = self.quantity * other
-            return Measurement(
-                Decimal(str(result_quantity.magnitude)), str(self.quantity.units)
-            )
+            return Measurement(Decimal(str(result_quantity.magnitude)), str(self.unit))
         else:
             raise TypeError(
                 "Multiplication is only allowed with Measurement or numeric values."
             )
 
     def __truediv__(self, other: Any) -> Measurement:
+        """
+        Divide this measurement by another measurement or a numeric value.
+        
+        If dividing by another `Measurement`, both must not be currencies. Returns a new `Measurement` with the resulting value and unit. If dividing by a numeric value, returns a new `Measurement` with the same unit and divided magnitude.
+        
+        Raises:
+            TypeError: If dividing two currency measurements, or if the operand is not a `Measurement` or numeric value.
+        """
         if isinstance(other, Measurement):
             if self.is_currency() and other.is_currency():
                 raise TypeError("Division between two currency amounts is not allowed.")
@@ -200,41 +278,38 @@ class Measurement:
             if not isinstance(other, Decimal):
                 other = Decimal(str(other))
             result_quantity = self.quantity / other
-            return Measurement(
-                Decimal(str(result_quantity.magnitude)), str(self.quantity.units)
-            )
+            return Measurement(Decimal(str(result_quantity.magnitude)), str(self.unit))
         else:
             raise TypeError(
                 "Division is only allowed with Measurement or numeric values."
             )
 
     def __str__(self):
-        if not str(self.quantity.units) == "dimensionless":
-            return f"{self.quantity.magnitude} {self.quantity.units}"
-        return f"{self.quantity.magnitude}"
+        """
+        Return a string representation of the measurement, including the unit unless it is dimensionless.
+        """
+        if not str(self.unit) == "dimensionless":
+            return f"{self.magnitude} {self.unit}"
+        return f"{self.magnitude}"
 
     def __repr__(self):
-        return f"Measurement({self.quantity.magnitude}, '{self.quantity.units}')"
+        """
+        Return a string representation of the Measurement instance for debugging, showing its magnitude and unit.
+        """
+        return f"Measurement({self.magnitude}, '{self.unit}')"
 
     def _compare(self, other: Any, operation: Callable[..., bool]) -> bool:
         """
-        Compares this Measurement with another using the specified comparison operation.
+        Compare this Measurement to another using a specified comparison operation.
         
-        If `other` is a string, it is parsed into a Measurement. Raises a TypeError if
-        `other` is not a Measurement instance. Converts `other` to this instance's unit
-        before applying the comparison. Raises a ValueError if the measurements have
-        incompatible dimensions.
+        If `other` is a string, it is parsed into a Measurement. The comparison is performed after converting `other` to this instance's unit. Raises a TypeError if `other` is not a Measurement or a valid string, and a ValueError if the measurements have incompatible dimensions.
         
-        Args:
-            other: The object to compare with, either a Measurement or a string in the format "value unit".
-            operation: A callable that takes two magnitudes and returns a boolean result.
+        Parameters:
+            other: The object to compare, either a Measurement or a string in the format "value unit".
+            operation: A callable that takes two magnitudes and returns a boolean.
         
         Returns:
-            The result of the comparison operation.
-        
-        Raises:
-            TypeError: If `other` is not a Measurement instance or a valid string representation.
-            ValueError: If the measurements have different dimensions and cannot be compared.
+            bool: The result of the comparison.
         """
         if isinstance(other, str):
             other = Measurement.from_string(other)
@@ -244,9 +319,9 @@ class Measurement:
             raise TypeError("Comparison is only allowed between Measurement instances.")
         try:
             # Convert `other` to the same units as `self`
-            other_converted: pint.Quantity = other.quantity.to(self.quantity.units)  # type: ignore
+            other_converted: pint.Quantity = other.quantity.to(self.unit)  # type: ignore
             # Apply the comparison operation
-            return operation(self.quantity.magnitude, other_converted.magnitude)
+            return operation(self.magnitude, other_converted.magnitude)
         except pint.DimensionalityError:
             raise ValueError("Cannot compare measurements with different dimensions.")
 
@@ -273,16 +348,16 @@ class Measurement:
 
     def __ge__(self, other: Any) -> bool:
         """
-        Returns True if this measurement is greater than or equal to another measurement.
+        Return True if this measurement is greater than or equal to another measurement.
         
-        Comparison is performed after converting the other operand to the same unit. Raises a TypeError if the other object is not a Measurement instance or a compatible string, or a ValueError if the units are not compatible.
+        The comparison is performed after converting the other operand to the same unit as this measurement. Raises a TypeError if the other object is not a Measurement instance or a compatible string, or a ValueError if the units are incompatible.
         """
         return self._compare(other, ge)
 
     def __hash__(self) -> int:
         """
-        Returns a hash value based on the magnitude and unit of the measurement.
+        Return a hash value derived from the measurement's magnitude and unit.
         
-        This enables Measurement instances to be used in hash-based collections such as sets and dictionaries.
+        Enables use of Measurement instances in hash-based collections such as sets and dictionaries.
         """
-        return hash((self.quantity.magnitude, str(self.quantity.units)))
+        return hash((self.magnitude, str(self.unit)))

{generalmanager-0.9.0/src/general_manager/auxiliary → generalmanager-0.10.0/src/general_manager/utils}/makeCacheKey.py

@@ -1,21 +1,21 @@
 import inspect
 import json
-from general_manager.auxiliary.jsonEncoder import CustomJSONEncoder
+from general_manager.utils.jsonEncoder import CustomJSONEncoder
 from hashlib import sha256
 
 
 def make_cache_key(func, args, kwargs):
     """
     Generates a unique, deterministic cache key for a specific function call.
-    
+
     The key is derived from the function's module, qualified name, and bound arguments,
     serialized to JSON and hashed with SHA-256 to ensure uniqueness for each call signature.
-    
+
     Args:
         func: The target function to be identified.
         args: Positional arguments for the function call.
         kwargs: Keyword arguments for the function call.
-    
+
     Returns:
         A hexadecimal SHA-256 hash string uniquely representing the function call.
     """