arpakitlib 1.8.62__tar.gz → 1.8.65__tar.gz

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.62
+Version: 1.8.65
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/check_sqlalchemy_db.py

@@ -3,17 +3,11 @@ 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.api.schema.out.common.ok import OkSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class CheckSQLAlchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Check sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=CheckSQLAlchemyDbAdminRouteSO | ErrorCommonSO
+    response_model=OkSO | ErrorCommonSO
 )
 async def _(
         *,
@@ -37,7 +31,5 @@ async def _(
             )
         ]))
 ):
-    get_cached_sqlalchemy_db().is_conn_good()
-    return CheckSQLAlchemyDbAdminRouteSO(
-        raw_data={"is_conn_good": get_cached_sqlalchemy_db().is_conn_good()}
-    )
+    get_cached_sqlalchemy_db().check_conn()
+    return OkSO()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -4,17 +4,11 @@ from fastapi import APIRouter
 from arpakitlib.ar_logging_util import init_log_file
 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.api.schema.out.common.ok import OkSO
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class ClearLogFileAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -22,7 +16,7 @@ api_router = APIRouter()
     path="",
     name="Clear log file",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ClearLogFileAdminRouteSO | ErrorCommonSO
+    response_model=OkSO | ErrorCommonSO
 )
 def _(
         *,
@@ -41,4 +35,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 ClearLogFileAdminRouteSO()
+    return OkSO()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -6,24 +6,20 @@ from fastapi import APIRouter
 from arpakitlib.ar_type_util import NotSet, is_set
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
-from project.api.schema.common import BaseRouteSO, BaseSI
-from project.api.schema.out.admin.operation import OperationAdmin1SO
+from project.api.schema.common import BaseSI
+from project.api.schema.out.admin.operation import Operation1AdminSO
 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, OperationDBM
 
 
-class CreateOperationAdminSI(BaseSI):
+class _CreateOperationAdminSI(BaseSI):
     slug: str | None = NotSet
     type: str
     title: str | None = NotSet
     input_data: dict[str, Any] = NotSet
 
 
-class CreateOperationAdminRouteSO(BaseRouteSO, OperationAdmin1SO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -31,7 +27,7 @@ api_router = APIRouter()
     "",
     name="Create operation",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=CreateOperationAdminRouteSO | ErrorCommonSO,
+    response_model=Operation1AdminSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -46,7 +42,7 @@ async def _(
                 require_user_roles=[UserDBM.Roles.admin]
             )
         ])),
-        create_operation_admin_si: CreateOperationAdminSI = fastapi.Body()
+        create_operation_admin_si: _CreateOperationAdminSI = fastapi.Body()
 ):
     operation_dbm = OperationDBM(
         status=OperationDBM.Statuses.waiting_for_execution
@@ -75,4 +71,4 @@ async def _(
         await async_session.commit()
         await async_session.refresh(operation_dbm)
 
-    return CreateOperationAdminRouteSO.from_dbm(simple_dbm=operation_dbm)
+    return Operation1AdminSO.from_dbm(simple_dbm=operation_dbm)

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -1,19 +1,14 @@
+from typing import Any
+
 import fastapi
 from fastapi import APIRouter
 
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
-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.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
-
-class GetArpakitlibProjectTemplateInfoAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +16,7 @@ api_router = APIRouter()
     "",
     name="Get arpakitlib project template info",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetArpakitlibProjectTemplateInfoAdminRouteSO | ErrorCommonSO
+    response_model=dict[str, Any] | ErrorCommonSO
 )
 async def _(
         *,
@@ -37,4 +32,4 @@ async def _(
         ]))
 ):
     arpakitlib_project_template_data = get_arpakitlib_project_template_info()
-    return GetArpakitlibProjectTemplateInfoAdminRouteSO(raw_data=arpakitlib_project_template_data)
+    return arpakitlib_project_template_data

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py

@@ -1,19 +1,14 @@
+from typing import Any
+
 import fastapi.requests
 from fastapi import APIRouter
 
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 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.common.error import ErrorCommonSO
-from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class GetAuthDataAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +16,7 @@ api_router = APIRouter()
     path="",
     name="Get auth data",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetAuthDataAdminRouteSO | ErrorCommonSO,
+    response_model=dict[str, Any] | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,4 +32,4 @@ async def _(
             )
         ]))
 ):
-    return GetAuthDataAdminRouteSO(raw_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()))
+    return transfer_data_to_json_str_to_data(api_auth_data.model_dump())

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -5,17 +5,11 @@ 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.operation import OperationAdmin1SO
+from project.api.schema.out.admin.operation import Operation1AdminSO
 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, OperationDBM
 
-
-class GetOperationAdminRouteSO(BaseRouteSO, OperationAdmin1SO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -23,7 +17,7 @@ api_router = APIRouter()
     "",
     name="Get operation",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationAdminRouteSO | None | ErrorCommonSO,
+    response_model=Operation1AdminSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -60,4 +54,4 @@ async def _(
         result = await async_session.scalar(query)
         if result is None:
             return None
-        return GetOperationAdminRouteSO.from_dbm(simple_dbm=result)
+        return Operation1AdminSO.from_dbm(simple_dbm=result)

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation_allowed_statuses.py

@@ -3,15 +3,9 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware
-from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, UserDBM
 
-
-class GetOperationAllowedStatusesAdminRouteSO(BaseRouteSO):
-    allowed_statuses: list[str]
-
-
 api_router = APIRouter()
 
 
@@ -19,7 +13,7 @@ api_router = APIRouter()
     "",
     name="Get operation allowed statuses",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationAllowedStatusesAdminRouteSO | ErrorCommonSO,
+    response_model=list[str] | ErrorCommonSO,
 )
 async def _(
         *,
@@ -35,6 +29,4 @@ async def _(
             )
         ]))
 ):
-    return GetOperationAllowedStatusesAdminRouteSO(
-        allowed_statuses=OperationDBM.Statuses.values_list()
-    )
+    return OperationDBM.Statuses.values_list()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation_allowed_types.py

@@ -3,15 +3,9 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware
-from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, UserDBM
 
-
-class GetOperationAllowedTypesAdminRouteSO(BaseRouteSO):
-    allowed_types: list[str]
-
-
 api_router = APIRouter()
 
 
@@ -19,7 +13,7 @@ api_router = APIRouter()
     "",
     name="Get operation allowed types",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetOperationAllowedTypesAdminRouteSO | ErrorCommonSO,
+    response_model=list[str] | ErrorCommonSO,
 )
 async def _(
         *,
@@ -35,6 +29,4 @@ async def _(
             )
         ]))
 ):
-    return GetOperationAllowedTypesAdminRouteSO(
-        allowed_types=OperationDBM.Types.values_list()
-    )
+    return OperationDBM.Types.values_list()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_settings.py

@@ -1,19 +1,14 @@
+from typing import Any
+
 import fastapi.requests
 from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware
-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.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class GetSettingsAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +16,7 @@ api_router = APIRouter()
     "",
     name="Get settings",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetSettingsAdminRouteSO | ErrorCommonSO,
+    response_model=dict[str, Any] | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,6 +32,4 @@ async def _(
             )
         ]))
 ):
-    return GetSettingsAdminRouteSO(
-        raw_data=get_cached_settings().model_dump(mode="json")
-    )
+    return get_cached_settings().model_dump(mode="json")

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_sqlalchemy_db_table_name_to_amount.py

@@ -1,19 +1,14 @@
+from typing import Any
+
 import fastapi
 from fastapi import APIRouter
 
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
-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_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class GetAuthDataAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +16,7 @@ api_router = APIRouter()
     "",
     name="Get sqlalchemy db table name to amount",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetAuthDataAdminRouteSO | ErrorCommonSO
+    response_model=dict[str, Any] | ErrorCommonSO
 )
 async def _(
         *,
@@ -36,4 +31,4 @@ async def _(
             )
         ]))
 ):
-    return GetAuthDataAdminRouteSO(raw_data=await get_cached_sqlalchemy_db().async_get_table_name_to_amount())
+    return await get_cached_sqlalchemy_db().async_get_table_name_to_amount()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -5,17 +5,11 @@ from fastapi import APIRouter
 from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 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.story_log import StoryLogAdmin1SO
+from project.api.schema.out.admin.story_log import StoryLog1AdminSO
 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, StoryLogDBM
 
-
-class GetStoryLogAdminRouteSO(BaseRouteSO, StoryLogAdmin1SO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -23,7 +17,7 @@ api_router = APIRouter()
     "",
     name="Get story log",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetStoryLogAdminRouteSO | None | ErrorCommonSO,
+    response_model=StoryLog1AdminSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -60,4 +54,4 @@ async def _(
         result = await async_session.scalar(query)
         if result is None:
             return None
-        return GetStoryLogAdminRouteSO.from_dbm(simple_dbm=result)
+        return StoryLog1AdminSO.from_dbm(simple_dbm=result)

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -5,17 +5,11 @@ 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.admin.user import User1AdminSO
 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()
 
 
@@ -23,7 +17,7 @@ api_router = APIRouter()
     "",
     name="Get user",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetUserAdminRouteSO | None | ErrorCommonSO,
+    response_model=User1AdminSO | None | ErrorCommonSO,
 )
 async def _(
         *,
@@ -78,4 +72,4 @@ async def _(
         result = await async_session.scalar(query)
         if result is None:
             return None
-        return GetUserAdminRouteSO.from_dbm(simple_dbm=result)
+        return User1AdminSO.from_dbm(simple_dbm=result)

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/init_sqlalchemy_db.py

@@ -3,17 +3,11 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware, require_not_prod_mode_api_authorize_middleware
-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.api.schema.out.common.ok import OkSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class InitSqlalchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -21,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Init sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=InitSqlalchemyDbAdminRouteSO | ErrorCommonSO,
+    response_model=OkSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -39,4 +33,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().init()
-    return InitSqlalchemyDbAdminRouteSO()
+    return OkSO()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/make_test_data_1.py

@@ -3,17 +3,11 @@ 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.api.schema.out.common.ok import OkSO
 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()
 
 
@@ -21,7 +15,7 @@ api_router = APIRouter()
     path="",
     name="Make test data 1",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=MakeTestData1AdminRouteSO | ErrorCommonSO
+    response_model=OkSO | ErrorCommonSO
 )
 def _(
         *,
@@ -38,4 +32,4 @@ def _(
         ]))
 ):
     make_test_data_1()
-    return MakeTestData1AdminRouteSO()
+    return OkSO()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py

@@ -4,17 +4,11 @@ from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_not_prod_mode_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-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.api.schema.out.common.ok import OkSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
-
-class ReinitSqlalchemyDbAdminRouteSO(BaseRouteSO, RawDataCommonSO):
-    pass
-
-
 api_router = APIRouter()
 
 
@@ -22,7 +16,7 @@ api_router = APIRouter()
     path="",
     name="Reinit sqlalchemy db",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ReinitSqlalchemyDbAdminRouteSO | ErrorCommonSO,
+    response_model=OkSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -40,4 +34,4 @@ async def _(
         ]))
 ):
     get_cached_sqlalchemy_db().reinit()
-    return ReinitSqlalchemyDbAdminRouteSO()
+    return OkSO()

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

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

{arpakitlib-1.8.62 → arpakitlib-1.8.65}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -3,15 +3,14 @@ from fastapi import APIRouter
 
 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.client.user import UserClient1SO
-from project.api.schema.out.client.user_token import UserTokenClient1SO
+from project.api.schema.out.client.user import User1ClientSO
+from project.api.schema.out.client.user_token import UserToken1ClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetCurrentUserTokenClientRouteSO(BaseRouteSO, UserTokenClient1SO):
-    user: UserClient1SO
+class _UserToken1ClientSO(UserToken1ClientSO):
+    user: User1ClientSO
 
 
 api_router = APIRouter()
@@ -21,7 +20,7 @@ api_router = APIRouter()
     "",
     name="Get current user token",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=GetCurrentUserTokenClientRouteSO | ErrorCommonSO,
+    response_model=_UserToken1ClientSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -37,6 +36,6 @@ async def _(
             )
         ]))
 ):
-    return GetCurrentUserTokenClientRouteSO.from_dbm(
+    return _UserToken1ClientSO.from_dbm(
         simple_dbm=api_auth_data.user_token_dbm
     )