fastapi-rtk 0.2.60__py3-none-any.whl → 1.0.18__py3-none-any.whl

fastapi_rtk/lang/translations/de/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-10-16 13:49+0200\n"
+"POT-Creation-Date: 2025-10-30 10:07+0100\n"
 "PO-Revision-Date: 2025-07-16 18:01+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -61,54 +61,54 @@ msgstr "Opr Filter muss ein Objekt sein"
 msgid "Invalid opr_filters: Not a valid JSON string"
 msgstr "Ungültige opr_filters: Kein gültiger JSON-String"
 
-#: fastapi_rtk/api/model_rest_api.py:461
+#: fastapi_rtk/api/model_rest_api.py:476
 #, python-brace-format
 msgid "List {ModelName}"
 msgstr "Liste von {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:470
+#: fastapi_rtk/api/model_rest_api.py:485
 #, python-brace-format
 msgid "Show {ModelName}"
 msgstr "Anzeigen von {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:479
+#: fastapi_rtk/api/model_rest_api.py:494
 #, python-brace-format
 msgid "Add {ModelName}"
 msgstr "Hinzufügen von {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:488
+#: fastapi_rtk/api/model_rest_api.py:503
 #, python-brace-format
 msgid "Edit {ModelName}"
 msgstr "Bearbeiten von {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:1338
+#: fastapi_rtk/api/model_rest_api.py:1395
 msgid "OK"
 msgstr "OK"
 
-#: fastapi_rtk/api/model_rest_api.py:2354
-#: fastapi_rtk/api/model_rest_api.py:2753
+#: fastapi_rtk/api/model_rest_api.py:2411
+#: fastapi_rtk/api/model_rest_api.py:2810
 #, python-brace-format
 msgid "Number of items in '{column}' does not match the number of items found."
 msgstr ""
 "Anzahl der Elemente in '{column}' stimmt nicht mit der Anzahl der "
 "gefundenen Elemente überein."
 
-#: fastapi_rtk/api/model_rest_api.py:2375
+#: fastapi_rtk/api/model_rest_api.py:2432
 #, python-brace-format
 msgid "Could not find related item for column '{column}'"
 msgstr "Konnte kein zugehöriges Element für die Spalte '{column}' finden"
 
-#: fastapi_rtk/api/model_rest_api.py:2407
+#: fastapi_rtk/api/model_rest_api.py:2464
 #, python-brace-format
 msgid "File type from '{filename}' is not allowed."
 msgstr "Dateityp von '{filename}' ist nicht erlaubt."
 
-#: fastapi_rtk/api/model_rest_api.py:2815
+#: fastapi_rtk/api/model_rest_api.py:2872
 #, fuzzy, python-brace-format
 msgid "Invalid column: {column}"
 msgstr "Ungültige Spalte: {column}"
 
-#: fastapi_rtk/api/model_rest_api.py:2825
+#: fastapi_rtk/api/model_rest_api.py:2882
 #, python-brace-format
 msgid "Invalid filter: {column}"
 msgstr "Ungültiger Filter: {column}"

fastapi_rtk/lang/translations/en/LC_MESSAGES/messages.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-10-16 13:49+0200\n"
+"POT-Creation-Date: 2025-10-30 10:07+0100\n"
 "PO-Revision-Date: 2025-07-16 18:01+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: en\n"
@@ -59,52 +59,52 @@ msgstr "Opr Filter must be an object"
 msgid "Invalid opr_filters: Not a valid JSON string"
 msgstr "Invalid opr_filters: Not a valid JSON string"
 
-#: fastapi_rtk/api/model_rest_api.py:461
+#: fastapi_rtk/api/model_rest_api.py:476
 #, python-brace-format
 msgid "List {ModelName}"
 msgstr "List of {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:470
+#: fastapi_rtk/api/model_rest_api.py:485
 #, python-brace-format
 msgid "Show {ModelName}"
 msgstr "Show {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:479
+#: fastapi_rtk/api/model_rest_api.py:494
 #, python-brace-format
 msgid "Add {ModelName}"
 msgstr "Add {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:488
+#: fastapi_rtk/api/model_rest_api.py:503
 #, python-brace-format
 msgid "Edit {ModelName}"
 msgstr "Edit {ModelName}"
 
-#: fastapi_rtk/api/model_rest_api.py:1338
+#: fastapi_rtk/api/model_rest_api.py:1395
 msgid "OK"
 msgstr "OK"
 
-#: fastapi_rtk/api/model_rest_api.py:2354
-#: fastapi_rtk/api/model_rest_api.py:2753
+#: fastapi_rtk/api/model_rest_api.py:2411
+#: fastapi_rtk/api/model_rest_api.py:2810
 #, python-brace-format
 msgid "Number of items in '{column}' does not match the number of items found."
 msgstr "Number of items in '{column}' does not match the number of items found."
 
-#: fastapi_rtk/api/model_rest_api.py:2375
+#: fastapi_rtk/api/model_rest_api.py:2432
 #, python-brace-format
 msgid "Could not find related item for column '{column}'"
 msgstr "Could not find related item for column '{column}'"
 
-#: fastapi_rtk/api/model_rest_api.py:2407
+#: fastapi_rtk/api/model_rest_api.py:2464
 #, python-brace-format
 msgid "File type from '{filename}' is not allowed."
 msgstr "File type from '{filename}' is not allowed."
 
-#: fastapi_rtk/api/model_rest_api.py:2815
+#: fastapi_rtk/api/model_rest_api.py:2872
 #, fuzzy, python-brace-format
 msgid "Invalid column: {column}"
 msgstr "Invalid column: {column}"
 
-#: fastapi_rtk/api/model_rest_api.py:2825
+#: fastapi_rtk/api/model_rest_api.py:2882
 #, python-brace-format
 msgid "Invalid filter: {column}"
 msgstr "Invalid filter: {column}"

fastapi_rtk/manager.py

@@ -81,6 +81,8 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         Returns:
             list[Role]: A list of Role objects that match the given role names.
         """
+        if not roles:
+            return []
         if isinstance(roles, str):
             roles = [roles]
         statement = select(Role).where(Role.name.in_(roles))
@@ -354,18 +356,14 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         password = user_dict.pop("password")
         user_dict["hashed_password"] = self.password_helper.hash(password)
 
-        role_names = roles
-        if role_names is None:
-            if request:
-                from .setting import Setting
+        if roles is None and request:
+            from .setting import Setting
 
-                role_names = Setting.AUTH_USER_REGISTRATION_ROLE
+            roles = Setting.AUTH_USER_REGISTRATION_ROLE
 
         # Get the roles if they exist
-        if role_names:
-            if isinstance(role_names, str):
-                role_names = [role_names]
-            user_dict["roles"] = await self.get_roles_by_names(role_names)
+        if roles is not None:
+            user_dict["roles"] = await self.get_roles_by_names(roles)
 
         created_user = await self.user_db.create(user_dict)
 
@@ -408,8 +406,6 @@ class UserManager(IDParser, BaseUserManager[User, int]):
             )
         )
         if roles is not None:
-            if isinstance(roles, str):
-                roles = [roles]
             updated_user_data["roles"] = await self.get_roles_by_names(roles)
         updated_user = await self._update(user, updated_user_data)
         await self.on_after_update(updated_user, updated_user_data, request)
@@ -500,6 +496,7 @@ class UserManager(IDParser, BaseUserManager[User, int]):
                 # Associate account
                 user = await self.get_by_email(account_email)
                 if not associate_by_email:
+                    await self.on_after_authenticate(user, False)
                     raise exceptions.UserAlreadyExists()
                 user = await self.user_db.add_oauth_account(user, oauth_account_dict)
             except exceptions.UserNotExists:
@@ -557,6 +554,7 @@ class UserManager(IDParser, BaseUserManager[User, int]):
             user = await self._handle_role_keys(
                 user, oauth_callback_params["user_dict"].pop("role_keys", None)
             )
+        await self.on_after_authenticate(user)
         return user
 
     @overload
@@ -716,13 +714,11 @@ class UserManager(IDParser, BaseUserManager[User, int]):
         Returns:
             User | dict[str, Any]: The updated user or user dictionary with roles.
         """
-        if not role_keys:
+        if role_keys is None:
             return user_or_user_dict
         role_names = [Setting.AUTH_ROLES_MAPPING.get(key, []) for key in role_keys]
         role_names = [name for sublist in role_names for name in sublist]
         role_names = list(dict.fromkeys(role_names).keys())
-        if not role_names:
-            return user_or_user_dict
         if isinstance(user_or_user_dict, User):
             user_or_user_dict = await self.update({}, user_or_user_dict, role_names)
         else:

fastapi_rtk/schemas.py

@@ -323,7 +323,7 @@ class BaseResponseMany(BaseResponse):
     Represents a response containing multiple items.
 
     Attributes:
-        count (int): The count of items.
+        count (int | None): The count of items. If None, count is not provided.
         ids (List[PRIMARY_KEY]): The IDs of the items.
         list_columns (List[str]): The columns to show in the list.
         list_title (str): The title for the list.
@@ -331,7 +331,7 @@ class BaseResponseMany(BaseResponse):
         result (List[BaseModel] | None): The result of the response.
     """
 
-    count: int
+    count: int | None = None
     ids: list[PRIMARY_KEY]
     list_columns: list[str] = []
     list_title: str = ""
@@ -384,24 +384,26 @@ class QuerySchema(BaseModel):
     Represents the query parameters for selection, pagination, ordering, and filtering.
 
     Attributes:
-        columns (str, optional): The columns to select in the query. Defaults to '[]'.
         page (int): The page number for pagination. Defaults to 0.
         page_size (int, optional): The number of items per page. Defaults to 25.
         order_column (str, optional): The column to order the results by.
         order_direction (Literal['asc', 'desc'], optional): The direction of the ordering (asc or desc).
+        columns (str, optional): The columns to select in the query. Defaults to '[]'.
         filters (str, optional): The filters to apply to the query. Defaults to '[]'.
         opr_filters (str, optional): The filters to apply without column name. Defaults to '[]'.
         global_filter (str, optional): The filter to apply globally across all columns.
+        with_count (bool): Whether to include the total count of items. Defaults to True.
     """
 
-    columns: str = "[]"
     page: int = 0
     page_size: int | None = 25
     order_column: str | None = None
     order_direction: Literal["asc", "desc"] | None = None
+    columns: str = "[]"
     filters: str = "[]"
     opr_filters: str = "[]"
     global_filter: str | None = None
+    with_count: bool = True
 
     @field_validator("columns")
     @classmethod

fastapi_rtk/security/sqla/apis.py

@@ -1,5 +1,6 @@
 from typing import List
 
+import sqlalchemy
 from fastapi import Depends, HTTPException, Request, status
 from pydantic import BaseModel, EmailStr, Field
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -8,7 +9,7 @@ from sqlalchemy.orm import Session
 from ...api import BaseApi, ModelRestApi
 from ...backends.sqla.interface import SQLAInterface
 from ...const import ErrorCode
-from ...db import UserDatabase, get_user_db
+from ...db import UserDatabase, db, get_user_db
 from ...decorators import expose, login_required
 from ...globals import g
 from ...lang import translate
@@ -21,7 +22,7 @@ from ...schemas import (
     generate_user_update_schema,
 )
 from ...setting import Setting
-from ...utils import SelfType, lazy, merge_schema
+from ...utils import SelfType, lazy, merge_schema, smart_run
 from .models import Api, Permission, PermissionApi, Role, User
 
 __all__ = [
@@ -163,7 +164,7 @@ class UsersApi(ModelRestApi):
                 col.required = False
 
     async def post_add(self, item, params):
-        await g.current_app.security.update_user(
+        await g.current_app.sm.update_user(
             user_update={"password": item.password},
             user=item,
             session=params.session,
@@ -172,7 +173,7 @@ class UsersApi(ModelRestApi):
 
     async def post_update(self, item, params):
         if params.body.password:
-            await g.current_app.security.update_user(
+            await g.current_app.sm.update_user(
                 user_update={"password": params.body.password},
                 user=item,
                 session=params.session,
@@ -275,12 +276,26 @@ class AuthApi(BaseApi):
             },
         )(self.update_user)
 
-    def get_user(self):
+    async def get_user(self):
         if not g.user:
             raise HTTPException(
                 status.HTTP_401_UNAUTHORIZED,
                 ErrorCode.GET_USER_MISSING_TOKEN_OR_INACTIVE_USER,
             )
+
+        g.user.permissions = []
+        if g.user.roles:
+            # Retrieve list of api names that user has access to
+            query = (
+                sqlalchemy.select(Api.name)
+                .join(PermissionApi)
+                .join(PermissionApi.roles)
+                .where(Role.id.in_([role.id for role in g.user.roles]))
+                .distinct()
+            )
+            result = await smart_run(db.current_session.scalars, query)
+            g.user.permissions = list(result)
+
         return g.user
 
     async def update_user(

fastapi_rtk/security/sqla/models.py

@@ -77,21 +77,18 @@ class PermissionApi(Model):
         Integer, ForeignKey(f"{API_TABLE}.id"), name=view_menu_id, nullable=False
     )
     api: Mapped["Api"] = relationship(
-        "Api", back_populates="permissions", lazy="selectin"
+        "Api", back_populates="permissions", lazy="joined"
     )
 
     permission_id: Mapped[int] = mapped_column(
         Integer, ForeignKey(f"{PERMISSION_TABLE}.id"), nullable=False
     )
     permission: Mapped["Permission"] = relationship(
-        "Permission", back_populates="apis", lazy="selectin"
+        "Permission", back_populates="apis", lazy="joined"
     )
 
     roles: Mapped[list["Role"]] = relationship(
-        "Role",
-        secondary=assoc_permission_api_role,
-        back_populates="permissions",
-        lazy="selectin",
+        "Role", secondary=assoc_permission_api_role, back_populates="permissions"
     )
 
     def __repr__(self) -> str:
@@ -104,10 +101,7 @@ class Api(Model):
     name: Mapped[str] = mapped_column(String, unique=True, nullable=False)
 
     permissions: Mapped[list[PermissionApi]] = relationship(
-        PermissionApi,
-        back_populates="api",
-        lazy="selectin",
-        cascade="all, delete-orphan",
+        PermissionApi, back_populates="api", cascade="all, delete-orphan"
     )
 
     def __eq__(self, other):
@@ -128,10 +122,7 @@ class Permission(Model):
     name: Mapped[str] = mapped_column(String, unique=True, nullable=False)
 
     apis: Mapped[list[PermissionApi]] = relationship(
-        PermissionApi,
-        back_populates="permission",
-        lazy="selectin",
-        cascade="all, delete-orphan",
+        PermissionApi, back_populates="permission", cascade="all, delete-orphan"
     )
 
     def __repr__(self) -> str:
@@ -144,14 +135,11 @@ class Role(Model):
     name: Mapped[str] = mapped_column(String, unique=True, nullable=False)
 
     users: Mapped[list["User"]] = relationship(
-        "User", secondary=assoc_user_role, back_populates="roles", lazy="selectin"
+        "User", secondary=assoc_user_role, back_populates="roles"
     )
 
     permissions: Mapped[list[PermissionApi]] = relationship(
-        PermissionApi,
-        secondary=assoc_permission_api_role,
-        back_populates="roles",
-        lazy="selectin",
+        PermissionApi, secondary=assoc_permission_api_role, back_populates="roles"
     )
 
     def __repr__(self) -> str:
@@ -203,10 +191,7 @@ class User(Model):
         return Column(Integer, ForeignKey("ab_user.id"), default=self.get_user_id)
 
     oauth_accounts: Mapped[list[OAuthAccount]] = relationship(
-        "OAuthAccount",
-        back_populates="user",
-        lazy="selectin",
-        cascade="all, delete-orphan",
+        "OAuthAccount", back_populates="user", cascade="all, delete-orphan"
     )
 
     roles: Mapped[list[Role]] = relationship(