GeneralManager 0.19.2__py3-none-any.whl → 0.20.1__py3-none-any.whl

general_manager/rule/rule.py

@@ -19,10 +19,12 @@ from general_manager.rule.handler import (
     SumHandler,
 )
 from general_manager.manager.general_manager import GeneralManager
+from general_manager.logging import get_logger
 
 GeneralManagerType = TypeVar("GeneralManagerType", bound=GeneralManager)
 
 NOTEXISTENT = object()
+logger = get_logger("rule.engine")
 
 
 class NonexistentAttributeError(AttributeError):
@@ -131,6 +133,13 @@ class Rule(Generic[GeneralManagerType]):
             handler_cls: type[BaseRuleHandler] = import_string(path)
             inst = handler_cls()
             self._handlers[inst.function_name] = inst
+        logger.debug(
+            "initialised rule",
+            context={
+                "rule": self._func.__qualname__,
+                "variables": self._variables,
+            },
+        )
 
     @property
     def func(self) -> Callable[[GeneralManagerType], bool]:
@@ -173,12 +182,47 @@ class Rule(Generic[GeneralManagerType]):
         if self._primary_param is not None:
             self._last_args[self._primary_param] = x
 
+        logger.debug(
+            "evaluating rule",
+            context={
+                "rule": self._func.__qualname__,
+                "manager": type(x).__name__,
+            },
+        )
+
         vals = self._extract_variable_values(x)
         if self._ignore_if_none and any(v is None for v in vals.values()):
             self._last_result = None
+            logger.debug(
+                "skipped rule evaluation due to missing values",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": type(x).__name__,
+                    "null_variables": [
+                        name for name, value in vals.items() if value is None
+                    ],
+                },
+            )
             return None
 
         self._last_result = self._func(x)
+        if self._last_result:
+            logger.debug(
+                "rule evaluation passed",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": type(x).__name__,
+                },
+            )
+        else:
+            logger.info(
+                "rule evaluation failed",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": type(x).__name__,
+                    "variables": self._variables,
+                },
+            )
         return self._last_result
 
     def validate_custom_error_message(self) -> None:
@@ -214,6 +258,14 @@ class Rule(Generic[GeneralManagerType]):
         # Validate and substitute template placeholders
         self.validate_custom_error_message()
         vals = self._extract_variable_values(self._last_input)
+        manager_class = type(self._last_input).__name__
+        logger.debug(
+            "generating rule error messages",
+            context={
+                "rule": self._func.__qualname__,
+                "manager": manager_class,
+            },
+        )
 
         if self._custom_error_message:
             formatted = re.sub(
@@ -221,9 +273,34 @@ class Rule(Generic[GeneralManagerType]):
                 lambda m: str(vals.get(m.group(1), m.group(0))),
                 self._custom_error_message,
             )
+            logger.info(
+                "rule produced custom error message",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": manager_class,
+                    "variables": self._variables,
+                },
+            )
             return {v: formatted for v in self._variables}
 
         errors = self._generate_error_messages(vals)
+        if errors:
+            logger.info(
+                "rule produced error messages",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": manager_class,
+                    "variables": list(errors.keys()),
+                },
+            )
+        else:
+            logger.debug(
+                "rule generated no error messages",
+                context={
+                    "rule": self._func.__qualname__,
+                    "manager": manager_class,
+                },
+            )
         return errors or None
 
     def _extract_variables(self) -> List[str]:
@@ -355,6 +432,14 @@ class Rule(Generic[GeneralManagerType]):
                         fn = self._get_node_name(left.func)
                         handler = self._handlers.get(fn)
                         if handler:
+                            logger.debug(
+                                "rule handler invoked",
+                                context={
+                                    "rule": self._func.__qualname__,
+                                    "handler": handler.__class__.__name__,
+                                    "function": fn,
+                                },
+                            )
                             errors.update(
                                 handler.handle(cmp, left, right, op, var_values, self)
                             )

general_manager/utils/public_api.py

@@ -5,6 +5,8 @@ from __future__ import annotations
 from importlib import import_module
 from typing import Any, Iterable, Mapping, MutableMapping, overload
 
+from general_manager.logging import get_logger
+
 
 class MissingExportError(AttributeError):
     """Raised when a requested export is not defined in the public API."""
@@ -24,6 +26,7 @@ class MissingExportError(AttributeError):
 
 ModuleTarget = tuple[str, str]
 ModuleMap = Mapping[str, str | ModuleTarget]
+logger = get_logger("utils.public_api")
 
 
 @overload
@@ -63,11 +66,27 @@ def resolve_export(
         MissingExportError: If `name` is not present in `module_all`.
     """
     if name not in module_all:
+        logger.warning(
+            "missing public api export",
+            context={
+                "module": module_globals["__name__"],
+                "export": name,
+            },
+        )
         raise MissingExportError(module_globals["__name__"], name)
     module_path, attr_name = _normalize_target(name, module_map[name])
     module = import_module(module_path)
     value = getattr(module, attr_name)
     module_globals[name] = value
+    logger.debug(
+        "resolved public api export",
+        context={
+            "module": module_globals["__name__"],
+            "export": name,
+            "target_module": module_path,
+            "target_attribute": attr_name,
+        },
+    )
     return value
 
 

{generalmanager-0.19.2.dist-info → generalmanager-0.20.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.19.2
+Version: 0.20.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.19.2.dist-info → generalmanager-0.20.1.dist-info}/RECORD

@@ -1,13 +1,14 @@
 general_manager/__init__.py,sha256=Xy4_fFjChIYtlBPDv7K3JEHOulq9_IFXkCc4CElS32Q,1035
-general_manager/apps.py,sha256=pY_gR2wMAWw9jyL69dyqtn9NJDeWItp0PCzFEWF_SrE,25852
-general_manager/public_api_registry.py,sha256=I6xgSW_02kBPCUoTt03DZdJG_WLQcpy1Caw6F5WEB6g,7756
+general_manager/apps.py,sha256=bz_A2IfgVba2b8lZC5aeQqe40IH7GaavpTEg828Ltm4,27343
+general_manager/logging.py,sha256=bL2dEdNnxo74qRmhOCG06lbPtVCOozfF3GS133T9HH8,4250
+general_manager/public_api_registry.py,sha256=mDpKIE3fmFAMTbQnQdLAZGc_CKNNA6p22Jrql9R6Y4w,7817
 general_manager/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/_types/__init__.py,sha256=RmS0Ok-1-CwWOZL_socLWksEk9MfsshL9eQx879I4mU,60
 general_manager/_types/api.py,sha256=i5fi7O3C3frI74oqPT-tAoztDplgNDOShyvPNxhw7CY,496
 general_manager/_types/bucket.py,sha256=DZ3GC-1iR4RiNBKydsMhp_R4GTaYMfsonwe7MCADVP4,435
 general_manager/_types/cache.py,sha256=jMbIEXDq1pUvVxTN8hvD8rSH7QRjE3ewrMx2gEhYP3w,660
 general_manager/_types/factory.py,sha256=cPG_td05KCWv2j6_h_vYCKETPol3k_nXkEMWCcUdNHM,1726
-general_manager/_types/general_manager.py,sha256=AVCM99Z-YDTvCvbKH8T9Na24-Bnod6JRQEkV9Sdypkg,966
+general_manager/_types/general_manager.py,sha256=Izs47-pOnYJqPmMF7m5DRodSISEztXKSxtBGIHgN8sA,1031
 general_manager/_types/interface.py,sha256=JlPn3G3ompn1PRfFQfsrIJv2Pf0I3n1RL2ki5_fDX54,605
 general_manager/_types/manager.py,sha256=rXM6NrQaPdfE9CQoRV_jhbI3SK23rvdpvyBpybVgWi8,506
 general_manager/_types/measurement.py,sha256=Unkpf3H7TGaUKfkjmFDR7QWBU4lPp5I2A4GlK8pps-Y,443
@@ -15,7 +16,7 @@ general_manager/_types/permission.py,sha256=HJBEOIDYbkYSZkEbT4_6qRDyUk2Ek153K_Rc
 general_manager/_types/rule.py,sha256=aNbx3jlVinAYQGJlmFwW8rOwTjf19F6khq5xbGTdD3U,238
 general_manager/_types/utils.py,sha256=8VyD6EKkcRIzdVs6FANP5Ri71eT4BT4c3dTUeyjDr40,1043
 general_manager/api/__init__.py,sha256=ChV1UPCUjW1Lci0BajmXVtE-3C-WLQTvjO058BMu1Bs,1020
-general_manager/api/graphql.py,sha256=khc6d0PHmc8wbnfCG__S3QDejfHDwOWqbFWjClQJmyA,80403
+general_manager/api/graphql.py,sha256=MqNvIWAlHpnRy4WYf6I4bjFLkL29rWWyQls2oS3b1b0,83122
 general_manager/api/graphql_subscription_consumer.py,sha256=cA-pQNjeF4o92yc2IHtNob6z1CNhHoGxIw2Fgoj24-U,17492
 general_manager/api/mutation.py,sha256=-zZ_zdyCQW46ihP0kC9BiNGRMPyLYVimxqOKNvP_s48,10155
 general_manager/api/property.py,sha256=dWRTg8CECSYkIqTBwSbM8CCDEqB_-Zfbtfhxzag7qJI,5690
@@ -25,9 +26,9 @@ general_manager/bucket/calculation_bucket.py,sha256=TpZOJP42CFwsqeQWOrltouClA9Xl
 general_manager/bucket/database_bucket.py,sha256=Hh__H3E-7tFaUvA5WiKbHmyafyFTzc72HgCvsTgawfU,23008
 general_manager/bucket/group_bucket.py,sha256=nr2_3rJizOhhbtF5WPiLtZn8lnP2JQ40ehPgYKpwR1M,16369
 general_manager/cache/__init__.py,sha256=1qLNRTHScsXDoIXKdwvHwyoi7pIb5phv7ASS1AP4Xc8,1014
-general_manager/cache/cache_decorator.py,sha256=k3i4tjWJE-XPwyBbebcsvsVeNOyWF6xlsk0MnqwgFdc,3500
+general_manager/cache/cache_decorator.py,sha256=SpXZE89lRqI2jD4iWKbdkvGXp3BBWULvRbG9jM0e4Fs,4203
 general_manager/cache/cache_tracker.py,sha256=AyDgc_PbxvfE3AJZilKaFCh9Dgg883pMRCXqZxWiILU,2992
-general_manager/cache/dependency_index.py,sha256=M9INDjjxROGma7hPh0iecouRS1QoTRLBz9uFl1GRJEk,25600
+general_manager/cache/dependency_index.py,sha256=-1NM13y6OIakw52bvXtWQOz55Mbq4EGq28aXvfpKxO8,26248
 general_manager/cache/model_dependency_collector.py,sha256=T0g1-0KaEKE8xRNBJj3qsEWKIVlaDZq_MoDn1mCpXv0,2649
 general_manager/cache/signals.py,sha256=FP_axmdeoJh9ZxjriNgz5zCEQRrVT__KvsHO4eAqdFg,2553
 general_manager/factory/__init__.py,sha256=A-if6AxDHIejg9S2ObJXGolBfD5xfG9P1aUqT-KEGf0,943
@@ -35,22 +36,22 @@ general_manager/factory/auto_factory.py,sha256=UcX0mxqLyeccuIhjnE8uHYEJ24bMRCZjz
 general_manager/factory/factories.py,sha256=yVqLSFWuFFTEE9mQGMA9uTRETIruKv0vj6DrUlRoasU,12092
 general_manager/factory/factory_methods.py,sha256=ZwUQwuLbs1NgVxkjK6idzmWAZY3-9F8wah05bSf14bQ,8407
 general_manager/interface/__init__.py,sha256=L0IQUHOJehJbX6hzX9nomMhT8f1tqrPtLDgINIpe5-w,1010
-general_manager/interface/base_interface.py,sha256=hzfWmjRT5ZMKNaq-0T0Ol05wRSEefhwue5XRP5h1lw0,16183
+general_manager/interface/base_interface.py,sha256=TREetLDX_BAtqrnsvZ9qHUkxl86JCCPzI_eky2bTLwg,16194
 general_manager/interface/calculation_interface.py,sha256=dsu2pjFgaOv-Kif5YbrsbEvH8Q1n_XfUabPv3CusbtE,5965
 general_manager/interface/database_based_interface.py,sha256=1L0Q22nEWiO_i--3AtuseAytiXMEkIUF4HL5rTB0s0M,25623
-general_manager/interface/database_interface.py,sha256=Xwvhoq17YZeVW8MoKlcJnDc04akdr-NRrDEn_sCTRms,11768
+general_manager/interface/database_interface.py,sha256=ALFQKl7jXNQMHegmUkNKyDGJruMmAmprDiiyYsfZZ_A,11825
 general_manager/interface/models.py,sha256=MWCgr-Qzauu7jq-15_iEdI0C9B99MsRONV9jUcjkkMU,3699
-general_manager/interface/read_only_interface.py,sha256=maZ4xwT_XGCu6aoqkFbdQE_lyXJgCk42BQXmHyrOy7o,14945
+general_manager/interface/read_only_interface.py,sha256=w1XrTeOyf3T7lDfC7ponAMhfNw5LTM46lTOEsocE244,16000
 general_manager/manager/__init__.py,sha256=Dbka86jtcS2NIxKXA0mohqnLZwLb6NDRX-HeD1_R6UQ,933
-general_manager/manager/general_manager.py,sha256=wmmyrM8hNfv5vTGRei4ytpsASQtzJ6zKGo7uEkDv4XA,10231
+general_manager/manager/general_manager.py,sha256=GperYpkoTg_CZlwYBsqGhnaMFENR6jyxanKYdHsvZjg,12083
 general_manager/manager/group_manager.py,sha256=EhiW2cEnr7J4Ft-FBfuW4hCT5mYg_RCD_-mYF4an9dw,7320
 general_manager/manager/input.py,sha256=e2M7TSZgNwQz0P1pD_rOpm6-wDUUTjga6kb3nJBR9js,3032
-general_manager/manager/meta.py,sha256=RyPwCwVzabz4D6CTVroWkvKQwlx4hAzZfWzbMntkyDk,9646
+general_manager/manager/meta.py,sha256=kkuwKJlbahUMAkh3Gqefbzdm0rnwhD-jbeR2XhveLLs,11391
 general_manager/measurement/__init__.py,sha256=38-6kTERbw7EeOQAw3eZ9DDEu6hwwqkGJIfJy1D5fx0,993
 general_manager/measurement/measurement.py,sha256=ArEnntLu3ffHID71uFbXwiB5e5tpsBT2_TbBPJfCWJI,26070
 general_manager/measurement/measurement_field.py,sha256=zQbyLZT7E9Lx4f3u_wQ-rEoLPqH0FWhfWyOd1BaW--M,13950
 general_manager/permission/__init__.py,sha256=s4Ka11uYBrymM5O-n5kIxOjwUprZ394jTuzGf5prO_8,981
-general_manager/permission/base_permission.py,sha256=XLqtz_rZtS3AXoLG9W5yaSSXD83IZjyeg_bfdqGdzwg,11141
+general_manager/permission/base_permission.py,sha256=IKi5n8t1sKUP_F2eZnzTC8lg7HI8OVo5p1jxCBpyCgw,11961
 general_manager/permission/file_based_permission.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/permission/manager_based_permission.py,sha256=OdDGKwutkHTT13bhSeGGycd3xr7wGhuRXsYym3Z9j2A,10613
 general_manager/permission/mutation_permission.py,sha256=5JV6pluIFPGzJPQ_pr-44zwFg_TgzNwDTHcdpwHettU,4606
@@ -59,7 +60,7 @@ general_manager/permission/permission_data_manager.py,sha256=vNWbPrcw1NUZ-oTRjc3
 general_manager/permission/utils.py,sha256=yojrcF1kD6KjKugrGyiaf8XOyS_tUA4yB5_RideKJeg,2905
 general_manager/rule/__init__.py,sha256=dFQLJNr0qpkpuzuBbMY-74jz_Y033YyB9X_OfeJYhSs,1026
 general_manager/rule/handler.py,sha256=qSBXmXvl7fRgjxUo4wyUOzdZm14a8Umd2Jec4zPXJQc,16309
-general_manager/rule/rule.py,sha256=VmaBdV-XmaVYtlDFf8vcmmOsChhLrnSguwlJbQBbvm0,19770
+general_manager/rule/rule.py,sha256=41VXFTSWkBEOj8045vZTezm38VEGimjrk22J4YRl144,22691
 general_manager/utils/__init__.py,sha256=a72hkiV4_c3wQN-NK-q3Dw25irbzoTTfyKm173WtjwQ,1003
 general_manager/utils/args_to_kwargs.py,sha256=uvc0YkfeKvny4SGWNVqFioIxajBHrSkzoqrzonu7jeU,2128
 general_manager/utils/filter_parser.py,sha256=qVkCM5M-gtVrQ3kbHApHjChwSm6Soz60hj41jJdvMvE,5676
@@ -68,10 +69,10 @@ general_manager/utils/json_encoder.py,sha256=0jyjBsZNYGl54hQRkig_5_a20bIN2mV0jlh
 general_manager/utils/make_cache_key.py,sha256=Uvf7duph8FkqmWWuc4vVdB5Dztur490hPGIFtlkVuT4,1253
 general_manager/utils/none_to_zero.py,sha256=Z2KVXBKCz02V2ZBs-7tIs_32n7YDxiXyoodW8JbXTDY,667
 general_manager/utils/path_mapping.py,sha256=f3sd3OFh9aJgyF-ayqr22mHnCo-uoIXqio5DRQmziGM,9931
-general_manager/utils/public_api.py,sha256=VvsJWJkJ9HIVu5xSQ_IhX2SROSbORXeGARpGVSGo9r4,2732
+general_manager/utils/public_api.py,sha256=bas4SKchJUg2dI2SLRQwkF_CoXJKKwkzQx_JOjMJ2VY,3272
 general_manager/utils/testing.py,sha256=_V4Y5SXvu-ocoq-AntPFPd140igclUJUT2xVXxhRrSs,14954
-generalmanager-0.19.2.dist-info/licenses/LICENSE,sha256=OcRwUgM4iiESN1oNELgyuwuah39XX-EPZiPDDHndNVI,1070
-generalmanager-0.19.2.dist-info/METADATA,sha256=yjpThJqHlO6FdkCiKsddsmI0ZJpT-kXAN69J7gEQj00,8266
-generalmanager-0.19.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-generalmanager-0.19.2.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.19.2.dist-info/RECORD,,
+generalmanager-0.20.1.dist-info/licenses/LICENSE,sha256=OcRwUgM4iiESN1oNELgyuwuah39XX-EPZiPDDHndNVI,1070
+generalmanager-0.20.1.dist-info/METADATA,sha256=aZ08I7nii3gn6zicyZnhavmaZlbQHZIlb8PEaYuT5is,8266
+generalmanager-0.20.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+generalmanager-0.20.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.20.1.dist-info/RECORD,,