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

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

@@ -1 +1 @@
-__version__ = "1.0.20"
+__version__ = "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/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/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/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/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/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/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/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/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/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/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/utils/flask_appbuilder_utils.py

@@ -1,19 +1,6 @@
-import os
-import re
-import unicodedata
 import uuid
 
-__all__ = ["uuid_namegen", "secure_filename"]
-
-_filename_ascii_strip_re = re.compile(r"[^A-Za-z0-9_.-]")
-_windows_device_files = {
-    "CON",
-    "PRN",
-    "AUX",
-    "NUL",
-    *(f"COM{i}" for i in range(10)),
-    *(f"LPT{i}" for i in range(10)),
-}
+__all__ = ["uuid_namegen"]
 
 
 def uuid_namegen(filename: str) -> str:
@@ -27,50 +14,3 @@ def uuid_namegen(filename: str) -> str:
         str: The generated unique filename.
     """
     return str(uuid.uuid1()) + "_sep_" + filename
-
-
-def secure_filename(filename: str) -> str:
-    r"""Pass it a filename and it will return a secure version of it.  This
-    filename can then safely be stored on a regular file system and passed
-    to :func:`os.path.join`.  The filename returned is an ASCII only string
-    for maximum portability.
-
-    On windows systems the function also makes sure that the file is not
-    named after one of the special device files.
-
-    >>> secure_filename("My cool movie.mov")
-    'My_cool_movie.mov'
-    >>> secure_filename("../../../etc/passwd")
-    'etc_passwd'
-    >>> secure_filename('i contain cool \xfcml\xe4uts.txt')
-    'i_contain_cool_umlauts.txt'
-
-    The function might return an empty filename.  It's your responsibility
-    to ensure that the filename is unique and that you abort or
-    generate a random filename if the function returned an empty one.
-
-    .. versionadded:: 0.5
-
-    :param filename: the filename to secure
-    """
-    filename = unicodedata.normalize("NFKD", filename)
-    filename = filename.encode("ascii", "ignore").decode("ascii")
-
-    for sep in os.sep, os.path.altsep:
-        if sep:
-            filename = filename.replace(sep, " ")
-    filename = str(_filename_ascii_strip_re.sub("", "_".join(filename.split()))).strip(
-        "._"
-    )
-
-    # on nt a couple of special files are present in each folder.  We
-    # have to ensure that the target file is not such a filename.  In
-    # this case we prepend an underline
-    if (
-        os.name == "nt"
-        and filename
-        and filename.split(".")[0].upper() in _windows_device_files
-    ):
-        filename = f"_{filename}"
-
-    return filename

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

@@ -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.dist-info → fastapi_rtk-1.0.22.dist-info}/RECORD

@@ -1,7 +1,7 @@
-fastapi_rtk/__init__.py,sha256=TGDmH62gymFCC6yFdAsiVHcdOvy4_tdDCzAK4WzEHH8,6264
-fastapi_rtk/_version.py,sha256=D3FIR1OP9p54JyJSpU5wDfDWvaAjk2k-IH5FzjX_kCA,23
+fastapi_rtk/__init__.py,sha256=ULEV1ai_Hk5MU10uhzalnaX9DTzuNRP-tOd9spIRnHk,6511
+fastapi_rtk/_version.py,sha256=3qPJsI_cs0SlJn5DWM459KiP-4DSaTWmW-7lyF1jPMo,23
 fastapi_rtk/apis.py,sha256=6X_Lhl98m7lKrDRybg2Oe24pLFLJ29eCOQSwCAvpKhY,172
-fastapi_rtk/config.py,sha256=9PZF9E5i1gxmnsZEprZZKxVHSk0dFEklJSplX9NEqdo,14036
+fastapi_rtk/config.py,sha256=7y5zsXlYwv4zv1CbiZsw0VvIZJv3IKAvLXNXGI4sios,14063
 fastapi_rtk/const.py,sha256=sEj_cYeerj9pVwbCu0k5Sy1EYpdr1EHzUjqqbnporgc,4905
 fastapi_rtk/db.py,sha256=BqWXj6zP_HZSSL_cFcF-TXwnI0pBqYp6nYV49-6ZmNs,24790
 fastapi_rtk/decorators.py,sha256=HqAFSiO0l5_M0idWs0IcY24FdzbAcDQDQoifM_WgZAQ,14515
@@ -9,25 +9,24 @@ fastapi_rtk/dependencies.py,sha256=jlcsMrh83yrJsgXvpWJet_mjqwDP3nBZfPSg4Lq8KKE,7
 fastapi_rtk/exceptions.py,sha256=P0qwd4VkeWFotgMVQHgmdT1NphFQaEznKLFIvJzW4Zs,2594
 fastapi_rtk/fastapi_react_toolkit.py,sha256=lvtieBLzCAlozKQU9dkAUVoW7Ofi1ncri_hDyeHazF4,29803
 fastapi_rtk/filters.py,sha256=weCH3suCxpGJQYmwhj9D1iAqMPiRnmbRiN7stK0rhoE,181
-fastapi_rtk/globals.py,sha256=TcoMHCueM7sFwZ8iYorUe4q-3KpVFfV04RAPuMTYFKY,8863
+fastapi_rtk/globals.py,sha256=VC_DyLpuoNvAQSVy8l3o8lHXNa8qH2tm4umqL4_rMn4,9842
 fastapi_rtk/manager.py,sha256=F57aD0DApH98H7GPpnxrwKHz0nETuxQG2bax4FDfJgM,33737
 fastapi_rtk/middlewares.py,sha256=ycdaAdLIUaNEZ7KotczTHS6OOqy98Mn1_O7Hpe7Sma8,10325
 fastapi_rtk/mixins.py,sha256=78RqwrRJFOz6KAxf-GSNOmRdr7R3b-ws7OIENYlzRQQ,238
 fastapi_rtk/models.py,sha256=lQSqe-r0H7jWBVdqXjEi_bNL1cGQr0YWnyI1ToS_coc,178
-fastapi_rtk/routers.py,sha256=5gMGyH4Any9TwB3Fz23QDkmrX8MouzCxVgoAIcBqnTI,18988
+fastapi_rtk/routers.py,sha256=k7rxDjkfn-92cGdH0M1HhTySws5KaCrpJ5becrMXxkI,20895
 fastapi_rtk/schemas.py,sha256=mdIX93QRaQBLrQz-kBvG5wyKoi8H6OQpFuTBO9-mCK4,17894
 fastapi_rtk/setting.py,sha256=mLIm-6DoVSEiXn2VUT-JByNVXujeIlyBFBUlPKTw7ys,19753
 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
-fastapi_rtk/auth/hashers/pbkdf2.py,sha256=EeusoypVDHVuxneoPP2aXOPpyCwxx_5O22qMeDW51b0,919
-fastapi_rtk/auth/hashers/scrypt.py,sha256=CPGe6vzj7hlKTl_MKDGSgKQW927EpPkgpGM7mVO5MW0,902
-fastapi_rtk/auth/hashers/utils.py,sha256=_fMQfTgzw8E2pvrWQDUTrpf2mE7Z3PS0PvUUwresWXY,4280
+fastapi_rtk/auth/hashers/pbkdf2.py,sha256=_ss8PENIkRjenqhYqDAP-ewsoxkPKp0lTPAfOKacZpA,929
+fastapi_rtk/auth/hashers/scrypt.py,sha256=cUcW_o49nrecpz6nysJE4hd3JqniEM67Ltx8TsdWxlg,912
 fastapi_rtk/auth/password_helpers/__init__.py,sha256=sT4-Xe0B4kh593NPNmCYr6Sz2XZnhE9bK1tx9mgFUw4,68
 fastapi_rtk/auth/password_helpers/fab.py,sha256=MjUlS-XpUmQUUI4EJ4uE7irRcBaUVSH-q4-Mb9dna1k,937
 fastapi_rtk/auth/strategies/__init__.py,sha256=MQuIeNRzUXKo8-ZjZUQTzAxOj-krU9reIUu5EpEMkAI,87
@@ -60,7 +59,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
@@ -85,9 +84,9 @@ fastapi_rtk/cli/commands/db/templates/fastapi-multidb/alembic.ini.mako,sha256=xm
 fastapi_rtk/cli/commands/db/templates/fastapi-multidb/env.py,sha256=KXb0a5c_3zutlTgyTP6MofCL0jinixLZMdG5aYd0E_U,7529
 fastapi_rtk/cli/commands/db/templates/fastapi-multidb/script.py.mako,sha256=o02Ul3GmWdWkOiLZiKInBcAuCN3OjgxCzdj5Y1gvgVY,1324
 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/file_manager.py,sha256=vXRp7e7i8bbLe3pSuvz7nJLNUJSguZhYcie_L6MU_rQ,2695
 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
@@ -103,15 +102,15 @@ fastapi_rtk/lang/translations/en/LC_MESSAGES/messages.po,sha256=qxKDx7Q0xgKe48w9
 fastapi_rtk/security/__init__.py,sha256=XkYZ_GO2opdyQS_LJwbCH1C6SUkNfLUvLkpFhcO7ZlI,86
 fastapi_rtk/security/sqla/__init__.py,sha256=qKh1mGQezDtMzvRzxzfHZRyKVaks-O7PXrOx16ekSZA,88
 fastapi_rtk/security/sqla/apis.py,sha256=8Qtd1G73i2TaA9Euo63naaB8d_I9r4EHL8DWtWNJEfs,10699
-fastapi_rtk/security/sqla/models.py,sha256=rEXpbljTMlTkiDp0VIxRXant8xN-WTjpqgQkr-ElXeM,7865
+fastapi_rtk/security/sqla/models.py,sha256=u3raCpfawRggQnTgLgKUAzIWSFmrzkm_2RVwGTWWHfw,7942
 fastapi_rtk/security/sqla/security_manager.py,sha256=ui0g2cH8Z-YjDuqszcstyj6Li8U4IpuVV4bAVaD69Lc,31395
-fastapi_rtk/utils/__init__.py,sha256=_FbWJg5OwHqHdoDfJnGcp54oVKIvAMwEkfOOrsv0-Tw,1891
+fastapi_rtk/utils/__init__.py,sha256=pIytlIp2c6r6vZqU-m_-DUoS0_lQcVKecByW0psw2n8,1782
 fastapi_rtk/utils/async_task_runner.py,sha256=ISKDmF8SJS9sVAwrGEzvUwL7D_c0mmTiYi3GJ3J67kA,16473
 fastapi_rtk/utils/class_factory.py,sha256=jlVw8yCh-tYsMnR5Hm8fgxtL0kvXwnhe6DPJA1sUh7k,598
 fastapi_rtk/utils/csv_json_converter.py,sha256=7szrPiB7DrK5S-s2GaHVCmEP9_OXk9RFwbZmRtAKM5A,14036
 fastapi_rtk/utils/deep_merge.py,sha256=PHtKJgXfCngOBGVliX9aVlEFcwCxr-GlzU-w6vjgAIs,2426
 fastapi_rtk/utils/extender_mixin.py,sha256=eu22VAZJIf-r_uD-zVn_2IzvknfuUkmEHn9oo-0KU0k,1388
-fastapi_rtk/utils/flask_appbuilder_utils.py,sha256=nPLQIczDZgKElMtqBRSo_aPJZMOnPs7fRyjqKUtPDbo,2276
+fastapi_rtk/utils/flask_appbuilder_utils.py,sha256=-wwRCn4eqROlTzuMby5NEq9xqO5aSI43KyPIetysx6w,373
 fastapi_rtk/utils/formatter.py,sha256=bLMAo6-NmD7bp64VkkenoybWTAvbMyOHX55FRfINjVI,1224
 fastapi_rtk/utils/hooks.py,sha256=iGE8HTfDDVfQm7yeD3WqPB8_I1FXFGpBdl3ngyjaRbY,901
 fastapi_rtk/utils/lazy.py,sha256=SlVYQ-RHRcp6pGmcslVNc5lKs5GOSjqLcRsQsSWIB0s,10352
@@ -125,9 +124,8 @@ fastapi_rtk/utils/sqla.py,sha256=To4PhsO5orPJVqjdLh5C9y_xPgiy8-zhrJdSqhR_tsc,690
 fastapi_rtk/utils/timezone.py,sha256=62S0pPWuDFFXxV1YTFCsc4uKiSP_Ba36Fv7S3gYjfhs,570
 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.22.dist-info/METADATA,sha256=BY2jPyBX2o7wdKs5swp8FJgPSVnw0FoqdZVRSQL4DyU,1333
+fastapi_rtk-1.0.22.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_rtk-1.0.22.dist-info/entry_points.txt,sha256=UuTkxSVIokSlVN28TMhoxzRRUaPxlVRSH3Gsx6yip60,53
+fastapi_rtk-1.0.22.dist-info/licenses/LICENSE,sha256=NDrWi4Qwcxal3u1r2lBWGA6TVh3OeW7yMan098mQz98,1073
+fastapi_rtk-1.0.22.dist-info/RECORD,,

fastapi_rtk/auth/hashers/utils.py

@@ -1,122 +0,0 @@
-import hashlib
-import hmac
-import secrets
-
-SALT_CHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-DEFAULT_PBKDF2_ITERATIONS = 600000
-
-__all__ = ["generate_password_hash", "check_password_hash"]
-
-
-def _hash_internal(method: str, salt: str, password: str) -> tuple[str, str]:
-    method, *args = method.split(":")
-    salt_bytes = salt.encode()
-    password_bytes = password.encode()
-
-    if method == "scrypt":
-        if not args:
-            n = 2**15
-            r = 8
-            p = 1
-        else:
-            try:
-                n, r, p = map(int, args)
-            except ValueError:
-                raise ValueError("'scrypt' takes 3 arguments.") from None
-
-        maxmem = 132 * n * r * p  # ideally 128, but some extra seems needed
-        return (
-            hashlib.scrypt(
-                password_bytes, salt=salt_bytes, n=n, r=r, p=p, maxmem=maxmem
-            ).hex(),
-            f"scrypt:{n}:{r}:{p}",
-        )
-    elif method == "pbkdf2":
-        len_args = len(args)
-
-        if len_args == 0:
-            hash_name = "sha256"
-            iterations = DEFAULT_PBKDF2_ITERATIONS
-        elif len_args == 1:
-            hash_name = args[0]
-            iterations = DEFAULT_PBKDF2_ITERATIONS
-        elif len_args == 2:
-            hash_name = args[0]
-            iterations = int(args[1])
-        else:
-            raise ValueError("'pbkdf2' takes 2 arguments.")
-
-        return (
-            hashlib.pbkdf2_hmac(
-                hash_name, password_bytes, salt_bytes, iterations
-            ).hex(),
-            f"pbkdf2:{hash_name}:{iterations}",
-        )
-    else:
-        raise ValueError(f"Invalid hash method '{method}'.")
-
-
-def gen_salt(length: int) -> str:
-    """Generate a random string of SALT_CHARS with specified ``length``."""
-    if length <= 0:
-        raise ValueError("Salt length must be at least 1.")
-
-    return "".join(secrets.choice(SALT_CHARS) for _ in range(length))
-
-
-def generate_password_hash(
-    password: str, method: str = "scrypt", salt_length: int = 16
-) -> str:
-    """Securely hash a password for storage. A password can be compared to a stored hash
-    using :func:`check_password_hash`.
-
-    The following methods are supported:
-
-    -   ``scrypt``, the default. The parameters are ``n``, ``r``, and ``p``, the default
-        is ``scrypt:32768:8:1``. See :func:`hashlib.scrypt`.
-    -   ``pbkdf2``, less secure. The parameters are ``hash_method`` and ``iterations``,
-        the default is ``pbkdf2:sha256:600000``. See :func:`hashlib.pbkdf2_hmac`.
-
-    Default parameters may be updated to reflect current guidelines, and methods may be
-    deprecated and removed if they are no longer considered secure. To migrate old
-    hashes, you may generate a new hash when checking an old hash, or you may contact
-    users with a link to reset their password.
-
-    :param password: The plaintext password.
-    :param method: The key derivation function and parameters.
-    :param salt_length: The number of characters to generate for the salt.
-
-    .. versionchanged:: 2.3
-        Scrypt support was added.
-
-    .. versionchanged:: 2.3
-        The default iterations for pbkdf2 was increased to 600,000.
-
-    .. versionchanged:: 2.3
-        All plain hashes are deprecated and will not be supported in Werkzeug 3.0.
-    """
-    salt = gen_salt(salt_length)
-    h, actual_method = _hash_internal(method, salt, password)
-    return f"{actual_method}${salt}${h}"
-
-
-def check_password_hash(pwhash: str, password: str) -> bool:
-    """Securely check that the given stored password hash, previously generated using
-    :func:`generate_password_hash`, matches the given password.
-
-    Methods may be deprecated and removed if they are no longer considered secure. To
-    migrate old hashes, you may generate a new hash when checking an old hash, or you
-    may contact users with a link to reset their password.
-
-    :param pwhash: The hashed password.
-    :param password: The plaintext password.
-
-    .. versionchanged:: 2.3
-        All plain hashes are deprecated and will not be supported in Werkzeug 3.0.
-    """
-    try:
-        method, salt, hashval = pwhash.split("$", 2)
-    except ValueError:
-        return False
-
-    return hmac.compare_digest(_hash_internal(method, salt, password)[0], hashval)

fastapi_rtk/utils/werkzeug.py

@@ -1,91 +0,0 @@
-import sys
-
-__all__ = ["import_string", "ImportStringError"]
-
-
-class ImportStringError(ImportError):
-    """
-    COPIED FROM WERKZEUG LIBRARY
-
-    Provides information about a failed :func:`import_string` attempt.
-    """
-
-    #: String in dotted notation that failed to be imported.
-    import_name: str
-    #: Wrapped exception.
-    exception: BaseException
-
-    def __init__(self, import_name: str, exception: BaseException) -> None:
-        self.import_name = import_name
-        self.exception = exception
-        msg = import_name
-        name = ""
-        tracked = []
-        for part in import_name.replace(":", ".").split("."):
-            name = f"{name}.{part}" if name else part
-            imported = import_string(name, silent=True)
-            if imported:
-                tracked.append((name, getattr(imported, "__file__", None)))
-            else:
-                track = [f"- {n!r} found in {i!r}." for n, i in tracked]
-                track.append(f"- {name!r} not found.")
-                track_str = "\n".join(track)
-                msg = (
-                    f"import_string() failed for {import_name!r}. Possible reasons"
-                    f" are:\n\n"
-                    "- missing __init__.py in a package;\n"
-                    "- package or module path not included in sys.path;\n"
-                    "- duplicated package or module name taking precedence in"
-                    " sys.path;\n"
-                    "- missing module, class, function or variable;\n\n"
-                    f"Debugged import:\n\n{track_str}\n\n"
-                    f"Original exception:\n\n{type(exception).__name__}: {exception}"
-                )
-                break
-
-        super().__init__(msg)
-
-    def __repr__(self) -> str:
-        return f"<{type(self).__name__}({self.import_name!r}, {self.exception!r})>"
-
-
-def import_string(import_name: str, silent: bool = False):
-    """
-    COPIED FROM WERKZEUG LIBRARY
-
-    Imports an object based on a string.  This is useful if you want to
-    use import paths as endpoints or something similar.  An import path can
-    be specified either in dotted notation (``xml.sax.saxutils.escape``)
-    or with a colon as object delimiter (``xml.sax.saxutils:escape``).
-
-    If `silent` is True the return value will be `None` if the import fails.
-
-    :param import_name: the dotted name for the object to import.
-    :param silent: if set to `True` import errors are ignored and
-                   `None` is returned instead.
-    :return: imported object
-    """
-    import_name = import_name.replace(":", ".")
-    try:
-        try:
-            __import__(import_name)
-        except ImportError:
-            if "." not in import_name:
-                raise
-        else:
-            return sys.modules[import_name]
-
-        module_name, obj_name = import_name.rsplit(".", 1)
-        module = __import__(module_name, globals(), locals(), [obj_name])
-        try:
-            return getattr(module, obj_name)
-        except AttributeError as e:
-            raise ImportError(e) from None
-
-    except ImportError as e:
-        if not silent:
-            raise ImportStringError(import_name, e).with_traceback(
-                sys.exc_info()[2]
-            ) from None
-
-    return None