ramifice 0.3.19__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(
@@ -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
 
@@ -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.
@@ -166,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.

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,7 +135,6 @@ 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.
@@ -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
@@ -209,7 +208,6 @@ class ImageField(Field, FileGroup, JsonMixin):
         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
@@ -224,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.
@@ -244,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

ramifice/model.py

@@ -46,6 +46,11 @@ 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,

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

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

@@ -1,13 +1,13 @@
 ramifice/__init__.py,sha256=ISlaL2BprlJLE_N1fvtAqGrB3Dhniy9IZGoyWEYZhRU,678
 ramifice/add_valid.py,sha256=kvpMg7snL9tor0A23XRdgwiXazRwHfb8baoJUNjM_4Y,327
-ramifice/decorators.py,sha256=rOM8b_5FHQ02rdxuRL-LUd5oV_MB-RDGXVfdjMUWuGY,6143
+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=t_Rm1OUQYrlaPQQd1uS5S7EYMvSuKUcWzi7P4JMkrOw,11114
 ramifice/mixins.py,sha256=gKLmWQ-QrGO3K5_k-h1tDa08lkCql_dte2Jy05q1wsM,1125
-ramifice/model.py,sha256=FnBEsKJhYHL3HZTGRC1_UaLlBh7BJS_O8qCRYCFavhg,7365
+ramifice/model.py,sha256=hKA_BrGBWcn-mYB9dHIJoSJYEteO6SdJdgwgjdaV7mc,7632
 ramifice/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramifice/store.py,sha256=MpDEPvUvbs11FXjakNtHPm9MekIv5p1U3as2Y80lTyc,1860
 ramifice/translations.py,sha256=GNGE0ULAA0aOY5pTxUd3MQW-nVaKvp6BeXWEcsR0s0o,4048
@@ -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=Ofui6MFme78v_U_pWu8chpN3FnCW5cKQmnqmJOCi2VE,7922
+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=flh08BZnluez-XvL-ucIS61Km_oZO8HCA5105hpHfTE,12285
+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
@@ -75,7 +75,7 @@ ramifice/paladins/groups/num_group.py,sha256=Jvb-lwHxapQybbLerC4t-_yO8N7Coo1fIlZ
 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.19.dist-info/METADATA,sha256=uaJt29S3kOMiBjlopixQuCRIu-O8MvdAeUzQDwJHr2I,18904
-ramifice-0.3.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.3.19.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.3.19.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,,