ramifice 0.8.32__py3-none-any.whl → 0.8.34__py3-none-any.whl

ramifice/__init__.py

@@ -21,6 +21,8 @@ a simplified alternative (Types of selective fields with dynamic addition of ele
 The project is more concentrated for web development or for applications with a graphic interface.
 """
 
+from __future__ import annotations
+
 __all__ = (
     "NamedTuple",
     "to_human_size",

ramifice/commons/__init__.py

@@ -1,5 +1,7 @@
 """Commons - Model class methods."""
 
+from __future__ import annotations
+
 __all__ = ("QCommonsMixin",)
 
 from ramifice.commons.general import GeneralMixin

ramifice/commons/general.py

@@ -1,5 +1,7 @@
 """General purpose query methods."""
 
+from __future__ import annotations
+
 __all__ = ("GeneralMixin",)
 
 from typing import Any

ramifice/commons/indexes.py

@@ -1,5 +1,7 @@
 """Indexation documents of collection."""
 
+from __future__ import annotations
+
 __all__ = ("IndexMixin",)
 
 from typing import Any
@@ -93,9 +95,8 @@ class IndexMixin:
         """Get information on this collection’s indexes."""
         # Get collection for current model.
         collection: AsyncCollection = constants.MONGO_DATABASE[cls.META["collection_name"]]
-        # Get information.
-        result = await collection.index_information(session=session, comment=comment)
-        return result
+        #
+        return await collection.index_information(session=session, comment=comment)
 
     @classmethod
     async def list_indexes(
@@ -106,6 +107,5 @@ class IndexMixin:
         """Get a cursor over the index documents for this collection."""
         # Get collection for current model.
         collection: AsyncCollection = constants.MONGO_DATABASE[cls.META["collection_name"]]
-        # Get cursor.
-        cursor = await collection.list_indexes(session=session, comment=comment)
-        return cursor
+        #
+        return await collection.list_indexes(session=session, comment=comment)

ramifice/commons/many.py

@@ -1,5 +1,7 @@
 """Queries like `find many`."""
 
+from __future__ import annotations
+
 __all__ = ("ManyMixin",)
 
 import logging

ramifice/commons/one.py

@@ -1,5 +1,7 @@
 """Requests like `find one`."""
 
+from __future__ import annotations
+
 __all__ = ("OneMixin",)
 
 import logging

ramifice/commons/tools.py

@@ -1,5 +1,7 @@
 """Tool of Commons - A set of auxiliary methods."""
 
+from __future__ import annotations
+
 __all__ = (
     "correct_mongo_filter",
     "password_to_none",
@@ -31,7 +33,7 @@ def password_to_none(
 ) -> dict[str, Any]:
     """Create object instance from Mongo document."""
     for f_name, t_name in field_name_and_type.items():
-        if "PasswordField" == t_name:
+        if t_name == "PasswordField":
             mongo_doc[f_name] = None
     return mongo_doc
 
@@ -44,10 +46,10 @@ def mongo_doc_to_raw_doc(
     """Convert the Mongo document to the raw document.
 
     Special changes:
-        _id to str
-        password to None
-        date to str
-        datetime to str
+        - `_id to str`
+        - `password to None`
+        - `date to str`
+        - `datetime to str`
     """
     doc: dict[str, Any] = {}
     for f_name, f_data in inst_model_dict.items():

ramifice/commons/unit_manager.py

@@ -3,6 +3,8 @@
 Management for `choices` parameter in dynamic field types.
 """
 
+from __future__ import annotations
+
 __all__ = ("UnitMixin",)
 
 import logging

ramifice/fields/__init__.py

@@ -1,5 +1,7 @@
 """Available field types."""
 
+from __future__ import annotations
+
 __all__ = (
     "BooleanField",
     "ChoiceFloatDynField",

ramifice/fields/bool_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter boolean value."""
 
+from __future__ import annotations
+
 __all__ = ("BooleanField",)
 
 import logging

ramifice/fields/choice_float_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective float field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceFloatDynField",)
 
 import logging

ramifice/fields/choice_float_field.py

@@ -3,6 +3,8 @@
 Type of selective float field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceFloatField",)
 
 import logging

ramifice/fields/choice_float_mult_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective float field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceFloatMultDynField",)
 
 import logging

ramifice/fields/choice_float_mult_field.py

@@ -3,6 +3,8 @@
 Type of selective float field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceFloatMultField",)
 
 import logging

ramifice/fields/choice_int_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective integer field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceIntDynField",)
 
 import logging

ramifice/fields/choice_int_field.py

@@ -3,6 +3,8 @@
 Type of selective integer field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceIntField",)
 
 import logging

ramifice/fields/choice_int_mult_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective integer field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceIntMultDynField",)
 
 import logging

ramifice/fields/choice_int_mult_field.py

@@ -3,6 +3,8 @@
 Type of selective integer field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceIntMultField",)
 
 import logging

ramifice/fields/choice_text_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective text field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceTextDynField",)
 
 import logging

ramifice/fields/choice_text_field.py

@@ -3,6 +3,8 @@
 Type of selective text field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceTextField",)
 
 import logging

ramifice/fields/choice_text_mult_dyn_field.py

@@ -3,6 +3,8 @@
 Type of selective text field with dynamic addition of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceTextMultDynField",)
 
 import logging

ramifice/fields/choice_text_mult_field.py

@@ -3,6 +3,8 @@
 Type of selective text field with static of elements.
 """
 
+from __future__ import annotations
+
 __all__ = ("ChoiceTextMultField",)
 
 import logging

ramifice/fields/color_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter color code."""
 
+from __future__ import annotations
+
 __all__ = ("ColorField",)
 
 import logging

ramifice/fields/date_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter date."""
 
+from __future__ import annotations
+
 __all__ = ("DateField",)
 
 import logging
@@ -52,12 +54,10 @@ class DateField(Field, DateGroup):
     ) -> None:
         if constants.DEBUG:
             try:
-                if max_date is not None:
-                    if not isinstance(max_date, datetime):
-                        raise AssertionError("Parameter `max_date` - Not а `str` type!")
-                if min_date is not None:
-                    if not isinstance(min_date, datetime):
-                        raise AssertionError("Parameter `min_date` - Not а `str` type!")
+                if max_date is not None and not isinstance(max_date, datetime):
+                    raise AssertionError("Parameter `max_date` - Not а `str` type!")
+                if min_date is not None and not isinstance(min_date, datetime):
+                    raise AssertionError("Parameter `min_date` - Not а `str` type!")
                 if max_date is not None and min_date is not None and max_date <= min_date:
                     raise AssertionError("The `max_date` parameter should be more than the `min_date`!")
                 if default is not None:

ramifice/fields/date_time_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter date and time."""
 
+from __future__ import annotations
+
 __all__ = ("DateTimeField",)
 
 import logging
@@ -52,12 +54,10 @@ class DateTimeField(Field, DateGroup):
     ) -> None:
         if constants.DEBUG:
             try:
-                if max_date is not None:
-                    if not isinstance(max_date, datetime):
-                        raise AssertionError("Parameter `max_date` - Not а `str` type!")
-                if min_date is not None:
-                    if not isinstance(min_date, datetime):
-                        raise AssertionError("Parameter `min_date` - Not а `str` type!")
+                if max_date is not None and not isinstance(max_date, datetime):
+                    raise AssertionError("Parameter `max_date` - Not а `str` type!")
+                if min_date is not None and not isinstance(min_date, datetime):
+                    raise AssertionError("Parameter `min_date` - Not а `str` type!")
                 if max_date is not None and min_date is not None and max_date <= min_date:
                     raise AssertionError("The `max_date` parameter should be more than the `min_date`!")
                 if default is not None:

ramifice/fields/email_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter email address."""
 
+from __future__ import annotations
+
 __all__ = ("EmailField",)
 
 import logging

ramifice/fields/file_field.py

@@ -1,5 +1,7 @@
 """Field of Model for upload file."""
 
+from __future__ import annotations
+
 __all__ = ("FileField",)
 
 import logging
@@ -7,7 +9,7 @@ import uuid
 from base64 import b64decode
 from datetime import datetime
 from os import makedirs
-from os.path import basename, exists, getsize
+from os.path import exists, getsize
 from shutil import copyfile
 
 from anyio import Path, open_file, to_thread
@@ -211,7 +213,7 @@ class FileField(Field, FileGroup, JsonMixin):
             file_info["path"] = f_target_path
             file_info["url"] = f"{MEDIA_URL}/uploads/{self.target_dir}/{date_str}/{f_uuid_name}"
             # Add original file name.
-            file_info["name"] = basename(src_path)
+            file_info["name"] = Path(src_path).name
             # Add file extension.
             file_info["extension"] = extension
             # Add file size (in bytes).

ramifice/fields/float_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter (float) number."""
 
+from __future__ import annotations
+
 __all__ = ("FloatField",)
 
 import logging

ramifice/fields/general/choice_group.py

@@ -1,5 +1,7 @@
 """General additional parameters for choice fields."""
 
+from __future__ import annotations
+
 __all__ = ("ChoiceGroup",)
 
 

ramifice/fields/general/date_group.py

@@ -1,5 +1,7 @@
 """General additional parameters for date|datetime fields."""
 
+from __future__ import annotations
+
 __all__ = ("DateGroup",)
 
 from datetime import datetime

ramifice/fields/general/field.py

@@ -1,5 +1,7 @@
 """General parameters for all types fields of Model."""
 
+from __future__ import annotations
+
 __all__ = ("Field",)
 
 

ramifice/fields/general/file_group.py

@@ -1,5 +1,7 @@
 """General additional parameters for file fields."""
 
+from __future__ import annotations
+
 __all__ = ("FileGroup",)
 
 

ramifice/fields/general/number_group.py

@@ -1,5 +1,7 @@
 """General additional parameters for number fields."""
 
+from __future__ import annotations
+
 __all__ = ("NumberGroup",)
 
 

ramifice/fields/general/text_group.py

@@ -1,5 +1,7 @@
 """General additional parameters for text fields."""
 
+from __future__ import annotations
+
 __all__ = ("TextGroup",)
 
 

ramifice/fields/id_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter identifier of document."""
 
+from __future__ import annotations
+
 __all__ = ("IDField",)
 
 import logging

ramifice/fields/image_field.py

@@ -1,5 +1,7 @@
 """Field of Model for upload image."""
 
+from __future__ import annotations
+
 __all__ = ("ImageField",)
 
 import logging
@@ -7,7 +9,7 @@ import uuid
 from base64 import b64decode
 from datetime import datetime
 from os import makedirs
-from os.path import basename, exists, getsize
+from os.path import exists, getsize
 from shutil import copyfile
 
 from anyio import Path, open_file, to_thread
@@ -77,7 +79,7 @@ class ImageField(Field, FileGroup, JsonMixin):
                         raise AssertionError("The `thumbnails` parameter should not contain an empty dictionary!")
                     size_name_list = ["lg", "md", "sm", "xs"]
                     curr_size_thumb: int = 0
-                    for size_name in thumbnails.keys():
+                    for size_name in thumbnails:
                         if size_name not in size_name_list:
                             raise AssertionError(
                                 f"The `thumbnails` parameter contains an unacceptable size name `{size_name}`!\n"
@@ -256,7 +258,7 @@ class ImageField(Field, FileGroup, JsonMixin):
             img_info["path"] = main_img_path
             img_info["url"] = f"{imgs_dir_url}/{new_original_name}"
             # Add original image name.
-            img_info["name"] = basename(src_path)
+            img_info["name"] = Path(src_path).name
             # Add image extension.
             img_info["extension"] = extension
             # Transform extension to the upper register and delete the point.

ramifice/fields/integer_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter (int) number."""
 
+from __future__ import annotations
+
 __all__ = ("IntegerField",)
 
 import logging

ramifice/fields/ip_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter IP address."""
 
+from __future__ import annotations
+
 __all__ = ("IPField",)
 
 import ipaddress

ramifice/fields/password_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter password."""
 
+from __future__ import annotations
+
 __all__ = ("PasswordField",)
 
 import logging
@@ -17,9 +19,9 @@ class PasswordField(Field):
     r"""Field of Model for enter password.
 
     Attention:
-    - Regular expression: ^[-._!"`'#%&,:;<>=@{}~$()*+/\\?[]^|a-zA-Z0-9]{8,256}$
-    - Valid characters: a-z A-Z 0-9 - . _ ! " ` ' # % & , : ; < > = @ { } ~ $ ( ) * + / \\ ? [ ] ^ |
-    - Number of characters: from 8 to 256.
+        - `Regular expression:` ^[-._!"`'#%&,:;<>=@{}~$()*+/\\?[]^|a-zA-Z0-9]{8,256}$
+        - `Valid characters:` a-z A-Z 0-9 - . _ ! " ` ' # % & , : ; < > = @ { } ~ $ ( ) * + / \\ ? [ ] ^ |
+        - `Number of characters:` from 8 to 256.
 
     Agrs:
         label: Text label for a web form field.

ramifice/fields/phone_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter phone number."""
 
+from __future__ import annotations
+
 __all__ = ("PhoneField",)
 
 import logging
@@ -18,7 +20,7 @@ class PhoneField(Field, TextGroup, JsonMixin):
     """Field of Model for enter phone number.
 
     Attention:
-    By default is used validator `phonenumbers.is_valid_number()`.
+        By default is used validator `phonenumbers.is_valid_number()`.
 
     Agrs:
         label: Text label for a web form field.

ramifice/fields/slug_field.py

@@ -1,5 +1,7 @@
 """Field of Model for automatic generation of string `slug`."""
 
+from __future__ import annotations
+
 __all__ = ("SlugField",)
 
 import logging

ramifice/fields/text_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter text."""
 
+from __future__ import annotations
+
 __all__ = ("TextField",)
 
 import logging
@@ -117,7 +119,7 @@ class TextField(Field, JsonMixin):
         value = self.value
         if isinstance(value, str):
             return len(value)
-        elif isinstance(value, dict):
+        if isinstance(value, dict):
             count = 0
             for text in value.values():
                 tmp = len(text)

ramifice/fields/url_field.py

@@ -1,5 +1,7 @@
 """Field of Model for enter URL address."""
 
+from __future__ import annotations
+
 __all__ = ("URLField",)
 
 import logging

ramifice/models/decorator.py

@@ -1,10 +1,12 @@
 """Decorator for converting Python classes into Ramifice models."""
 
+from __future__ import annotations
+
 __all__ = ("model",)
 
 import logging
 import re
-from os.path import exists
+from pathlib import Path
 from typing import Any
 
 from ramifice.commons import QCommonsMixin
@@ -58,7 +60,7 @@ def model(
         if fixture_name is not None:
             fixture_path = f"config/fixtures/{fixture_name}.yml"
 
-            if not exists(fixture_path):
+            if not Path(fixture_path).exists():
                 msg = (
                     f"Model: `{cls.__module__}.{cls.__name__}` > "
                     + "META param: `fixture_name` => "

ramifice/models/model.py

@@ -1,5 +1,7 @@
 """Converting Python classes into Ramifice Models."""
 
+from __future__ import annotations
+
 __all__ = ("Model",)
 
 from abc import abstractmethod
@@ -56,7 +58,6 @@ class Model:
     @abstractmethod
     def fields(self) -> None:
         """Adding fields."""
-        pass
 
     def model_name(self) -> str:
         """Get Model name - Class name."""

ramifice/paladins/__init__.py

@@ -15,6 +15,8 @@ This module provides:
 - `print_err`: Printing errors to console.
 """
 
+from __future__ import annotations
+
 __all__ = ("QPaladinsMixin",)
 
 from ramifice.paladins.add_valid import AddValidMixin

ramifice/paladins/add_valid.py

@@ -1,5 +1,7 @@
 """AddValidMixin - Contains an abstract method for additional validation of fields."""
 
+from __future__ import annotations
+
 __all__ = ("AddValidMixin",)
 
 from abc import abstractmethod

ramifice/paladins/check.py

@@ -1,5 +1,7 @@
 """Validation of Model data before saving to the database."""
 
+from __future__ import annotations
+
 __all__ = ("CheckMixin",)
 
 import logging

ramifice/paladins/delete.py

@@ -1,5 +1,7 @@
 """Delete document from database."""
 
+from __future__ import annotations
+
 __all__ = ("DeleteMixin",)
 
 import logging

ramifice/paladins/groups/__init__.py

@@ -1,5 +1,7 @@
 """Groups - Model instance methods for specific processing of fields."""
 
+from __future__ import annotations
+
 __all__ = (
     "BoolGroupMixin",
     "ChoiceGroupMixin",

ramifice/paladins/groups/bool_group.py

@@ -4,6 +4,8 @@ Supported fields:
     BooleanField
 """
 
+from __future__ import annotations
+
 __all__ = ("BoolGroupMixin",)
 
 from typing import Any