pyquoks 2.1.3__tar.gz → 2.2.1__tar.gz

{pyquoks-2.1.3 → pyquoks-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.1.3
+Version: 2.2.1
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License: MIT
 License-File: LICENSE
@@ -10,6 +10,7 @@ Requires-Python: >=3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: annotated-types (==0.7.0)
 Requires-Dist: blinker (==1.9.0)
 Requires-Dist: certifi (==2025.11.12)
 Requires-Dist: charset-normalizer (==3.4.4)
@@ -22,8 +23,12 @@ Requires-Dist: jinja2 (==3.1.6)
 Requires-Dist: markupsafe (==3.0.3)
 Requires-Dist: pillow (==12.0.0)
 Requires-Dist: psutil (==7.1.3)
+Requires-Dist: pydantic (==2.12.5)
+Requires-Dist: pydantic-core (==2.41.5)
 Requires-Dist: requests (==2.32.5)
-Requires-Dist: urllib3 (==2.6.1)
+Requires-Dist: typing-extensions (==4.15.0)
+Requires-Dist: typing-inspection (==0.4.2)
+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.1.3 → pyquoks-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyquoks"
-version = "2.1.3"
+version = "2.2.1"
 description = "Пакет PyPI для часто используемых модулей в проектах diquoks"
 authors = [
     { name = "Denis Titovets <den232titovets@yandex.ru>" }
@@ -9,6 +9,7 @@ license = { text = "MIT" }
 readme = "README.md"
 requires-python = ">=3.14"
 dependencies = [
+    "annotated-types (==0.7.0)",
     "blinker (==1.9.0)",
     "certifi (==2025.11.12)",
     "charset-normalizer (==3.4.4)",
@@ -21,8 +22,12 @@ dependencies = [
     "markupsafe (==3.0.3)",
     "pillow (==12.0.0)",
     "psutil (==7.1.3)",
+    "pydantic (==2.12.5)",
+    "pydantic-core (==2.41.5)",
     "requests (==2.32.5)",
-    "urllib3 (==2.6.1)",
+    "typing-inspection (==0.4.2)",
+    "typing-extensions (==4.15.0)",
+    "urllib3 (==2.6.2)",
     "waitress (==3.0.2)",
     "werkzeug (==3.1.4)"
 ]

pyquoks-2.2.1/src/pyquoks/__init__.py

@@ -0,0 +1,8 @@
+__all__ = [
+    "data",
+    "utils",
+    "localhost",
+    "test",
+]
+
+from . import data, utils, localhost, test

{pyquoks-2.1.3 → pyquoks-2.2.1}/src/pyquoks/data.py

@@ -9,6 +9,7 @@ import sys
 import typing
 
 import PIL.Image
+import pydantic
 import requests
 
 import pyquoks.utils
@@ -76,13 +77,13 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
 
             self._PATH = self._parent._PATH + self._PATH
 
-            for filename in self._ATTRIBUTES:
+            for attribute in self._ATTRIBUTES:
                 try:
-                    setattr(self, filename, self._parent.file_image(
-                        path=self._PATH + self._FILENAME.format(filename),
+                    setattr(self, attribute, self._parent.file_image(
+                        path=self._PATH + self._FILENAME.format(attribute),
                     ))
                 except Exception:
-                    setattr(self, filename, None)
+                    setattr(self, attribute, None)
 
     class Network(pyquoks.utils._HasRequiredAttributes):
         """
@@ -133,8 +134,8 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, object_class in self._OBJECTS.items():
-            setattr(self, attribute, object_class(self))
+        for attribute, child_class in self._OBJECTS.items():
+            setattr(self, attribute, child_class(self))
 
     @staticmethod
     def file_image(path: str) -> PIL.Image.Image:
@@ -190,8 +191,8 @@ class StringsProvider(pyquoks.utils._HasRequiredAttributes):
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, object_class in self._OBJECTS.items():
-            setattr(self, attribute, object_class(self))
+        for attribute, child_class in self._OBJECTS.items():
+            setattr(self, attribute, child_class(self))
 
 
 # endregion
@@ -270,20 +271,20 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
 
             for attribute, object_type in self._VALUES.items():
                 try:
-                    match object_type.__name__:
-                        case str.__name__:
-                            pass
-                        case int.__name__:
-                            setattr(self, attribute, int(getattr(self, attribute)))
-                        case float.__name__:
-                            setattr(self, attribute, float(getattr(self, attribute)))
-                        case bool.__name__:
+                    match object_type():
+                        case bool():
                             if getattr(self, attribute) not in [str(True), str(False)]:
                                 setattr(self, attribute, None)
                                 raise self._incorrect_content_exception
                             else:
                                 setattr(self, attribute, getattr(self, attribute) == str(True))
-                        case dict.__name__ | list.__name__:
+                        case int():
+                            setattr(self, attribute, int(getattr(self, attribute)))
+                        case float():
+                            setattr(self, attribute, float(getattr(self, attribute)))
+                        case str():
+                            pass
+                        case dict() | list():
                             setattr(self, attribute, json.loads(getattr(self, attribute)))
                         case _:
                             raise ValueError(f"{object_type.__name__} type is not supported!")
@@ -314,9 +315,11 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
                 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 type(value) is not 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)
@@ -337,8 +340,8 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, object_class in self._OBJECTS.items():
-            setattr(self, attribute, object_class(self))
+        for attribute, child_class in self._OBJECTS.items():
+            setattr(self, attribute, child_class(self))
 
 
 class DataManager(pyquoks.utils._HasRequiredAttributes):
@@ -347,7 +350,7 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
 
     **Required attributes**::
 
-        _OBJECTS = {"users": UsersContainer}
+        _OBJECTS = {"users": list[UserModel]}
 
         # Predefined:
 
@@ -356,7 +359,7 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
         _FILENAME = "{0}.json"
 
     Attributes:
-        _OBJECTS: Dictionary with filenames and containers
+        _OBJECTS: Dictionary with filenames and types of models
         _PATH: Path to the directory with JSON-like files
         _FILENAME: Filename of JSON-like files
     """
@@ -367,7 +370,7 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
         "_FILENAME",
     }
 
-    _OBJECTS: dict[str, type]
+    _OBJECTS: dict[str, type[pydantic.BaseModel] | list[type[pydantic.BaseModel]]]
 
     _PATH: str = pyquoks.utils.get_path("data/")
 
@@ -376,12 +379,17 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
     def __init__(self) -> None:
         self._check_attributes()
 
-        for filename, object_class in self._OBJECTS.items():
+        for attribute, object_type in self._OBJECTS.items():
             try:
-                with open(self._PATH + self._FILENAME.format(filename), "rb") as file:
-                    setattr(self, filename, object_class(json.loads(file.read())))
+                with open(self._PATH + self._FILENAME.format(attribute), "rb") as file:
+                    data = json.loads(file.read())
+
+                    if typing.get_origin(object_type) == list:
+                        setattr(self, attribute, [typing.get_args(object_type)[0](**model) for model in data])
+                    else:
+                        setattr(self, attribute, object_type(**data))
             except Exception:
-                setattr(self, filename, None)
+                setattr(self, attribute, None)
 
     def update(self, **kwargs) -> None:
         """
@@ -392,29 +400,29 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
             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:
-                object_class(value)
-            except Exception:
+            if type(value) is not object_type:
                 raise AttributeError(
-                    f"{attribute} cannot be converted to {object_class.__name__}!",
+                    f"{attribute} has incorrect type! (must be {object_type.__name__})",
                 )
-            else:
-                setattr(self, attribute, object_class(value))
 
-                os.makedirs(
-                    name=self._PATH,
-                    exist_ok=True,
-                )
+            setattr(self, attribute, value)
 
-                with open(self._PATH + self._FILENAME.format(attribute), "w", encoding="utf-8") as file:
-                    json.dump(
-                        value,
-                        fp=file,
-                        ensure_ascii=False,
-                        indent=2,
-                    )
+            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):
@@ -510,16 +518,16 @@ class DatabaseManager(pyquoks.utils._HasRequiredAttributes):
             exist_ok=True,
         )
 
-        for attribute, object_class in self._OBJECTS.items():
-            setattr(self, attribute, object_class(self))
+        for attribute, child_class in self._OBJECTS.items():
+            setattr(self, attribute, child_class(self))
 
     def close_all(self) -> None:
         """
         Closes all database connections
         """
 
-        for database in self._OBJECTS.keys():
-            getattr(self, database).close()
+        for attribute in self._OBJECTS.keys():
+            getattr(self, attribute).close()
 
 
 # endregion

pyquoks-2.1.3/src/pyquoks/__init__.py

@@ -1,9 +0,0 @@
-__all__ = [
-    "models",
-    "data",
-    "utils",
-    "localhost",
-    "test",
-]
-
-from . import models, data, utils, localhost, test

pyquoks-2.1.3/src/pyquoks/models.py

@@ -1,164 +0,0 @@
-import typing
-
-import pyquoks.utils
-
-
-class _HasInitialData:
-    """
-    Assistive class for providing initial data
-
-    Attributes:
-        _data: Initial data that was passed into object
-    """
-
-    _data: typing.Any
-
-    def __init__(self, data: typing.Any) -> None:
-        self._data = data
-
-
-class Model(_HasInitialData):
-    """
-    Class for storing parameters and models
-
-    **Optional attributes**::
-
-        _ATTRIBUTES = {"beatmap_id", "score_id"}
-
-        _OBJECTS = {"beatmap": BeatmapModel}
-
-    Attributes:
-        _ATTRIBUTES: Set of parameters that stored in this model
-        _OBJECTS: Dictionary with attributes and their models
-        _data: Initial data that was passed into object
-    """
-
-    _ATTRIBUTES: set[str] | None
-
-    _OBJECTS: dict[str, type] | None
-
-    _data: dict
-
-    def __init__(self, data: dict) -> None:
-        super().__init__(data)
-
-        if hasattr(self, "_ATTRIBUTES"):
-            if isinstance(self._ATTRIBUTES, set):
-                for attribute in self._ATTRIBUTES:
-                    setattr(self, attribute, self._data.get(attribute, None))
-        else:
-            self._ATTRIBUTES = None
-
-        if hasattr(self, "_OBJECTS"):
-            if isinstance(self._OBJECTS, dict):
-                for attribute, object_class in self._OBJECTS.items():
-                    try:
-                        setattr(self, attribute, object_class(self._data.get(attribute)))
-                    except Exception:
-                        setattr(self, attribute, None)
-        else:
-            self._OBJECTS = None
-
-
-class Container(Model, _HasInitialData):
-    """
-    Class for storing lists of models and another parameters
-
-    **Optional attributes**::
-
-        _ATTRIBUTES = {"beatmap_id", "score_id"}
-
-        _OBJECTS = {"beatmap": BeatmapModel}
-
-        _DATA = {"scores": ScoreModel}
-
-    Attributes:
-        _ATTRIBUTES: Set of parameters that stored in this container
-        _OBJECTS: Dictionary with attributes and their models
-        _DATA: Dictionary with attributes and models stored in their lists
-        _data: Initial data that was passed into object
-    """
-
-    _ATTRIBUTES: set[str] | None
-
-    _OBJECTS: dict[str, type] | None
-
-    _DATA: dict[str, type] | None
-
-    _data: dict
-
-    def __init__(self, data: dict) -> None:
-        super().__init__(data)
-
-        if hasattr(self, "_DATA"):
-            if isinstance(self._DATA, dict):
-                for attribute, object_class in self._DATA.items():
-                    try:
-                        setattr(self, attribute, [object_class(data) for data in self._data.get(attribute)])
-                    except Exception:
-                        setattr(self, attribute, None)
-        else:
-            self._DATA = None
-
-
-class Listing(_HasInitialData):
-    """
-    Class for storing list of models
-
-    **Optional attributes**::
-
-        _DATA = {"scores": ScoreModel}
-
-    Attributes:
-        _DATA: Dictionary with attribute and model stored in list
-        _data: Initial data that was passed into object
-    """
-
-    _DATA: dict[str, type] | None
-
-    _data: list
-
-    def __init__(self, data: list) -> None:
-        super().__init__(data)
-
-        if hasattr(self, "_DATA"):
-            if isinstance(self._DATA, dict):
-                for attribute, object_class in self._DATA.items():
-                    try:
-                        setattr(self, attribute, [object_class(data) for data in self._data])
-                    except Exception:
-                        setattr(self, attribute, None)
-        else:
-            self._DATA = None
-
-
-class Values(pyquoks.utils._HasRequiredAttributes):
-    """
-    Class for storing various parameters and values
-
-    **Required attributes**::
-
-        _ATTRIBUTES = {"settings", "path"}
-
-    Attributes:
-        _ATTRIBUTES: Attributes that can be stored in this class
-    """
-
-    _REQUIRED_ATTRIBUTES = {
-        "_ATTRIBUTES",
-    }
-
-    _ATTRIBUTES: set[str]
-
-    def __init__(self, **kwargs) -> None:
-        self._check_attributes()
-
-        for attribute in self._ATTRIBUTES:
-            setattr(self, attribute, kwargs.get(attribute, getattr(self, attribute, None)))
-
-    def update(self, **kwargs) -> None:
-        """
-        Updates provided attributes in object
-        """
-
-        self.__init__(**kwargs)