ramifice 0.5.3__py3-none-any.whl → 0.5.4__py3-none-any.whl

ramifice/commons/unit_manager.py

@@ -34,59 +34,64 @@ class UnitMixin:
         # Check the presence of a Model state.
         if model_state is None:
             raise PanicError("Error: Model State - Not found!")
-        # Get dynamic field data.
-        choices: list | None = model_state["data_dynamic_fields"][unit.field]
-        # Get Title.
+        # Get clean fields of Unit.
+        unit_field: str = unit.field
         title = unit.title
         title = {lang: title.get(lang, "- -") for lang in translations.LANGUAGES}
-        main_lang = translations.DEFAULT_LOCALE
-        main_title = title[main_lang]
+        target_value = unit.value
+        # Get dynamic field data.
+        choices: list | None = model_state["data_dynamic_fields"][unit_field]
+        # Determine the presence of unit.
+        is_unit_exists: bool = False
+        if choices is not None:
+            for item in choices:
+                if item["value"] == target_value:
+                    is_unit_exists = True
+                    break
         # Add Unit to Model State.
         if not unit.is_delete:
             if choices is not None:
-                choices.append({"title": title, "value": unit.value})
+                if is_unit_exists:
+                    main_lang = translations.DEFAULT_LOCALE
+                    msg = (
+                        "Error: It is impossible to add unit - "
+                        + f"Unit `{title[main_lang]}: {target_value}` is exists!"
+                    )
+                    raise PanicError(msg)
+                choices.append({"title": title, "value": target_value})
             else:
-                choices = [{"title": title, "value": unit.value}]
-            model_state["data_dynamic_fields"][unit.field] = choices
+                choices = [{"title": title, "value": target_value}]
+            model_state["data_dynamic_fields"][unit_field] = choices
         else:
             # Delete Unit from Model State.
             if choices is None:
-                msg = (
-                    "Error: It is not possible to delete Unit."
-                    + f"Title `{main_title}` not exists!"
-                )
+                msg = "Error: It is not possible to delete Unit - Units is not exists!"
                 raise PanicError(msg)
-            is_key_exists: bool = False
-            for item in choices:
-                if main_title == item["title"][main_lang]:
-                    is_key_exists = True
-                    break
-            if not is_key_exists:
+            if not is_unit_exists:
+                main_lang = translations.DEFAULT_LOCALE
                 msg = (
                     "Error: It is not possible to delete Unit."
-                    + f"Title `{main_title}` not exists!"
+                    + f"Unit `{title[main_lang]}: {target_value}` is not exists!"
                 )
                 raise PanicError(msg)
-            choices = [item for item in choices if item["title"][main_lang] != main_title]
-            model_state["data_dynamic_fields"][unit.field] = choices or None
+            choices = [item for item in choices if item["value"] != target_value]
+            model_state["data_dynamic_fields"][unit_field] = choices or None
         # Update state of current Model in super collection.
         await super_collection.replace_one(
             filter={"collection_name": model_state["collection_name"]},
             replacement=model_state,
         )
         # Update metadata of current Model.
-        cls.META["data_dynamic_fields"][unit.field] = choices or None
+        cls.META["data_dynamic_fields"][unit_field] = choices or None
         # Update documents in the collection of the current Model.
         if unit.is_delete:
-            unit_field: str = unit.field
-            unit_value: float | int | str | None = unit.value
             collection: AsyncCollection = globals.MONGO_DATABASE[cls.META["collection_name"]]
             async for mongo_doc in collection.find():
                 field_value = mongo_doc[unit_field]
                 if field_value is not None:
-                    if isinstance(unit_value, list):
+                    if isinstance(field_value, list):
                         value_list = mongo_doc[unit_field]
-                        value_list.remove(unit_value)
+                        value_list.remove(target_value)
                         mongo_doc[unit_field] = value_list or None
                     else:
                         mongo_doc[unit_field] = None

ramifice/utils/migration.py

@@ -189,7 +189,7 @@ class Monitor:
                         "data_dynamic_fields"
                     ][field_name]
             # Refresh state of current Model.
-            model_state["data_dynamic_field"] = metadata["data_dynamic_fields"]
+            model_state["data_dynamic_fields"] = metadata["data_dynamic_fields"]
             model_state["field_name_and_type"] = metadata["field_name_and_type"]
             await super_collection.replace_one(
                 filter={"collection_name": model_state["collection_name"]},

ramifice/utils/unit.py

@@ -20,7 +20,7 @@ class Unit(JsonMixin):
         self,
         field: str,
         title: dict[str, str],  # Example: {"en": "Title", "ru": "Заголовок"}
-        value: float | int | str | None = None,  # None for is_delete=True
+        value: float | int | str,
         is_delete: bool = False,
     ):
         # Check the match of types.
@@ -33,8 +33,8 @@ class Unit(JsonMixin):
                 + 'Example: {"en": "Title", "ru": "Заголовок"}'
             )
             raise PanicError(msg)
-        if not isinstance(value, (float, int, str, type(None))):
-            msg = "Class: `Unit` > Field: `value` => Not а `float | int | str | None` type!"
+        if not isinstance(value, (float, int, str)):
+            msg = "Class: `Unit` > Field: `value` => Not а `float | int | str` type!"
             raise PanicError(msg)
         if not isinstance(is_delete, bool):
             msg = "Class: `Unit` > Field: `is_delete` => Not а `bool` type!"
@@ -47,10 +47,10 @@ class Unit(JsonMixin):
         self.value = value
         self.is_delete = is_delete
 
-        self.check_value_arguments()
+        self.check_empty_arguments()
 
-    def check_value_arguments(self) -> None:
-        """Check if the values correspond to the arguments.
+    def check_empty_arguments(self) -> None:
+        """Check the arguments for empty values.
 
         Returns:
             `None` or raised exception `PanicError`.
@@ -61,14 +61,6 @@ class Unit(JsonMixin):
             field_name = "field"
         elif len(self.title) == 0:
             field_name = "title"
-        elif self.value is None and self.is_delete == False:
-            msg = (
-                "Method: `unit_manager` > "
-                + "Argument: `unit` > "
-                + f"Field: `{field_name}` => "
-                + "For `value` = None, `is_delete` should be True!"
-            )
-            raise PanicError(msg)
         elif isinstance(self.value, str) and len(self.value) == 0:
             field_name = "value"
 

{ramifice-0.5.3.dist-info → ramifice-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.5.3
+Version: 0.5.4
 Summary: ORM-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/

{ramifice-0.5.3.dist-info → ramifice-0.5.4.dist-info}/RECORD

@@ -6,7 +6,7 @@ ramifice/commons/indexes.py,sha256=hAcWKZ9MMgLbRtoQ6Af0b8r-PY0dbEYmMBl8z_d1DRo,3
 ramifice/commons/many.py,sha256=jkah1kO1CXWPB0xW0dbMelCFBSirRYkX9a333EcPE_M,9202
 ramifice/commons/one.py,sha256=uZsgwg_GgA1VMZDPqhRFMmCdtvcv6xsL4DWbCOwGV3w,6730
 ramifice/commons/tools.py,sha256=ectaILVYCSwNbB0VAys6nIhdsJbwuxAupNvcQfweC88,2366
-ramifice/commons/unit_manager.py,sha256=o8Ux2y95nddo762hf1YDyp07QwvQyotR5iVoG5FZaZI,4001
+ramifice/commons/unit_manager.py,sha256=sMoeANBW9OZUDijn3zg5wxt9TN9lF0qYgiHzljr9xyw,4303
 ramifice/fields/__init__.py,sha256=yRfX7Tvpuh27Ggcx5u9e1RRYK7Wu59EVJYxxetmuP1w,1290
 ramifice/fields/bool_field.py,sha256=WWubSwsFJZu8b3MviDd2zXnNYOQaYw8toklFNSTVFLA,2072
 ramifice/fields/choice_float_dyn_field.py,sha256=Yrd9cNKLm0mhU-P3IojwFRLSbuxdp7f2NMGJhrRWsf8,3093
@@ -70,16 +70,16 @@ ramifice/utils/__init__.py,sha256=xixHoOX4ja5jIUZemem1qn4k4aonv3G3Q76azQK_pkU,43
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/utils/fixtures.py,sha256=qsv9cg06lc82XaRlhI1j5vftmOQTTwOcDXCg_lnpK04,3159
 ramifice/utils/globals.py,sha256=uR20um3Qg_1SG1t7WyWbpq8kQD-9Mslyr_c1yh5Hw9w,1751
-ramifice/utils/migration.py,sha256=ol8ysNGBr0wuOwo00ZbbN0U8YKiiYVgyRYja0axdiHM,11059
+ramifice/utils/migration.py,sha256=kx1JX0xSgebtNtoTm_161_MqBw5kpsqCfIsc8wXYc34,11060
 ramifice/utils/tools.py,sha256=sOKzwnvf6vdTNf9r6PKAdw6aB4undat2Z8tzS3M1GnQ,2733
 ramifice/utils/translations.py,sha256=GNGE0ULAA0aOY5pTxUd3MQW-nVaKvp6BeXWEcsR0s0o,4048
-ramifice/utils/unit.py,sha256=cFnhXt8sO0X-wiuiSU7_YzmRkpdNFcf2qxfR8YPsuiE,2861
+ramifice/utils/unit.py,sha256=R34gxriT67vI6PmjMIRftNsSP036jwbnsYjxt1Wma48,2454
 ramifice/utils/mixins/__init__.py,sha256=-UxYokZSlEaqoIs0aPVGtzK2CgN88mTzyhryHEtt0Yo,181
 ramifice/utils/mixins/add_valid.py,sha256=TLOObedzXNA9eCylfAVbVCqIKE5sV-P5AdIN7avj-GA,407
 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.5.3.dist-info/METADATA,sha256=58pSq3FozgQeGrLrBroRfRJk1ohZVLIVQityHj6GdrU,22500
-ramifice-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.5.3.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.5.3.dist-info/RECORD,,
+ramifice-0.5.4.dist-info/METADATA,sha256=G7x9T9_WihchEvWZhdsdn7wsAoPaSXxNazI1ZoZASec,22500
+ramifice-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.5.4.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.5.4.dist-info/RECORD,,