ramifice 0.4.12__py3-none-any.whl → 0.5.0__py3-none-any.whl

ramifice/commons/general.py

@@ -26,7 +26,7 @@ class GeneralMixin:
             if field is None:
                 continue
             if field.field_type == "TextField":
-                field.value = data.get(lang, "") if data is not None else None
+                field.value = data.get(lang, "- -") if data is not None else None
             elif field.group == "pass":
                 field.value = None
             else:

ramifice/commons/tools.py

@@ -54,7 +54,7 @@ def mongo_doc_to_raw_doc(
         value = mongo_doc[f_name]
         if value is not None:
             if field_type == "TextField" and f_data.multi_language:
-                value = value.get(lang, "") if value is not None else None
+                value = value.get(lang, "- -") if value is not None else None
             elif "Date" in field_type:
                 if "Time" in field_type:
                     value = format_datetime(

ramifice/commons/unit_manager.py

@@ -7,7 +7,7 @@ from typing import Any
 
 from pymongo.asynchronous.collection import AsyncCollection
 
-from ..utils import globals
+from ..utils import globals, translations
 from ..utils.errors import PanicError
 from ..utils.unit import Unit
 
@@ -34,59 +34,52 @@ class UnitMixin:
         # Check the presence of a Model state.
         if model_state is None:
             raise PanicError("Error: Model State - Not found!")
-        # Get the dynamic field type.
-        field_type = model_state["field_name_and_type"][unit.field]
         # Get dynamic field data.
-        choices: dict[str, float | int | str] | None = model_state["data_dynamic_fields"][
-            unit.field
-        ]
-        # Check whether the type of value is valid for the type of field.
-        if not (
-            ("ChoiceFloat" in field_type and isinstance(unit.value, float))
-            or ("ChoiceInt" in field_type and isinstance(unit.value, int))
-            or ("ChoiceText" in field_type and isinstance(unit.value, str))
-        ):
-            msg = (
-                "Error: Method: `unit_manager(unit: Unit)` => unit.value - "
-                + f"The type of value `{type(unit.value)}` "
-                + f"does not correspond to the type of field `{field_type}`!"
-            )
-            raise PanicError(msg)
+        choices: list | None = model_state["data_dynamic_fields"][unit.field]
+        # Get Title.
+        title = unit.title
+        title = {lang: title.get(lang, "- -") for lang in translations.LANGUAGES}
+        main_lang = translations.DEFAULT_LOCALE
+        main_title = title[main_lang]
         # Add Unit to Model State.
         if not unit.is_delete:
             if choices is not None:
-                choices = {**choices, **{unit.title: unit.value}}
+                choices.append({"title": title, "value": unit.value})
             else:
-                choices = {unit.title: unit.value}
+                choices = [{"title": title, "value": unit.value}]
             model_state["data_dynamic_fields"][unit.field] = choices
-        # Delete Unit from Model State.
         else:
+            # Delete Unit from Model State.
             if choices is None:
                 msg = (
                     "Error: It is not possible to delete Unit."
-                    + f"Unit `{unit.title}: {unit.value}` not exists!"
+                    + f"Title `{main_title}` not exists!"
                 )
                 raise PanicError(msg)
-            is_key_exists: bool = unit.title in choices.keys()
+            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:
                 msg = (
                     "Error: It is not possible to delete Unit."
-                    + f"Unit `{unit.title}: {unit.value}` not exists!"
+                    + f"Title `{main_title}` not exists!"
                 )
                 raise PanicError(msg)
-            del choices[unit.title]
+            choices = [item for item in choices if item["title"][main_lang] != main_title]
             model_state["data_dynamic_fields"][unit.field] = choices or None
-        # Update the state of the Model in the super collection.
+        # 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 the current Model.
+        # Update metadata of current Model.
         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 = unit.value
+            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]

ramifice/models/model.py

@@ -68,6 +68,7 @@ class Model(metaclass=ABCMeta):
         """Injecting metadata from Model.META in params of fields."""
         metadata = self.__class__.META
         if bool(metadata):
+            lang = translations.CURRENT_LOCALE
             field_attrs = metadata["field_attrs"]
             data_dynamic_fields = metadata["data_dynamic_fields"]
             for f_name, f_type in self.__dict__.items():
@@ -75,7 +76,13 @@ class Model(metaclass=ABCMeta):
                     f_type.id = field_attrs[f_name]["id"]
                     f_type.name = field_attrs[f_name]["name"]
                     if "Dyn" in f_type.field_type:
-                        f_type.choices = data_dynamic_fields[f_name]
+                        dyn_data = data_dynamic_fields[f_name]
+                        if dyn_data is not None:
+                            f_type.choices = {
+                                item["title"].get(lang, "- -"): item["value"] for item in dyn_data
+                            }
+                        else:
+                            f_type.choices = None
 
     # Complect of methods for converting Model to JSON and back.
     # --------------------------------------------------------------------------

ramifice/paladins/groups/text_group.py

@@ -92,12 +92,12 @@ class TextGroupMixin:
                     else (
                         {lang: value for lang in translations.LANGUAGES}
                         if isinstance(value, str)
-                        else {lang: value.get(lang, "") for lang in translations.LANGUAGES}
+                        else {lang: value.get(lang, "- -") for lang in translations.LANGUAGES}
                     )
                 )
                 if isinstance(value, dict):
                     for lang in translations.LANGUAGES:
-                        mult_lang_text[lang] = value.get(lang, "")
+                        mult_lang_text[lang] = value.get(lang, "- -")
                 else:
                     mult_lang_text[translations.CURRENT_LOCALE] = value
                 value = mult_lang_text

ramifice/paladins/tools.py

@@ -19,7 +19,7 @@ def refresh_from_mongo_doc(inst_model: Any, mongo_doc: dict[str, Any]) -> None:
     for name, data in mongo_doc.items():
         field = model_dict[name]
         if field.field_type == "TextField" and field.multi_language:
-            field.value = data.get(lang, "") if data is not None else None
+            field.value = data.get(lang, "- -") if data is not None else None
         elif field.group == "pass":
             field.value = None
         else:

ramifice/utils/unit.py

@@ -1,5 +1,7 @@
 """Unit - Data management in dynamic fields."""
 
+from typing import Any
+
 from .errors import PanicError
 from .mixins.json_converter import JsonMixin
 
@@ -17,19 +19,22 @@ class Unit(JsonMixin):
     def __init__(  # noqa: D107
         self,
         field: str,
-        title: str,
-        value: float | int | str,
+        title: dict[str, str],  # Example: {"en": "Title", "ru": "Заголовок"}
+        value: float | int | str | None = None,  # None for is_delete=True
         is_delete: bool = False,
     ):
         # Check the match of types.
         if not isinstance(field, str):
             msg = "Class: `Unit` > Field: `field` => Not а `str` type!"
             raise PanicError(msg)
-        if not isinstance(title, str):
-            msg = "Class: `Unit` > Field: `title` => Not а `str` type!"
+        if not isinstance(title, dict):
+            msg = (
+                "Class: `Unit` > Field: `title` => Not а `str` type! "
+                + 'Example: {"en": "Title", "ru": "Заголовок"}'
+            )
             raise PanicError(msg)
-        if not isinstance(value, (float, int, str)):
-            msg = "Class: `Unit` > Field: `value` => Not а `float | int | str` type!"
+        if not isinstance(value, (float, int, str, type(None))):
+            msg = "Class: `Unit` > Field: `value` => Not а `float | int | str | None` type!"
             raise PanicError(msg)
         if not isinstance(is_delete, bool):
             msg = "Class: `Unit` > Field: `is_delete` => Not а `bool` type!"
@@ -42,10 +47,10 @@ class Unit(JsonMixin):
         self.value = value
         self.is_delete = is_delete
 
-        self.check_empty_arguments()
+        self.check_value_arguments()
 
-    def check_empty_arguments(self) -> None:
-        """Error: If any of the arguments in the Unit is empty.
+    def check_value_arguments(self) -> None:
+        """Check if the values correspond to the arguments.
 
         Returns:
             `None` or raised exception `PanicError`.
@@ -56,6 +61,14 @@ 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.4.12.dist-info → ramifice-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.4.12
+Version: 0.5.0
 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.4.12.dist-info → ramifice-0.5.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
 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=Vq0IMuaZj-BqwENTDMg_DouMjV8EjzDy181Ujtw3JQs,5358
+ramifice/commons/general.py,sha256=SmtJge18Yjz7cpc-KXo238rQl465WtTqzNnuRjHl8qs,5361
 ramifice/commons/indexes.py,sha256=hAcWKZ9MMgLbRtoQ6Af0b8r-PY0dbEYmMBl8z_d1DRo,3646
 ramifice/commons/many.py,sha256=jkah1kO1CXWPB0xW0dbMelCFBSirRYkX9a333EcPE_M,9202
 ramifice/commons/one.py,sha256=uZsgwg_GgA1VMZDPqhRFMmCdtvcv6xsL4DWbCOwGV3w,6730
-ramifice/commons/tools.py,sha256=hCnB95nwSCUufig9cSA5Kj9jvqRIJJ2GUSzfUK4FNXM,2363
-ramifice/commons/unit_manager.py,sha256=IkWqXu1PHHal0aGfx6zme81iXPeygxPqEWO-u_8RXoI,4356
+ramifice/commons/tools.py,sha256=ectaILVYCSwNbB0VAys6nIhdsJbwuxAupNvcQfweC88,2366
+ramifice/commons/unit_manager.py,sha256=o8Ux2y95nddo762hf1YDyp07QwvQyotR5iVoG5FZaZI,4001
 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
@@ -45,7 +45,7 @@ ramifice/fields/general/number_group.py,sha256=AqlCY-t6JHZ2QVBe7mk5nPt6z8M4VJ_RA
 ramifice/fields/general/text_group.py,sha256=6GD2Fe6Toz6zZjAAlcy5rPVCAGh6Yn1ltdIrFg9RF18,1057
 ramifice/models/__init__.py,sha256=h_QQ5rSJNZ-7kmx7wIFd8E8RmUS94b_x4jdwMbq8zm4,15
 ramifice/models/decorator.py,sha256=U1ukWWq2voEwvKonQAzihqGYVsoyPrOQ2jDXJZ-UcMc,7251
-ramifice/models/model.py,sha256=ZvgIbcuSXuAkBl_FofOZXGwWMwlqKB-PwTMyXiqK-Fo,6610
+ramifice/models/model.py,sha256=3426PGlJpb9ojc7gP80fd0cz5zsenvCyfgDaXAVk6FM,6963
 ramifice/models/pseudo.py,sha256=PhLQM4zXdaOtTSmNFzwN4twlUmdvA1D_-YOMJtaOIwM,6754
 ramifice/paladins/__init__.py,sha256=PIP3AXI2KBRXNcLJUF0d7ygJ7VLOAxlhb4HRKQ9MGYY,516
 ramifice/paladins/check.py,sha256=ennDiVAoCZIS3aKBK0eA-Vt8VJQnbIv90be5IFYraFg,7026
@@ -53,7 +53,7 @@ ramifice/paladins/delete.py,sha256=tw50E98D5eFZ7gHGnh_8ztUB1LeTeWWKZvIcQqlgbF8,3
 ramifice/paladins/password.py,sha256=w1XWh3bsncH1VTVjCLxyKI2waxMvltwcsPWW3V9Ib84,3027
 ramifice/paladins/refrash.py,sha256=fw-9x_NKGzreipBt_F9KF6FTsYm9hSzfq4ubi1FHYrQ,1065
 ramifice/paladins/save.py,sha256=EG0_v-imCQPax2pJIAXPoQcSL99g8abY2EeGJMvXBW4,3864
-ramifice/paladins/tools.py,sha256=fn1gve72oFRWDmFw9ESe5wd6bY5av5qyrrvWf0tw8Ns,2703
+ramifice/paladins/tools.py,sha256=Xm1RhkV1GX5B6GbyGmJMBzFyDQcenBxcRjlUamIz5pA,2706
 ramifice/paladins/validation.py,sha256=gcEJXIEPu1g7Z54vl14YTs5rCmxOEYsgQH1usFfyy7k,1730
 ramifice/paladins/groups/__init__.py,sha256=hpqmWLsYAMvZHAbmMXluQSqLhkHOSTUAgLHyTM1LTYI,472
 ramifice/paladins/groups/bool_group.py,sha256=oJc9mw9KGrnK_Pj7uXixYYQAJphcXLr_xSQv3PMUlcU,792
@@ -65,7 +65,7 @@ ramifice/paladins/groups/img_group.py,sha256=RoD_QnW0F0DAzrGQmRi8jMZnWy2IomlFn6A
 ramifice/paladins/groups/num_group.py,sha256=6jT7nfIiVoQTlI2UdkcQOlHIDYjllFqSH7Nb87uJgzg,2274
 ramifice/paladins/groups/pass_group.py,sha256=YU5a-NwohEutoEx2N5JmGfg8uPiYiW0XJ8XYsOih6eA,1859
 ramifice/paladins/groups/slug_group.py,sha256=joBB5litljbv2h5JKEMzF71s_DKMWH6nzgThLiLZx2E,2307
-ramifice/paladins/groups/text_group.py,sha256=iftXyyqloQr9yJki__d0LwCEeerkcFquDHyI5rB8fio,4348
+ramifice/paladins/groups/text_group.py,sha256=EiHGuiJKm-A4UrsV4DHoI7whL-LdQCIEvW6jX4YjfCo,4354
 ramifice/utils/__init__.py,sha256=xixHoOX4ja5jIUZemem1qn4k4aonv3G3Q76azQK_pkU,43
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/utils/fixtures.py,sha256=qsv9cg06lc82XaRlhI1j5vftmOQTTwOcDXCg_lnpK04,3159
@@ -73,13 +73,13 @@ ramifice/utils/globals.py,sha256=uR20um3Qg_1SG1t7WyWbpq8kQD-9Mslyr_c1yh5Hw9w,175
 ramifice/utils/migration.py,sha256=ol8ysNGBr0wuOwo00ZbbN0U8YKiiYVgyRYja0axdiHM,11059
 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
+ramifice/utils/unit.py,sha256=cFnhXt8sO0X-wiuiSU7_YzmRkpdNFcf2qxfR8YPsuiE,2861
 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.4.12.dist-info/METADATA,sha256=u46bs5blVVIv_vh4jrW5ERLTFe7z8O_11-U-VK7UvLg,21965
-ramifice-0.4.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.4.12.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.4.12.dist-info/RECORD,,
+ramifice-0.5.0.dist-info/METADATA,sha256=up068qtq-ezkO2-Y5M1-oiZoHgcA9OPdc-FXFGV5jls,21964
+ramifice-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.5.0.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.5.0.dist-info/RECORD,,