pyquoks 2.2.0__py3-none-any.whl → 2.2.1.1__py3-none-any.whl

pyquoks/data.py

@@ -312,12 +312,18 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
             """
 
             for attribute, value in kwargs.items():
+
                 if attribute not in self._VALUES.keys():
                     raise AttributeError(f"{attribute} is not specified!")
 
-                if type(value) is not self._VALUES.get(attribute):
+                object_type = self._VALUES.get(attribute)
+
+                if not isinstance(
+                        value,
+                        typing.get_origin(object_type) if typing.get_origin(object_type) else object_type,
+                ):
                     raise AttributeError(
-                        f"{attribute} has incorrect type! (must be {self._VALUES.get(attribute).__name__})",
+                        f"{attribute} has incorrect type! (must be {object_type.__name__})",
                     )
 
                 setattr(self, attribute, value)
@@ -395,38 +401,37 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
         """
 
         for attribute, value in kwargs.items():
+            value: pydantic.BaseModel | list[pydantic.BaseModel]
+
             if attribute not in self._OBJECTS.keys():
                 raise AttributeError(f"{attribute} is not specified!")
 
-            object_class = self._OBJECTS.get(attribute)
+            object_type = self._OBJECTS.get(attribute)
 
-            try:
-                if typing.get_origin(object_class) == list:
-                    [typing.get_args(object_class)[0](**model) for model in value]
-                else:
-                    object_class(**value)
-            except Exception:
+            if not isinstance(
+                    value,
+                    typing.get_origin(object_type) if typing.get_origin(object_type) else object_type,
+            ):
                 raise AttributeError(
-                    f"{attribute} cannot be converted to {object_class.__name__}!",
-                )
-            else:
-                if typing.get_origin(object_class) == list:
-                    setattr(self, attribute, [typing.get_args(object_class)[0](**model) for model in value])
-                else:
-                    setattr(self, attribute, object_class(**value))
-
-                os.makedirs(
-                    name=self._PATH,
-                    exist_ok=True,
+                    f"{attribute} has incorrect type! (must be {object_type.__name__})",
                 )
 
-                with open(self._PATH + self._FILENAME.format(attribute), "w", encoding="utf-8") as file:
-                    json.dump(
-                        value,
-                        fp=file,
-                        ensure_ascii=False,
-                        indent=2,
-                    )
+            setattr(self, attribute, value)
+
+            os.makedirs(
+                name=self._PATH,
+                exist_ok=True,
+            )
+
+            with open(self._PATH + self._FILENAME.format(attribute), "w", encoding="utf-8") as file:
+                json.dump(
+                    [model.model_dump() for model in value] if typing.get_origin(
+                        object_type,
+                    ) == list else value.model_dump(),
+                    fp=file,
+                    ensure_ascii=False,
+                    indent=2,
+                )
 
 
 class DatabaseManager(pyquoks.utils._HasRequiredAttributes):

{pyquoks-2.2.0.dist-info → pyquoks-2.2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.2.0
+Version: 2.2.1.1
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License: MIT
 License-File: LICENSE
@@ -28,7 +28,7 @@ Requires-Dist: pydantic-core (==2.41.5)
 Requires-Dist: requests (==2.32.5)
 Requires-Dist: typing-extensions (==4.15.0)
 Requires-Dist: typing-inspection (==0.4.2)
-Requires-Dist: urllib3 (==2.6.1)
+Requires-Dist: urllib3 (==2.6.2)
 Requires-Dist: waitress (==3.0.2)
 Requires-Dist: werkzeug (==3.1.4)
 Description-Content-Type: text/markdown

pyquoks-2.2.1.1.dist-info/RECORD

@@ -0,0 +1,9 @@
+pyquoks/__init__.py,sha256=u62PPaulBuYAxCYvLzsPkJb9hezXHCg6ZONHmnCJf-I,120
+pyquoks/data.py,sha256=xvydnHUAILEK9kqI5UYY8KS36Hf3ORK9ZwgwAt8K318,18132
+pyquoks/localhost.py,sha256=HPixbz33l4ZkLrk__kbb4mekPjJKA78-Lpi3AjCWvgs,1062
+pyquoks/test.py,sha256=Hx3cLng0uDMDVMx-NveLOPlgpX51A00aVELa0sbR5D0,3379
+pyquoks/utils.py,sha256=6uC5QUtPtVt4G5iiP2jog0t-4IUshUQPshJwmsEwmqg,1475
+pyquoks-2.2.1.1.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
+pyquoks-2.2.1.1.dist-info/METADATA,sha256=PjmiP5rZQ1XNEs7_wUS9KTvB6cEVVUQF_S_vGLzoOjY,1868
+pyquoks-2.2.1.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyquoks-2.2.1.1.dist-info/RECORD,,

pyquoks-2.2.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-pyquoks/__init__.py,sha256=u62PPaulBuYAxCYvLzsPkJb9hezXHCg6ZONHmnCJf-I,120
-pyquoks/data.py,sha256=-5O-BQC02HIAX_lvNm8BizxkKaXZt1v5qmLCg2-7fdg,18095
-pyquoks/localhost.py,sha256=HPixbz33l4ZkLrk__kbb4mekPjJKA78-Lpi3AjCWvgs,1062
-pyquoks/test.py,sha256=Hx3cLng0uDMDVMx-NveLOPlgpX51A00aVELa0sbR5D0,3379
-pyquoks/utils.py,sha256=6uC5QUtPtVt4G5iiP2jog0t-4IUshUQPshJwmsEwmqg,1475
-pyquoks-2.2.0.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
-pyquoks-2.2.0.dist-info/METADATA,sha256=_anNhJlV75weo2K3vFTzRPDTif1QkZYv7na3aHlvC5w,1866
-pyquoks-2.2.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pyquoks-2.2.0.dist-info/RECORD,,