GeneralManager 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

general_manager/auxiliary/noneToZero.py

@@ -1,12 +1,12 @@
 from typing import Optional, TypeVar, Literal
 from general_manager.measurement import Measurement
 
-VALUE = TypeVar("VALUE", int, float, Measurement)
+NUMBERVALUE = TypeVar("NUMBERVALUE", int, float, Measurement)
 
 
 def noneToZero(
-    value: Optional[VALUE],
-) -> VALUE | Literal[0]:
+    value: Optional[NUMBERVALUE],
+) -> NUMBERVALUE | Literal[0]:
     if value is None:
         return 0
     return value

general_manager/interface/databaseInterface.py

@@ -654,7 +654,7 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
             kwarg_filter[key].append(value)
         return kwarg_filter
 
-    def filter(self, **kwargs: Any) -> DatabaseBucket:
+    def filter(self, **kwargs: Any) -> DatabaseBucket[GeneralManagerType]:
         merged_filter = self.__mergeFilterDefinitions(self.filters, **kwargs)
         return self.__class__(
             self._data.filter(**kwargs),
@@ -663,7 +663,7 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
             self.excludes,
         )
 
-    def exclude(self, **kwargs: Any) -> DatabaseBucket:
+    def exclude(self, **kwargs: Any) -> DatabaseBucket[GeneralManagerType]:
         merged_exclude = self.__mergeFilterDefinitions(self.excludes, **kwargs)
         return self.__class__(
             self._data.exclude(**kwargs),

general_manager/manager/input.py

@@ -17,6 +17,14 @@ class Input(Generic[INPUT_TYPE]):
         possible_values: Optional[Callable | Iterable] = None,
         depends_on: Optional[List[str]] = None,
     ):
+        """
+        Initializes an Input instance with type information, possible values, and dependencies.
+        
+        Args:
+            type: The expected type for the input value.
+            possible_values: An optional iterable or callable that defines allowed values.
+            depends_on: An optional list of dependency names. If not provided and possible_values is callable, dependencies are inferred from its parameters.
+        """
         self.type = type
         self.possible_values = possible_values
         self.is_manager = issubclass(type, GeneralManager)
@@ -33,16 +41,33 @@ class Input(Generic[INPUT_TYPE]):
             self.depends_on = []
 
     def cast(self, value: Any) -> Any:
+        """
+        Casts the input value to the type specified by this Input instance.
+        
+        Handles special cases for date, datetime, GeneralManager subclasses, and Measurement types.
+        If the value is already of the target type, it is returned unchanged. Otherwise, attempts to
+        convert or construct the value as appropriate for the target type.
+        
+        Args:
+            value: The value to be cast or converted.
+        
+        Returns:
+            The value converted to the target type, or an instance of the target type.
+        """
+        if self.type == date:
+            if isinstance(value, datetime) and type(value) is not date:
+                return value.date()
+            return date.fromisoformat(value)
+        if self.type == datetime:
+            if isinstance(value, date):
+                return datetime.combine(value, datetime.min.time())
+            return datetime.fromisoformat(value)
         if isinstance(value, self.type):
             return value
         if issubclass(self.type, GeneralManager):
             if isinstance(value, dict):
                 return self.type(**value)  # type: ignore
             return self.type(id=value)  # type: ignore
-        if self.type == date:
-            return date.fromisoformat(value)
-        if self.type == datetime:
-            return datetime.fromisoformat(value)
         if self.type == Measurement and isinstance(value, str):
             return Measurement.from_string(value)
         return self.type(value)

{generalmanager-0.1.1.dist-info → generalmanager-0.1.2.dist-info}/METADATA

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

{generalmanager-0.1.1.dist-info → generalmanager-0.1.2.dist-info}/RECORD

@@ -6,7 +6,7 @@ general_manager/api/property.py,sha256=oc93p1P8dcIvrNorRuqD1EJVsd6eYttYhZuAS0s28
 general_manager/auxiliary/__init__.py,sha256=4IwKJzsNxGduF-Ej0u1BNHVaMhkql8PjHbVtx9DOTSY,76
 general_manager/auxiliary/argsToKwargs.py,sha256=kmp1xonpQp4X_y8ZJG6c5uOW7zQwo0HtPqsHWVzXRSM,921
 general_manager/auxiliary/filterParser.py,sha256=exmRGVwvdMPgN-65MLwAV2q6L23bI4gTWb6lWXO4ZuU,3108
-general_manager/auxiliary/noneToZero.py,sha256=UtIdye6wPdiIZqOnHxSdHnc0aKcH_sMjeCHPs7uLwKo,276
+general_manager/auxiliary/noneToZero.py,sha256=ovopSddMlTw84GIFWRd5s91_CFahPyL-t974w78Jb7g,300
 general_manager/cache/cacheDecorator.py,sha256=RmUDyJfkouO2-R2KZZJF1n8RCB0FjVa2OoTeLQ0vUyg,2934
 general_manager/cache/cacheTracker.py,sha256=vUQCarqABIW_O02hbKeRo0thurmPD0TfrOlIUh7kneI,1045
 general_manager/cache/dependencyIndex.py,sha256=KUDroajKrWfJv0PO2EQVNTrYq7XxrpBT4MGKBgPwMwo,10676
@@ -18,11 +18,11 @@ general_manager/factory/lazy_methods.py,sha256=UJC50a4Gbe4T5IQPh7ucyQqpaS2x4zhQz
 general_manager/interface/__init__.py,sha256=6x5adQLefTugvrJeyPcAxstyqgLAYeaJ1EPdAbac9pE,213
 general_manager/interface/baseInterface.py,sha256=mvSKUlA-0fazNnaIXGBwkiZxmX8DM_sOn-SaAIpaW8I,10273
 general_manager/interface/calculationInterface.py,sha256=GzSNXjU6Z7bFz60gHyMKkI5xNUDIPuniV8wbyVtQT50,14250
-general_manager/interface/databaseInterface.py,sha256=2Xzb04J7c1Z4ZKlA-6-8AOXaWNvF6zUVNNzM6k0jzLQ,27337
+general_manager/interface/databaseInterface.py,sha256=VR3V8WTE6XEeM84bv09h2__XMnTWp92u8CA8WRlevWc,27377
 general_manager/manager/__init__.py,sha256=l3RYp62aEhj3Y975_XUTIzo35LUnkTJHkb_hgChnXXI,111
 general_manager/manager/generalManager.py,sha256=xt7tvwTaPGhh7Z8VhbdMJuScsl78B9QDVQoMWv4amuo,5158
 general_manager/manager/groupManager.py,sha256=O4FABqbm7KlZw6t36Ot3HU1FsBYN0h6Zhmk7ktN8a-Y,10087
-general_manager/manager/input.py,sha256=NTZis3QsF0N3SODZBeQrR2R-_iMbmdEBvoYNuVKWNtE,1737
+general_manager/manager/input.py,sha256=iKawV3P1QICz-0AQUF00OvH7LZYxussg3svpvCUl8hE,2977
 general_manager/manager/meta.py,sha256=5wHrCVnua5c38vpVZSCesrNvgydQDH8h6pxW6_QgCDg,3107
 general_manager/measurement/__init__.py,sha256=X97meFujBldE5v0WMF7SmKeGpC5R0JTczfLo_Lq1Xek,84
 general_manager/measurement/measurement.py,sha256=hTISANW7nAN2voakq9f-naJxa1MUcxWLDrcDW1Rdn3s,9340
@@ -36,8 +36,8 @@ general_manager/permission/permissionDataManager.py,sha256=Ji7fsnuaKTa6M8yzCGyzr
 general_manager/rule/__init__.py,sha256=4Har5cfPD1fmOsilTDod-ZUz3Com-tkl58jz7yY4fD0,23
 general_manager/rule/handler.py,sha256=O3BZbTnUE9o3LTSWpoq6hgm3tKy1sEBjRcDrRaA54Gw,3936
 general_manager/rule/rule.py,sha256=tu3pNe_avs6ayI16KYeaQX85o2lXcPip_LN9CJEhr8Y,10708
-generalmanager-0.1.1.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.1.1.dist-info/METADATA,sha256=-geVqx1Ev6GPeu8OB3yymvkIHt0X6sUMTPIib4lMe4o,8188
-generalmanager-0.1.1.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-generalmanager-0.1.1.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.1.1.dist-info/RECORD,,
+generalmanager-0.1.2.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.1.2.dist-info/METADATA,sha256=gfnRxKVbWKkOoCdnaR4cTvT7kXEaW6c5_kFTTEkFqVU,8188
+generalmanager-0.1.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+generalmanager-0.1.2.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.1.2.dist-info/RECORD,,