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

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/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.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyquoks
-Version: 2.1.0
+Version: 2.1.1
 Summary: Пакет PyPI для часто используемых модулей в проектах diquoks
 License: MIT
 License-File: LICENSE

pyquoks-2.1.1.dist-info/RECORD

@@ -0,0 +1,10 @@
+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=NSrwbL1eOEDz1HnYt_4_Lx95Hj8q2OumvsHWxhD_ygE,4501
+pyquoks/test.py,sha256=i7smDot_13Kzu1gONhLGVFEkXz6x9MFi-_8DBNnRXd4,3060
+pyquoks/utils.py,sha256=AQTVexZxn_-XAVBQjHmwdNM2oKZY4W98ZO1VEzMyVxE,1513
+pyquoks-2.1.1.dist-info/licenses/LICENSE,sha256=eEd8UIYxvKUY7vqrV1XTFo70_FQdiW6o1fznseCXRJs,1095
+pyquoks-2.1.1.dist-info/METADATA,sha256=jX9pAEOvQ6A_UoNHpEkg3wUjLxgdO-B9bFxYNpWm6PI,1714
+pyquoks-2.1.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+pyquoks-2.1.1.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,,