arpakitlib 1.8.53__py3-none-any.whl → 1.8.55__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/.gitignore

@@ -20,6 +20,7 @@ lerna-debug.log*
 *.sln
 *.sw?
 *_ardb
+.~lock.*
 
 # dirs
 media

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +1,4 @@
 {
   "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "10"
+  "arpakitlib_project_template_subversion": "15"
 }

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/check_sqlalchemy_db.py

@@ -10,7 +10,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class CheckSQLAlchemyDbRouteSO(BaseRouteSO, RawDataCommonSO):
+class CheckSQLAlchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     path="",
     name="Check sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=CheckSQLAlchemyDbRouteSO | ErrorCommonSO
+    response_model=CheckSQLAlchemyDbAdminRouteSO | ErrorCommonSO
 )
 async def _(
         *,
@@ -38,6 +38,6 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().is_conn_good()
-    return CheckSQLAlchemyDbRouteSO(
-        data={"is_conn_good": get_cached_sqlalchemy_db().is_conn_good()}
+    return CheckSQLAlchemyDbAdminRouteSO(
+        raw_data={"is_conn_good": get_cached_sqlalchemy_db().is_conn_good()}
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -11,7 +11,7 @@ from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class ClearLogFileRouteSO(BaseRouteSO, RawDataCommonSO):
+class ClearLogFileAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -22,7 +22,7 @@ api_router = APIRouter()
     path="",
     name="Clear log file",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ClearLogFileRouteSO | ErrorCommonSO
+    response_model=ClearLogFileAdminRouteSO | ErrorCommonSO
 )
 def _(
         *,
@@ -41,4 +41,4 @@ def _(
     init_log_file(log_filepath=get_cached_settings().log_filepath)
     with open(file=get_cached_settings().log_filepath, mode="w") as f:
         f.write("")
-    return ClearLogFileRouteSO()
+    return ClearLogFileAdminRouteSO()

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -20,7 +20,7 @@ class CreateOperationAdminSI(BaseSI):
     input_data: dict[str, Any] = NotSet
 
 
-class CreateOperationRouteSO(BaseRouteSO, OperationAdmin1SO):
+class CreateOperationAdminRouteSO(BaseRouteSO, OperationAdmin1SO):
     pass
 
 
@@ -31,7 +31,7 @@ api_router = APIRouter()
     "",
     name="Create operation",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=CreateOperationRouteSO | None | ErrorCommonSO,
+    response_model=CreateOperationAdminRouteSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -75,4 +75,4 @@ async def _(
         await async_session.commit()
         await async_session.refresh(operation_dbm)
 
-    return CreateOperationRouteSO.from_dbm(simple_dbm=operation_dbm)
+    return CreateOperationAdminRouteSO.from_dbm(simple_dbm=operation_dbm)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -10,7 +10,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
 
-class GetArpakitlibProjectTemplateInfoRouteSO(BaseRouteSO, RawDataCommonSO):
+class GetArpakitlibProjectTemplateInfoAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     "",
     name="Get arpakitlib project template info",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetArpakitlibProjectTemplateInfoRouteSO | ErrorCommonSO
+    response_model=GetArpakitlibProjectTemplateInfoAdminRouteSO | ErrorCommonSO
 )
 async def _(
         *,
@@ -37,4 +37,4 @@ async def _(
         ]))
 ):
     arpakitlib_project_template_data = get_arpakitlib_project_template_info()
-    return GetArpakitlibProjectTemplateInfoRouteSO(data=arpakitlib_project_template_data)
+    return GetArpakitlibProjectTemplateInfoAdminRouteSO(raw_data=arpakitlib_project_template_data)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py

@@ -10,7 +10,7 @@ from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetAuthDataRouteSO(BaseRouteSO, RawDataCommonSO):
+class GetAuthDataAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     path="",
     name="Get auth data",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetAuthDataRouteSO | ErrorCommonSO,
+    response_model=GetAuthDataAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,4 +37,4 @@ async def _(
             )
         ]))
 ):
-    return GetAuthDataRouteSO(data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()))
+    return GetAuthDataAdminRouteSO(raw_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()))

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -12,7 +12,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, OperationDBM
 
 
-class GetOperationRouteSO(BaseRouteSO, OperationAdmin1SO):
+class GetOperationAdminRouteSO(BaseRouteSO, OperationAdmin1SO):
     pass
 
 
@@ -23,7 +23,7 @@ api_router = APIRouter()
     "",
     name="Get story log",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationRouteSO | None | ErrorCommonSO,
+    response_model=GetOperationAdminRouteSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -60,4 +60,4 @@ async def _(
         result = await async_session.scalar(query)
         if result is None:
             return None
-        return GetOperationRouteSO.from_dbm(simple_dbm=result)
+        return GetOperationAdminRouteSO.from_dbm(simple_dbm=result)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation_allowed_statuses.py

@@ -8,7 +8,7 @@ from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, UserDBM
 
 
-class GetOperationAllowedStatusesRouteSO(BaseRouteSO):
+class GetOperationAllowedStatusesAdminRouteSO(BaseRouteSO):
     allowed_statuses: list[str]
 
 
@@ -19,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Get operation allowed statuses",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationAllowedStatusesRouteSO | ErrorCommonSO,
+    response_model=GetOperationAllowedStatusesAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -35,6 +35,6 @@ async def _(
             )
         ]))
 ):
-    return GetOperationAllowedStatusesRouteSO(
+    return GetOperationAllowedStatusesAdminRouteSO(
         allowed_statuses=OperationDBM.Statuses.values_list()
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation_allowed_types.py

@@ -8,7 +8,7 @@ from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, UserDBM
 
 
-class GetOperationAllowedTypesRouteSO(BaseRouteSO):
+class GetOperationAllowedTypesAdminRouteSO(BaseRouteSO):
     allowed_types: list[str]
 
 
@@ -19,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Get operation allowed types",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationAllowedTypesRouteSO | ErrorCommonSO,
+    response_model=GetOperationAllowedTypesAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -35,6 +35,6 @@ async def _(
             )
         ]))
 ):
-    return GetOperationAllowedTypesRouteSO(
+    return GetOperationAllowedTypesAdminRouteSO(
         allowed_types=OperationDBM.Types.values_list()
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_settings.py

@@ -10,7 +10,7 @@ from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetSettingsRouteSO(BaseRouteSO, RawDataCommonSO):
+class GetSettingsAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     "",
     name="Get settings",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetSettingsRouteSO | ErrorCommonSO,
+    response_model=GetSettingsAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,6 +37,6 @@ async def _(
             )
         ]))
 ):
-    return GetSettingsRouteSO(
-        data=get_cached_settings().model_dump(mode="json")
+    return GetSettingsAdminRouteSO(
+        raw_data=get_cached_settings().model_dump(mode="json")
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_sqlalchemy_db_table_name_to_amount.py

@@ -10,7 +10,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetAuthDataRouteSO(BaseRouteSO, RawDataCommonSO):
+class GetAuthDataAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     "",
     name="Get sqlalchemy db table name to amount",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetAuthDataRouteSO | ErrorCommonSO
+    response_model=GetAuthDataAdminRouteSO | ErrorCommonSO
 )
 async def _(
         *,
@@ -36,4 +36,4 @@ async def _(
             )
         ]))
 ):
-    return GetAuthDataRouteSO(data=await get_cached_sqlalchemy_db().async_get_table_name_to_amount())
+    return GetAuthDataAdminRouteSO(raw_data=await get_cached_sqlalchemy_db().async_get_table_name_to_amount())

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -12,7 +12,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM, StoryLogDBM
 
 
-class GetStoryLogRouteSO(BaseRouteSO, StoryLogAdmin1SO):
+class GetStoryLogAdminRouteSO(BaseRouteSO, StoryLogAdmin1SO):
     pass
 
 
@@ -23,7 +23,7 @@ api_router = APIRouter()
     "",
     name="Get story log",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetStoryLogRouteSO | None | ErrorCommonSO,
+    response_model=GetStoryLogAdminRouteSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -60,4 +60,4 @@ async def _(
         result = await async_session.scalar(query)
         if result is None:
             return None
-        return GetStoryLogRouteSO.from_dbm(simple_dbm=result)
+        return GetStoryLogAdminRouteSO.from_dbm(simple_dbm=result)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -0,0 +1,81 @@
+import fastapi.requests
+import sqlalchemy
+from fastapi import APIRouter
+
+from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
+from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
+    require_api_key_dbm_api_authorize_middleware
+from project.api.schema.common import BaseRouteSO
+from project.api.schema.out.admin.user import UserAdmin1SO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+
+class GetUserAdminRouteSO(BaseRouteSO, UserAdmin1SO):
+    pass
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get user",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=GetUserAdminRouteSO | None | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
+            require_api_key_dbm_api_authorize_middleware(
+                require_active=True
+            ),
+            require_user_token_dbm_api_authorize_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
+        ])),
+        filter_id: int | None = fastapi.Query(default=None),
+        filter_long_id: str | None = fastapi.Query(default=None),
+        filter_slug: str | None = fastapi.Query(default=None),
+        filter_email: str | None = fastapi.Query(default=None),
+        filter_username: str | None = fastapi.Query(default=None),
+        filter_tg_id: int | None = fastapi.Query(default=None),
+):
+    filter_long_id = make_none_if_blank(strip_if_not_none(filter_long_id))
+    filter_slug = make_none_if_blank(strip_if_not_none(filter_slug))
+    filter_email = make_none_if_blank(strip_if_not_none(filter_email))
+    filter_username = make_none_if_blank(strip_if_not_none(filter_username))
+
+    if (
+            filter_id is None
+            and filter_long_id is None
+            and filter_slug is None
+            and filter_email is None
+            and filter_username is None
+            and filter_tg_id is None
+    ):
+        return None
+
+    query = sqlalchemy.select(UserDBM)
+    if filter_id is not None:
+        query = query.filter(UserDBM.id == filter_id)
+    if filter_long_id is not None:
+        query = query.filter(UserDBM.long_id == filter_long_id)
+    if filter_slug is not None:
+        query = query.filter(UserDBM.slug == filter_slug)
+    if filter_email is not None:
+        query = query.filter(UserDBM.email == filter_email)
+    if filter_username is not None:
+        query = query.filter(UserDBM.username == filter_username)
+    if filter_tg_id is not None:
+        query = query.filter(UserDBM.tg_id == filter_tg_id)
+
+    async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+        result = await async_session.scalar(query)
+        if result is None:
+            return None
+        return GetUserAdminRouteSO.from_dbm(simple_dbm=result)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/init_sqlalchemy_db.py

@@ -10,7 +10,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class InitSqlalchemyDbRouteSO(BaseRouteSO, RawDataCommonSO):
+class InitSqlalchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     path="",
     name="Init sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=InitSqlalchemyDbRouteSO | ErrorCommonSO,
+    response_model=InitSqlalchemyDbAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -39,4 +39,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().init()
-    return InitSqlalchemyDbRouteSO()
+    return InitSqlalchemyDbAdminRouteSO()

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py

@@ -3,7 +3,7 @@ from fastapi import APIRouter
 from project.api.router.admin import get_auth_data, get_arpakitlib_project_template_info, raise_fake_error, \
     reinit_sqlalchemy_db, get_story_log, init_sqlalchemy_db, get_sqlalchemy_db_table_name_to_amount, \
     get_operation_allowed_statuses, get_operation, create_operation, get_operation_allowed_types, get_log_file, \
-    clear_log_file, check_sqlalchemy_db, get_settings
+    clear_log_file, check_sqlalchemy_db, get_settings, get_user, make_test_data_1
 
 main_admin_api_router = APIRouter()
 
@@ -81,3 +81,13 @@ main_admin_api_router.include_router(
     router=get_settings.api_router,
     prefix="/get_settings"
 )
+
+main_admin_api_router.include_router(
+    router=get_user.api_router,
+    prefix="/get_user"
+)
+
+main_admin_api_router.include_router(
+    router=make_test_data_1.api_router,
+    prefix="/make_test_data_1"
+)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/make_test_data_1.py

@@ -0,0 +1,41 @@
+import fastapi
+from fastapi import APIRouter
+
+from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
+    require_user_token_dbm_api_authorize_middleware, api_authorize
+from project.api.schema.common import BaseRouteSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+from project.test_data.make_test_data_1 import make_test_data_1
+
+
+class MakeTestData1AdminRouteSO(BaseRouteSO, RawDataCommonSO):
+    pass
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Make test data 1",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=MakeTestData1AdminRouteSO | ErrorCommonSO
+)
+def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
+            require_api_key_dbm_api_authorize_middleware(
+                require_active=True
+            ),
+            require_user_token_dbm_api_authorize_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
+        ]))
+):
+    make_test_data_1()
+    return MakeTestData1AdminRouteSO()

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py

@@ -11,7 +11,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class ReinitSqlalchemyDbRouteSO(BaseRouteSO, RawDataCommonSO):
+class ReinitSqlalchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
     pass
 
 
@@ -22,7 +22,7 @@ api_router = APIRouter()
     path="",
     name="Reinit sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ReinitSqlalchemyDbRouteSO | ErrorCommonSO,
+    response_model=ReinitSqlalchemyDbAdminRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -40,4 +40,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().reinit()
-    return ReinitSqlalchemyDbRouteSO()
+    return ReinitSqlalchemyDbAdminRouteSO()

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -11,7 +11,7 @@ from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetCurrentUserRouteSO(BaseRouteSO, UserClient1SO):
+class GetCurrentUserClientRouteSO(BaseRouteSO, UserClient1SO):
     pass
 
 
@@ -22,7 +22,7 @@ api_router = APIRouter()
     "",
     name="Get current user",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetCurrentUserRouteSO | ErrorCommonSO,
+    response_model=GetCurrentUserClientRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -38,6 +38,6 @@ async def _(
             )
         ]))
 ):
-    return GetCurrentUserRouteSO.from_dbm(
+    return GetCurrentUserClientRouteSO.from_dbm(
         simple_dbm=api_auth_data.user_token_dbm.user
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -10,7 +10,7 @@ from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetCurrentUserTokenRouteSO(BaseRouteSO, UserTokenClient1SO):
+class GetCurrentUserTokenClientRouteSO(BaseRouteSO, UserTokenClient1SO):
     user: UserClient1SO
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
     "",
     name="Get current user token",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetCurrentUserTokenRouteSO | ErrorCommonSO,
+    response_model=GetCurrentUserTokenClientRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,6 +37,6 @@ async def _(
             )
         ]))
 ):
-    return GetCurrentUserTokenRouteSO.from_dbm(
+    return GetCurrentUserTokenClientRouteSO.from_dbm(
         simple_dbm=api_auth_data.user_token_dbm
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/check_authorization.py

@@ -35,12 +35,13 @@ async def _(
     return CheckAuthorizationGeneralRouteSO(
         is_current_api_key_ok=api_auth_data.api_key_dbm is not None,
         is_current_user_token_ok=api_auth_data.user_token_dbm is not None,
-        current_api_key=ApiKeyGeneral1SO.from_dbm(simple_dbm=api_auth_data.api_key_dbm),
+        current_api_key=ApiKeyGeneral1SO.from_dbm(
+            simple_dbm=api_auth_data.api_key_dbm
+        ) if api_auth_data.api_key_dbm is not None else None,
         current_user_token=UserTokenGeneral1SO.from_dbm(
             simple_dbm=api_auth_data.user_token_dbm
-        ) if api_auth_data.user_token_dbm is not None else None
-        ,
+        ) if api_auth_data.user_token_dbm is not None else None,
         current_user=UserGeneral1SO.from_dbm(
             simple_dbm=api_auth_data.user_token_dbm.user
-        ) if api_auth_data.user_token_dbm is not None else None
+        ) if (api_auth_data.user_token_dbm is not None and api_auth_data.user_token_dbm.user is not None) else None
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_current_api_key.py

@@ -9,7 +9,7 @@ from project.api.schema.out.general.api_key import ApiKeyGeneral1SO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetCurrentApiKeyRouteSO(BaseRouteSO, ApiKeyGeneral1SO):
+class GetCurrentApiKeyGeneralRouteSO(BaseRouteSO, ApiKeyGeneral1SO):
     pass
 
 
@@ -20,7 +20,7 @@ api_router = APIRouter()
     "",
     name="Get current api key",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetCurrentApiKeyRouteSO | str | ErrorCommonSO,
+    response_model=GetCurrentApiKeyGeneralRouteSO | str | ErrorCommonSO,
 )
 async def _(
         *,
@@ -36,6 +36,6 @@ async def _(
             )
         ]))
 ):
-    return GetCurrentApiKeyRouteSO.from_dbm(
+    return GetCurrentApiKeyGeneralRouteSO.from_dbm(
         simple_dbm=api_auth_data.api_key_dbm
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_errors_info.py

@@ -7,7 +7,7 @@ from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
 
 
-class GetErrorsInfoRouteSO(BaseRouteSO):
+class GetErrorsInfoGeneralRouteSO(BaseRouteSO):
     api_error_codes: list[str] = []
     api_error_specification_codes: list[str] = []
 
@@ -19,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Get errors info",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetErrorsInfoRouteSO | ErrorCommonSO,
+    response_model=GetErrorsInfoGeneralRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -31,7 +31,7 @@ async def _(
             )
         ]))
 ):
-    return GetErrorsInfoRouteSO(
+    return GetErrorsInfoGeneralRouteSO(
         api_error_codes=APIErrorCodes.values_list(),
         api_error_specification_codes=APIErrorSpecificationCodes.values_list()
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py

@@ -8,7 +8,7 @@ from project.api.schema.out.common.error import ErrorCommonSO
 from project.core.util import now_local_dt
 
 
-class HealthcheckRouteSO(BaseRouteSO):
+class HealthcheckGeneralRouteSO(BaseRouteSO):
     is_ok: bool = True
     datetime: dt.datetime
 
@@ -20,11 +20,11 @@ api_router = APIRouter()
     "",
     name="Healthcheck",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=HealthcheckRouteSO | ErrorCommonSO,
+    response_model=HealthcheckGeneralRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response
 ):
-    return HealthcheckRouteSO(is_ok=True, datetime=now_local_dt())
+    return HealthcheckGeneralRouteSO(is_ok=True, datetime=now_local_dt())

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/now_utc_datetime.py

@@ -8,7 +8,7 @@ from project.api.schema.out.common.datetime_ import DatetimeCommonSO
 from project.api.schema.out.common.error import ErrorCommonSO
 
 
-class NowUTCDatetimeRouteSO(BaseRouteSO, DatetimeCommonSO):
+class NowUTCDatetimeGeneralRouteSO(BaseRouteSO, DatetimeCommonSO):
     pass
 
 
@@ -19,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Now UTC datetime",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=NowUTCDatetimeRouteSO | ErrorCommonSO,
+    response_model=NowUTCDatetimeGeneralRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -31,4 +31,4 @@ async def _(
             )
         ]))
 ):
-    return NowUTCDatetimeRouteSO.from_datetime(datetime_=now_utc_dt())
+    return NowUTCDatetimeGeneralRouteSO.from_datetime(datetime_=now_utc_dt())

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py

@@ -18,4 +18,6 @@ class SimpleDBMAdminSO(BaseSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMAdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
+            only_columns_and_sd_properties=cls.model_fields.keys()
+        ))