pyquoks 2.2.1__tar.gz → 2.3.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.2.1
+Version: 2.3.0
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License: MIT
 License-File: LICENSE
@@ -22,7 +22,7 @@ Requires-Dist: itsdangerous (==2.2.0)
 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: psutil (==7.2.1)
 Requires-Dist: pydantic (==2.12.5)
 Requires-Dist: pydantic-core (==2.41.5)
 Requires-Dist: requests (==2.32.5)

{pyquoks-2.2.1 → pyquoks-2.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyquoks"
-version = "2.2.1"
+version = "2.3.0"
 description = "Пакет PyPI для часто используемых модулей в проектах diquoks"
 authors = [
     { name = "Denis Titovets <den232titovets@yandex.ru>" }
@@ -21,7 +21,7 @@ dependencies = [
     "jinja2 (==3.1.6)",
     "markupsafe (==3.0.3)",
     "pillow (==12.0.0)",
-    "psutil (==7.1.3)",
+    "psutil (==7.2.1)",
     "pydantic (==2.12.5)",
     "pydantic-core (==2.41.5)",
     "requests (==2.32.5)",

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

@@ -23,14 +23,11 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
 
     **Required attributes**::
 
-        _OBJECTS = {"images": ImagesDirectory, "example": ExampleNetwork}
-
         # Predefined:
 
         _PATH = pyquoks.utils.get_path("assets/")
 
     Attributes:
-        _OBJECTS: Dictionary with names of attributes and child objects
         _PATH: Path to the directory with assets folders
     """
 
@@ -123,19 +120,21 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
                     setattr(self, attribute, None)
 
     _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
         "_PATH",
     }
 
-    _OBJECTS: dict[str, type]
-
     _PATH: str = pyquoks.utils.get_path("assets/")
 
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, child_class in self._OBJECTS.items():
-            setattr(self, attribute, child_class(self))
+        for attribute, child_class in self.__class__.__annotations__.items():
+            if issubclass(child_class, AssetsProvider.Directory | AssetsProvider.Network):
+                setattr(self, attribute, child_class(self))
+            else:
+                raise AttributeError(
+                    f"{attribute} has incorrect type! (must be subclass of {AssetsProvider.Directory.__name__} or {AssetsProvider.Network.__name__})",
+                )
 
     @staticmethod
     def file_image(path: str) -> PIL.Image.Image:
@@ -161,16 +160,9 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
         )
 
 
-class StringsProvider(pyquoks.utils._HasRequiredAttributes):
+class StringsProvider:
     """
     Class for providing various strings data
-
-    **Required attributes**::
-
-        _OBJECTS = {"menu": MenuStrings}
-
-    Attributes:
-        _OBJECTS: Dictionary with names of attributes and child objects
     """
 
     class Strings:
@@ -182,17 +174,14 @@ class StringsProvider(pyquoks.utils._HasRequiredAttributes):
         def __init__(self, parent: StringsProvider) -> None:
             ...  # TODO
 
-    _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
-    }
-
-    _OBJECTS: dict[str, type]
-
     def __init__(self) -> None:
-        self._check_attributes()
-
-        for attribute, child_class in self._OBJECTS.items():
-            setattr(self, attribute, child_class(self))
+        for attribute, child_class in self.__class__.__annotations__.items():
+            if issubclass(child_class, StringsProvider.Strings):
+                setattr(self, attribute, child_class(self))
+            else:
+                raise AttributeError(
+                    f"{attribute} has incorrect type! (must be subclass of {StringsProvider.Strings.__name__})",
+                )
 
 
 # endregion
@@ -205,14 +194,11 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
 
     **Required attributes**::
 
-        _OBJECTS = {"settings": SettingsConfig}
-
         # Predefined
 
         _PATH = pyquoks.utils.get_path("config.ini")
 
     Attributes:
-        _OBJECTS: Dictionary with names of attributes and child objects
         _PATH: Path to the configuration file
     """
 
@@ -312,12 +298,16 @@ 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!")
 
                 object_type = self._VALUES.get(attribute)
 
-                if type(value) is not object_type:
+                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 {object_type.__name__})",
                     )
@@ -329,19 +319,21 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
                     self._config.write(file)
 
     _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
         "_PATH",
     }
 
-    _OBJECTS: dict[str, type]
-
     _PATH: str = pyquoks.utils.get_path("config.ini")
 
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, child_class in self._OBJECTS.items():
-            setattr(self, attribute, child_class(self))
+        for attribute, child_class in self.__class__.__annotations__.items():
+            if issubclass(child_class, ConfigManager.Config):
+                setattr(self, attribute, child_class(self))
+            else:
+                raise AttributeError(
+                    f"{attribute} has incorrect type! (must be subclass of {ConfigManager.Config.__name__})",
+                )
 
 
 class DataManager(pyquoks.utils._HasRequiredAttributes):
@@ -350,8 +342,6 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
 
     **Required attributes**::
 
-        _OBJECTS = {"users": list[UserModel]}
-
         # Predefined:
 
         _PATH = pyquoks.utils.get_path("data/")
@@ -359,19 +349,15 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
         _FILENAME = "{0}.json"
 
     Attributes:
-        _OBJECTS: Dictionary with filenames and types of models
         _PATH: Path to the directory with JSON-like files
         _FILENAME: Filename of JSON-like files
     """
 
     _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
         "_PATH",
         "_FILENAME",
     }
 
-    _OBJECTS: dict[str, type[pydantic.BaseModel] | list[type[pydantic.BaseModel]]]
-
     _PATH: str = pyquoks.utils.get_path("data/")
 
     _FILENAME: str = "{0}.json"
@@ -379,17 +365,28 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
     def __init__(self) -> None:
         self._check_attributes()
 
-        for attribute, object_type in self._OBJECTS.items():
-            try:
-                with open(self._PATH + self._FILENAME.format(attribute), "rb") as file:
-                    data = json.loads(file.read())
+        for attribute, object_type in self.__class__.__annotations__.items():
+            if issubclass(
+                    typing.get_args(object_type)[0],
+                    pydantic.BaseModel,
+            ) if typing.get_origin(object_type) else issubclass(
+                object_type,
+                pydantic.BaseModel,
+            ):
+                try:
+                    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, attribute, None)
+                        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, attribute, None)
+            else:
+                raise AttributeError(
+                    f"{attribute} has incorrect type! (must be subclass of {pydantic.BaseModel.__name__} or {list.__name__} of its subclasses)",
+                )
 
     def update(self, **kwargs) -> None:
         """
@@ -397,12 +394,17 @@ class DataManager(pyquoks.utils._HasRequiredAttributes):
         """
 
         for attribute, value in kwargs.items():
-            if attribute not in self._OBJECTS.keys():
+            value: pydantic.BaseModel | list[pydantic.BaseModel]
+
+            if attribute not in self.__class__.__annotations__.keys():
                 raise AttributeError(f"{attribute} is not specified!")
 
-            object_type = self._OBJECTS.get(attribute)
+            object_type = self.__class__.__annotations__.get(attribute)
 
-            if type(value) is not object_type:
+            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 {object_type.__name__})",
                 )
@@ -431,14 +433,11 @@ class DatabaseManager(pyquoks.utils._HasRequiredAttributes):
 
     **Required attributes**::
 
-        _OBJECTS = {"users": UsersDatabase}
-
         # Predefined
 
         _PATH = pyquoks.utils.get_path("db/")
 
     Attributes:
-        _OBJECTS: Dictionary with names of attributes and child objects
         _PATH: Path to the directory with databases
     """
 
@@ -502,12 +501,9 @@ class DatabaseManager(pyquoks.utils._HasRequiredAttributes):
             self.commit()
 
     _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
         "_PATH",
     }
 
-    _OBJECTS: dict[str, type]
-
     _PATH: str = pyquoks.utils.get_path("db/")
 
     def __init__(self) -> None:
@@ -518,15 +514,20 @@ class DatabaseManager(pyquoks.utils._HasRequiredAttributes):
             exist_ok=True,
         )
 
-        for attribute, child_class in self._OBJECTS.items():
-            setattr(self, attribute, child_class(self))
+        for attribute, child_class in self.__class__.__annotations__.items():
+            if issubclass(child_class, DatabaseManager.Database):
+                setattr(self, attribute, child_class(self))
+            else:
+                raise AttributeError(
+                    f"{attribute} has incorrect type! (must be subclass of {DatabaseManager.Database.__name__})",
+                )
 
     def close_all(self) -> None:
         """
         Closes all database connections
         """
 
-        for attribute in self._OBJECTS.keys():
+        for attribute in self.__class__.__annotations__.keys():
             getattr(self, attribute).close()
 
 

{pyquoks-2.2.1 → pyquoks-2.3.0}/src/pyquoks/utils.py

@@ -1,29 +1,26 @@
 import datetime
 import os
+import platform
+import subprocess
 import sys
 
 import psutil
 
 
-class _HasRequiredAttributes:
+def check_connection() -> bool:
     """
-    Assistive class for checking required attributes
-
-    **Required attributes**::
-
-        _REQUIRED_ATTRIBUTES = {"_ATTRIBUTES", "_OBJECTS"}
-
-    Attributes:
-        _REQUIRED_ATTRIBUTES: Set of required attributes in the class
+    :return: Status of "ping www.google.com"
     """
 
-    _REQUIRED_ATTRIBUTES: set[str]
-
-    def _check_attributes(self) -> None:
-        if hasattr(self, "_REQUIRED_ATTRIBUTES"):
-            for attribute in self._REQUIRED_ATTRIBUTES:
-                if not hasattr(self, attribute):
-                    raise AttributeError(f"The required class attribute is not set! ({attribute})")
+    return subprocess.run(
+        args=[
+            "ping",
+            "-n" if platform.system().lower() == "windows" else "-c",
+            "1",
+            "www.google.com",
+        ],
+        capture_output=True,
+    ).returncode == 0
 
 
 def get_path(relative_path: str, use_meipass: bool = False) -> str:
@@ -52,3 +49,24 @@ def get_process_created_datetime(pid: int = os.getpid()) -> datetime.datetime:
     return datetime.datetime.fromtimestamp(
         timestamp=process.create_time(),
     )
+
+
+class _HasRequiredAttributes:
+    """
+    Assistive class for checking required attributes
+
+    **Required attributes**::
+
+        _REQUIRED_ATTRIBUTES = {"_ATTRIBUTES", "_PATH"}
+
+    Attributes:
+        _REQUIRED_ATTRIBUTES: Set of required attributes in the class
+    """
+
+    _REQUIRED_ATTRIBUTES: set[str]
+
+    def _check_attributes(self) -> None:
+        if hasattr(self, "_REQUIRED_ATTRIBUTES"):
+            for attribute in self._REQUIRED_ATTRIBUTES:
+                if not hasattr(self, attribute):
+                    raise AttributeError(f"The required class attribute is not set! ({attribute})")