pyquoks 2.7.0__tar.gz → 2.7.2__tar.gz

{pyquoks-2.7.0 → pyquoks-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.7.0
+Version: 2.7.2
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License-Expression: MIT
 License-File: LICENSE
@@ -25,7 +25,6 @@ Description-Content-Type: text/markdown
 
 - [Контакты](#контакты)
     - [Связь с разработчиком](#связь-с-разработчиком)
-    - [Прочие ссылки](#прочие-ссылки)
 
 ---
 
@@ -34,9 +33,5 @@ Description-Content-Type: text/markdown
 #### Связь с разработчиком
 
 - [Telegram для связи](https://t.me/diquoks)
-- [Почта для связи](mailto:diquoks@yandex.ru)
-
-#### Прочие ссылки
-
-- [Telegram-канал с новостями](https://t.me/diquoks_channel)
+- [Почта для связи](mailto:den232titovets@yandex.ru)
 

{pyquoks-2.7.0 → pyquoks-2.7.2}/README.md

@@ -8,7 +8,6 @@
 
 - [Контакты](#контакты)
     - [Связь с разработчиком](#связь-с-разработчиком)
-    - [Прочие ссылки](#прочие-ссылки)
 
 ---
 
@@ -17,8 +16,4 @@
 #### Связь с разработчиком
 
 - [Telegram для связи](https://t.me/diquoks)
-- [Почта для связи](mailto:diquoks@yandex.ru)
-
-#### Прочие ссылки
-
-- [Telegram-канал с новостями](https://t.me/diquoks_channel)
+- [Почта для связи](mailto:den232titovets@yandex.ru)

{pyquoks-2.7.0 → pyquoks-2.7.2}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "pyquoks"
-version = "2.7.0"
+version = "2.7.2"
 dependencies = [
     "pillow (>=12.2.0,<13.0.0)",
     "psutil (>=7.2.2,<8.0.0)",
     "pydantic (>=2.13.4,<3.0.0)",
-    "requests (>=2.34.2,<3.0.0)"
+    "requests (>=2.34.2,<3.0.0)",
 ]
 requires-python = ">=3.14.0,<4.0.0"
 authors = [
@@ -20,7 +20,7 @@ license-files = ["LICENSE"]
 dev = [
     "poetry (>=2.4.1,<3.0.0)",
     "pytest (>=9.0.3,<10.0.0)",
-    "twine (>=6.2.0,<7.0.0)"
+    "twine (>=6.2.0,<7.0.0)",
 ]
 
 [tool.pytest]

{pyquoks-2.7.0 → pyquoks-2.7.2}/src/pyquoks/managers/config.py

@@ -29,8 +29,10 @@ class ConfigManager(utils._HasRequiredAttributes):
         self._check_attributes()
 
         for attribute, object_type in self.__class__.__annotations__.items():
-            if issubclass(object_type, Config):
-                setattr(self, attribute, object_type(self))
+            if not issubclass(object_type, Config):
+                continue
+
+            setattr(self, attribute, object_type(self))
 
 
 class Config(utils._HasRequiredAttributes):
@@ -84,8 +86,8 @@ class Config(utils._HasRequiredAttributes):
                         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))
+
+                        setattr(self, attribute, getattr(self, attribute) == str(True))
                     case int():
                         setattr(self, attribute, int(getattr(self, attribute)))
                     case float():
@@ -134,13 +136,16 @@ class Config(utils._HasRequiredAttributes):
 
             setattr(self, attribute, value)
 
-            match object_type():
-                case bool() | int() | float() | str():
-                    self._config.set(self._SECTION, attribute, str(value))
-                case dict() | list():
-                    self._config.set(self._SECTION, attribute, json.dumps(value))
-                case _:
-                    raise ValueError(f"{object_type.__name__} type is not supported!")
+            try:
+                match object_type():
+                    case bool() | int() | float() | str():
+                        self._config.set(self._SECTION, attribute, str(value))
+                    case dict() | list():
+                        self._config.set(self._SECTION, attribute, json.dumps(value))
+                    case _:
+                        raise ValueError()
+            except:
+                raise ValueError(f"{object_type.__name__} type is not supported!")
 
             with open(self._parent._PATH, "w", encoding="utf-8") as file:
                 self._config.write(file)

{pyquoks-2.7.0 → pyquoks-2.7.2}/src/pyquoks/managers/database.py

@@ -33,8 +33,10 @@ class DatabaseManager(utils._HasRequiredAttributes):
         )
 
         for attribute, object_type in self.__class__.__annotations__.items():
-            if issubclass(object_type, Database):
-                setattr(self, attribute, object_type(self))
+            if not issubclass(object_type, Database):
+                continue
+
+            setattr(self, attribute, object_type(self))
 
     def close_all(self) -> None:
         """
@@ -42,8 +44,10 @@ class DatabaseManager(utils._HasRequiredAttributes):
         """
 
         for attribute, object_type in self.__class__.__annotations__.items():
-            if issubclass(object_type, Database):
-                getattr(self, attribute).close()
+            if not issubclass(object_type, Database):
+                continue
+
+            getattr(self, attribute).close()
 
 
 class Database(sqlite3.Connection, utils._HasRequiredAttributes):

{pyquoks-2.7.0 → pyquoks-2.7.2}/src/pyquoks/providers/assets.py

@@ -30,8 +30,10 @@ class AssetsProvider(utils._HasRequiredAttributes):
         self._check_attributes()
 
         for attribute, object_type in self.__class__.__annotations__.items():
-            if issubclass(object_type, Directory | Network):
-                setattr(self, attribute, object_type(self))
+            if not issubclass(object_type, Directory | Network):
+                continue
+
+            setattr(self, attribute, object_type(self))
 
 
 class Directory(utils._HasRequiredAttributes):

{pyquoks-2.7.0 → pyquoks-2.7.2}/src/pyquoks/services/logger.py

@@ -36,28 +36,28 @@ class LoggerService(logging.Logger):
         )
         self.addHandler(self.stream_handler)
 
-        if file_handling:
-            os.makedirs(
-                name=path,
-                exist_ok=True
-            )
-            self._LOG_PATH = path + f"{int(datetime.datetime.now().timestamp())}.{filename}.log"
-
-            # noinspection PyTypeChecker
-            self.file_handler = logging.FileHandler(
-                filename=self._LOG_PATH,
-                encoding="utf-8",
-            )
-            self.file_handler.setFormatter(
-                logging.Formatter(
-                    fmt="$levelname $asctime - $message",
-                    datefmt="%d-%m-%y %H:%M:%S",
-                    style="$",
-                ),
-            )
-            self.addHandler(self.file_handler)
-        else:
+        if not file_handling:
             self._LOG_PATH = None
+            return
+
+        os.makedirs(
+            name=path,
+            exist_ok=True
+        )
+        self._LOG_PATH: str = path + f"{int(datetime.datetime.now().timestamp())}.{filename}.log"
+
+        self.file_handler = logging.FileHandler(
+            filename=self._LOG_PATH,
+            encoding="utf-8",
+        )
+        self.file_handler.setFormatter(
+            logging.Formatter(
+                fmt="$levelname $asctime - $message",
+                datefmt="%d-%m-%y %H:%M:%S",
+                style="$",
+            ),
+        )
+        self.addHandler(self.file_handler)
 
     @property
     def file(self) -> typing.IO | None:
@@ -65,10 +65,10 @@ class LoggerService(logging.Logger):
         :return: Opened file-like object of current logs
         """
 
-        if self._LOG_PATH:
+        if self._LOG_PATH is not None:
             return open(self._LOG_PATH, "rb")
-        else:
-            return None
+
+        return None
 
     def log_exception(self, exception: Exception, raise_again: bool = False) -> None:
         """

{pyquoks-2.7.0 → pyquoks-2.7.2}/src/pyquoks/utils.py

@@ -56,10 +56,7 @@ def get_process_created_datetime(pid: int | None = None) -> datetime.datetime:
     :return: Datetime when the process was created
     """
 
-    if pid is None:
-        pid = os.getpid()
-
-    process = psutil.Process(pid)
+    process = psutil.Process(pid or os.getpid())
 
     return datetime.datetime.fromtimestamp(
         timestamp=process.create_time(),
@@ -81,7 +78,11 @@ class _HasRequiredAttributes:
     _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})")
+        if not hasattr(self, "_REQUIRED_ATTRIBUTES"):
+            return
+
+        for attribute in self._REQUIRED_ATTRIBUTES:
+            if hasattr(self, attribute):
+                continue
+
+            raise AttributeError(f"The required class attribute is not set! ({attribute})")