PyPI - pyquoks - Versions diffs - 1.3.2.1__py3-none-any.whl → 2.0.0__py3-none-any.whl - Mend

pyquoks 1.3.2.1py3-none-any.whl → 2.0.0py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

pyquoks/__init__.py +9 -0
pyquoks/data.py +371 -343
pyquoks/localhost.py +20 -8
pyquoks/models.py +94 -96
pyquoks/test.py +86 -0
pyquoks/utils.py +27 -7
{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/METADATA +56 -55
pyquoks-2.0.0.dist-info/RECORD +10 -0
{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/WHEEL +1 -2
pyquoks-1.3.2.1.dist-info/RECORD +0 -10
pyquoks-1.3.2.1.dist-info/top_level.txt +0 -1
{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/licenses/LICENSE +0 -0

pyquoks/localhost.py CHANGED Viewed

@@ -1,23 +1,33 @@
 from __future__ import annotations
 import typing
 import waitress, flask
+import pyquoks.utils
-class ILocalhostFlask(flask.Flask):
+class LocalhostFlask(flask.Flask, pyquoks.utils._HasRequiredAttributes):
     """
     Class for creating a simple localhost server
+    **Required attributes**::
+        _RULES = {"/": self.base_redirect}
+    Attributes:
+        _RULES: Dictionary with rules and functions
     """
+    _REQUIRED_ATTRIBUTES = {
+        "_RULES",
+    }
     _RULES: dict[str, typing.Callable]
-    """
-    Dictionary with rules and functions
-    Example:
-        _RULES = {"/": base_redirect}
-    """
     def __init__(self, import_name: str) -> None:
-        super().__init__(import_name)
+        self._check_attributes()
+        super().__init__(
+            import_name=import_name,
+        )
         for rule, view_func in self._RULES.items():
             self.add_url_rule(
@@ -28,6 +38,8 @@ class ILocalhostFlask(flask.Flask):
     def serve(self, port: int) -> None:
         """
         Starts this Flask application
+        :param port: Port number
         """
         waitress.serve(

pyquoks/models.py CHANGED Viewed

@@ -1,138 +1,136 @@
 from __future__ import annotations
+import pyquoks.utils
-class IContainer:
-    """
-    Class for storing lists of models and another parameters
+class Model:
     """
+    Class for storing parameters and models
-    _ATTRIBUTES: set[str] | dict[str, set[str]] = None
-    """
-    Set of parameters that also can be stored one key deep
+    **Optional attributes**::
-    Example:
         _ATTRIBUTES = {"beatmap_id", "score_id"}
-        _ATTRIBUTES = {"attributes": {"max_combo", "star_rating"}}
-    """
+        _OBJECTS = {"scores": ScoreModel}
-    _DATA: dict[str, type] = None
+    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
     """
-    Dictionary with name and type of models stored in list inside ``json_data``
-    Example:
-        _DATA = {"scores": ScoreModel}
-    """
+    _ATTRIBUTES: set[str] | None
-    _OBJECTS: dict[str, type] = None
-    """
-    Dictionary with keys of ``json_data`` and types of models stored in a list inside
-    Example:
-        _OBJECTS = {"beatmaps": BeatmapModel, "scores": ScoreModel}
-    """
+    _OBJECTS: dict[str, type] | None
     _data: dict
-    """
-    Initial data that was passed into object
-    """
-    def __init__(self, json_data: dict) -> None:
-        self._data = json_data
+    def __init__(self, data: dict) -> None:
+        self._data = 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:
+                        setattr(self, attribute, None)
+        else:
+            self._OBJECTS = None
-        if isinstance(self._ATTRIBUTES, set):
-            for name in self._ATTRIBUTES:
-                setattr(self, name, self._data.get(name, None))
-        elif isinstance(self._ATTRIBUTES, dict):
-            for key, attributes in self._ATTRIBUTES.items():
-                if isinstance(attributes, set):
-                    for name in attributes:
-                        try:
-                            setattr(self, name, self._data.get(key).get(name, None))
-                        except:
-                            setattr(self, name, None)
-        if isinstance(self._DATA, dict):
-            for name, data_class in self._DATA.items():
-                try:
-                    setattr(self, name, [data_class(data) for data in self._data])
-                except:
-                    setattr(self, name, None)
-        elif isinstance(self._OBJECTS, dict):
-            for name, data_class in self._OBJECTS.items():
-                try:
-                    setattr(self, name, [data_class(data) for data in self._data.get(name)])
-                except:
-                    setattr(self, name, None)
-class IModel:
-    """
-    Class for storing parameters and models
-    """
-    _ATTRIBUTES: set[str] | dict[str, set[str]] = None
+class Container:
     """
-    Set of parameters that also can be stored one key deep
+    Class for storing lists of models and another parameters
+    **Optional attributes**::
-    Example:
         _ATTRIBUTES = {"beatmap_id", "score_id"}
-        _ATTRIBUTES = {"attributes": {"max_combo", "star_rating"}}
-    """
+        _OBJECTS = {"beatmap": BeatmapModel}
-    _OBJECTS: dict[str, type] = None
-    """
-    Dictionary with attributes and their models
-    Example:
-        _OBJECTS = {"score": ScoreModel}
+        _DATA = {"scores": ScoreModel}
+    Attributes:
+        _ATTRIBUTES: Set of parameters that stored in this container
+        _OBJECTS: Dictionary with attributes and their models
+        _DATA: Dictionary with attribute and type of models stored in list
+        _data: Initial data that was passed into object
     """
+    _ATTRIBUTES: set[str] | None
+    _OBJECTS: dict[str, type] | None
+    _DATA: dict[str, type] | None
     _data: dict | list[dict]
-    """
-    Initial data that was passed into object
-    """
-    def __init__(self, json_data: dict | list[dict]) -> None:
-        self._data = json_data
+    def __init__(self, data: dict | list[dict]) -> None:
+        self._data = data
+        if isinstance(self._data, dict):
+            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 isinstance(self._ATTRIBUTES, set):
-            for name in self._ATTRIBUTES:
-                setattr(self, name, self._data.get(name, None))
-        elif isinstance(self._ATTRIBUTES, dict):
-            for key, attributes in self._ATTRIBUTES.items():
-                if isinstance(attributes, set):
-                    for name in attributes:
+            if hasattr(self, "_OBJECTS"):
+                if isinstance(self._OBJECTS, dict):
+                    for attribute, object_class in self._OBJECTS.items():
                         try:
-                            setattr(self, name, self._data.get(key).get(name, None))
+                            setattr(self, attribute, object_class(self._data.get(attribute)))
                         except:
-                            setattr(self, name, None)
-        if isinstance(self._OBJECTS, dict):
-            for name, data_class in self._OBJECTS.items():
-                try:
-                    setattr(self, name, data_class(self._data.get(name)))
-                except:
-                    setattr(self, name, None)
+                            setattr(self, attribute, None)
+            else:
+                self._OBJECTS = None
+        elif isinstance(self._data, list):
+            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:
+                            setattr(self, attribute, None)
+            else:
+                self._DATA = None
-class IValues:
+class Values(pyquoks.utils._HasRequiredAttributes):
     """
     Class for storing various parameters and values
-    """
-    _ATTRIBUTES: set[str] = None
-    """
-    Attributes that can be stored in this class
+    **Required attributes**::
-    Example:
         _ATTRIBUTES = {"settings", "path"}
+    Attributes:
+        _ATTRIBUTES: Attributes that can be stored in this class
     """
+    _REQUIRED_ATTRIBUTES = {
+        "_ATTRIBUTES",
+    }
+    _ATTRIBUTES: set[str]
     def __init__(self, **kwargs) -> None:
-        for name in self._ATTRIBUTES:
-            setattr(self, name, kwargs.get(name, 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)

pyquoks/test.py ADDED Viewed

@@ -0,0 +1,86 @@
+from __future__ import annotations
+import unittest, types
+import pyquoks.data, pyquoks.utils
+class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
+    """
+    Class for performing unit testing
+    **Required attributes**::
+        _MODULE_NAME = __name__
+    Attributes:
+        _MODULE_NAME: Name of the testing module
+    """
+    _REQUIRED_ATTRIBUTES = {
+        "_MODULE_NAME"
+    }
+    _MODULE_NAME: str
+    def __init__(self, *args, **kwargs) -> None:
+        self._check_attributes()
+        super().__init__(*args, **kwargs)
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls._logger = pyquoks.data.LoggerService(
+            filename=__name__,
+        )
+    def _get_func_name(self, func_name: str) -> str:
+        return f"{self._MODULE_NAME}.{func_name}"
+    def assert_equal(
+            self,
+            func_name: str,
+            test_data: object,
+            test_expected: object,
+    ) -> None:
+        self._logger.info(
+            msg=(
+                f"{self._get_func_name(func_name)}:\n"
+                f"Data: {test_data}\n"
+                f"Expected: {test_expected}\n"
+            ),
+        )
+        try:
+            self.assertEqual(
+                first=test_data,
+                second=test_expected,
+            )
+        except Exception as exception:
+            self._logger.log_error(
+                exception=exception,
+                raise_again=True,
+            )
+    def assert_type(
+            self,
+            func_name: str,
+            test_data: object,
+            test_type: type | types.UnionType,
+    ) -> None:
+        self._logger.info(
+            msg=(
+                f"{self._get_func_name(func_name)}:\n"
+                f"Type: {type(test_data).__name__}\n"
+                f"Expected: {test_type.__name__}\n"
+            ),
+        )
+        try:
+            self.assertIsInstance(
+                obj=test_data,
+                cls=test_type,
+            )
+        except Exception as exception:
+            self._logger.log_error(
+                exception=exception,
+                raise_again=True,
+            )

pyquoks/utils.py CHANGED Viewed

@@ -2,17 +2,37 @@ from __future__ import annotations
 import sys, os
-def get_path(relative_path: str, only_abspath: bool = False) -> str:
+class _HasRequiredAttributes:
     """
+    Assistive class for checking for required attributes
+    **Required attributes**::
+        _REQUIRED_ATTRIBUTES = {"_ATTRIBUTES", "_OBJECTS"}
+    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})")
+def get_path(relative_path: str, use_meipass: bool = False) -> str:
+    """
+    :param relative_path: Relative path of the file
+    :param use_meipass: Whether or not ``sys._MEIPASS`` should be used
     :return: Absolute path for provided relative path
     """
-    try:
-        # noinspection PyUnresolvedReferences
+    if use_meipass and hasattr(sys, "_MEIPASS"):
         base_path = sys._MEIPASS
-    except:
+    else:
         base_path = os.path.abspath(".")
-    finally:
-        if only_abspath:
-            base_path = os.path.abspath(".")
     return os.path.join(base_path, relative_path)

{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/METADATA RENAMED Viewed

@@ -1,55 +1,56 @@
-Metadata-Version: 2.4
-Name: pyquoks
-Version: 1.3.2.1
-Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
-Home-page: https://diquoks.ru
-Author: Denis Titovets
-Author-email: den232titovets@yandex.ru
-Project-URL: Bug Tracker, https://github.com/diquoks/pyquoks/issues
-Project-URL: Repository, https://github.com/diquoks/pyquoks
-Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: blinker==1.9.0
-Requires-Dist: certifi==2025.10.5
-Requires-Dist: charset-normalizer==3.4.4
-Requires-Dist: click==8.3.0
-Requires-Dist: colorama==0.4.6
-Requires-Dist: Flask==3.1.2
-Requires-Dist: idna==3.11
-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: requests==2.32.5
-Requires-Dist: urllib3==2.5.0
-Requires-Dist: waitress==3.0.2
-Requires-Dist: Werkzeug==3.1.3
-Dynamic: license-file
-# pyquoks
-#### Пакет PyPI для часто используемых модулей в проектах diquoks
----
-## Оглавление
-- [Контакты](#контакты)
-    - [Связь с разработчиком](#связь-с-разработчиком)
-    - [Прочие ссылки](#прочие-ссылки)
----
-## Контакты
-#### Связь с разработчиком
-- [План разработки pyquoks](https://www.icloud.com/notes/0e0C-Bm4IkqXuBYqJrq00yhog)
-- [Telegram для связи](https://t.me/diquoks)
-- [Почта для связи](mailto:diquoks@yandex.ru)
-#### Прочие ссылки
-- [Telegram-канал с новостями](https://t.me/diquoks_channel)
+Metadata-Version: 2.4
+Name: pyquoks
+Version: 2.0.0
+Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
+License: MIT
+License-File: LICENSE
+Author: Denis Titovets
+Author-email: den232titovets@yandex.ru
+Requires-Python: >=3.13
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Dist: blinker (==1.9.0)
+Requires-Dist: certifi (==2025.11.12)
+Requires-Dist: charset-normalizer (==3.4.4)
+Requires-Dist: click (==8.3.0)
+Requires-Dist: colorama (==0.4.6)
+Requires-Dist: flask (==3.1.2)
+Requires-Dist: idna (==3.11)
+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: requests (==2.32.5)
+Requires-Dist: urllib3 (==2.5.0)
+Requires-Dist: waitress (==3.0.2)
+Requires-Dist: werkzeug (==3.1.3)
+Description-Content-Type: text/markdown
+# pyquoks
+#### Пакет PyPI для часто используемых модулей в проектах diquoks
+---
+## Оглавление
+- [Контакты](#контакты)
+    - [Связь с разработчиком](#связь-с-разработчиком)
+    - [Прочие ссылки](#прочие-ссылки)
+---
+## Контакты
+#### Связь с разработчиком
+- [План разработки pyquoks](https://www.icloud.com/notes/0e0C-Bm4IkqXuBYqJrq00yhog)
+- [Telegram для связи](https://t.me/diquoks)
+- [Почта для связи](mailto:diquoks@yandex.ru)
+#### Прочие ссылки
+- [Telegram-канал с новостями](https://t.me/diquoks_channel)

pyquoks-2.0.0.dist-info/RECORD ADDED Viewed

@@ -0,0 +1,10 @@
+pyquoks/__init__.py,sha256=r70_95sq0zntKp4Jjkk_0hgDMBzUGtCK8EGkkCA6k1c,143
+pyquoks/data.py,sha256=cbiMsUf6lXkc3fWxya906HgCjdVNa-NKkgx_TJG0EiU,16239
+pyquoks/localhost.py,sha256=-SG-VFoQ7gLksydlDFL3jrHwjNDurHkbXWB1rRxuFaA,1087
+pyquoks/models.py,sha256=pJ165gZnc9eeQnLJhJ3om6nhL3c2UZ9THDu060N3V1w,4154
+pyquoks/test.py,sha256=Dw4nVResnFatBQtFZnl1OKdIkVbmmeATEBRLOhfPcac,2219
+pyquoks/utils.py,sha256=m1N32manBwqw2X4gZJ6czA2ywpF1WBLdd9SKNpzKnpY,1152
+pyquoks-2.0.0.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
+pyquoks-2.0.0.dist-info/METADATA,sha256=GzbqbS_5FaiFYSWN_WcxEHtscrIz9z1yYPrZgdCSrII,1780
+pyquoks-2.0.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyquoks-2.0.0.dist-info/RECORD,,

{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/WHEEL RENAMED Viewed

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any

pyquoks-1.3.2.1.dist-info/RECORD DELETED Viewed

@@ -1,10 +0,0 @@
-pyquoks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyquoks/data.py,sha256=lwdhIS2zls5UqN7hn4shL3NBHDUxDUk8R7CicbQqM20,15724
-pyquoks/localhost.py,sha256=2sl1CovYrnIzBYW-eKDIYOfi5bUsSVTAdQobzAHpIys,828
-pyquoks/models.py,sha256=kdduuHgh8RLe8_S5Lmv3jS6hqsZG-oYQhPTgk2C11ug,4171
-pyquoks/utils.py,sha256=lcHZyIFIflGMqAhDkqm8GWOUFwb2f-IHgIPZxEiHBz0,484
-pyquoks-1.3.2.1.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
-pyquoks-1.3.2.1.dist-info/METADATA,sha256=FvyQo98t33VtfExAHVdUf1nCmOcQFsYcA9Wf3NY8Cz8,1804
-pyquoks-1.3.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyquoks-1.3.2.1.dist-info/top_level.txt,sha256=4Eqn44TCCp-D8V6To92e8-KKr49ZGf0dCcsdRQmPkhc,8
-pyquoks-1.3.2.1.dist-info/RECORD,,

pyquoks-1.3.2.1.dist-info/top_level.txt DELETED Viewed

	@@ -1 +0,0 @@
1	- pyquoks

{pyquoks-1.3.2.1.dist-info → pyquoks-2.0.0.dist-info}/licenses/LICENSE RENAMED Viewed

File without changes

pyquoks 1.3.2.1__py3-none-any.whl → 2.0.0__py3-none-any.whl

pyquoks 1.3.2.1py3-none-any.whl → 2.0.0py3-none-any.whl