GeneralManager 0.10.2__tar.gz → 0.10.3__tar.gz

{generalmanager-0.10.2 → generalmanager-0.10.3}/GeneralManager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.10.2
+Version: 0.10.3
 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.10.2 → generalmanager-0.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.10.2
+Version: 0.10.3
 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.10.2 → generalmanager-0.10.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.10.2"
+version = "0.10.3"
 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.10.2 → generalmanager-0.10.3}/src/general_manager/bucket/baseBucket.py

@@ -15,6 +15,7 @@ if TYPE_CHECKING:
     from general_manager.manager.generalManager import GeneralManager
     from general_manager.manager.groupManager import GroupManager
     from general_manager.bucket.groupBucket import GroupBucket
+    from general_manager.interface.baseInterface import InterfaceBase
 
 
 class Bucket(ABC, Generic[GeneralManagerType]):
@@ -22,7 +23,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def __init__(self, manager_class: Type[GeneralManagerType]):
         """
         Initializes the Bucket with a specified manager class.
-        
+
         Args:
             manager_class: The class of manager objects this bucket will manage.
         """
@@ -34,7 +35,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def __eq__(self, other: object) -> bool:
         """
         Checks if this Bucket is equal to another by comparing class, data, and manager class.
-        
+
         Returns:
             True if both objects are of the same class and have equal internal data and manager class; otherwise, False.
         """
@@ -45,7 +46,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def __reduce__(self) -> str | tuple[Any, ...]:
         """
         Prepares the object for pickling by returning the class and initialization arguments.
-        
+
         Returns:
             A tuple containing the class and a tuple of arguments needed to reconstruct the object during unpickling.
         """
@@ -56,14 +57,18 @@ class Bucket(ABC, Generic[GeneralManagerType]):
 
     @abstractmethod
     def __or__(
-        self, other: Bucket[GeneralManagerType] | GeneralManager[GeneralManagerType]
+        self,
+        other: (
+            Bucket[GeneralManagerType]
+            | GeneralManager[GeneralManagerType, InterfaceBase]
+        ),
     ) -> Bucket[GeneralManagerType]:
         """
         Returns a new bucket representing the union of this bucket and another bucket or manager instance.
-        
+
         Args:
             other: Another bucket or a single manager instance to combine with this bucket.
-        
+
         Returns:
             A new bucket containing all unique items from both sources.
         """
@@ -72,10 +77,10 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     @abstractmethod
     def __iter__(
         self,
-    ) -> Generator[GeneralManagerType | GroupManager[GeneralManagerType]]:
+    ) -> Generator[GeneralManagerType | GroupManager[GeneralManagerType], None, None]:
         """
         Returns an iterator over the items in the bucket.
-        
+
         Yields:
             Instances of the managed type or group manager contained in the bucket.
         """
@@ -85,10 +90,10 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def filter(self, **kwargs: Any) -> Bucket[GeneralManagerType]:
         """
         Returns a new bucket containing only items that match the specified filter criteria.
-        
+
         Args:
             **kwargs: Field-value pairs used to filter items in the bucket.
-        
+
         Returns:
             A new Bucket instance with items matching the given criteria.
         """
@@ -98,10 +103,10 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def exclude(self, **kwargs: Any) -> Bucket[GeneralManagerType]:
         """
         Returns a new Bucket excluding items that match the specified criteria.
-        
+
         Args:
             **kwargs: Field-value pairs specifying the exclusion criteria.
-        
+
         Returns:
             A new Bucket instance with items matching the criteria excluded.
         """
@@ -111,7 +116,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def first(self) -> GeneralManagerType | GroupManager[GeneralManagerType] | None:
         """
         Returns the first item in the bucket, or None if the bucket is empty.
-        
+
         Returns:
             The first GeneralManager or GroupManager instance, or None if no items exist.
         """
@@ -121,7 +126,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def last(self) -> GeneralManagerType | GroupManager[GeneralManagerType] | None:
         """
         Returns the last item in the bucket, or None if the bucket is empty.
-        
+
         Returns:
             The last GeneralManager or GroupManager instance, or None if no items exist.
         """
@@ -131,7 +136,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def count(self) -> int:
         """
         Returns the number of items in the bucket.
-        
+
         Subclasses must implement this method to provide the count of contained elements.
         """
         raise NotImplementedError
@@ -140,7 +145,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def all(self) -> Bucket[GeneralManagerType]:
         """
         Returns a bucket containing all items managed by this instance.
-        
+
         Subclasses must implement this method to provide access to the complete collection without filters or exclusions applied.
         """
         raise NotImplementedError
@@ -151,13 +156,13 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     ) -> GeneralManagerType | GroupManager[GeneralManagerType]:
         """
         Retrieves a single item matching the specified criteria.
-        
+
         Args:
             **kwargs: Field-value pairs used to identify the item.
-        
+
         Returns:
             The matching GeneralManager or GroupManager instance.
-        
+
         Raises:
             NotImplementedError: If the method is not implemented by a subclass.
         """
@@ -173,13 +178,13 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     ):
         """
         Retrieves an item or a slice from the bucket.
-        
+
         Args:
             item: An integer index to retrieve a single element, or a slice to retrieve a subset.
-        
+
         Returns:
             A single manager instance if an integer is provided, or a new Bucket containing the sliced elements if a slice is provided.
-        
+
         Raises:
             NotImplementedError: This method must be implemented by subclasses.
         """
@@ -189,7 +194,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def __len__(self) -> int:
         """
         Returns the number of items in the bucket.
-        
+
         Subclasses must implement this method to provide the count of contained elements.
         """
         raise NotImplementedError
@@ -198,12 +203,12 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def __contains__(self, item: GeneralManagerType) -> bool:
         """
         Checks whether the specified item is present in the bucket.
-        
+
         Args:
-        	item: The manager instance to check for membership.
-        
+                item: The manager instance to check for membership.
+
         Returns:
-        	True if the item is contained in the bucket, otherwise False.
+                True if the item is contained in the bucket, otherwise False.
         """
         raise NotImplementedError
 
@@ -215,11 +220,11 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     ) -> Bucket[GeneralManagerType]:
         """
         Returns a new Bucket with items sorted by the specified key or keys.
-        
+
         Args:
             key: A string or tuple of strings specifying the attribute(s) to sort by.
             reverse: If True, sorts in descending order. Defaults to False.
-        
+
         Returns:
             A new Bucket instance with items sorted according to the given key(s).
         """
@@ -228,10 +233,10 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     def group_by(self, *group_by_keys: str) -> GroupBucket[GeneralManagerType]:
         """
         Groups the bucket's data by one or more specified keys.
-        
+
         Args:
             *group_by_keys: One or more attribute names to group the data by.
-        
+
         Returns:
             A GroupBucket instance containing the grouped data.
         """

{generalmanager-0.10.2 → generalmanager-0.10.3}/src/general_manager/bucket/calculationBucket.py

@@ -190,7 +190,7 @@ class CalculationBucket(Bucket[GeneralManagerType]):
         """
         return self
 
-    def __iter__(self) -> Generator[GeneralManagerType]:
+    def __iter__(self) -> Generator[GeneralManagerType, None, None]:
         """
         Yields manager instances for each valid combination of input parameters.
 

{generalmanager-0.10.2 → generalmanager-0.10.3}/src/general_manager/bucket/databaseBucket.py

@@ -4,6 +4,7 @@ from typing import (
     Any,
     Generator,
     TypeVar,
+    TYPE_CHECKING,
 )
 from django.db import models
 from general_manager.interface.baseInterface import (
@@ -15,6 +16,9 @@ from general_manager.manager.generalManager import GeneralManager
 
 modelsModel = TypeVar("modelsModel", bound=models.Model)
 
+if TYPE_CHECKING:
+    from general_manager.interface.databaseInterface import DatabaseInterface
+
 
 class DatabaseBucket(Bucket[GeneralManagerType]):
 
@@ -40,7 +44,7 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
         self.filters = {**(filter_definitions or {})}
         self.excludes = {**(exclude_definitions or {})}
 
-    def __iter__(self) -> Generator[GeneralManagerType]:
+    def __iter__(self) -> Generator[GeneralManagerType, None, None]:
         """
         Yields manager instances for each item in the underlying queryset.
 
@@ -51,7 +55,10 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
 
     def __or__(
         self,
-        other: Bucket[GeneralManagerType] | GeneralManager[GeneralManagerType],
+        other: (
+            Bucket[GeneralManagerType]
+            | GeneralManager[GeneralManagerType, DatabaseInterface]
+        ),
     ) -> DatabaseBucket[GeneralManagerType]:
         """
         Combines this bucket with another bucket or manager instance using the union operator.

{generalmanager-0.10.2 → generalmanager-0.10.3}/src/general_manager/bucket/groupBucket.py

@@ -117,7 +117,7 @@ class GroupBucket(Bucket[GeneralManagerType]):
             self._basis_data | other._basis_data,
         )
 
-    def __iter__(self) -> Generator[GroupManager[GeneralManagerType]]:
+    def __iter__(self) -> Generator[GroupManager[GeneralManagerType], None, None]:
         """
         Yields each grouped manager in the current GroupBucket.
 

{generalmanager-0.10.2 → generalmanager-0.10.3}/src/general_manager/cache/modelDependencyCollector.py

@@ -11,15 +11,17 @@ from general_manager.cache.dependencyIndex import (
 class ModelDependencyCollector:
 
     @staticmethod
-    def collect(obj) -> Generator[tuple[general_manager_name, filter_type, str]]:
+    def collect(
+        obj,
+    ) -> Generator[tuple[general_manager_name, filter_type, str], None, None]:
         """
         Recursively extracts dependency information from Django model-related objects.
-        
+
         Inspects the input object and its nested structures to identify instances of GeneralManager and Bucket, yielding a tuple for each dependency found. Each tuple contains the manager class name, the dependency type ("identification", "filter", or "exclude"), and the string representation of the dependency value.
-        
+
         Args:
             obj: The object or collection to inspect for model dependencies.
-        
+
         Yields:
             Tuples of (manager class name, dependency type, dependency value) for each dependency discovered.
         """

{generalmanager-0.10.2 → generalmanager-0.10.3}/src/general_manager/utils/testing.py

@@ -6,8 +6,10 @@ from django.conf import settings
 from typing import cast
 from django.db import models
 from general_manager.manager.generalManager import GeneralManager
+from general_manager.manager.meta import GeneralManagerMeta
 from general_manager.api.graphql import GraphQL
 from django.apps import apps as global_apps
+from contextlib import suppress
 
 
 from unittest.mock import ANY
@@ -70,7 +72,7 @@ class GMTestCaseMeta(type):
     def __new__(mcs, name, bases, attrs):
         """
         Creates a new test case class with a customized setUpClass method for GeneralManager and GraphQL integration tests.
-        
+
         The generated setUpClass ensures the test environment is properly initialized by resetting GraphQL registries, applying any user-defined setup, clearing default GraphQL URL patterns, creating missing database tables for specified GeneralManager models and their history, initializing GeneralManager and GraphQL configurations, and invoking the base GraphQLTransactionTestCase setup.
         """
         user_setup = attrs.get("setUpClass")
@@ -81,7 +83,7 @@ class GMTestCaseMeta(type):
         def wrapped_setUpClass(cls):
             """
             Performs setup for a test case class by resetting GraphQL internals, configuring fallback app lookup, clearing default GraphQL URL patterns, ensuring database tables exist for specified GeneralManager models and their history, initializing GeneralManager and GraphQL configurations, and invoking the base test case setup.
-            
+
             Skips database table creation for any GeneralManager class lacking an `Interface` or `_model` attribute.
             """
             GraphQL._query_class = None
@@ -139,12 +141,12 @@ class LoggingCache(LocMemCache):
     def get(self, key, default=None, version=None):
         """
         Retrieve a value from the cache and log whether it was a cache hit or miss.
-        
+
         Parameters:
             key (str): The cache key to retrieve.
             default: The value to return if the key is not found.
             version: Optional cache version.
-        
+
         Returns:
             The cached value if found; otherwise, the default value.
         """
@@ -155,7 +157,7 @@ class LoggingCache(LocMemCache):
     def set(self, key, value, timeout=None, version=None):
         """
         Store a value in the cache and log the set operation.
-        
+
         Parameters:
             key (str): The cache key to set.
             value (Any): The value to store in the cache.
@@ -189,11 +191,68 @@ class GeneralManagerTransactionTestCase(
         setattr(caches._connections, "default", LoggingCache("test-cache", {}))  # type: ignore
         self.__resetCacheCounter()
 
+    @classmethod
+    def tearDownClass(cls) -> None:
+        """Clean up dynamic managers and restore patched globals."""
+        # remove GraphQL URL pattern added during setUpClass
+        _default_graphql_url_clear()
+
+        # drop generated tables and unregister models from Django's app registry
+        existing = connection.introspection.table_names()
+        with connection.schema_editor() as editor:
+            for manager_class in cls.general_manager_classes:
+                interface = getattr(manager_class, "Interface", None)
+                model = getattr(interface, "_model", None)
+                if not model:
+                    continue
+                model = cast(type[models.Model], model)
+                if model._meta.db_table in existing:
+                    editor.delete_model(model)
+                history_model = getattr(model, "history", None)
+                if history_model and history_model.model._meta.db_table in existing:
+                    editor.delete_model(history_model.model)
+
+                app_label = model._meta.app_label
+                model_key = model.__name__.lower()
+                global_apps.all_models[app_label].pop(model_key, None)
+                app_config = global_apps.get_app_config(app_label)
+                with suppress(LookupError):
+                    app_config.models.pop(model_key, None)
+                if history_model:
+                    hist_key = history_model.model.__name__.lower()
+                    global_apps.all_models[app_label].pop(hist_key, None)
+                    with suppress(LookupError):
+                        app_config.models.pop(hist_key, None)
+
+        global_apps.clear_cache()
+
+        # remove classes from metaclass registries
+        GeneralManagerMeta.all_classes = [
+            gm
+            for gm in GeneralManagerMeta.all_classes
+            if gm not in cls.general_manager_classes
+        ]
+        GeneralManagerMeta.pending_graphql_interfaces = [
+            gm
+            for gm in GeneralManagerMeta.pending_graphql_interfaces
+            if gm not in cls.general_manager_classes
+        ]
+        GeneralManagerMeta.pending_attribute_initialization = [
+            gm
+            for gm in GeneralManagerMeta.pending_attribute_initialization
+            if gm not in cls.general_manager_classes
+        ]
+
+        # reset fallback app lookup
+        global_apps.get_containing_app_config = _original_get_app
+
+        super().tearDownClass()
+
     #
     def assertCacheMiss(self):
         """
         Assert that a cache miss occurred, followed by a cache set operation.
-        
+
         Checks that the cache's `get` method was called and did not find a value, and that the `set` method was subsequently called to store a value. Resets the cache operation log after the assertion.
         """
         ops = getattr(caches["default"], "ops")
@@ -208,7 +267,7 @@ class GeneralManagerTransactionTestCase(
     def assertCacheHit(self):
         """
         Assert that a cache get operation resulted in a cache hit and no cache set operation occurred.
-        
+
         Raises an assertion error if the cache did not return a value for a get operation or if a set operation was performed. Resets the cache operation log after the check.
         """
         ops = getattr(caches["default"], "ops")