fastapi-rtk 1.0.20__tar.gz → 1.0.21__tar.gz

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.21}/PKG-INFO

@@ -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.21/fastapi_rtk/_version.py

@@ -0,0 +1 @@
+__version__ = "1.0.21"

{fastapi_rtk-1.0.20 → fastapi_rtk-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-1.0.20 → fastapi_rtk-1.0.21}/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-1.0.20 → fastapi_rtk-1.0.21}/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/fastapi_rtk/_version.py

@@ -1 +0,0 @@
-__version__ = "1.0.20"