ramifice 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

ramifice/models/model.py

@@ -45,6 +45,11 @@ class Model(metaclass=ABCMeta):
         self.fields()
         self.inject()
 
+    @property
+    def id(self) -> IDField:
+        """Getter for the field `_id`."""
+        return self._id
+
     @abstractmethod
     def fields(self) -> None:
         """For adding fields."""

ramifice/paladins/check.py

@@ -84,7 +84,9 @@ class CheckMixin(
             "field_data": None,
             "full_model_name": cls_model.META["full_model_name"],
             "is_migrate_model": is_migrate_model,
-            "mongo_doc": await collection.find_one({"_id": doc_id}) if is_save else None,
+            "curr_doc": (
+                await collection.find_one({"_id": doc_id}) if is_save and is_update else None
+            ),
         }
 
         # Run checking fields.
@@ -129,9 +131,7 @@ class CheckMixin(
                 if not is_update:
                     self._id.value = None
                 # Delete orphaned files.
-                curr_doc: dict[str, Any] | None = (
-                    await collection.find_one({"_id": doc_id}) if is_update else None
-                )
+                curr_doc: dict[str, Any] | None = params["curr_doc"]
                 for field_name, field_data in self.__dict__.items():
                     if callable(field_data) or field_data.ignored:
                         continue

ramifice/paladins/groups/num_group.py

@@ -20,6 +20,7 @@ class NumGroupMixin:
     async def num_group(self, params: dict[str, Any]) -> None:
         """Checking number fields."""
         field = params["field_data"]
+        field_name = field.name
         # Get current value.
         value = field.value
         if value is None:
@@ -37,7 +38,7 @@ class NumGroupMixin:
                 err_msg = translations._("Required field !")
                 accumulate_error(err_msg, params)
             if params["is_save"]:
-                params["result_map"][field.name] = None
+                params["result_map"][field_name] = None
             return
         # Validation the `max_number` field attribute.
         max_number = field.max_number
@@ -54,9 +55,9 @@ class NumGroupMixin:
             )
             accumulate_error(err_msg, params)
         # Validation the `unique` field attribute.
-        if field.unique and not await check_uniqueness(value, params):
+        if field.unique and not await check_uniqueness(value, params, field_name):
             err_msg = translations._("Is not unique !")
             accumulate_error(err_msg, params)
         # Insert result.
         if params["is_save"]:
-            params["result_map"][field.name] = value
+            params["result_map"][field_name] = value

ramifice/paladins/groups/slug_group.py

@@ -25,23 +25,24 @@ class SlugGroupMixin:
             return
         #
         field = params["field_data"]
+        field_name = field.name
         raw_str_list: list[str] = []
         slug_sources = field.slug_sources
         #
-        for field_name, field_data in self.__dict__.items():
+        for _field_name, field_data in self.__dict__.items():
             if callable(field_data):
                 continue
-            if field_name in slug_sources:
+            if _field_name in slug_sources:
                 value = field_data.value
                 if value is None:
                     value = field_data.__dict__.get("default")
                 if value is not None:
-                    raw_str_list.append(value if field_name != "_id" else str(value))
+                    raw_str_list.append(value if _field_name != "_id" else str(value))
                 else:
                     err_msg = (
                         f"Model: `{params['full_model_name']}` > "
-                        + f"Field: `{field.name}` => "
-                        + f"{field_name} - "
+                        + f"Field: `{field_name}` => "
+                        + f"{_field_name} - "
                         + "This field is specified in slug_sources. "
                         + "This field should be mandatory or assign a default value."
                     )
@@ -51,13 +52,17 @@ class SlugGroupMixin:
             # Convert to slug.
             value = slugify("-".join(raw_str_list))
             # Validation of uniqueness of the value.
-            if not await check_uniqueness(value, params):
+            if not await check_uniqueness(
+                value,
+                params,
+                field_name,
+            ):
                 err_msg = (
                     f"Model: `{params['full_model_name']}` > "
-                    + f"Field: `{field.name}` > "
+                    + f"Field: `{field_name}` > "
                     + f"Parameter: `slug_sources` => "
                     + "At least one field should be unique!"
                 )
                 raise PanicError(err_msg)
             # Add value to map.
-            params["result_map"][field.name] = value
+            params["result_map"][field_name] = value

ramifice/paladins/groups/text_group.py

@@ -25,6 +25,7 @@ class TextGroupMixin:
     async def text_group(self, params: dict[str, Any]) -> None:
         """Checking text fields."""
         field = params["field_data"]
+        field_name = field.name
         field_type: str = field.field_type
         is_text_field: bool = "TextField" == field_type
         # Get current value.
@@ -32,7 +33,7 @@ class TextGroupMixin:
 
         if is_text_field:
             if not isinstance(value, (str, dict, type(None))):
-                panic_type_error("str | None", params)
+                panic_type_error("str | dict | None", params)
         else:
             if not isinstance(value, (str, type(None))):
                 panic_type_error("str | None", params)
@@ -42,7 +43,7 @@ class TextGroupMixin:
                 err_msg = translations._("Required field !")
                 accumulate_error(err_msg, params)
             if params["is_save"]:
-                params["result_map"][field.name] = None
+                params["result_map"][field_name] = None
             return
         # Validation the `maxlength` field attribute.
         maxlength: int | None = field.__dict__.get("maxlength")
@@ -50,7 +51,12 @@ class TextGroupMixin:
             err_msg = translations._("The length of the string exceeds maxlength=%d !" % maxlength)
             accumulate_error(err_msg, params)
         # Validation the `unique` field attribute.
-        if field.unique and not await check_uniqueness(value, params):
+        if field.unique and not await check_uniqueness(
+            value,
+            params,
+            field_name,
+            is_text_field,
+        ):
             err_msg = translations._("Is not unique !")
             accumulate_error(err_msg, params)
         # Validation Email, Url, IP, Color, Phone.
@@ -80,13 +86,13 @@ class TextGroupMixin:
         # Insert result.
         if params["is_save"]:
             if is_text_field:
-                mult_lang_text: dict[str, str] = {}
-                if params["mongo_doc"] is not None:
-                    mult_lang_text = params["mongo_doc"][field.name]
+                mult_lang_text: dict[str, str] = (
+                    params["curr_doc"][field_name] if params["is_update"] else {}
+                )
                 if isinstance(value, dict):
                     for lang, text in value.items():
                         mult_lang_text[lang] = text
                 else:
                     mult_lang_text[translations.CURRENT_LOCALE] = value
                 value = mult_lang_text
-            params["result_map"][field.name] = value
+            params["result_map"][field_name] = value

ramifice/paladins/tools.py

@@ -54,14 +54,26 @@ def accumulate_error(err_msg: str, params: dict[str, Any]) -> None:
 async def check_uniqueness(
     value: str | int | float,
     params: dict[str, Any],
+    field_name: str | None = None,
+    is_text_field: bool = False,
 ) -> bool:
     """Check the uniqueness of the value in the collection."""
     if not params["is_migrate_model"]:
         return True
-    q_filter = {
-        "$and": [
-            {"_id": {"$ne": params["doc_id"]}},
-            {params["field_data"].name: value},
-        ],
-    }
+    q_filter = None
+    if is_text_field:
+        lang_filter = [{f"{field_name}.{lang}": value} for lang in translations.LANGUAGES]
+        q_filter = {
+            "$and": [
+                {"_id": {"$ne": params["doc_id"]}},
+                {"$or": lang_filter},
+            ],
+        }
+    else:
+        q_filter = {
+            "$and": [
+                {"_id": {"$ne": params["doc_id"]}},
+                {field_name: value},
+            ],
+        }
     return await params["collection"].find_one(q_filter) is None

{ramifice-0.4.0.dist-info → ramifice-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.4.0
+Version: 0.4.2
 Summary: ORM-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/
@@ -135,12 +135,22 @@ from datetime import datetime
 
 from pymongo import AsyncMongoClient
 from ramifice import model, translations, migration
-from ramifice.fields import DateField, EmailField, ImageField, PasswordField, TextField, FileField
+from ramifice.fields import (
+    DateField,
+    EmailField,
+    FileField,
+    ImageField,
+    PasswordField,
+    TextField,
+)
 
 
 @model(service_name="Accounts")
 class User:
+    """Model of User."""
+
     def fields(self):
+        """For adding fields."""
         # For custom translations.
         gettext = translations.gettext
         ngettext = translations.ngettext
@@ -228,7 +238,7 @@ async def main():
         user.print_err()
 
     print("User details:")
-    user_details = await User.find_one_to_raw_doc({"_id": user._id.value})
+    user_details = await User.find_one_to_raw_doc({"_id": user.id.value})
     pprint.pprint(user_details)
 
     # Remove User.

{ramifice-0.4.0.dist-info → ramifice-0.4.2.dist-info}/RECORD

@@ -45,15 +45,15 @@ 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=jOEn-0v0m_tM7mow45-tM-8LADUmwlG2DWZsEuC9S_w,6834
-ramifice/models/model.py,sha256=6iD4c6Rk9Y5SFXnKNULWk7PlgVfzU_i4arF6SX6nysg,6495
+ramifice/models/model.py,sha256=ZvgIbcuSXuAkBl_FofOZXGwWMwlqKB-PwTMyXiqK-Fo,6610
 ramifice/models/pseudo.py,sha256=PhLQM4zXdaOtTSmNFzwN4twlUmdvA1D_-YOMJtaOIwM,6754
 ramifice/paladins/__init__.py,sha256=PIP3AXI2KBRXNcLJUF0d7ygJ7VLOAxlhb4HRKQ9MGYY,516
-ramifice/paladins/check.py,sha256=hz9uQtAarZG9P2I5bwVYgKn2Nk_BD2wB3yqEdD3w494,6838
+ramifice/paladins/check.py,sha256=SdDC9cE4I_Pt9L9NTatEzNYtwpcCIy03yCJqi1O6qM8,6796
 ramifice/paladins/delete.py,sha256=tw50E98D5eFZ7gHGnh_8ztUB1LeTeWWKZvIcQqlgbF8,3352
 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=d3sKH6GzPlt7SxR9JyTEY3YgmqhwNvwPOg3hg80-zoU,2297
+ramifice/paladins/tools.py,sha256=SCmESo8isvcy0yk43Rj1J5BZ1xSZbNV1KLhhBrzfezY,2687
 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
@@ -62,10 +62,10 @@ ramifice/paladins/groups/date_group.py,sha256=B9usKKrHX16F1ckik60Xkub1tawgNENSHT
 ramifice/paladins/groups/file_group.py,sha256=-xgtrLOTlKXc71Mnbu3I_LbYnTEd8OprnhtYcJbaDtg,2932
 ramifice/paladins/groups/id_group.py,sha256=q5BeoM1e7mZmX0zVgemva9K-9ihJKBrX8kxvMh-uhhQ,1268
 ramifice/paladins/groups/img_group.py,sha256=RoD_QnW0F0DAzrGQmRi8jMZnWy2IomlFn6A5jTM02iA,5542
-ramifice/paladins/groups/num_group.py,sha256=FHT9D2S3TsxdMypqoBgZsIzlaLY0KjXdPYqB95vvTRI,2229
+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=o-lr1ssfhTcBovlS6pWA2TQdg1qI6tlDjZ2iKkz-584,2191
-ramifice/paladins/groups/text_group.py,sha256=TVMo19IU-bLEb-xOeNNfSejTr0lDYahrQhWMHvle-Ws,3896
+ramifice/paladins/groups/slug_group.py,sha256=joBB5litljbv2h5JKEMzF71s_DKMWH6nzgThLiLZx2E,2307
+ramifice/paladins/groups/text_group.py,sha256=67gk-vEoZImifCqIzWYexc0Yj2__srFAUqmOHRhBgOk,4005
 ramifice/utils/__init__.py,sha256=xixHoOX4ja5jIUZemem1qn4k4aonv3G3Q76azQK_pkU,43
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/utils/fixtures.py,sha256=NtxOnZslYJb4yvRpZbs3ckugmTwHQFS_9iCt2zddOC0,3102
@@ -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.0.dist-info/METADATA,sha256=hzKA83Yk4QFj5gAQWnu7X9y-ove9os6gEIiRYj3w3DE,20962
-ramifice-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.4.0.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.4.0.dist-info/RECORD,,
+ramifice-0.4.2.dist-info/METADATA,sha256=ZJlFn29k4RDuT4iyHoqJQl4VTx4otqyDr27fb6I3KKA,21049
+ramifice-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.4.2.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.4.2.dist-info/RECORD,,