pyquoks 2.1.0__py3-none-any.whl → 2.1.2__py3-none-any.whl

pyquoks/data.py

@@ -18,49 +18,6 @@ import pyquoks.utils
 
 # region Providers
 
-class DataProvider(pyquoks.utils._HasRequiredAttributes):
-    """
-    Class for providing data from JSON-like files
-
-    **Required attributes**::
-
-        _OBJECTS = {"users": UsersContainer}
-
-        # Predefined:
-
-        _PATH = pyquoks.utils.get_path("data/")
-
-        _FILENAME = "{0}.json"
-
-    Attributes:
-        _OBJECTS: Dictionary with filenames and containers
-        _PATH: Path to the directory with JSON-like files
-        _FILENAME: Filename of JSON-like files
-    """
-
-    _REQUIRED_ATTRIBUTES = {
-        "_OBJECTS",
-        "_PATH",
-        "_FILENAME",
-    }
-
-    _OBJECTS: dict[str, type]
-
-    _PATH: str = pyquoks.utils.get_path("data/")
-
-    _FILENAME: str = "{0}.json"
-
-    def __init__(self) -> None:
-        self._check_attributes()
-
-        for filename, object_class 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())))
-            except Exception:
-                setattr(self, filename, None)
-
-
 class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
     """
     Class for providing various assets data
@@ -201,9 +158,7 @@ class AssetsProvider(pyquoks.utils._HasRequiredAttributes):
         """
 
         return PIL.Image.open(
-            fp=io.BytesIO(
-                initial_bytes=requests.get(url).content,
-            ),
+            fp=io.BytesIO(requests.get(url).content),
         )
 
 
@@ -360,7 +315,8 @@ 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!")
-                elif type(value) is not self._VALUES.get(attribute):
+
+                if type(value) is not self._VALUES.get(attribute):
                     raise AttributeError(
                         f"{attribute} has incorrect type! (must be {self._VALUES.get(attribute).__name__})",
                     )
@@ -387,6 +343,82 @@ class ConfigManager(pyquoks.utils._HasRequiredAttributes):
             setattr(self, attribute, object_class(self))
 
 
+class DataManager(pyquoks.utils._HasRequiredAttributes):
+    """
+    Class for managing data from JSON-like files
+
+    **Required attributes**::
+
+        _OBJECTS = {"users": UsersContainer}
+
+        # Predefined:
+
+        _PATH = pyquoks.utils.get_path("data/")
+
+        _FILENAME = "{0}.json"
+
+    Attributes:
+        _OBJECTS: Dictionary with filenames and containers
+        _PATH: Path to the directory with JSON-like files
+        _FILENAME: Filename of JSON-like files
+    """
+
+    _REQUIRED_ATTRIBUTES = {
+        "_OBJECTS",
+        "_PATH",
+        "_FILENAME",
+    }
+
+    _OBJECTS: dict[str, type]
+
+    _PATH: str = pyquoks.utils.get_path("data/")
+
+    _FILENAME: str = "{0}.json"
+
+    def __init__(self) -> None:
+        self._check_attributes()
+
+        for filename, object_class 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())))
+            except Exception:
+                setattr(self, filename, None)
+
+    def update(self, **kwargs) -> None:
+        """
+        Updates provided attributes in object
+        """
+
+        for attribute, value in kwargs.items():
+            if attribute not in self._OBJECTS.keys():
+                raise AttributeError(f"{attribute} is not specified!")
+
+            object_class = self._OBJECTS.get(attribute)
+
+            try:
+                object_class(value)
+            except Exception:
+                raise AttributeError(
+                    f"{attribute} cannot be converted to {object_class.__name__}!",
+                )
+            else:
+                setattr(self, attribute, object_class(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(
+                        value,
+                        fp=file,
+                        ensure_ascii=False,
+                        indent=2,
+                    )
+
+
 class DatabaseManager(pyquoks.utils._HasRequiredAttributes):
     """
     Class for managing database connections
@@ -526,7 +558,10 @@ class LoggerService(logging.Logger):
         self.addHandler(self.stream_handler)
 
         if file_handling:
-            os.makedirs(path, exist_ok=True)
+            os.makedirs(
+                name=path,
+                exist_ok=True
+            )
             self._LOG_PATH = path + f"{int(datetime.datetime.now().timestamp())}.{filename}.log"
 
             self.file_handler = logging.FileHandler(
@@ -545,7 +580,7 @@ class LoggerService(logging.Logger):
             self._LOG_PATH = None
 
     @property
-    def file(self) -> typing.BinaryIO | None:
+    def file(self) -> typing.IO | None:
         """
         :return: Opened file-like object of current logs
         """

pyquoks/models.py

@@ -1,9 +1,25 @@
 from __future__ import annotations
 
+import typing
+
 import pyquoks.utils
 
 
-class Model:
+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
 
@@ -11,7 +27,7 @@ class Model:
 
         _ATTRIBUTES = {"beatmap_id", "score_id"}
 
-        _OBJECTS = {"scores": ScoreModel}
+        _OBJECTS = {"beatmap": BeatmapModel}
 
     Attributes:
         _ATTRIBUTES: Set of parameters that stored in this model
@@ -26,7 +42,7 @@ class Model:
     _data: dict
 
     def __init__(self, data: dict) -> None:
-        self._data = data
+        super().__init__(data)
 
         if hasattr(self, "_ATTRIBUTES"):
             if isinstance(self._ATTRIBUTES, set):
@@ -46,7 +62,7 @@ class Model:
             self._OBJECTS = None
 
 
-class Container:
+class Container(Model, _HasInitialData):
     """
     Class for storing lists of models and another parameters
 
@@ -74,24 +90,7 @@ class Container:
     _data: dict
 
     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 Exception:
-                        setattr(self, attribute, None)
-        else:
-            self._OBJECTS = None
+        super().__init__(data)
 
         if hasattr(self, "_DATA"):
             if isinstance(self._DATA, dict):
@@ -104,7 +103,7 @@ class Container:
             self._DATA = None
 
 
-class Listing:
+class Listing(_HasInitialData):
     """
     Class for storing list of models
 
@@ -122,7 +121,7 @@ class Listing:
     _data: list
 
     def __init__(self, data: list) -> None:
-        self._data = data
+        super().__init__(data)
 
         if hasattr(self, "_DATA"):
             if isinstance(self._DATA, dict):

pyquoks/test.py

@@ -45,10 +45,12 @@ class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
             func_name: str,
             test_data: object,
             test_expected: object,
+            message: str = None,
     ) -> None:
         self._logger.info(
             msg=(
                 f"{self._get_func_name(func_name)}:\n"
+                f"{f"Message: {message}\n" if message else ""}"
                 f"Data: {test_data}\n"
                 f"Expected: {test_expected}\n"
             ),
@@ -58,6 +60,7 @@ class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
             self.assertEqual(
                 first=test_data,
                 second=test_expected,
+                msg=message,
             )
         except Exception as exception:
             self._logger.log_error(
@@ -70,12 +73,14 @@ class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
             func_name: str,
             test_func: typing.Callable,
             test_exception: type[BaseException],
+            message: str = None,
             *args,
             **kwargs,
     ) -> None:
         self._logger.info(
             msg=(
                 f"{self._get_func_name(func_name)}:\n"
+                f"{f"Message: {message}\n" if message else ""}"
                 f"Function: {test_func.__name__}()\n"
                 f"Exception: {test_exception.__name__}\n"
             ),
@@ -99,10 +104,12 @@ class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
             func_name: str,
             test_data: object,
             test_type: type | types.UnionType,
+            message: str = None,
     ) -> None:
         self._logger.info(
             msg=(
                 f"{self._get_func_name(func_name)}:\n"
+                f"{f"Message: {message}\n" if message else ""}"
                 f"Type: {type(test_data).__name__}\n"
                 f"Expected: {test_type.__name__}\n"
             ),
@@ -112,6 +119,7 @@ class TestCase(unittest.TestCase, pyquoks.utils._HasRequiredAttributes):
             self.assertIsInstance(
                 obj=test_data,
                 cls=test_type,
+                msg=message,
             )
         except Exception as exception:
             self._logger.log_error(

pyquoks/utils.py

@@ -9,7 +9,7 @@ import psutil
 
 class _HasRequiredAttributes:
     """
-    Assistive class for checking for required attributes
+    Assistive class for checking required attributes
 
     **Required attributes**::
 

{pyquoks-2.1.0.dist-info → pyquoks-2.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.1.0
+Version: 2.1.2
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License: MIT
 License-File: LICENSE
@@ -24,7 +24,7 @@ Requires-Dist: markupsafe (==3.0.3)
 Requires-Dist: pillow (==12.0.0)
 Requires-Dist: psutil (==7.1.3)
 Requires-Dist: requests (==2.32.5)
-Requires-Dist: urllib3 (==2.5.0)
+Requires-Dist: urllib3 (==2.6.0)
 Requires-Dist: waitress (==3.0.2)
 Requires-Dist: werkzeug (==3.1.4)
 Description-Content-Type: text/markdown

pyquoks-2.1.2.dist-info/RECORD

@@ -0,0 +1,10 @@
+pyquoks/__init__.py,sha256=axiG3ptbyRzfPKNrEGSGb9ZeQztdwWOq_LNbJhZDHOs,143
+pyquoks/data.py,sha256=Vz7b_b5dZD-EnhyVLqScjFqCvju6esWPkOKmXEBgiiE,17488
+pyquoks/localhost.py,sha256=dn9Dwx0wKRIudPxOIql7JgsDomUtf-bOr7SkZozAbqk,1100
+pyquoks/models.py,sha256=NSrwbL1eOEDz1HnYt_4_Lx95Hj8q2OumvsHWxhD_ygE,4501
+pyquoks/test.py,sha256=7s_RdzuTq90hv-QyPVrlr2_H_7KiMkkFMQEbpskO8Ss,3417
+pyquoks/utils.py,sha256=AQTVexZxn_-XAVBQjHmwdNM2oKZY4W98ZO1VEzMyVxE,1513
+pyquoks-2.1.2.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
+pyquoks-2.1.2.dist-info/METADATA,sha256=b2ZFqwqNtCYKjUPgbZWcD3oOahlNzPmpuFaDQ63K6nA,1714
+pyquoks-2.1.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyquoks-2.1.2.dist-info/RECORD,,

pyquoks-2.1.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-pyquoks/__init__.py,sha256=axiG3ptbyRzfPKNrEGSGb9ZeQztdwWOq_LNbJhZDHOs,143
-pyquoks/data.py,sha256=WnrgMO04anzi1e5AiVDSL-JxwjDRLIm4UceVp9cv8p0,16389
-pyquoks/localhost.py,sha256=dn9Dwx0wKRIudPxOIql7JgsDomUtf-bOr7SkZozAbqk,1100
-pyquoks/models.py,sha256=XXBWKvGgWvMxSIn6EYoAZ_vx7vct2gyMA7bBO4nwSps,4833
-pyquoks/test.py,sha256=i7smDot_13Kzu1gONhLGVFEkXz6x9MFi-_8DBNnRXd4,3060
-pyquoks/utils.py,sha256=iAYG56cZ3xjBnR3wzeF-B5ELcx7UTkQi8H1x3W4vCvk,1517
-pyquoks-2.1.0.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
-pyquoks-2.1.0.dist-info/METADATA,sha256=OPFRa6UFDe055Pi8QyQMyE3UiEoVaPWkRdtLFNroIUI,1714
-pyquoks-2.1.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-pyquoks-2.1.0.dist-info/RECORD,,