fastapi-rtk 1.0.20__py3-none-any.whl → 1.0.21__py3-none-any.whl

fastapi_rtk/_version.py

@@ -1 +1 @@
-__version__ = "1.0.20"
+__version__ = "1.0.21"

fastapi_rtk/api/model_rest_api.py

@@ -1883,20 +1883,21 @@ class ModelRestApi(BaseApi):
                         if not isinstance(filenames, list):
                             filenames = [filenames]
                         for filename in filenames:
-                            old_content = await smart_run(fm.get_file, filename)
                             before_commit_runner.add_task(
                                 lambda fm=fm, filename=filename: smart_run(
                                     fm.delete_file, filename
                                 )
                             )
-                            after_commit_runner.add_task(
-                                lambda fm=fm,
-                                content=old_content,
-                                filename=filename: smart_run(
-                                    fm.save_content_to_file, content, filename
-                                ),
-                                tags=["file"],
-                            )
+                            if fm.file_exists(filename):
+                                old_content = await smart_run(fm.get_file, filename)
+                                after_commit_runner.add_task(
+                                    lambda fm=fm,
+                                    content=old_content,
+                                    filename=filename: smart_run(
+                                        fm.save_content_to_file, content, filename
+                                    ),
+                                    tags=["file"],
+                                )
                 await smart_run(self.datamodel.delete, session, item)
                 after_commit_runner.remove_tasks_by_tag(
                     "file"
@@ -2410,21 +2411,26 @@ class ModelRestApi(BaseApi):
                             # Delete only the files or images that are not in the new old_filenames
                             for filename in actual_old_filenames:
                                 if filename not in old_filenames:
-                                    old_content = await smart_run(fm.get_file, filename)
                                     before_commit_runner.add_task(
                                         lambda fm=fm, old_filename=filename: smart_run(
                                             fm.delete_file, old_filename
                                         ),
                                         tags=["file"],
                                     )
-                                    after_commit_runner.add_task(
-                                        lambda fm=fm,
-                                        content=old_content,
-                                        filename=filename: smart_run(
-                                            fm.save_content_to_file, content, filename
-                                        ),
-                                        tags=["file"],
-                                    )
+                                    if fm.file_exists(filename):
+                                        old_content = await smart_run(
+                                            fm.get_file, filename
+                                        )
+                                        after_commit_runner.add_task(
+                                            lambda fm=fm,
+                                            content=old_content,
+                                            filename=filename: smart_run(
+                                                fm.save_content_to_file,
+                                                content,
+                                                filename,
+                                            ),
+                                            tags=["file"],
+                                        )
 
                         new_filenames = []
                         # Loop through value instead of only file values so the order is maintained
@@ -2440,27 +2446,28 @@ class ModelRestApi(BaseApi):
                         # Delete existing file or image if it is being updated
                         if item and hasattr(item, key) and getattr(item, key):
                             filename = getattr(item, key)
-                            old_content = await smart_run(fm.get_file, filename)
                             before_commit_runner = AsyncTaskRunner.get_runner(
                                 "before_commit"
                             )
-                            after_commit_runner = AsyncTaskRunner.get_runner(
-                                "after_commit"
-                            )
                             before_commit_runner.add_task(
                                 lambda fm=fm, old_filename=filename: smart_run(
                                     fm.delete_file, old_filename
                                 ),
                                 tags=["file"],
                             )
-                            after_commit_runner.add_task(
-                                lambda fm=fm,
-                                content=old_content,
-                                filename=filename: smart_run(
-                                    fm.save_content_to_file, content, filename
-                                ),
-                                tags=["file"],
-                            )
+                            if fm.file_exists(filename):
+                                old_content = await smart_run(fm.get_file, filename)
+                                after_commit_runner = AsyncTaskRunner.get_runner(
+                                    "after_commit"
+                                )
+                                after_commit_runner.add_task(
+                                    lambda fm=fm,
+                                    content=old_content,
+                                    filename=filename: smart_run(
+                                        fm.save_content_to_file, content, filename
+                                    ),
+                                    tags=["file"],
+                                )
 
                         # Only process if the value exists and is not None
                         if value:

fastapi_rtk/bases/file_manager.py

@@ -268,6 +268,7 @@ class AbstractFileManager(abc.ABC):
         return self.__class__(
             base_path=f"{self.base_path}/{subfolder}",
             allowed_extensions=self.allowed_extensions,
+            max_file_size=self.max_file_size,
             namegen=self.namegen,
             permission=self.permission,
             *args,

fastapi_rtk/file_managers/s3_file_manager.py

@@ -2,7 +2,7 @@ import typing
 
 from ..bases.file_manager import AbstractFileManager
 from ..setting import Setting
-from ..utils import lazy, smart_run, use_default_when_none
+from ..utils import T, lazy, smart_run, use_default_when_none
 
 __all__ = ["S3FileManager"]
 
@@ -14,6 +14,7 @@ class S3FileManager(AbstractFileManager):
 
     allowed_extensions = lazy(lambda: Setting.FILE_ALLOWED_EXTENSIONS)
     max_file_size = lazy(lambda: Setting.FILE_MAX_SIZE)
+    ERROR_CODE_FILE_NOT_FOUND = "NoSuchKey"
 
     def __init__(
         self,
@@ -57,10 +58,14 @@ class S3FileManager(AbstractFileManager):
 
         try:
             import boto3
+            import botocore
+            import botocore.client
             import smart_open
 
             self.smart_open = smart_open
             self.boto3 = boto3
+            self.botocore = botocore
+            self.botocore.client = botocore.client
         except ImportError:
             raise ImportError(
                 "smart_open is required for S3FileManager. "
@@ -125,27 +130,22 @@ class S3FileManager(AbstractFileManager):
         return path
 
     def delete_file(self, filename):
-        path = self.get_path(filename)
-        try:
-            self.smart_open.open(
-                path, "rb", **self.open_params
-            ).close()  # Check if file exists
+        if self.file_exists(filename):
             self.boto3_client.delete_object(
                 Bucket=self.bucket_name,
                 Key=f"{self.bucket_subfolder}/{filename}"
                 if self.bucket_subfolder
                 else filename,
             )
-        except FileNotFoundError:
-            pass
 
     def file_exists(self, filename):
         path = self.get_path(filename)
         try:
-            with self.smart_open.open(path, "rb", **self.open_params):
-                return True
-        except FileNotFoundError:
-            return False
+            with self.smart_open.open(path, "rb", **self.open_params) as f:
+                f.read(1)  # Try to read a byte to confirm existence
+            return True
+        except IOError as e:
+            return self._handle_io_error(e, value_to_return=False)
 
     def get_instance_with_subfolder(self, subfolder, *args, **kwargs):
         return super().get_instance_with_subfolder(
@@ -161,3 +161,13 @@ class S3FileManager(AbstractFileManager):
             *args,
             **kwargs,
         )
+
+    def _handle_io_error(self, e: IOError, *, value_to_return: T = None):
+        if hasattr(e, "backend_error") and isinstance(
+            e.backend_error, self.botocore.client.ClientError
+        ):
+            error = e.backend_error.response.get("Error", {})
+            error_code = error.get("Code")
+            if error_code == self.ERROR_CODE_FILE_NOT_FOUND:
+                return value_to_return
+        raise e

{fastapi_rtk-1.0.20.dist-info → fastapi_rtk-1.0.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.20
+Version: 1.0.21
 Summary: A package that provides a set of tools to build a FastAPI application with a Class-Based CRUD API.
 Project-URL: Homepage, https://codeberg.org/datatactics/fastapi-rtk
 Project-URL: Issues, https://codeberg.org/datatactics/fastapi-rtk/issues

{fastapi_rtk-1.0.20.dist-info → fastapi_rtk-1.0.21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 fastapi_rtk/__init__.py,sha256=TGDmH62gymFCC6yFdAsiVHcdOvy4_tdDCzAK4WzEHH8,6264
-fastapi_rtk/_version.py,sha256=D3FIR1OP9p54JyJSpU5wDfDWvaAjk2k-IH5FzjX_kCA,23
+fastapi_rtk/_version.py,sha256=lJ4ivbKbnYXFf2Ku8SMHBz5WRCggnAB-EiaLLFW9B-8,23
 fastapi_rtk/apis.py,sha256=6X_Lhl98m7lKrDRybg2Oe24pLFLJ29eCOQSwCAvpKhY,172
 fastapi_rtk/config.py,sha256=9PZF9E5i1gxmnsZEprZZKxVHSk0dFEklJSplX9NEqdo,14036
 fastapi_rtk/const.py,sha256=sEj_cYeerj9pVwbCu0k5Sy1EYpdr1EHzUjqqbnporgc,4905
@@ -21,7 +21,7 @@ fastapi_rtk/types.py,sha256=-LPnTIbHvqJW81__gab3EWrhjNmznHhptz0BtXkEAHQ,3612
 fastapi_rtk/version.py,sha256=D2cmQf2LNeHOiEfcNzVOOfcAmuLvPEmGEtZv5G54D0c,195
 fastapi_rtk/api/__init__.py,sha256=MwFR7HHppnhbjZGg3sOdQ6nqy9uxnHHXvicpswNFMNA,245
 fastapi_rtk/api/base_api.py,sha256=42I9v3b25lqxNAMDGEtajA5-btIDSyUWF0xMDgGkA8c,8078
-fastapi_rtk/api/model_rest_api.py,sha256=B29CA1pOoCyoyKbknPmnIfgbYBLAWKD8pRdBlPh0RA4,111332
+fastapi_rtk/api/model_rest_api.py,sha256=YNwIBDBm7jWNqN9KExZ5bLIxdLSNDuRsDpJOjLf6CkU,111821
 fastapi_rtk/auth/__init__.py,sha256=iX7O41NivBYDfdomEaqm4lUx9KD17wI4g3EFLF6kUTw,336
 fastapi_rtk/auth/auth.py,sha256=F2qZoR7go_7FnvVJrDxUCd6vtRz5XW8yyOv143MWPts,20664
 fastapi_rtk/auth/hashers/__init__.py,sha256=uBThFj2VPPSMSioxYTktNiM4-mVgtDAjTpKA3ZzWxxs,110
@@ -60,7 +60,7 @@ fastapi_rtk/backends/sqla/extensions/geoalchemy2/filters.py,sha256=L1WgO7UzWuAgs
 fastapi_rtk/backends/sqla/extensions/geoalchemy2/geometry_converter.py,sha256=sckNoxPE8ApKCLgBZzE_2dokXrM6mIXvMguHZvyJzIM,3891
 fastapi_rtk/bases/__init__.py,sha256=Te9rcmi1AGG72iZCzGyvc5qEIVyIexN7ViFdb59a2RA,494
 fastapi_rtk/bases/db.py,sha256=D27BhF89J0OaLHjALDCa85eNf35lBaTz6VV7EDa4wuM,18711
-fastapi_rtk/bases/file_manager.py,sha256=A5Tt_BYQQc3cNYzWxJ5tCKcQe3HOxhXcrBoyWx6wtnc,11557
+fastapi_rtk/bases/file_manager.py,sha256=sT49sYA-KFVZS4I4_uf4838QBmKBUPBlklFfHhz2M7Y,11603
 fastapi_rtk/bases/filter.py,sha256=XmWTcLaIcBj9pKF1PMAKdwSnZNpdT8Df3uLeUIOGUDE,1840
 fastapi_rtk/bases/interface.py,sha256=Cq9Duxa3w-tw342P424h88fc0_X1DoxCdTa3rAN-6jM,45380
 fastapi_rtk/bases/model.py,sha256=nUZf0AVs0Mzqh2u_ALiRNYN1bfOU9PzYLvEFHDQ57Y0,1692
@@ -87,7 +87,7 @@ fastapi_rtk/cli/commands/db/templates/fastapi-multidb/script.py.mako,sha256=o02U
 fastapi_rtk/file_managers/__init__.py,sha256=RZzSSUDq_cIv4MeVePRBGR0mbEiJua7WKccfE6IAawk,198
 fastapi_rtk/file_managers/file_manager.py,sha256=eEoaoh1pw0negbNNo7z8adijwCR_Y6ZWlbIeWK-9ZB0,2668
 fastapi_rtk/file_managers/image_manager.py,sha256=4Tq1m0cdEYXGPJdjXJoEJWERs1vL6Ejfwyd_MBHp71U,628
-fastapi_rtk/file_managers/s3_file_manager.py,sha256=Rb5rEet2R72VFUHMPITJugVLhsTjxVh4oqrL7TjKZVo,6424
+fastapi_rtk/file_managers/s3_file_manager.py,sha256=8lxmk889N0CQwi7HryfFp4YVPuwHoGEIMG6gHHQ9YBo,6962
 fastapi_rtk/file_managers/s3_image_manager.py,sha256=FBwdGu9FWDPjrUQVTvTyZNnyZvS5-hd-fkxQLOsLa80,533
 fastapi_rtk/lang/__init__.py,sha256=zJejpbIXx1O-nSuWwrCYgr5f5EtwjYW6kh8jRy_Yo0U,68
 fastapi_rtk/lang/babel.cfg,sha256=ahkzg8wUKyl9G9UqkgAyWEtRlCnaWkjStM5c4FhKuUE,18
@@ -126,8 +126,8 @@ fastapi_rtk/utils/timezone.py,sha256=62S0pPWuDFFXxV1YTFCsc4uKiSP_Ba36Fv7S3gYjfhs
 fastapi_rtk/utils/update_signature.py,sha256=PIzZgNpGEwvDNgQ3G51Zi-QhVV3mbxvUvSwDwf_-yYs,2209
 fastapi_rtk/utils/use_default_when_none.py,sha256=H2HqhKy_8eYk3i1xijEjuaKak0oWkMIkrdz6T7DK9QU,469
 fastapi_rtk/utils/werkzeug.py,sha256=1Gv-oyqSmhVGrmNbB9fDqpqJzPpANOzWf4zMMrhW9UA,3245
-fastapi_rtk-1.0.20.dist-info/METADATA,sha256=3HSGbdKbJ8IG24nA3D8HxptAVRj9NtYieA-3tF5GSZY,1302
-fastapi_rtk-1.0.20.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_rtk-1.0.20.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
-fastapi_rtk-1.0.20.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
-fastapi_rtk-1.0.20.dist-info/RECORD,,
+fastapi_rtk-1.0.21.dist-info/METADATA,sha256=U6I4Prujp70tf_W94pKGxXcxZaGzUwB8xld2Y700YbI,1302
+fastapi_rtk-1.0.21.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_rtk-1.0.21.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
+fastapi_rtk-1.0.21.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
+fastapi_rtk-1.0.21.dist-info/RECORD,,