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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-rtk
-Version: 1.0.20
+Version: 1.0.22
 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
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Requires-Dist: alembic>=1.17.0
 Requires-Dist: beautifulsoup4>=4.14.2
 Requires-Dist: fastapi-babel>=1.0.0
-Requires-Dist: fastapi-users[oauth,sqlalchemy]>=14.0.1
+Requires-Dist: fastapi-users[oauth,sqlalchemy]>=15.0.3
 Requires-Dist: fastapi[standard]>=0.119.1
 Requires-Dist: jsonschema2md>=1.7.0
 Requires-Dist: marshmallow-sqlalchemy>=1.4.2
@@ -26,3 +26,4 @@ Requires-Dist: prometheus-fastapi-instrumentator>=7.1.0
 Requires-Dist: secweb>=1.25.2
 Requires-Dist: sqlalchemy-utils>=0.42.0
 Requires-Dist: uvicorn==0.38.0
+Requires-Dist: werkzeug>=3.1.5

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/__init__.py

@@ -1,3 +1,6 @@
+# Import from werkzeug to keep compatibility
+from werkzeug.utils import ImportStringError, import_string, secure_filename
+
 # Import all submodules
 from .api import *
 from .auth import *
@@ -174,6 +177,10 @@ __all__ = [
     "S3ImageManager",
     # .globals
     "g",
+    "current_app",
+    "current_user",
+    "request",
+    "background_tasks",
     # .lang
     "lazy_text",
     "translate",
@@ -232,7 +239,6 @@ __all__ = [
     "deep_merge",
     "ExtenderMixin",
     "uuid_namegen",
-    "secure_filename",
     "prettify_dict",
     "format_file_size",
     "hooks",
@@ -258,6 +264,8 @@ __all__ = [
     "validate_utc",
     "update_signature",
     "use_default_when_none",
+    # Re-exported from werkzeug.utils
     "ImportStringError",
     "import_string",
+    "secure_filename",
 ]

fastapi_rtk-1.0.22/fastapi_rtk/_version.py

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

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/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.22}/fastapi_rtk/auth/hashers/pbkdf2.py

@@ -2,8 +2,7 @@ import typing
 
 from pwdlib.hashers import HasherProtocol
 from pwdlib.hashers.base import ensure_str
-
-from .utils import check_password_hash, generate_password_hash
+from werkzeug.security import check_password_hash, generate_password_hash
 
 __all__ = ["PBKDF2Hasher"]
 

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/auth/hashers/scrypt.py

@@ -2,8 +2,7 @@ import typing
 
 from pwdlib.hashers import HasherProtocol
 from pwdlib.hashers.base import ensure_str
-
-from .utils import check_password_hash, generate_password_hash
+from werkzeug.security import check_password_hash, generate_password_hash
 
 __all__ = ["ScryptHasher"]
 

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/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.22}/fastapi_rtk/config.py

@@ -6,7 +6,9 @@ import os
 import types
 import typing as t
 
-from .utils import deep_merge, import_string
+from werkzeug.utils import import_string
+
+from .utils import deep_merge
 
 __all__ = ["Config"]
 

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/file_managers/file_manager.py

@@ -2,9 +2,11 @@ import os
 import os.path as op
 import shutil
 
+from werkzeug.utils import secure_filename
+
 from ..bases.file_manager import AbstractFileManager
 from ..setting import Setting
-from ..utils import lazy, secure_filename, smart_run
+from ..utils import lazy, smart_run
 
 __all__ = ["FileManager"]
 

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

@@ -44,6 +44,7 @@ import fastapi
 from fastapi import Request, Response
 from starlette.middleware.base import BaseHTTPMiddleware
 from starlette.types import ASGIApp
+from werkzeug.local import LocalProxy
 
 from .config import Config
 from .const import (
@@ -61,7 +62,7 @@ if TYPE_CHECKING:
     from .fastapi_react_toolkit import FastAPIReactToolkit
     from .security.sqla.models import User
 
-__all__ = ["g"]
+__all__ = ["g", "current_app", "current_user", "request", "background_tasks"]
 
 
 class Globals:
@@ -71,9 +72,9 @@ class Globals:
     _defaults: dict[str, Any]
 
     # Type annotations for the attributes
-    user: "User"
+    user: "User | None"
     """
-    The current user object. It will be `None` when not used in a request context.
+    The current user object. It will be `None` when not used in a request context or if no user is authenticated.
     """
     auth: "AuthConfigurator"
     """
@@ -91,11 +92,11 @@ class Globals:
     """
     A dictionary used to store list of sensitive columns for each model that should not be returned in the list and get endpoints. Default is `{"User": ["password", "hashed_password"]}`.
     """
-    background_tasks: fastapi.BackgroundTasks
+    background_tasks: fastapi.BackgroundTasks | None
     """
     The background tasks object to add tasks to be executed after the response is sent. It will be `None` when not used in a request context.
     """
-    request: Request
+    request: Request | None
     """
     The current request object. It will be `None` when not used in a request context.
     """
@@ -108,6 +109,9 @@ class Globals:
     The image manager object to manage images in the application. Defaults to `ImageManager` from `fastapi_rtk.file_managers.image_manager`.
     """
     current_app: "FastAPIReactToolkit"
+    """
+    The current FastAPI React Toolkit application instance.
+    """
 
     def __init__(self) -> None:
         object.__setattr__(self, "_vars", {})
@@ -269,3 +273,23 @@ g.set_default(
     ),
 )
 g.config.add_callback(basic_callback)
+
+# Local Proxies
+current_app: "FastAPIReactToolkit" = LocalProxy(lambda: g.current_app)
+"""
+Proxy to the current FastAPI React Toolkit application instance.
+"""
+current_user: "User | None" = LocalProxy(lambda: g.user)
+"""
+Proxy to the current user object. It will be `None` when not used in a request context or if no user is authenticated.
+"""
+request: Request | None = LocalProxy(lambda: g.request)
+"""
+Proxy to the current request object. It will be `None` when not used in a request context.
+"""
+background_tasks: fastapi.BackgroundTasks | None = LocalProxy(
+    lambda: g.background_tasks
+)
+"""
+Proxy to the background tasks object to add tasks to be executed after the response is sent. It will be `None` when not used in a request context.
+"""

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/routers.py

@@ -99,11 +99,9 @@ def get_oauth_router(
     backend: AuthenticationBackend[models.UP, models.ID],
     get_user_manager: UserManagerDependency[models.UP, models.ID],
     state_secret: SecretType,
-    redirect_url: typing.Optional[str] = None,
-    redirect_url_factory: typing.Optional[
-        typing.Callable[[Request, list[str]], str]
-    ] = None,
-    redirect_url_after_callback: typing.Optional[str] = None,
+    redirect_url: str | None = None,
+    redirect_url_factory: typing.Callable[[Request, list[str]], str] | None = None,
+    redirect_url_after_callback: str | None = None,
     associate_by_email: bool = False,
     is_verified_by_default: bool = False,
     **kwargs: dict[str, typing.Any],
@@ -185,6 +183,18 @@ def get_oauth_router(
                                 "summary": "User is inactive.",
                                 "value": {"detail": ErrorCode.LOGIN_BAD_CREDENTIALS},
                             },
+                            ErrorCode.ACCESS_TOKEN_DECODE_ERROR: {
+                                "summary": "Access token is error.",
+                                "value": {
+                                    "detail": ErrorCode.ACCESS_TOKEN_DECODE_ERROR
+                                },
+                            },
+                            ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED: {
+                                "summary": "Access token is already expired.",
+                                "value": {
+                                    "detail": ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED
+                                },
+                            },
                         }
                     }
                 },
@@ -216,7 +226,15 @@ def get_oauth_router(
             try:
                 state_data = decode_jwt(state, state_secret, [STATE_TOKEN_AUDIENCE])
             except jwt.DecodeError:
-                raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=ErrorCode.ACCESS_TOKEN_DECODE_ERROR,
+                )
+            except jwt.ExpiredSignatureError:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED,
+                )
 
         try:
             user = await user_manager.oauth_callback(
@@ -271,11 +289,9 @@ def get_oauth_associate_router(
     get_user_manager: UserManagerDependency[models.UP, models.ID],
     user_schema: type[schemas.U],
     state_secret: SecretType,
-    redirect_url: typing.Optional[str] = None,
-    redirect_url_factory: typing.Optional[
-        typing.Callable[[Request, list[str]], str]
-    ] = None,
-    redirect_url_after_callback: typing.Optional[str] = None,
+    redirect_url: str | None = None,
+    redirect_url_factory: typing.Callable[[Request, list[str]], str] | None = None,
+    redirect_url_after_callback: str | None = None,
     requires_verification: bool = False,
 ) -> APIRouter:
     """
@@ -354,6 +370,18 @@ def get_oauth_associate_router(
                                 "summary": "Invalid state token.",
                                 "value": None,
                             },
+                            ErrorCode.ACCESS_TOKEN_DECODE_ERROR: {
+                                "summary": "Access token is error.",
+                                "value": {
+                                    "detail": ErrorCode.ACCESS_TOKEN_DECODE_ERROR
+                                },
+                            },
+                            ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED: {
+                                "summary": "Access token is already expired.",
+                                "value": {
+                                    "detail": ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED
+                                },
+                            },
                         }
                     }
                 },
@@ -385,7 +413,15 @@ def get_oauth_associate_router(
             try:
                 state_data = decode_jwt(state, state_secret, [STATE_TOKEN_AUDIENCE])
             except jwt.DecodeError:
-                raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=ErrorCode.ACCESS_TOKEN_DECODE_ERROR,
+                )
+            except jwt.ExpiredSignatureError:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail=ErrorCode.ACCESS_TOKEN_ALREADY_EXPIRED,
+                )
 
         if state_data["sub"] != str(user.id):
             raise HTTPException(status_code=status.HTTP_400_BAD_REQUEST)
@@ -404,7 +440,7 @@ def get_oauth_associate_router(
         if redirect_url_after_callback:
             return RedirectResponse(redirect_url_after_callback)
 
-        return schemas.model_validate(user_schema, user)
+        return user_schema.model_validate(user)
 
     return router
 

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/security/sqla/models.py

@@ -232,6 +232,10 @@ class User(Model):
         if hasattr(self, "verified"):
             self.verified = value
 
+    @property
+    def is_authenticated(self):
+        return self.is_active
+
     @property
     def is_superuser(self):
         from ...globals import g

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/fastapi_rtk/utils/__init__.py

@@ -19,7 +19,6 @@ from .sqla import *
 from .timezone import *
 from .update_signature import *
 from .use_default_when_none import *
-from .werkzeug import *
 
 __all__ = [
     # .async_task_runner
@@ -35,7 +34,6 @@ __all__ = [
     "ExtenderMixin",
     # .flask_appbuilder_utils
     "uuid_namegen",
-    "secure_filename",
     # .formatter
     "prettify_dict",
     "format_file_size",
@@ -74,9 +72,6 @@ __all__ = [
     "update_signature",
     # .use_default_when_none
     "use_default_when_none",
-    # .werkzeug
-    "ImportStringError",
-    "import_string",
 ]
 
 P = typing.ParamSpec("P")

fastapi_rtk-1.0.22/fastapi_rtk/utils/flask_appbuilder_utils.py

@@ -0,0 +1,16 @@
+import uuid
+
+__all__ = ["uuid_namegen"]
+
+
+def uuid_namegen(filename: str) -> str:
+    """
+    Generates a unique filename by combining a UUID and the original filename.
+
+    Args:
+        filename (str): The original filename to be used in the unique name.
+
+    Returns:
+        str: The generated unique filename.
+    """
+    return str(uuid.uuid1()) + "_sep_" + filename

{fastapi_rtk-1.0.20 → fastapi_rtk-1.0.22}/pyproject.toml

@@ -30,7 +30,7 @@ dependencies = [
   "alembic>=1.17.0",
   "beautifulsoup4>=4.14.2",
   "fastapi-babel>=1.0.0",
-  "fastapi-users[oauth,sqlalchemy]>=14.0.1",
+  "fastapi-users[oauth,sqlalchemy]>=15.0.3",
   "fastapi[standard]>=0.119.1",
   "jsonschema2md>=1.7.0",
   "marshmallow-sqlalchemy>=1.4.2",
@@ -39,6 +39,7 @@ dependencies = [
   "secweb>=1.25.2",
   "sqlalchemy-utils>=0.42.0",
   "uvicorn==0.38.0",
+  "werkzeug>=3.1.5",
 ]
 urls = { Homepage = "https://codeberg.org/datatactics/fastapi-rtk", Issues = "https://codeberg.org/datatactics/fastapi-rtk/issues" }
 scripts = { "fastapi-rtk" = "fastapi_rtk.cli:main" }