ramifice 0.4.8__py3-none-any.whl → 0.4.9__py3-none-any.whl

ramifice/commons/general.py

@@ -6,12 +6,32 @@ from pymongo.asynchronous.collection import AsyncCollection
 from pymongo.asynchronous.command_cursor import AsyncCommandCursor
 from pymongo.asynchronous.database import AsyncDatabase
 
-from ..utils import globals
+from ..utils import globals, translations
 
 
 class GeneralMixin:
     """General purpose query methods."""
 
+    @classmethod
+    def from_mongo_doc(
+        cls,
+        mongo_doc: dict[str, Any],
+    ) -> Any:
+        """Create object instance from Mongo document."""
+        obj: Any = cls()
+        lang: str = translations.CURRENT_LOCALE
+        for name, data in mongo_doc.items():
+            field = obj.__dict__.get(name)
+            if field is None:
+                continue
+            if field.field_type == "TextField":
+                field.value = data.get(lang, "") if data is not None else None
+            elif field.group == "pass":
+                field.value = None
+            else:
+                field.value = data
+        return obj
+
     @classmethod
     async def estimated_document_count(  # type: ignore[no-untyped-def]
         cls,

ramifice/commons/one.py

@@ -7,7 +7,7 @@ from pymongo.results import DeleteResult
 
 from ..utils import globals
 from ..utils.errors import PanicError
-from .tools import from_mongo_doc, mongo_doc_to_raw_doc, password_to_none
+from .tools import mongo_doc_to_raw_doc, password_to_none
 
 
 class OneMixin:
@@ -67,7 +67,7 @@ class OneMixin:
         mongo_doc = await collection.find_one(filter, *args, **kwargs)
         if mongo_doc is not None:
             # Convert document to Model instance.
-            inst_model = from_mongo_doc(cls, mongo_doc)
+            inst_model = cls.from_mongo_doc(mongo_doc)
         return inst_model
 
     @classmethod
@@ -85,7 +85,7 @@ class OneMixin:
         mongo_doc = await collection.find_one(filter, *args, **kwargs)
         if mongo_doc is not None:
             # Convert document to Model instance.
-            inst_model = from_mongo_doc(cls, mongo_doc)
+            inst_model = cls.from_mongo_doc( mongo_doc)
             json_str = inst_model.to_json()
         return json_str
 

ramifice/commons/tools.py

@@ -18,24 +18,6 @@ def password_to_none(
     return mongo_doc
 
 
-def from_mongo_doc(
-    cls_model: Any,
-    mongo_doc: dict[str, Any],
-) -> Any:
-    """Create object instance from Mongo document."""
-    obj: Any = cls_model()
-    lang: str = translations.CURRENT_LOCALE
-    for name, data in mongo_doc.items():
-        field = obj.__dict__[name]
-        if field.field_type == "TextField":
-            field.value = data.get(lang, "") if data is not None else None
-        elif field.group == "pass":
-            field.value = None
-        else:
-            field.value = data
-    return obj
-
-
 def mongo_doc_to_raw_doc(
     field_name_and_type: dict[str, str],
     mongo_doc: dict[str, Any],

ramifice/utils/fixtures.py

@@ -68,7 +68,8 @@ async def apply_fixture(
                 print(colored("\nFIXTURE:", "red", attrs=["bold"]))
                 print(colored(fixture_path, "blue", attrs=["bold"]))
                 inst_model.print_err()
-                raise PanicError("Error: Fixtures")
+                msg = f"Fixture `{fixture_name}` failed."
+                raise PanicError(msg)
             # Get data for document.
             checked_data: dict[str, Any] = result_check["data"]
             # Add date and time.

ramifice/utils/migration.py

@@ -174,20 +174,21 @@ class Monitor:
                     checked_data["updated_at"] = datetime.now()
                     # Update the document in the database.
                     await model_collection.replace_one(
-                        filter={"_id": checked_data["_id"]}, replacement=checked_data
+                        filter={"_id": checked_data["_id"]},
+                        replacement=checked_data,
                     )
             #
             # Refresh the dynamic fields data for the current model.
-            meta_dyn_field_list: list[str] = metadata["data_dynamic_fields"].keys()
-            for field_name, field_data in model_state["data_dynamic_fields"].items():
-                field_type = metadata["field_name_and_type"].get(field_name)
-                if field_type is not None and field_name in meta_dyn_field_list:
-                    model_state["field_name_and_type"][field_name] = field_type
-                    metadata["data_dynamic_fields"][field_name] = field_data
-            #
+            for field_name, field_data in metadata["data_dynamic_fields"].items():
+                if model_state["data_dynamic_fields"].get(field_name, False) == False:
+                    model_state["data_dynamic_fields"][field_name] = field_data
+                else:
+                    metadata["data_dynamic_fields"][field_name] = model_state[
+                        "data_dynamic_fields"
+                    ][field_name]
+            # Refresh state of current Model.
             model_state["data_dynamic_field"] = metadata["data_dynamic_fields"]
             model_state["field_name_and_type"] = metadata["field_name_and_type"]
-            # Refresh state of current Model.
             await super_collection.replace_one(
                 filter={"collection_name": model_state["collection_name"]},
                 replacement=model_state,

{ramifice-0.4.8.dist-info → ramifice-0.4.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.4.8
+Version: 0.4.9
 Summary: ORM-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/
@@ -453,6 +453,11 @@ collection = await User.collection()
 q_filter = {"email": "John_Smith@gmail.com"}
 mongo_doc = await User.find_one(q_filter)
 
+# Create object instance from Mongo document.
+q_filter = {"email": "John_Smith@gmail.com"}
+mongo_doc = await User.find_one(q_filter)
+user = User.from_mongo_doc(mongo_doc)
+
 # Find a single document and converting to raw document.
 q_filter = {"email": "John_Smith@gmail.com"}
 raw_doc = await User.find_one_to_raw_doc(q_filter)
@@ -516,7 +521,7 @@ async for index in await User.list_indexes():
 # Units Management.
 # Management for `choices` parameter in dynamic field types.
 # Units are stored in a separate collection.
-from ramifice.utils.unit import Unit
+from ramifice import Unit
 unit = Unit(
   field="field_name",  # The name of the dynamic field.
   title="Title",  # The name of the choice item.

{ramifice-0.4.8.dist-info → ramifice-0.4.9.dist-info}/RECORD

@@ -1,11 +1,11 @@
 ramifice/__init__.py,sha256=IuI20h84QWyFftykvte_HLft2iVxwpu0K592NypMwfo,759
 ramifice/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramifice/commons/__init__.py,sha256=FTG78sTU0ay0rvmrq5fUmVjL-I-S7wgQq3BLcyqnjrQ,433
-ramifice/commons/general.py,sha256=dy2GTpekLyshrNG68XV2dxNgwsS4QODtIcG-c6Xvalw,4298
+ramifice/commons/general.py,sha256=yi52I9t8R1XePZdyrPmhXJxLc_YkY72Ea7_dBvsKfXI,4984
 ramifice/commons/indexes.py,sha256=hAcWKZ9MMgLbRtoQ6Af0b8r-PY0dbEYmMBl8z_d1DRo,3646
 ramifice/commons/many.py,sha256=KGt7licVJmLADvyPtH7-GbXHig-EnGFbnk7QKu3mfvQ,8214
-ramifice/commons/one.py,sha256=h9R-Ev-7h-xln4lp4SMJIIU9Cf9acqwjj4YYaML6uFg,5832
-ramifice/commons/tools.py,sha256=zR-mmqqsfSWKF0lws1qMvCh-sauJa8pHX5GNJZdAjMI,2341
+ramifice/commons/one.py,sha256=MwUlU9getNtwTOL6-lROdzViBsChWgMIMppCWoeAnFU,5815
+ramifice/commons/tools.py,sha256=s4CdHb9h8aqR371py0KVsBnNBJSW8-7AVjbTmuFAeeg,1793
 ramifice/commons/unit_manager.py,sha256=IkWqXu1PHHal0aGfx6zme81iXPeygxPqEWO-u_8RXoI,4356
 ramifice/fields/__init__.py,sha256=yRfX7Tvpuh27Ggcx5u9e1RRYK7Wu59EVJYxxetmuP1w,1290
 ramifice/fields/bool_field.py,sha256=WWubSwsFJZu8b3MviDd2zXnNYOQaYw8toklFNSTVFLA,2072
@@ -68,9 +68,9 @@ ramifice/paladins/groups/slug_group.py,sha256=joBB5litljbv2h5JKEMzF71s_DKMWH6nzg
 ramifice/paladins/groups/text_group.py,sha256=rUWNaAPkTMMlRf6A-6nQAa4HCj6NBTjPKIYaEKSOUL4,4305
 ramifice/utils/__init__.py,sha256=xixHoOX4ja5jIUZemem1qn4k4aonv3G3Q76azQK_pkU,43
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
-ramifice/utils/fixtures.py,sha256=Krl31nNShEg6A15Q8WRDqIai0bPyaJuK8jEGt5ySzao,3114
+ramifice/utils/fixtures.py,sha256=qsv9cg06lc82XaRlhI1j5vftmOQTTwOcDXCg_lnpK04,3159
 ramifice/utils/globals.py,sha256=uR20um3Qg_1SG1t7WyWbpq8kQD-9Mslyr_c1yh5Hw9w,1751
-ramifice/utils/migration.py,sha256=LON53a8oBpjc9ox-FzqBEGsAWnqW8t-CWBkRC7BbwxI,11022
+ramifice/utils/migration.py,sha256=JBPDrkox2ONpqfhBVR-i8gHUeyp0cR5if03Ml1rT9Q0,10980
 ramifice/utils/tools.py,sha256=sOKzwnvf6vdTNf9r6PKAdw6aB4undat2Z8tzS3M1GnQ,2733
 ramifice/utils/translations.py,sha256=GNGE0ULAA0aOY5pTxUd3MQW-nVaKvp6BeXWEcsR0s0o,4048
 ramifice/utils/unit.py,sha256=qJ2SpClsFcMRcwB_ZA-QlrB5T9OinCBiWx5KqQ9vH_A,2266
@@ -79,7 +79,7 @@ ramifice/utils/mixins/add_valid.py,sha256=TLOObedzXNA9eCylfAVbVCqIKE5sV-P5AdIN7a
 ramifice/utils/mixins/hooks.py,sha256=33jvJRhfnJeL2Hd_YFXk3M_7wjqHaByU2wRjKyboL6s,914
 ramifice/utils/mixins/indexing.py,sha256=Z0427HoaVRyNmSNN8Fx0mSICgAKV-gDdu3iR5qYUEbs,329
 ramifice/utils/mixins/json_converter.py,sha256=WhigXyDAV-FfILaZuwvRFRIk0D90Rv3dG5t-mv5fVyc,1107
-ramifice-0.4.8.dist-info/METADATA,sha256=8SwX-fdl1VAUuVPM0j1M7ga_sZeClHp2tiD1hr5cFSM,21624
-ramifice-0.4.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.4.8.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.4.8.dist-info/RECORD,,
+ramifice-0.4.9.dist-info/METADATA,sha256=nSJxqklFILcOWassjetiISC2chZ18V7dlbffS-HAcgo,21785
+ramifice-0.4.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.4.9.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.4.9.dist-info/RECORD,,