arpakitlib 1.8.61__tar.gz → 1.8.63__tar.gz

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/PKG-INFO

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

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -7,7 +7,7 @@ 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.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
@@ -20,7 +20,7 @@ class CreateOperationAdminSI(BaseSI):
     input_data: dict[str, Any] = NotSet
 
 
-class CreateOperationAdminRouteSO(BaseRouteSO, OperationAdmin1SO):
+class CreateOperationAdminRouteSO(BaseRouteSO, Operation1AdminSO):
     pass
 
 

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -6,13 +6,13 @@ 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):
+class GetOperationAdminRouteSO(BaseRouteSO, Operation1AdminSO):
     pass
 
 
@@ -21,7 +21,7 @@ api_router = APIRouter()
 
 @api_router.get(
     "",
-    name="Get story log",
+    name="Get operation",
     status_code=fastapi.status.HTTP_200_OK,
     response_model=GetOperationAdminRouteSO | None | ErrorCommonSO,
 )

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -6,13 +6,13 @@ 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):
+class GetStoryLogAdminRouteSO(BaseRouteSO, StoryLog1AdminSO):
     pass
 
 

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -6,13 +6,13 @@ 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):
+class GetUserAdminRouteSO(BaseRouteSO, User1AdminSO):
     pass
 
 

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -6,12 +6,12 @@ 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):
+class GetCurrentUserClientRouteSO(BaseRouteSO, User1ClientSO):
     pass
 
 

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -4,14 +4,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 GetCurrentUserTokenClientRouteSO(BaseRouteSO, UserToken1ClientSO):
+    user: User1ClientSO
 
 
 api_router = APIRouter()

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/general/check_authorization.py

@@ -4,17 +4,17 @@ from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize
 from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.general.api_key import ApiKeyGeneral1SO
-from project.api.schema.out.general.user import UserGeneral1SO
-from project.api.schema.out.general.user_token import UserTokenGeneral1SO
+from project.api.schema.out.general.api_key import ApiKey1GeneralSO
+from project.api.schema.out.general.user import User1GeneralSO
+from project.api.schema.out.general.user_token import UserToken1GeneralSO
 
 
 class CheckAuthorizationGeneralRouteSO(BaseRouteSO):
     is_current_api_key_ok: bool = False
     is_current_user_token_ok: bool = False
-    current_api_key: ApiKeyGeneral1SO | None = None
-    current_user_token: UserTokenGeneral1SO | None = None
-    current_user: UserGeneral1SO | None = None
+    current_api_key: ApiKey1GeneralSO | None = None
+    current_user_token: UserToken1GeneralSO | None = None
+    current_user: User1GeneralSO | None = None
 
 
 api_router = APIRouter()
@@ -35,13 +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(
+        current_api_key=ApiKey1GeneralSO.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(
+        current_user_token=UserToken1GeneralSO.from_dbm(
             simple_dbm=api_auth_data.user_token_dbm
         ) if api_auth_data.user_token_dbm is not None else None,
-        current_user=UserGeneral1SO.from_dbm(
+        current_user=User1GeneralSO.from_dbm(
             simple_dbm=api_auth_data.user_token_dbm.user
         ) if (api_auth_data.user_token_dbm is not None and api_auth_data.user_token_dbm.user is not None) else None
     )

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_current_api_key.py

@@ -5,11 +5,11 @@ from project.api.authorize import APIAuthorizeData, api_authorize, require_user_
     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.general.api_key import ApiKeyGeneral1SO
+from project.api.schema.out.general.api_key import ApiKey1GeneralSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class GetCurrentApiKeyGeneralRouteSO(BaseRouteSO, ApiKeyGeneral1SO):
+class GetCurrentApiKeyGeneralRouteSO(BaseRouteSO, ApiKey1GeneralSO):
     pass
 
 

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py

@@ -7,7 +7,7 @@ from project.api.schema.out.admin.common import SimpleDBMAdminSO
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
 
-class OperationAdmin1SO(SimpleDBMAdminSO):
+class Operation1AdminSO(SimpleDBMAdminSO):
     execution_start_dt: dt.datetime | None
     execution_finish_dt: dt.datetime | None
     status: str
@@ -22,7 +22,7 @@ class OperationAdmin1SO(SimpleDBMAdminSO):
     allowed_types: list[str]
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: OperationDBM) -> OperationAdmin1SO:
+    def from_dbm(cls, *, simple_dbm: OperationDBM) -> Operation1AdminSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py

@@ -4,7 +4,7 @@ from project.api.schema.out.admin.common import SimpleDBMAdminSO
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
-class StoryLogAdmin1SO(SimpleDBMAdminSO):
+class StoryLog1AdminSO(SimpleDBMAdminSO):
     level: str
     type: str | None
     title: str | None
@@ -13,7 +13,7 @@ class StoryLogAdmin1SO(SimpleDBMAdminSO):
     allowed_types: list[str]
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLogAdmin1SO:
+    def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLog1AdminSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py

@@ -7,7 +7,7 @@ from project.api.schema.out.admin.common import SimpleDBMAdminSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class UserAdmin1SO(SimpleDBMAdminSO):
+class User1AdminSO(SimpleDBMAdminSO):
     email: str | None
     username: str | None
     roles: list[str]
@@ -29,7 +29,7 @@ class UserAdmin1SO(SimpleDBMAdminSO):
     tg_data_link_by_username: str | None
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserAdmin1SO:
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> User1AdminSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -7,7 +7,7 @@ from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class UserClient1SO(SimpleDBMClientSO):
+class User1ClientSO(SimpleDBMClientSO):
     email: str | None
     username: str | None
     roles: list[str]
@@ -28,7 +28,7 @@ class UserClient1SO(SimpleDBMClientSO):
     tg_data_link_by_username: str | None
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserClient1SO:
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> User1ClientSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py

@@ -4,13 +4,13 @@ from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
 
-class UserTokenClient1SO(SimpleDBMClientSO):
+class UserToken1ClientSO(SimpleDBMClientSO):
     value: str
     user_id: int
     is_active: bool
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserTokenClient1SO:
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1ClientSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/api_key.py

@@ -4,13 +4,13 @@ from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
 
-class ApiKeyGeneral1SO(SimpleDBMClientSO):
+class ApiKey1GeneralSO(SimpleDBMClientSO):
     title: str | None
     value: str
     is_active: bool
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: ApiKeyDBM) -> ApiKeyGeneral1SO:
+    def from_dbm(cls, *, simple_dbm: ApiKeyDBM) -> ApiKey1GeneralSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py

@@ -7,7 +7,7 @@ from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class UserGeneral1SO(SimpleDBMClientSO):
+class User1GeneralSO(SimpleDBMClientSO):
     email: str | None
     username: str | None
     roles: list[str]
@@ -28,7 +28,7 @@ class UserGeneral1SO(SimpleDBMClientSO):
     tg_data_link_by_username: str | None
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserGeneral1SO:
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> User1GeneralSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py

@@ -4,13 +4,13 @@ from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
 
-class UserTokenGeneral1SO(SimpleDBMClientSO):
+class UserToken1GeneralSO(SimpleDBMClientSO):
     value: str
     user_id: int
     is_active: bool
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserTokenGeneral1SO:
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserToken1GeneralSO:
         return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
             only_columns_and_sd_properties=cls.model_fields.keys()
         ))

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -85,7 +85,8 @@ class UserDBM(SimpleDBM):
         "UserTokenDBM",
         uselist=True,
         back_populates="user",
-        foreign_keys="UserTokenDBM.user_id"
+        foreign_keys="UserTokenDBM.user_id",
+        cascade="all, delete-orphan"
     )
 
     def __repr__(self) -> str:

{arpakitlib-1.8.61 → arpakitlib-1.8.63}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.61"
+version = "1.8.63"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }