ramifice 0.8.4__py3-none-any.whl → 0.8.5__py3-none-any.whl

ramifice/fields/file_field.py

@@ -3,12 +3,11 @@
 import uuid
 from base64 import b64decode
 from datetime import date
-from os.path import basename
-from pathlib import Path
+from os import makedirs
+from os.path import basename, exists, getsize
+from shutil import copyfile
 
-from aiofiles import open as async_open
-from aiofiles import os as async_os
-from aioshutil import copyfile
+from anyio import Path, open_file, to_thread
 
 from ramifice.fields.general.field import Field
 from ramifice.fields.general.file_group import FileGroup
@@ -128,12 +127,12 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create path to target directory.
             dir_target_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}"
             # Create target directory if it does not exist.
-            if not await async_os.path.exists(dir_target_path):
-                await async_os.makedirs(dir_target_path)
+            if not await to_thread.run_sync(exists, dir_target_path):
+                await to_thread.run_sync(makedirs, dir_target_path)
             # Create path to target file.
             f_target_path = f"{dir_target_path}/{f_uuid_name}"
             # Save file in target directory.
-            async with async_open(f_target_path, mode="wb") as open_f:
+            async with await open_file(f_target_path, mode="wb") as open_f:
                 f_content = b64decode(base64_str)
                 await open_f.write(f_content)
             # Add paths to target file.
@@ -144,7 +143,7 @@ class FileField(Field, FileGroup, JsonMixin):
             # Add file extension.
             file_info["extension"] = extension
             # Add file size (in bytes).
-            file_info["size"] = await async_os.path.getsize(f_target_path)
+            file_info["size"] = await to_thread.run_sync(getsize, f_target_path)
         #
         # to value.
         self.value = file_info
@@ -173,12 +172,12 @@ class FileField(Field, FileGroup, JsonMixin):
             # Create path to target directory.
             dir_target_path = f"{MEDIA_ROOT}/uploads/{self.target_dir}/{date_str}"
             # Create target directory if it does not exist.
-            if not await async_os.path.exists(dir_target_path):
-                await async_os.makedirs(dir_target_path)
+            if not await to_thread.run_sync(exists, dir_target_path):
+                await to_thread.run_sync(makedirs, dir_target_path)
             # Create path to target file.
             f_target_path = f"{dir_target_path}/{f_uuid_name}"
             # Save file in target directory.
-            await copyfile(src_path, f_target_path)
+            await to_thread.run_sync(copyfile, src_path, f_target_path)
             # Add paths to target file.
             file_info["path"] = f_target_path
             file_info["url"] = f"{MEDIA_URL}/uploads/{self.target_dir}/{date_str}/{f_uuid_name}"
@@ -187,7 +186,7 @@ class FileField(Field, FileGroup, JsonMixin):
             # Add file extension.
             file_info["extension"] = extension
             # Add file size (in bytes).
-            file_info["size"] = await async_os.path.getsize(f_target_path)
+            file_info["size"] = await to_thread.run_sync(getsize, f_target_path)
         #
         # to value.
         self.value = file_info

ramifice/fields/image_field.py

@@ -3,12 +3,11 @@
 import uuid
 from base64 import b64decode
 from datetime import date
-from os.path import basename
-from pathlib import Path
+from os import makedirs
+from os.path import basename, exists, getsize
+from shutil import copyfile
 
-from aiofiles import open as async_open
-from aiofiles import os as async_os
-from aioshutil import copyfile
+from anyio import Path, open_file, to_thread
 
 from ramifice.fields.general.field import Field
 from ramifice.fields.general.file_group import FileGroup
@@ -165,10 +164,10 @@ class ImageField(Field, FileGroup, JsonMixin):
             # 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 async_os.path.exists(imgs_dir_path):
-                await async_os.makedirs(imgs_dir_path)
+            if not await to_thread.run_sync(exists, imgs_dir_path):
+                await to_thread.run_sync(makedirs, imgs_dir_path)
             # Save main image in target directory.
-            async with async_open(main_img_path, mode="wb") as open_f:
+            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.
@@ -188,7 +187,7 @@ class ImageField(Field, FileGroup, JsonMixin):
             # 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 async_os.path.getsize(main_img_path)
+            img_info["size"] = await to_thread.run_sync(getsize, main_img_path)
         #
         # to value.
         self.value = img_info
@@ -223,10 +222,10 @@ class ImageField(Field, FileGroup, JsonMixin):
             # 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 async_os.path.exists(imgs_dir_path):
-                await async_os.makedirs(imgs_dir_path)
+            if not await to_thread.run_sync(exists, imgs_dir_path):
+                await to_thread.run_sync(makedirs, imgs_dir_path)
             # Save main image in target directory.
-            await copyfile(src_path, main_img_path)
+            await to_thread.run_sync(copyfile, src_path, main_img_path)
             # Add paths for main image.
             img_info["path"] = main_img_path
             img_info["url"] = f"{imgs_dir_url}/{new_original_name}"
@@ -244,7 +243,7 @@ class ImageField(Field, FileGroup, JsonMixin):
             # 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 async_os.path.getsize(main_img_path)
+            img_info["size"] = await to_thread.run_sync(getsize, main_img_path)
         #
         # to value.
         self.value = img_info

ramifice/models/decorator.py

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

ramifice/paladins/check.py

@@ -1,9 +1,10 @@
 """Validation of Model data before saving to the database."""
 
+from os import remove
+from shutil import rmtree
 from typing import Any
 
-from aiofiles import os as async_os
-from aioshutil import rmtree
+from anyio import to_thread
 from bson.objectid import ObjectId
 from pymongo.asynchronous.collection import AsyncCollection
 
@@ -133,7 +134,7 @@ class CheckMixin(
                         file_data = result_map.get(field_name)
                         if file_data is not None:
                             if file_data["is_new_file"]:
-                                await async_os.remove(file_data["path"])
+                                await to_thread.run_sync(remove, file_data["path"])
                             field_data.value = None
                         if curr_doc is not None:
                             field_data.value = curr_doc[field_name]
@@ -141,7 +142,7 @@ class CheckMixin(
                         img_data = result_map.get(field_name)
                         if img_data is not None:
                             if img_data["is_new_img"]:
-                                await rmtree(img_data["imgs_dir_path"])  # type: ignore[call-arg]
+                                await to_thread.run_sync(rmtree, img_data["imgs_dir_path"])
                             field_data.value = None
                         if curr_doc is not None:
                             field_data.value = curr_doc[field_name]

ramifice/paladins/delete.py

@@ -1,9 +1,10 @@
 """Delete document from database."""
 
+from os import remove
+from shutil import rmtree
 from typing import Any
 
-from aiofiles import os as async_os
-from aioshutil import rmtree
+from anyio import to_thread
 from pymongo.asynchronous.collection import AsyncCollection
 
 from ramifice.utils import constants
@@ -77,12 +78,12 @@ class DeleteMixin:
                 if group == "file":
                     file_data = mongo_doc[field_name]
                     if file_data is not None and len(file_data["path"]) > 0:
-                        await async_os.remove(file_data["path"])
+                        await to_thread.run_sync(remove, file_data["path"])
                     file_data = None
                 elif group == "img":
                     file_data = mongo_doc[field_name]
                     if file_data is not None and len(file_data["imgs_dir_path"]) > 0:
-                        await rmtree(file_data["imgs_dir_path"])  # type: ignore[call-arg]
+                        await to_thread.run_sync(rmtree, file_data["imgs_dir_path"])
                     file_data = None
             field_data.value = None
         # Run hook.

ramifice/paladins/groups/img_group.py

@@ -3,7 +3,7 @@
 Supported fields: ImageField
 """
 
-import asyncio
+from asyncio import to_thread
 from typing import Any
 
 from PIL import Image
@@ -80,7 +80,7 @@ class ImgGroupMixin:
                     # Extension to the upper register and delete the point.
                     ext_upper = value["ext_upper"]
                     # Get image file.
-                    with await asyncio.to_thread(Image.open, path) as img:
+                    with await to_thread(Image.open, path) as img:
                         width, height = img.size
                         value["width"] = width
                         value["height"] = height
@@ -93,7 +93,7 @@ class ImgGroupMixin:
                             if size_name == "lg":
                                 value["path_lg"] = f"{imgs_dir_path}/lg{extension}"
                                 value["url_lg"] = f"{imgs_dir_url}/lg{extension}"
-                                await asyncio.to_thread(
+                                await to_thread(
                                     img.save,
                                     fp=value["path_lg"],
                                     format=ext_upper,
@@ -101,7 +101,7 @@ class ImgGroupMixin:
                             elif size_name == "md":
                                 value["path_md"] = f"{imgs_dir_path}/md{extension}"
                                 value["url_md"] = f"{imgs_dir_url}/md{extension}"
-                                await asyncio.to_thread(
+                                await to_thread(
                                     img.save,
                                     fp=value["path_md"],
                                     format=ext_upper,
@@ -109,7 +109,7 @@ class ImgGroupMixin:
                             elif size_name == "sm":
                                 value["path_sm"] = f"{imgs_dir_path}/sm{extension}"
                                 value["url_sm"] = f"{imgs_dir_url}/sm{extension}"
-                                await asyncio.to_thread(
+                                await to_thread(
                                     img.save,
                                     fp=value["path_sm"],
                                     format=ext_upper,
@@ -117,7 +117,7 @@ class ImgGroupMixin:
                             elif size_name == "xs":
                                 value["path_xs"] = f"{imgs_dir_path}/xs{extension}"
                                 value["url_xs"] = f"{imgs_dir_url}/xs{extension}"
-                                await asyncio.to_thread(
+                                await to_thread(
                                     img.save,
                                     fp=value["path_xs"],
                                     format=ext_upper,

ramifice/utils/tools.py

@@ -1,13 +1,13 @@
 """Global collection of auxiliary methods."""
 
-import asyncio
 import ipaddress
 import math
+from asyncio import to_thread
+from os.path import getsize
 from typing import Any
 from urllib.parse import urlparse
 
 import phonenumbers
-from aiofiles import ospath
 from bson.objectid import ObjectId
 from email_validator import EmailNotValidError, validate_email
 
@@ -31,7 +31,7 @@ def to_human_size(size: int) -> str:
 
 async def get_file_size(path: str) -> int:
     """Get file size in bytes."""
-    size: int = await ospath.getsize(path)
+    size: int = await to_thread(getsize, path)
     return size
 
 
@@ -43,7 +43,10 @@ def normal_email(email: str | None) -> str | None:
     """
     normal: str | None = None
     try:
-        emailinfo = validate_email(str(email), check_deliverability=False)
+        emailinfo = validate_email(
+            str(email),
+            check_deliverability=False,
+        )
         normal = emailinfo.normalized
     except EmailNotValidError:
         pass
@@ -53,7 +56,7 @@ def normal_email(email: str | None) -> str | None:
 async def is_email(email: str | None) -> bool:
     """Validate Email address."""
     try:
-        await asyncio.to_thread(
+        await to_thread(
             validate_email,
             str(email),
             check_deliverability=True,

{ramifice-0.8.4.dist-info → ramifice-0.8.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ramifice
-Version: 0.8.4
+Version: 0.8.5
 Summary: ORM-like API MongoDB for Python language.
 Project-URL: Homepage, https://github.com/kebasyaty/ramifice
 Project-URL: Documentation, https://kebasyaty.github.io/ramifice/
@@ -23,8 +23,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Database
 Classifier: Typing :: Typed
 Requires-Python: <4.0,>=3.12
-Requires-Dist: aiofiles>=24.1.0
-Requires-Dist: aioshutil>=1.5
+Requires-Dist: anyio>=4.9.0
 Requires-Dist: argon2-cffi>=25.1.0
 Requires-Dist: babel>=2.17.0
 Requires-Dist: email-validator>=2.2.0

{ramifice-0.8.4.dist-info → ramifice-0.8.5.dist-info}/RECORD

@@ -25,10 +25,10 @@ ramifice/fields/color_field.py,sha256=K-lYp8f08HTZt6WU0kY3CQWaAmx6I3-uyKHBq7xAeS
 ramifice/fields/date_field.py,sha256=-M_dD8tVUXcDCQD5Hy5Ns9Z2QGlRya0qbvoWgA4qpmg,5277
 ramifice/fields/date_time_field.py,sha256=ahjX-cD5Qj-V7JUi5QAZ8qgv9UePhYYYzJghiasKdqE,5312
 ramifice/fields/email_field.py,sha256=4Kxy1K6CXJUJ8Db0CQuopjodiY4ybe7V0GT756t7Nks,3481
-ramifice/fields/file_field.py,sha256=CSCHSExyXUsvLGGCj3WmBHM0YUUcK9QZZb3kB8r8HQs,8253
+ramifice/fields/file_field.py,sha256=2uc2YyuS0WDYO-jD0I8b3RL74m1Fw5DKAc7GlkzU8LE,8305
 ramifice/fields/float_field.py,sha256=JeVwoIi6j-dovXarZ3NgmSQI7f3qZzydlRs_yqp3Faw,4637
 ramifice/fields/id_field.py,sha256=YO5oIwXtqgURjjd2oYe2ouXxdpaiJp5ZhUgUA2pkNeo,4183
-ramifice/fields/image_field.py,sha256=ZBbraEI0P5qWK1_xDnZ42YXhqgK4LdcL28vg9zgPBiw,11672
+ramifice/fields/image_field.py,sha256=_UseQMYOh7jUebsH1u4bYlTt3xTM3Yb09yrTtQx2wi0,11724
 ramifice/fields/integer_field.py,sha256=xPwpdhYNz4MyHgOypqa29oGNdKZic05yyUYHg5CDD3E,4609
 ramifice/fields/ip_field.py,sha256=tBFGFMC_zwAyLGtVRNNfiu4vQoxXPcgVHhX_aoHrvns,3390
 ramifice/fields/password_field.py,sha256=USD4Y8MTI89QZVT6zqLGBmb5kqOKrXqh73-z99cOvtk,3266
@@ -44,11 +44,11 @@ ramifice/fields/general/file_group.py,sha256=pC9bGUpDeu7FLJVD6NMCzq18aPETotipknS
 ramifice/fields/general/number_group.py,sha256=LOPHbKAnIuqW4DEh2fH78w6qOQjp0OhkuP7MoikhlkA,761
 ramifice/fields/general/text_group.py,sha256=m9EnlYGwqlck-JIYOCUd0hUYAVr8jH4YCnTmm9QlCkQ,1103
 ramifice/models/__init__.py,sha256=h_QQ5rSJNZ-7kmx7wIFd8E8RmUS94b_x4jdwMbq8zm4,15
-ramifice/models/decorator.py,sha256=dzwC489KBjamQxrWNy8lrdXVLb3e8OKPWbPGJZqxaFA,5958
+ramifice/models/decorator.py,sha256=4NwnWcu2wxiX0EI_YXhbleyn4LB22mgDaDkQzJbHKD0,5967
 ramifice/models/model.py,sha256=e5UWHKIHwm7saxQ4bbamsTkz1VVBIqTRlAmJCOg5uRE,7160
 ramifice/paladins/__init__.py,sha256=EJ6EEKXUcMG5P1bDmlEa4W3fsxSz5u6mzDG_oU1efMQ,618
-ramifice/paladins/check.py,sha256=c-7jbFV5qzE9nF8Cl6VSPA8DtziADOuV6j1rldnZBKI,6602
-ramifice/paladins/delete.py,sha256=teUyj-sosObatoaFpMC3wodC4GvWbzgJCCxsI_Z9vyk,3448
+ramifice/paladins/check.py,sha256=sDTdUECMTSfV37Hm4_HDZOB_YRWs58H5fnOY6dTT90k,6619
+ramifice/paladins/delete.py,sha256=V3vahfx_kVCv5dTG6PVRsDlehVk4OtET4nHtxr9M5s0,3465
 ramifice/paladins/password.py,sha256=G-tMz2dIiOYEhOeSHYgAmc2e4tG_TJ2gt5tzPwBapkw,3047
 ramifice/paladins/refrash.py,sha256=hIZQEBGtoIhuGGg2KQYGApCaMb8WhK_QZlzi1_-zzU0,1100
 ramifice/paladins/save.py,sha256=mFau65uWYy4dSVyTVdZGR3VUnP-I_NPdMvq7F5n1sFo,3899
@@ -60,7 +60,7 @@ ramifice/paladins/groups/choice_group.py,sha256=KmrjbuHLLl6yGbRkdoMflf1thh17GLWr
 ramifice/paladins/groups/date_group.py,sha256=V3MCp8eA7txVLh6xmg76G9_y62TzWIQWqH59Ip26Xag,3779
 ramifice/paladins/groups/file_group.py,sha256=ySS7L5zcm2XrZRQUUOU8kgzqrucZ95UYzXD6pALWqE4,2982
 ramifice/paladins/groups/id_group.py,sha256=zN_Glu_cMGk8jMSDli3vYPvYrQXvQJNJFzb-t-qtZlQ,1290
-ramifice/paladins/groups/img_group.py,sha256=YDJTvbRoqQ2nf7-2QbIQ72I4j_c98_d5LZNrD9kCy0Q,6040
+ramifice/paladins/groups/img_group.py,sha256=YOTUiXlmpNcsbzuLOEGB0eyemQxwaLkOBN9kzPb-lkI,6015
 ramifice/paladins/groups/num_group.py,sha256=sbxzTdl33TVySfaNfqMixyBkJ69v6AqEgraFUN3Kftk,2317
 ramifice/paladins/groups/pass_group.py,sha256=uuIIqMBXsYG7vTHc_AhdgWuNCivxTgQMjkEu0-ElSmY,1887
 ramifice/paladins/groups/slug_group.py,sha256=ztiA2v7e5lQYRZtlLw8WGOhSWaYQfOdZ6wkKbx3ZbTM,2329
@@ -70,7 +70,7 @@ ramifice/utils/constants.py,sha256=dTSk07FVc6hgXwG1IF0_klPnbfxlFHiaRmym5zWgzIM,2
 ramifice/utils/errors.py,sha256=iuhq7fzpUmsOyeXeg2fJjta8yAuqlXLKsZVMpfUhtHE,1901
 ramifice/utils/fixtures.py,sha256=PMRl1Ud0Ek0eX5F7BPiL7az_H7YKtIVKB8MJ17CeBdw,3179
 ramifice/utils/migration.py,sha256=5VYYB7DFMzLCRYWdlwtqGRSUPFdXp5SMxuMWraofVCw,11106
-ramifice/utils/tools.py,sha256=DSSR__sHgfDlYF4vhtR8vmeFtgquonkM5W_3V3SX6Y0,2872
+ramifice/utils/tools.py,sha256=6N0YNlYB6c6Tz-4rhHrZJPi-KCUbRZhtK0VXHdusnNs,2921
 ramifice/utils/translations.py,sha256=Ibx6HqPcnsNxuBfXDs9mCLEA7xu4mkl3q39vqFaK-GI,4233
 ramifice/utils/unit.py,sha256=PPNKWYFJ8cz0nwbBPaTdL58_Nr7N0fIHFJBpKG2ZLKI,2482
 ramifice/utils/mixins/__init__.py,sha256=GrxJDsw73bEkitIh0-0BCxNnUK-N5uRXMCRlaPoaz1o,265
@@ -78,7 +78,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=2K_PZ34AzpesusgyyQFOLXFPcjXez3TWn-m9CHIKwRo,1131
-ramifice-0.8.4.dist-info/METADATA,sha256=D7LCsTfcUITuLa2XzN_DS5sSgED6Scv9JfaXcu5b84k,21016
-ramifice-0.8.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ramifice-0.8.4.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
-ramifice-0.8.4.dist-info/RECORD,,
+ramifice-0.8.5.dist-info/METADATA,sha256=W52KVNywCe-f2e4gR_VBW5J9nJ3cKgjAoOAq64uUtGE,20982
+ramifice-0.8.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ramifice-0.8.5.dist-info/licenses/LICENSE,sha256=LrEL0aTZx90HDwFUQCJutORiDjJL9AnuVvCtspXIqt4,1095
+ramifice-0.8.5.dist-info/RECORD,,