ramifice 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

ramifice/decorators.py

@@ -65,7 +65,10 @@ def model(
             "is_update_doc": is_update_doc if is_migrate_model else False,
             "is_delete_doc": is_delete_doc if is_migrate_model else False,
         }
-        attrs["META"] = {**metadata, **caching(cls, service_name)}
+        attrs["META"] = {
+            **metadata,
+            **caching(cls, service_name),
+        }
 
         if is_migrate_model:
             return type(
@@ -96,7 +99,7 @@ def model(
 
 
 def caching(cls: Any, service_name: str) -> dict[str, Any]:
-    """Get additional metadata for `Model.META`."""
+    """Add additional metadata to `Model.META`."""
     metadata: dict[str, Any] = {}
     model_name = cls.__name__
     if REGEX["model_name"].match(model_name) is None:
@@ -117,14 +120,14 @@ def caching(cls: Any, service_name: str) -> dict[str, Any]:
     # Count fields for migrating.
     count_fields_for_migrating = 0
 
-    old_model = cls()
-    old_model.fields()
+    raw_model = cls()
+    raw_model.fields()
     default_fields: dict[str, Any] = {
         "_id": IDField(),
         "created_at": DateTimeField(),
         "updated_at": DateTimeField(),
     }
-    fields = {**old_model.__dict__, **default_fields}
+    fields = {**raw_model.__dict__, **default_fields}
     for f_name, f_type in fields.items():
         if not callable(f_type):
             f_type_str = f_type.__class__.__name__

ramifice/fields/file_field.py

@@ -4,7 +4,7 @@ import os
 import shutil
 import uuid
 from base64 import b64decode
-from datetime import datetime
+from datetime import date
 from pathlib import Path
 from typing import Any
 
@@ -102,7 +102,7 @@ class FileField(Field, FileGroup, JsonMixin):
         """  # noqa: D205
         base64_str = base64_str or None
         filename = filename or None
-        file_info = store.FILE_INFO_DICT.copy()
+        file_info: dict[str, str | int | bool] = {"save_as_is": False}
         file_info["is_new_file"] = True
         file_info["is_delete"] = is_delete
 
@@ -121,7 +121,7 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create new (uuid) file name.
             f_uuid_name = f"{uuid.uuid4()}{extension}"
             # Create the current date for the directory name.
-            date_str = datetime.now().strftime("%Y-%m-%d")
+            date_str: str = str(date.today())
             # Create path to target directory.
             dir_target_path = f"{self.media_root}/{self.target_dir}/{date_str}"
             # Create target directory if it does not exist.
@@ -142,11 +142,10 @@ class FileField(Field, FileGroup, JsonMixin):
             file_info["extension"] = extension
             # Add file size (in bytes).
             file_info["size"] = os.path.getsize(f_target_path)
-
+        #
         # to value.
         self.value = file_info
 
-    # --------------------------------------------------------------------------
     def from_path(
         self,
         src_path: str | None = None,
@@ -154,7 +153,7 @@ class FileField(Field, FileGroup, JsonMixin):
     ) -> None:
         """Get file information and copy the file to the target directory."""
         src_path = src_path or None
-        file_info = store.FILE_INFO_DICT.copy()
+        file_info: dict[str, str | int | bool] = {"save_as_is": False}
         file_info["is_new_file"] = True
         file_info["is_delete"] = is_delete
 
@@ -167,7 +166,7 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create new (uuid) file name.
             f_uuid_name = f"{uuid.uuid4()}{extension}"
             # Create the current date for the directory name.
-            date_str = datetime.now().strftime("%Y-%m-%d")
+            date_str: str = str(date.today())
             # Create path to target directory.
             dir_target_path = f"{self.media_root}/{self.target_dir}/{date_str}"
             # Create target directory if it does not exist.
@@ -186,6 +185,6 @@ class FileField(Field, FileGroup, JsonMixin):
             file_info["extension"] = extension
             # Add file size (in bytes).
             file_info["size"] = os.path.getsize(f_target_path)
-
+        #
         # to value.
         self.value = file_info

ramifice/fields/image_field.py

@@ -4,7 +4,7 @@ import os
 import shutil
 import uuid
 from base64 import b64decode
-from datetime import datetime
+from datetime import date
 from pathlib import Path
 from typing import Any
 
@@ -135,14 +135,13 @@ class ImageField(Field, FileGroup, JsonMixin):
         base64_str: str | None = None,
         filename: str | None = None,
         is_delete: bool = False,
-        add_wh: bool = False,
     ) -> None:
         """Convert base64 to a image,
         get image information and save in the target directory.
         """  # noqa: D205
         base64_str = base64_str or None
         filename = filename or None
-        img_info = store.IMG_INFO_DICT.copy()
+        img_info: dict[str, str | int | bool] = {"save_as_is": False}
         img_info["is_new_img"] = True
         img_info["is_delete"] = is_delete
 
@@ -159,7 +158,7 @@ class ImageField(Field, FileGroup, JsonMixin):
                 if item[0] == 40:
                     break
             # Create the current date for the directory name.
-            date_str = datetime.now().strftime("%Y-%m-%d")
+            date_str: str = str(date.today())
             # Directory name for the original image and its thumbnails.
             general_dir = uuid.uuid4()
             # Create path to target directory with images.
@@ -181,7 +180,7 @@ class ImageField(Field, FileGroup, JsonMixin):
             img_info["path"] = main_img_path
             img_info["url"] = f"{imgs_dir_url}/{new_original_name}"
             # Add width and height.
-            if add_wh:
+            if self.__dict__.get("add_width_height", False):
                 with Image.open(main_img_path) as img:
                     width, height = img.size
                     img_info["width"] = width
@@ -201,20 +200,18 @@ class ImageField(Field, FileGroup, JsonMixin):
             img_info["imgs_dir_url"] = imgs_dir_url
             # Add size of main image (in bytes).
             img_info["size"] = os.path.getsize(main_img_path)
-
+        #
         # to value.
         self.value = img_info
 
-    # --------------------------------------------------------------------------
     def from_path(
         self,
         src_path: str | None = None,
         is_delete: bool = False,
-        add_wh: bool = False,
     ) -> None:
         """Get image information and copy the image to the target directory."""
         src_path = src_path or None
-        img_info = store.IMG_INFO_DICT.copy()
+        img_info: dict[str, str | int | bool] = {"save_as_is": False}
         img_info["is_new_img"] = True
         img_info["is_delete"] = is_delete
 
@@ -225,7 +222,7 @@ class ImageField(Field, FileGroup, JsonMixin):
                 msg = f"The image `{src_path}` has no extension."
                 raise FileHasNoExtensionError(msg)
             # Create the current date for the directory name.
-            date_str = datetime.now().strftime("%Y-%m-%d")
+            date_str: str = str(date.today())
             # Directory name for the original image and its thumbnails.
             general_dir = uuid.uuid4()
             # Create path to target directory with images.
@@ -245,7 +242,7 @@ class ImageField(Field, FileGroup, JsonMixin):
             img_info["path"] = main_img_path
             img_info["url"] = f"{imgs_dir_url}/{new_original_name}"
             # Add width and height.
-            if add_wh:
+            if self.__dict__.get("add_width_height", False):
                 with Image.open(main_img_path) as img:
                     width, height = img.size
                     img_info["width"] = width
@@ -265,6 +262,6 @@ class ImageField(Field, FileGroup, JsonMixin):
             img_info["imgs_dir_url"] = imgs_dir_url
             # Add size of main image (in bytes).
             img_info["size"] = os.path.getsize(main_img_path)
-
+        #
         # to value.
         self.value = img_info

ramifice/migration.py

@@ -15,7 +15,6 @@ from . import store
 from .errors import DoesNotMatchRegexError, NoModelsForMigrationError, PanicError
 from .fixtures import apply_fixture
 from .model import Model
-from .store import FILE_INFO_DICT, IMG_INFO_DICT
 
 
 class Monitor:
@@ -137,13 +136,19 @@ class Monitor:
                         field_type = metadata["field_name_and_type"].get(field_name)
                         if field_type is not None:
                             if field_type == "FileField":
-                                file_data = FILE_INFO_DICT.copy()
-                                file_data["is_delete"] = True
-                                mongo_doc[field_name] = file_data
+                                file_info = {
+                                    "path": "",
+                                    "is_delete": True,
+                                    "save_as_is": False,
+                                }
+                                mongo_doc[field_name] = file_info
                             elif field_type == "ImageField":
-                                img_data = IMG_INFO_DICT.copy()
-                                img_data["is_delete"] = True
-                                mongo_doc[field_name] = img_data
+                                img_info = {
+                                    "path": "",
+                                    "is_delete": True,
+                                    "save_as_is": False,
+                                }
+                                mongo_doc[field_name] = img_info
                             else:
                                 mongo_doc[field_name] = None
                     #

ramifice/model.py

@@ -1,7 +1,8 @@
 """For converting Python classes into Ramifice Model."""
 
-import copy
 import json
+import os
+import shutil
 from abc import ABCMeta, abstractmethod
 from typing import Any
 
@@ -45,6 +46,29 @@ class Model(metaclass=ABCMeta):
         )
         self.fields()
         self.inject()
+        if not self.__class__.META["is_migrate_model"]:
+            for _, f_type in self.__dict__.items():
+                if not callable(f_type):
+                    if f_type.group == "img":
+                        f_type.__dict__["add_width_height"] = True
+
+    def __del__(self) -> None:  # noqa: D105
+        # If the model is not migrated,
+        # it must delete files and images in the destructor.
+        if not self.__class__.META["is_migrate_model"]:
+            for _, f_type in self.__dict__.items():
+                if not callable(f_type):
+                    value = f_type.value
+                    if value is None:
+                        continue
+                    if f_type.group == "file":
+                        value = value.get("path")
+                        if value is not None:
+                            os.remove(value)
+                    elif f_type.group == "img":
+                        value = value.get("imgs_dir_path")
+                        if value is not None:
+                            shutil.rmtree(value)
 
     @abstractmethod
     def fields(self) -> None:

ramifice/paladins/groups/file_group.py

@@ -3,7 +3,6 @@
 Supported fields: FileField
 """
 
-import os
 from typing import Any
 
 from ... import translations
@@ -46,7 +45,7 @@ class FileGroupMixin:
             return
         if not value["save_as_is"]:
             # If the file needs to be delete.
-            if value["is_delete"] and len(value.path) == 0:
+            if value["is_delete"] and len(value["path"]) == 0:
                 default = field.default or None
                 # If necessary, use the default value.
                 if default is not None:
@@ -67,12 +66,6 @@ class FileGroupMixin:
                 )
                 accumulate_error(params["full_model_name"], err_msg, params)
                 return
-            # Return if there is no need to save.
-            if not params["is_save"]:
-                if value["is_new_file"]:
-                    os.remove(value["path"])
-                    params["field_data"].value = None
-                return
         # Insert result.
         if params["is_save"] and (value["is_new_file"] or value["save_as_is"]):
             value["is_delete"] = False

ramifice/paladins/groups/img_group.py

@@ -3,7 +3,6 @@
 Supported fields: ImageField
 """
 
-import shutil
 from typing import Any
 
 from PIL import Image
@@ -69,12 +68,6 @@ class ImgGroupMixin:
                 )
                 accumulate_error(params["full_model_name"], err_msg, params)
                 return
-            # Return if there is no need to save.
-            if not params["is_save"]:
-                if value["is_new_img"]:
-                    shutil.rmtree(value["imgs_dir_path"])
-                    params["field_data"].value = None
-                return
             # Create thumbnails.
             if value["is_new_img"]:
                 thumbnails = field.thumbnails

ramifice/store.py

@@ -43,43 +43,3 @@ REGEX: dict[str, re.Pattern] = {
     ),
     "password": re.compile(r'^[-._!"`\'#%&,:;<>=@{}~\$\(\)\*\+\/\\\?\[\]\^\|a-zA-Z0-9]{8,256}$'),
 }
-
-# Caching a dictionary to transmit information about the file.
-# Hint: `FileField.value`.
-FILE_INFO_DICT: dict[str, str | int | bool] = dict(
-    path="",
-    url="",
-    name="",
-    size=0,
-    is_new_file=False,
-    is_delete=False,
-    extension="",
-    save_as_is=False,
-)
-
-# Caching a dictionary to transmit information about the image.
-# Hint: `ImageField.value`.
-IMG_INFO_DICT: dict[str, str | int | bool] = dict(
-    path="",
-    path_xs="",
-    path_sm="",
-    path_md="",
-    path_lg="",
-    url="",
-    url_xs="",
-    url_sm="",
-    url_md="",
-    url_lg="",
-    name="",
-    width=0,
-    height=0,
-    size=0,
-    is_new_img=False,
-    is_delete=False,
-    extension="",
-    imgs_dir_path="",
-    imgs_dir_url="",
-    save_as_is=False,
-    # Extension to the upper register and delete the point.
-    ext_upper="",
-)

{ramifice-0.3.18.dist-info → ramifice-0.3.20.dist-info}/METADATA

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

@@ -1,15 +1,15 @@
 ramifice/__init__.py,sha256=ISlaL2BprlJLE_N1fvtAqGrB3Dhniy9IZGoyWEYZhRU,678
 ramifice/add_valid.py,sha256=kvpMg7snL9tor0A23XRdgwiXazRwHfb8baoJUNjM_4Y,327
-ramifice/decorators.py,sha256=hTivOrCbTqnnbbbicgoET3bLSICSjMzqctLKzf2YseM,6144
+ramifice/decorators.py,sha256=txbTYnKw5AtRZb7IshOzEHuoy8MAPB8wBcCTbk-6CcE,6181
 ramifice/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/fixtures.py,sha256=NtxOnZslYJb4yvRpZbs3ckugmTwHQFS_9iCt2zddOC0,3102
 ramifice/hooks.py,sha256=Ri-ISfMT-IHaLO2eAqg8CODCTs3HRTxSylqspUKnVf4,873
 ramifice/indexing.py,sha256=wQpX2qei5Zc7iIq5yIV93Skp8Aa8ZD0vybnEk7cRuXs,271
-ramifice/migration.py,sha256=lksHC2f_19pDHp6Sg9pdwqA14jKxMsS8T7gfBdzIsDw,10932
+ramifice/migration.py,sha256=t_Rm1OUQYrlaPQQd1uS5S7EYMvSuKUcWzi7P4JMkrOw,11114
 ramifice/mixins.py,sha256=gKLmWQ-QrGO3K5_k-h1tDa08lkCql_dte2Jy05q1wsM,1125
-ramifice/model.py,sha256=eJCrwURQuZApY84IpxvecS6dHTvT4MK3BpGFTEWz-H4,6536
+ramifice/model.py,sha256=hKA_BrGBWcn-mYB9dHIJoSJYEteO6SdJdgwgjdaV7mc,7632
 ramifice/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ramifice/store.py,sha256=Kqd2Zw7Wj2vnn_0eE6KmIOkWJRhDc6AZ0ZyqxENBetQ,2730
+ramifice/store.py,sha256=MpDEPvUvbs11FXjakNtHPm9MekIv5p1U3as2Y80lTyc,1860
 ramifice/translations.py,sha256=GNGE0ULAA0aOY5pTxUd3MQW-nVaKvp6BeXWEcsR0s0o,4048
 ramifice/types.py,sha256=ljo6VscUGWEJ4Km4JYo8GEfxd1YK1CUbS8CfHp_MlEA,2390
 ramifice/utilities.py,sha256=c662nwFcWXSXNYfwqDnGlLWpA01KaK79GwTdApqtMh8,2442
@@ -38,10 +38,10 @@ ramifice/fields/color_field.py,sha256=sjVSoJU6TIZ66wzPx0WRl5zQsx-kINMMuxa_pSUpW6
 ramifice/fields/date_field.py,sha256=Vlaxgp3WeDNMwbnQcTGu8kyQ7gc7M-7sFBPfzu-4MVw,5205
 ramifice/fields/date_time_field.py,sha256=VpLeYJHs0df45fz4gnprtn7aipVFKGY4n02eRep7in0,5240
 ramifice/fields/email_field.py,sha256=wOM07nQ5fOSOTydQhg3b4dV_95F1bd97peQ_XAnV0MY,3720
-ramifice/fields/file_field.py,sha256=-1oxKg8Bs6lqNB2wIEldGBck5YwwgoDtCks2z1vHnww,7940
+ramifice/fields/file_field.py,sha256=NMM9k-kVes7VarxvTQmsl2f2nvRKp-upjPHMDjNIrwY,7892
 ramifice/fields/float_field.py,sha256=4l7gzg46qQ7ZbXS6Z8GUhiUBR26rXChvO_uFx-lbUds,4555
 ramifice/fields/id_field.py,sha256=5wlY2j051TB2GPsw0iQkFiQBV_Y_o1W_QnCtBlaDuYQ,4126
-ramifice/fields/image_field.py,sha256=EX7J-qon60_FJDE3_pnink6pa5vTRGspj8v_Rk8JEt4,12301
+ramifice/fields/image_field.py,sha256=u4YJ3vFtGj5uhVLjgrvV9gNLwLXT4jfVPUN2mlPKHfg,12269
 ramifice/fields/integer_field.py,sha256=Gnm5IBSvWtCLGbg5pOSAdKa5xLzqXgiigVbzw8zcjas,4531
 ramifice/fields/ip_field.py,sha256=D7xR3A-O049TQ_pEEKVTLsKF5cdr5O7ULyz4Pj3-cwQ,3601
 ramifice/fields/password_field.py,sha256=5BlZZ4mXM0CAYDHguwsK8KFnvkOOmr8R0yowHByNVD4,3451
@@ -68,14 +68,14 @@ ramifice/paladins/groups/__init__.py,sha256=hpqmWLsYAMvZHAbmMXluQSqLhkHOSTUAgLHy
 ramifice/paladins/groups/bool_group.py,sha256=fpxCySJ5JL7w1dLFPX1025zEU8CRsWSyQyXb3Hr3Z2s,819
 ramifice/paladins/groups/choice_group.py,sha256=OJeZjpnqKnSF1_bechtNepCCPjmp54x1T0c28DAa11c,1777
 ramifice/paladins/groups/date_group.py,sha256=-IS9pAHXdWK7tO9KQ2UyG1uf7TA43DKYCOCtOM2_tZ0,3844
-ramifice/paladins/groups/file_group.py,sha256=oQ61TCGoRF8kArOY0F2IXXUTOiRyyu0oh3F1reV8rmU,3298
+ramifice/paladins/groups/file_group.py,sha256=9GzRY3sV8PYJh23ZPtMQYH5RDi4pibN-kIaSui4B5zY,3033
 ramifice/paladins/groups/id_group.py,sha256=tK3OL1pr-V8PHPyS7vmjmJi_sRU669EvkY_Fc4sRHzg,1352
-ramifice/paladins/groups/img_group.py,sha256=X8JDvxr1khNfsuPUXRn_1PoZnrjk_TKTklwujB8Rc9A,5927
+ramifice/paladins/groups/img_group.py,sha256=j184UyyYZ8gNuAivkP1A57o9JlrGS_0sht6QKiblbDs,5643
 ramifice/paladins/groups/num_group.py,sha256=Jvb-lwHxapQybbLerC4t-_yO8N7Coo1fIlZ9eAGHcGs,2508
 ramifice/paladins/groups/pass_group.py,sha256=SEKpR2voNQtmywugDXJKY4XqPTL91CrJ87h0QNMqQqs,1952
 ramifice/paladins/groups/slug_group.py,sha256=_IRil2PwpY7cH7WaExNksKz61kQjvc27blrEufgUB30,2323
 ramifice/paladins/groups/text_group.py,sha256=nYZGwAIsJD-tX8RBtFlWvngO9RU4V0CnREUhxvV2UDo,3493
-ramifice-0.3.18.dist-info/METADATA,sha256=lojHKf4q5Rrxj4vXJxOfqmNnmZu0JRXalEJxAhoBNAU,18904
-ramifice-0.3.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.3.18.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.3.18.dist-info/RECORD,,
+ramifice-0.3.20.dist-info/METADATA,sha256=ZpWGFOazkmaGbW9rMKja65dApz_DHCrA2_PBCynIqzw,18904
+ramifice-0.3.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.3.20.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.3.20.dist-info/RECORD,,