ramifice 0.8.42__py3-none-any.whl → 0.8.44__py3-none-any.whl

ramifice/__init__.py

@@ -35,7 +35,7 @@ __all__ = (
 import logging
 
 from xloft import NamedTuple
-from xloft.human import to_human_size
+from xloft.converters import to_human_size
 
 from ramifice.models.decorator import model
 from ramifice.utils import translations

ramifice/fields/file_field.py

@@ -8,11 +8,12 @@ import logging
 import uuid
 from base64 import b64decode
 from datetime import datetime
-from os import makedirs
-from os.path import exists, getsize
+from os.path import getsize
 from shutil import copyfile
+from typing import Any
 
 from anyio import Path, open_file, to_thread
+from xloft.converters import to_human_size
 
 from ramifice.fields.general.field import Field
 from ramifice.fields.general.file_group import FileGroup
@@ -132,7 +133,7 @@ class FileField(Field, FileGroup, JsonMixin):
         """  # noqa: D205
         base64_str = base64_str or None
         filename = filename or None
-        file_info: dict[str, str | int | bool] = {"save_as_is": False}
+        file_info: dict[str, Any] = {"save_as_is": False}
         file_info["is_new_file"] = True
         file_info["is_delete"] = is_delete
 
@@ -155,12 +156,17 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create the current date for the directory name.
             date_str: str = str(datetime.now(UTC_TIMEZONE).date())
             # Create path to target directory.
-            dir_target_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}"
+            dir_target_path = Path(
+                MEDIA_ROOT,
+                "uploads",
+                self.target_dir,
+                date_str,
+            )
             # Create target directory if it does not exist.
-            if not await to_thread.run_sync(exists, dir_target_path):
-                await to_thread.run_sync(makedirs, dir_target_path)
+            if not await dir_target_path.exists():
+                await dir_target_path.mkdir(parents=True)
             # Create path to target file.
-            f_target_path = f"{dir_target_path}/{f_uuid_name}"
+            f_target_path = f"{dir_target_path.as_posix()}/{f_uuid_name}"
             # Save file in target directory.
             async with await open_file(f_target_path, mode="wb") as open_f:
                 f_content = b64decode(base64_str)
@@ -174,6 +180,9 @@ class FileField(Field, FileGroup, JsonMixin):
             file_info["extension"] = extension
             # Add file size (in bytes).
             file_info["size"] = await to_thread.run_sync(getsize, f_target_path)
+            # Convert the number of bytes into a human-readable format.
+            # Examples: 200 bytes | 1 KB | 1.5 MB.
+            file_info["human_size"] = to_human_size(file_info["size"])
         #
         # to value.
         self.value = file_info
@@ -185,7 +194,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: dict[str, str | int | bool] = {"save_as_is": False}
+        file_info: dict[str, Any] = {"save_as_is": False}
         file_info["is_new_file"] = True
         file_info["is_delete"] = is_delete
 
@@ -201,12 +210,17 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create the current date for the directory name.
             date_str: str = str(datetime.now(UTC_TIMEZONE).date())
             # Create path to target directory.
-            dir_target_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}"
+            dir_target_path = Path(
+                MEDIA_ROOT,
+                "uploads",
+                self.target_dir,
+                date_str,
+            )
             # Create target directory if it does not exist.
-            if not await to_thread.run_sync(exists, dir_target_path):
-                await to_thread.run_sync(makedirs, dir_target_path)
+            if not await dir_target_path.exists():
+                await dir_target_path.mkdir(parents=True)
             # Create path to target file.
-            f_target_path = f"{dir_target_path}/{f_uuid_name}"
+            f_target_path = f"{dir_target_path.as_posix()}/{f_uuid_name}"
             # Save file in target directory.
             await to_thread.run_sync(copyfile, src_path, f_target_path)
             # Add paths to target file.
@@ -218,6 +232,9 @@ class FileField(Field, FileGroup, JsonMixin):
             file_info["extension"] = extension
             # Add file size (in bytes).
             file_info["size"] = await to_thread.run_sync(getsize, f_target_path)
+            # Convert the number of bytes into a human-readable format.
+            # Examples: 200 bytes | 1 KB | 1.5 MB.
+            file_info["human_size"] = to_human_size(file_info["size"])
         #
         # to value.
         self.value = file_info

ramifice/fields/image_field.py

@@ -8,11 +8,12 @@ import logging
 import uuid
 from base64 import b64decode
 from datetime import datetime
-from os import makedirs
-from os.path import exists, getsize
+from os.path import getsize
 from shutil import copyfile
+from typing import Any
 
 from anyio import Path, open_file, to_thread
+from xloft.converters import to_human_size
 
 from ramifice.fields.general.field import Field
 from ramifice.fields.general.file_group import FileGroup
@@ -160,7 +161,7 @@ class ImageField(Field, FileGroup, JsonMixin):
         """  # noqa: D205
         base64_str = base64_str or None
         filename = filename or None
-        img_info: dict[str, str | int | bool] = {"save_as_is": False}
+        img_info: dict[str, Any] = {"save_as_is": False}
         img_info["is_new_img"] = True
         img_info["is_delete"] = is_delete
 
@@ -181,24 +182,30 @@ class ImageField(Field, FileGroup, JsonMixin):
             # Create the current date for the directory name.
             date_str: str = str(datetime.now(UTC_TIMEZONE).date())
             # Directory name for the original image and its thumbnails.
-            general_dir = uuid.uuid4()
+            general_dir = str(uuid.uuid4())
             # Create path to target directory with images.
-            imgs_dir_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}/{general_dir}"
+            imgs_dir_path = Path(
+                MEDIA_ROOT,
+                "uploads",
+                self.target_dir,
+                date_str,
+                general_dir,
+            )
+            # Create target directory if it does not exist.
+            if not await imgs_dir_path.exists():
+                await imgs_dir_path.mkdir(parents=True)
             # Create url path to target directory with images.
             imgs_dir_url = f"{MEDIA_URL}/uploads/{self.target_dir}/{date_str}/{general_dir}"
             # Create a new name for the original image.
             new_original_name = f"original{extension}"
             # Create path to main image.
-            main_img_path = f"{imgs_dir_path}/{new_original_name}"
-            # Create target directory if it does not exist.
-            if not await to_thread.run_sync(exists, imgs_dir_path):
-                await to_thread.run_sync(makedirs, imgs_dir_path)
+            main_img_path = Path(imgs_dir_path, new_original_name)
             # Save main image in target directory.
             async with await open_file(main_img_path, mode="wb") as open_f:
                 f_content = b64decode(base64_str)
                 await open_f.write(f_content)
             # Add paths for main image.
-            img_info["path"] = main_img_path
+            img_info["path"] = main_img_path.as_posix()
             img_info["url"] = f"{imgs_dir_url}/{new_original_name}"
             # Add original image name.
             img_info["name"] = filename
@@ -210,11 +217,14 @@ class ImageField(Field, FileGroup, JsonMixin):
                 ext_upper = "JPEG"
             img_info["ext_upper"] = ext_upper
             # Add path to target directory with images.
-            img_info["imgs_dir_path"] = imgs_dir_path
+            img_info["imgs_dir_path"] = imgs_dir_path.as_posix()
             # Add url path to target directory with images.
             img_info["imgs_dir_url"] = imgs_dir_url
             # Add size of main image (in bytes).
             img_info["size"] = await to_thread.run_sync(getsize, main_img_path)
+            # Convert the number of bytes into a human-readable format.
+            # Examples: 200 bytes | 1 KB | 1.5 MB.
+            img_info["human_size"] = to_human_size(img_info["size"])
         #
         # to value.
         self.value = img_info
@@ -226,7 +236,7 @@ class ImageField(Field, FileGroup, JsonMixin):
     ) -> None:
         """Get image information and copy the image to the target directory."""
         src_path = src_path or None
-        img_info: dict[str, str | int | bool] = {"save_as_is": False}
+        img_info: dict[str, Any] = {"save_as_is": False}
         img_info["is_new_img"] = True
         img_info["is_delete"] = is_delete
 
@@ -240,18 +250,24 @@ class ImageField(Field, FileGroup, JsonMixin):
             # Create the current date for the directory name.
             date_str: str = str(datetime.now(UTC_TIMEZONE).date())
             # Directory name for the original image and its thumbnails.
-            general_dir = uuid.uuid4()
+            general_dir = str(uuid.uuid4())
             # Create path to target directory with images.
-            imgs_dir_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}/{general_dir}"
+            imgs_dir_path = Path(
+                MEDIA_ROOT,
+                "uploads",
+                self.target_dir,
+                date_str,
+                general_dir,
+            )
             # Create url path to target directory with images.
             imgs_dir_url = f"{MEDIA_URL}/uploads/{self.target_dir}/{date_str}/{general_dir}"
+            # Create target directory if it does not exist.
+            if not await imgs_dir_path.exists():
+                await imgs_dir_path.mkdir(parents=True)
             # Create a new name for the original image.
             new_original_name = f"original{extension}"
             # Create path to main image.
-            main_img_path = f"{imgs_dir_path}/{new_original_name}"
-            # Create target directory if it does not exist.
-            if not await to_thread.run_sync(exists, imgs_dir_path):
-                await to_thread.run_sync(makedirs, imgs_dir_path)
+            main_img_path = f"{imgs_dir_path.as_posix()}/{new_original_name}"
             # Save main image in target directory.
             await to_thread.run_sync(copyfile, src_path, main_img_path)
             # Add paths for main image.
@@ -267,11 +283,14 @@ class ImageField(Field, FileGroup, JsonMixin):
                 ext_upper = "JPEG"
             img_info["ext_upper"] = ext_upper
             # Add path to target directory with images.
-            img_info["imgs_dir_path"] = imgs_dir_path
+            img_info["imgs_dir_path"] = imgs_dir_path.as_posix()
             # Add url path to target directory with images.
             img_info["imgs_dir_url"] = imgs_dir_url
             # Add size of main image (in bytes).
             img_info["size"] = await to_thread.run_sync(getsize, main_img_path)
+            # Convert the number of bytes into a human-readable format.
+            # Examples: 200 bytes | 1 KB | 1.5 MB.
+            img_info["human_size"] = to_human_size(img_info["size"])
         #
         # to value.
         self.value = img_info

ramifice/paladins/groups/file_group.py

@@ -9,7 +9,7 @@ __all__ = ("FileGroupMixin",)
 
 from typing import Any
 
-from xloft.human import to_human_size
+from xloft.converters import to_human_size
 
 from ramifice.paladins.tools import (
     accumulate_error,

ramifice/paladins/groups/img_group.py

@@ -11,7 +11,7 @@ from asyncio import to_thread
 from typing import Any
 
 from PIL import Image
-from xloft.human import to_human_size
+from xloft.converters import to_human_size
 
 from ramifice.paladins.tools import accumulate_error, panic_type_error
 from ramifice.utils import translations

{ramifice-0.8.42.dist-info → ramifice-0.8.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.42
+Version: 0.8.44
 Summary: ORM-pseudo-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/

{ramifice-0.8.42.dist-info → ramifice-0.8.44.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ramifice/__init__.py,sha256=Ms9drE4wSvoUyzAtAa-VRykD7ufz6L_GtHx-YQRePDI,1619
+ramifice/__init__.py,sha256=E_FanqYNnI0nrzHGS7LxsmRSe18Ka4iyxrr3K2TC6s4,1624
 ramifice/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ramifice/commons/__init__.py,sha256=RR_cVDF0H8xa56q2PXGKUSmYOPF-AUNKRY9u7DHD_KU,583
 ramifice/commons/general.py,sha256=yPRG8c2s5C7-J2L4Ev_pa0QA0TWdVrCoD15MuKU5DtY,5488
@@ -25,10 +25,10 @@ ramifice/fields/color_field.py,sha256=eTWSqin6ZM1V6U9PRfEphuCdfNajFiT4nInorelWLq
 ramifice/fields/date_field.py,sha256=p-pMTDpIWrK0SqUk8FVnribIEmQk37modEveytOJuKA,6255
 ramifice/fields/date_time_field.py,sha256=UZLl8zvwLfytJDmrTIhpbMJVHHjg6AU_p9U0O1E0f34,6312
 ramifice/fields/email_field.py,sha256=7T1ks9Plusr-fon1wa9rO7S6_Zj7J9ZmwE504UFDHx8,4427
-ramifice/fields/file_field.py,sha256=G510AuGjtMerHjpUpIV6tYRShTBkNzWcI3hD_vqAGyQ,9532
+ramifice/fields/file_field.py,sha256=EOFfOswvmX9u4Gmj_2uGFFrNTX-PXEVAStgZ7AIS88M,10071
 ramifice/fields/float_field.py,sha256=XtyaTgAFaTem4Hv7c0G_l6LIrspraijqkEqE8G7gEE0,5834
 ramifice/fields/id_field.py,sha256=pNDQRmqcsDtWVC2zW310T_3tqxpM-d3sd1elwxL14a8,4795
-ramifice/fields/image_field.py,sha256=LZqDXgRLXljNUqqMSpvfPJwwiNnLB2PpSQ8F8SBNg_g,12904
+ramifice/fields/image_field.py,sha256=llvPLWBLHsVoU6z_7DE3SMeW-GZenyzPeXhRH5ptDZc,13503
 ramifice/fields/integer_field.py,sha256=kZohnGFJb9YFiJ3Fl-YnPQJW1YBCAEzyavY23hl9jxc,5808
 ramifice/fields/ip_field.py,sha256=FGf2Bnz87k9HRDY3SZ92OKdRb_8Z34iVq_UnP-fb7ew,4331
 ramifice/fields/password_field.py,sha256=aBY8XaRCTqHGi7LfCfImoaUZuPrXmvDwquGjEkCda0A,3958
@@ -61,9 +61,9 @@ ramifice/paladins/groups/__init__.py,sha256=MmScWKa2cfEfowr2fUxH41VIVOkOpgz5ELTd
 ramifice/paladins/groups/bool_group.py,sha256=yHdjC1MknQCQ-PssQRkxhQObE7U6XjlBTk40sa54a3M,879
 ramifice/paladins/groups/choice_group.py,sha256=PRuxCkDrWtoCyEhCn-WTPjub7RfoWEdSHJRyza3Nsc8,1886
 ramifice/paladins/groups/date_group.py,sha256=Y2fFEX2elmE5QphDEOf-xhvmR6ryR34S9tSBpMspZY4,3846
-ramifice/paladins/groups/file_group.py,sha256=8TI0CozyLar-uEQX7STxmrm3fqYDieQMyquydbyx-I4,3025
+ramifice/paladins/groups/file_group.py,sha256=BTZbep5OA5Dn31R4HHeQZx24TXTT6zwslArvfpxw_54,3030
 ramifice/paladins/groups/id_group.py,sha256=PnWfH1LkpduMxU9Qpm6XhC1zeKb_KQNgGAFSASQm9q0,1359
-ramifice/paladins/groups/img_group.py,sha256=CygCrv-hzzFzmvI2U-CnuluB70oGIs05QYFHjr_GO8g,6179
+ramifice/paladins/groups/img_group.py,sha256=mQYHJQ8IuYAnguMUfPyLnxyKm_ow3qUgsKCNP-qxD88,6184
 ramifice/paladins/groups/num_group.py,sha256=-dQeE9IpeoLZ4hWw5YjeKdhPfV8U_TIwKAiFEjYzVzA,2401
 ramifice/paladins/groups/pass_group.py,sha256=jRU2tQGEJjFnOJnW1uKlgib-ffA2aVncgNjlCS_rxfM,1964
 ramifice/paladins/groups/slug_group.py,sha256=zq1C-4XvL7vnM12FhzXYgDhgAgydrU1PlG70pP0pQnA,2543
@@ -77,7 +77,7 @@ ramifice/utils/mixins.py,sha256=5G3x8hK3igM7JBgCiCnVDdb_0K_D1gV1tw0QKpDlm-A,1161
 ramifice/utils/tools.py,sha256=WOazw24pvL96-0yNBy7YRGErN3vAQ4F6GS9TLvWFqrs,2747
 ramifice/utils/translations.py,sha256=YItvCWv-13FS2x8VYsAOH-Nx_qQOitOX7-bRGX3mc3A,4718
 ramifice/utils/unit.py,sha256=zHfvkyEU4sxHOc-QMuntEcvyfQqH75AK1zx8E25kM9Y,2535
-ramifice-0.8.42.dist-info/METADATA,sha256=A3eFjc5MeNxDWEkNp7eilVtGiKFVNop0qyNp6T1MmQ0,18899
-ramifice-0.8.42.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.8.42.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.8.42.dist-info/RECORD,,
+ramifice-0.8.44.dist-info/METADATA,sha256=2tvf0SZQf1ZIN6OKGDV2WAfD4CuSaWI5jajN9Nn2cb8,18899
+ramifice-0.8.44.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.8.44.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.8.44.dist-info/RECORD,,