GeneralManager 0.4.6__tar.gz → 0.5.1__tar.gz

{generalmanager-0.4.6 → generalmanager-0.5.1}/GeneralManager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.4.6
+Version: 0.5.1
 Summary: Kurzbeschreibung deines Pakets
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License-Expression: MIT

{generalmanager-0.4.6 → generalmanager-0.5.1}/GeneralManager.egg-info/SOURCES.txt

@@ -58,7 +58,9 @@ tests/test_factories.py
 tests/test_factoryMethods.py
 tests/test_filterParser.py
 tests/test_generalManager.py
+tests/test_generalManagerMeta.py
 tests/test_graph_ql.py
+tests/test_groupManager.py
 tests/test_input.py
 tests/test_jsonEncoder.py
 tests/test_makeCacheKey.py

{generalmanager-0.4.6 → generalmanager-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.4.6
+Version: 0.5.1
 Summary: Kurzbeschreibung deines Pakets
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License-Expression: MIT

{generalmanager-0.4.6 → generalmanager-0.5.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.4.6"
+version = "0.5.1"
 description = "Kurzbeschreibung deines Pakets"
 readme = "README.md"
 authors = [

{generalmanager-0.4.6 → generalmanager-0.5.1}/src/general_manager/apps.py

@@ -41,7 +41,7 @@ class GeneralmanagerConfig(AppConfig):
             attributes = general_manager_class.Interface.getAttributes()
             setattr(general_manager_class, "_attributes", attributes)
             GeneralManagerMeta.createAtPropertiesForAttributes(
-                attributes, general_manager_class
+                attributes.keys(), general_manager_class
             )
 
         if getattr(settings, "AUTOCREATE_GRAPHQL", False):

{generalmanager-0.4.6 → generalmanager-0.5.1}/src/general_manager/interface/baseInterface.py

@@ -21,7 +21,7 @@ if TYPE_CHECKING:
     from general_manager.manager.input import Input
     from general_manager.manager.generalManager import GeneralManager
     from general_manager.manager.meta import GeneralManagerMeta
-    from general_manager.manager.groupManager import GroupedManager, GroupBucket
+    from general_manager.manager.groupManager import GroupManager, GroupBucket
 
 
 GeneralManagerType = TypeVar("GeneralManagerType", bound="GeneralManager")
@@ -239,7 +239,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     @abstractmethod
     def __iter__(
         self,
-    ) -> Generator[GeneralManagerType | GroupedManager[GeneralManagerType]]:
+    ) -> Generator[GeneralManagerType | GroupManager[GeneralManagerType]]:
         raise NotImplementedError
 
     @abstractmethod
@@ -251,11 +251,11 @@ class Bucket(ABC, Generic[GeneralManagerType]):
         raise NotImplementedError
 
     @abstractmethod
-    def first(self) -> GeneralManagerType | GroupedManager[GeneralManagerType] | None:
+    def first(self) -> GeneralManagerType | GroupManager[GeneralManagerType] | None:
         raise NotImplementedError
 
     @abstractmethod
-    def last(self) -> GeneralManagerType | GroupedManager[GeneralManagerType] | None:
+    def last(self) -> GeneralManagerType | GroupManager[GeneralManagerType] | None:
         raise NotImplementedError
 
     @abstractmethod
@@ -269,7 +269,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
     @abstractmethod
     def get(
         self, **kwargs: Any
-    ) -> GeneralManagerType | GroupedManager[GeneralManagerType]:
+    ) -> GeneralManagerType | GroupManager[GeneralManagerType]:
         raise NotImplementedError
 
     @abstractmethod
@@ -277,7 +277,7 @@ class Bucket(ABC, Generic[GeneralManagerType]):
         self, item: int | slice
     ) -> (
         GeneralManagerType
-        | GroupedManager[GeneralManagerType]
+        | GroupManager[GeneralManagerType]
         | Bucket[GeneralManagerType]
     ):
         raise NotImplementedError

{generalmanager-0.4.6 → generalmanager-0.5.1}/src/general_manager/manager/groupManager.py

@@ -32,6 +32,15 @@ class GroupBucket(Bucket[GeneralManagerType]):
         self._data = self.__buildGroupedManager(data)
         self._basis_data = data
 
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, self.__class__):
+            return False
+        return (
+            self._data == other._data
+            and self._manager_class == other._manager_class
+            and self._group_by_keys == other._group_by_keys
+        )
+
     def __checkGroupByArguments(self, group_by_keys: tuple[str, ...]) -> None:
         """
         This method checks if the given arguments are valid for the groupBy method.
@@ -50,7 +59,7 @@ class GroupBucket(Bucket[GeneralManagerType]):
     def __buildGroupedManager(
         self,
         data: Bucket[GeneralManagerType],
-    ) -> list[GroupedManager[GeneralManagerType]]:
+    ) -> list[GroupManager[GeneralManagerType]]:
         """
         This method builds the grouped manager.
         It returns a GroupBucket with the grouped data.
@@ -63,11 +72,11 @@ class GroupBucket(Bucket[GeneralManagerType]):
             group_by_values.add(json.dumps(group_by_value))
 
         groups = []
-        for group_by_value in group_by_values:
+        for group_by_value in sorted(group_by_values):
             group_by_value = json.loads(group_by_value)
             grouped_manager_objects = data.filter(**group_by_value)
             groups.append(
-                GroupedManager(
+                GroupManager(
                     self._manager_class, group_by_value, grouped_manager_objects
                 )
             )
@@ -84,7 +93,7 @@ class GroupBucket(Bucket[GeneralManagerType]):
             self._basis_data | other._basis_data,
         )
 
-    def __iter__(self) -> Generator[GroupedManager[GeneralManagerType]]:
+    def __iter__(self) -> Generator[GroupManager[GeneralManagerType]]:
         for grouped_manager in self._data:
             yield grouped_manager
 
@@ -104,13 +113,13 @@ class GroupBucket(Bucket[GeneralManagerType]):
             new_basis_data,
         )
 
-    def first(self) -> GroupedManager[GeneralManagerType] | None:
+    def first(self) -> GroupManager[GeneralManagerType] | None:
         try:
             return next(iter(self))
         except StopIteration:
             return None
 
-    def last(self) -> GroupedManager[GeneralManagerType] | None:
+    def last(self) -> GroupManager[GeneralManagerType] | None:
         items = list(self)
         if items:
             return items[-1]
@@ -122,7 +131,7 @@ class GroupBucket(Bucket[GeneralManagerType]):
     def all(self) -> Bucket[GeneralManagerType]:
         return self
 
-    def get(self, **kwargs: Any) -> GroupedManager[GeneralManagerType]:
+    def get(self, **kwargs: Any) -> GroupManager[GeneralManagerType]:
         first_value = self.filter(**kwargs).first()
         if first_value is None:
             raise ValueError(
@@ -132,7 +141,7 @@ class GroupBucket(Bucket[GeneralManagerType]):
 
     def __getitem__(
         self, item: int | slice
-    ) -> GroupedManager[GeneralManagerType] | GroupBucket[GeneralManagerType]:
+    ) -> GroupManager[GeneralManagerType] | GroupBucket[GeneralManagerType]:
         if isinstance(item, int):
             return self._data[item]
         elif isinstance(item, slice):
@@ -162,12 +171,14 @@ class GroupBucket(Bucket[GeneralManagerType]):
         if isinstance(key, str):
             key = (key,)
         if reverse:
-            sorted_data = self._data.sort(
-                key=lambda x: tuple([-getattr(x, k) for k in key])
+            sorted_data = sorted(
+                self._data,
+                key=lambda x: tuple(getattr(x, k) for k in key),
+                reverse=True,
             )
         else:
-            sorted_data = self._data.sort(
-                key=lambda x: tuple([getattr(x, k) for k in key])
+            sorted_data = sorted(
+                self._data, key=lambda x: tuple(getattr(x, k) for k in key)
             )
 
         new_bucket = GroupBucket(
@@ -182,11 +193,13 @@ class GroupBucket(Bucket[GeneralManagerType]):
         It returns a GroupBucket with the grouped data.
         """
         return GroupBucket(
-            self._manager_class, tuple([*self._group_by_keys, *group_by_keys]), self
+            self._manager_class,
+            tuple([*self._group_by_keys, *group_by_keys]),
+            self._basis_data,
         )
 
 
-class GroupedManager(Generic[GeneralManagerType]):
+class GroupManager(Generic[GeneralManagerType]):
     """
     This class is used to group the data of a GeneralManager.
     It is used to create a new GeneralManager with the grouped data.
@@ -212,11 +225,6 @@ class GroupedManager(Generic[GeneralManagerType]):
             and self._group_by_value == other._group_by_value
         )
 
-    def __hash__(self) -> int:
-        return hash(
-            (self._manager_class, frozenset(self._group_by_value.items()), self._data)
-        )
-
     def __repr__(self) -> str:
         return f"{self.__class__.__name__}({self._manager_class}, {self._group_by_value}, {self._data})"
 
@@ -277,12 +285,16 @@ class GroupedManager(Generic[GeneralManagerType]):
             for entry in total_data:
                 new_data.update(entry)
         elif issubclass(data_type, str):
-            new_data = " ".join(total_data)
+            temp_data = []
+            for entry in total_data:
+                if entry not in temp_data:
+                    temp_data.append(str(entry))
+            new_data = ", ".join(temp_data)
+        elif issubclass(data_type, bool):
+            new_data = any(total_data)
         elif issubclass(data_type, (int, float, Measurement)):
             new_data = sum(total_data)
         elif issubclass(data_type, (datetime, date, time)):
             new_data = max(total_data)
-        elif issubclass(data_type, bool):
-            new_data = any(total_data)
 
         return new_data

{generalmanager-0.4.6 → generalmanager-0.5.1}/src/general_manager/manager/meta.py

@@ -3,7 +3,7 @@ from general_manager.interface.baseInterface import (
     InterfaceBase,
 )
 from django.conf import settings
-from typing import Any, Type, TYPE_CHECKING, Generic, TypeVar
+from typing import Any, Type, TYPE_CHECKING, Generic, TypeVar, Iterable
 
 if TYPE_CHECKING:
     from general_manager.interface.databaseInterface import ReadOnlyInterface
@@ -12,6 +12,10 @@ if TYPE_CHECKING:
 GeneralManagerType = TypeVar("GeneralManagerType", bound="GeneralManager")
 
 
+class _nonExistent:
+    pass
+
+
 class GeneralManagerMeta(type):
     all_classes: list[Type[GeneralManager]] = []
     read_only_classes: list[Type[ReadOnlyInterface]] = []
@@ -48,7 +52,7 @@ class GeneralManagerMeta(type):
 
     @staticmethod
     def createAtPropertiesForAttributes(
-        attributes: dict[str, Any], new_class: Type[GeneralManager]
+        attributes: Iterable[str], new_class: Type[GeneralManager]
     ):
 
         def desciptorMethod(attr_name: str, new_class: type):
@@ -64,12 +68,21 @@ class GeneralManagerMeta(type):
                 ):
                     if instance is None:
                         return self.new_class.Interface.getFieldType(self.attr_name)
-                    attribute = instance._attributes[attr_name]
+                    attribute = instance._attributes.get(attr_name, _nonExistent)
+                    if attribute is _nonExistent:
+                        raise AttributeError(
+                            f"{self.attr_name} not found in {instance.__class__.__name__}"
+                        )
                     if callable(attribute):
-                        return attribute(instance._interface)
+                        try:
+                            attribute = attribute(instance._interface)
+                        except Exception as e:
+                            raise AttributeError(
+                                f"Error calling attribute {self.attr_name}: {e}"
+                            ) from e
                     return attribute
 
             return Descriptor(attr_name, new_class)
 
-        for attr_name in attributes.keys():
+        for attr_name in attributes:
             setattr(new_class, attr_name, desciptorMethod(attr_name, new_class))