arpakitlib 1.8.36__py3-none-any.whl → 1.8.37__py3-none-any.whl

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

@@ -0,0 +1,46 @@
+import fastapi.requests
+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
+
+
+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
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Check authorization",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=CheckAuthorizationGeneralRouteSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize())
+):
+    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_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
+        ,
+        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
+    )

arpakitlib/_arpakit_project_template_v_5/project/api/router/{client → general}/get_current_api_key.py

@@ -3,10 +3,16 @@ 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.out.client.api_key import ApiKeyClientSO
+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.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
+
+class GetCurrentApiKeyRouteSO(BaseRouteSO, ApiKeyGeneral1SO):
+    pass
+
+
 api_router = APIRouter()
 
 
@@ -14,7 +20,7 @@ api_router = APIRouter()
     "",
     name="Get current api key",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ApiKeyClientSO | str | ErrorCommonSO,
+    response_model=GetCurrentApiKeyRouteSO | str | ErrorCommonSO,
 )
 async def _(
         *,
@@ -30,6 +36,6 @@ async def _(
             )
         ]))
 ):
-    return ApiKeyClientSO.from_dbm(
+    return GetCurrentApiKeyRouteSO.from_dbm(
         simple_dbm=api_auth_data.api_key_dbm
     )

arpakitlib/_arpakit_project_template_v_5/project/api/router/{client → general}/get_errors_info.py

@@ -1,11 +1,16 @@
 import fastapi.requests
 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.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.const import APIErrorCodes, APIErrorSpecificationCodes
+from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.error import ErrorCommonSO
-from project.api.schema.out.general.errors_info_general import ErrorsInfoGeneralSO
+
+
+class GetErrorsInfoRouteSO(BaseRouteSO):
+    api_error_codes: list[str] = []
+    api_error_specification_codes: list[str] = []
+
 
 api_router = APIRouter()
 
@@ -14,7 +19,7 @@ api_router = APIRouter()
     "",
     name="Get errors info",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=ErrorsInfoGeneralSO | ErrorCommonSO,
+    response_model=GetErrorsInfoRouteSO | ErrorCommonSO,
 )
 async def _(
         *,
@@ -23,13 +28,10 @@ async def _(
         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
             )
         ]))
 ):
-    return ErrorsInfoGeneralSO(
+    return GetErrorsInfoRouteSO(
         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

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

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

@@ -1,6 +1,7 @@
 from fastapi import APIRouter
 
-from project.api.router.general import healthcheck, now_utc_datetime
+from project.api.router.general import healthcheck, now_utc_datetime, get_current_api_key, check_authorization, \
+    get_errors_info
 
 main_general_api_router = APIRouter()
 
@@ -8,7 +9,23 @@ main_general_api_router.include_router(
     router=healthcheck.api_router,
     prefix="/healthcheck"
 )
+
 main_general_api_router.include_router(
     router=now_utc_datetime.api_router,
     prefix="/now_utc_datetime"
 )
+
+main_general_api_router.include_router(
+    router=get_current_api_key.api_router,
+    prefix="/get_current_api_key"
+)
+
+main_general_api_router.include_router(
+    router=check_authorization.api_router,
+    prefix="/check_authorization"
+)
+
+main_general_api_router.include_router(
+    router=get_errors_info.api_router,
+    prefix="/get_errors_info"
+)

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

@@ -2,9 +2,16 @@ import fastapi
 from fastapi import APIRouter
 
 from arpakitlib.ar_datetime_util import now_utc_dt
+from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
+from project.api.schema.common import BaseRouteSO
 from project.api.schema.out.common.datetime_ import DatetimeCommonSO
 from project.api.schema.out.common.error import ErrorCommonSO
 
+
+class NowUTCDatetimeRouteSO(BaseRouteSO, DatetimeCommonSO):
+    pass
+
+
 api_router = APIRouter()
 
 
@@ -12,11 +19,16 @@ api_router = APIRouter()
     "",
     name="Now UTC datetime",
     status_code=fastapi.status.HTTP_200_OK,
-    response_model=DatetimeCommonSO | ErrorCommonSO,
+    response_model=NowUTCDatetimeRouteSO | 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
+            )
+        ]))
 ):
-    return DatetimeCommonSO.from_datetime(datetime_=now_utc_dt())
+    return NowUTCDatetimeRouteSO.from_datetime(datetime_=now_utc_dt())

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

@@ -24,3 +24,14 @@ class BaseSI(BaseSchema):
 
 class BaseSO(BaseSchema):
     pass
+
+
+class BaseRouteSO(BaseSchema):
+    @classmethod
+    def __pydantic_init_subclass__(cls, **kwargs: Any) -> None:
+        if not (
+                cls.__name__.endswith("RouteSO")
+                or cls.__name__.endswith("RouteSchemaOut")
+        ):
+            raise ValueError("Route APISchema class should ends with RouteSO | RouteSchemaOut")
+        super().__init_subclass__(**kwargs)

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

@@ -13,6 +13,7 @@ class SimpleDBMAdminSO(BaseSO):
     slug: str | None
     creation_dt: dt.datetime
     extra_data: dict[str, Any]
+
     entity_name: str
 
     @classmethod

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 OperationAdminSO(SimpleDBMAdminSO):
+class OperationAdmin1SO(SimpleDBMAdminSO):
     execution_start_dt: dt.datetime | None
     execution_finish_dt: dt.datetime | None
     status: str
@@ -16,10 +16,13 @@ class OperationAdminSO(SimpleDBMAdminSO):
     input_data: dict[str, Any]
     output_data: dict[str, Any]
     error_data: dict[str, Any]
+
     duration_total_seconds: float | None
     allowed_statuses: list[str]
     allowed_types: list[str]
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: OperationDBM) -> OperationAdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: OperationDBM) -> OperationAdmin1SO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
+            only_columns_and_sd_properties=cls.model_fields.keys()
+        ))

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

@@ -1,17 +1,19 @@
 from __future__ import annotations
 
-from typing import Any
-
 from project.api.schema.out.admin.common import SimpleDBMAdminSO
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
 
-class StoryLogAdminSO(SimpleDBMAdminSO):
+class StoryLogAdmin1SO(SimpleDBMAdminSO):
     level: str
     type: str | None
     title: str | None
-    data: dict[str, Any]
+
+    allowed_levels: list[str]
+    allowed_types: list[str]
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLogAdminSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLogAdmin1SO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
+            only_columns_and_sd_properties=cls.model_fields.keys()
+        ))

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

@@ -15,4 +15,6 @@ class SimpleDBMClientSO(BaseSO):
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMClientSO:
-        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()
+        ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -1,22 +1,31 @@
 from __future__ import annotations
 
 import datetime as dt
-from typing import Any
 
 from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class UserClientSO(SimpleDBMClientSO):
+class UserClient1SO(SimpleDBMClientSO):
     email: str | None
     roles: list[str]
     is_active: bool
     tg_id: int | None
     tg_bot_last_action_dt: dt.datetime | None
-    tg_data: dict[str, Any] | None
+
     roles_has_admin: bool
     roles_has_client: bool
+    allowed_roles: list[str]
+    tg_data_first_name: str | None
+    tg_data_last_name: str | None
+    tg_data_language_code: str | None
+    tg_data_username: str | None
+    tg_data_at_username: str | None
+    tg_data_fullname: str | None
+    tg_data_link_by_username: str | None
 
     @classmethod
-    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserClientSO:
-        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserClient1SO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
+            only_columns_and_sd_properties=cls.model_fields.keys()
+        ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py

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

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/{client → general}/api_key.py

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

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import datetime as dt
+
+from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+
+class UserGeneral1SO(SimpleDBMClientSO):
+    email: str | None
+    roles: list[str]
+    is_active: bool
+    tg_id: int | None
+    tg_bot_last_action_dt: dt.datetime | None
+
+    roles_has_admin: bool
+    roles_has_client: bool
+    allowed_roles: list[str]
+    tg_data_first_name: str | None
+    tg_data_last_name: str | None
+    tg_data_language_code: str | None
+    tg_data_username: str | None
+    tg_data_at_username: str | None
+    tg_data_fullname: str | None
+    tg_data_link_by_username: str | None
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserGeneral1SO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties(
+            only_columns_and_sd_properties=cls.model_fields.keys()
+        ))

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user_token.py

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

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py

@@ -140,7 +140,7 @@ class OperationExecutorWorker(BaseWorker):
                         f", operation_id={operation_dbm.id}"
                         f", operation_type={operation_dbm.type}"
                     ),
-                    data={
+                    extra_data={
                         "operation_id": operation_dbm.id,
                         "operation_type": operation_dbm.type,
                     }
@@ -236,7 +236,7 @@ class OperationExecutorWorker(BaseWorker):
                         f", operation_id={operation_dbm.id}"
                         f", operation_type={operation_dbm.type}"
                     ),
-                    data={
+                    extra_data={
                         "operation_id": operation_dbm.id,
                         "operation_type": operation_dbm.type,
                     }

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operation_creator_worker.py

@@ -45,7 +45,8 @@ class ScheduledOperationCreatorWorker(BaseWorker):
             with self.sqlalchemy_db.new_session() as session:
                 operation_dbm = OperationDBM(
                     type=scheduled_operation.type,
-                    input_data=scheduled_operation.input_data
+                    input_data=scheduled_operation.input_data,
+                    status=OperationDBM.Statuses.waiting_for_execution
                 )
                 session.add(operation_dbm)
                 session.commit()

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py

@@ -1,8 +1,13 @@
 import asyncio
 
+import sqlalchemy
+
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+
 
 def __sandbox():
-    pass
+    a = sqlalchemy.inspect(SimpleDBM)
+    print(a)
 
 
 async def __async_sandbox():

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py

@@ -1,3 +1,5 @@
+import sqlalchemy
+
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 
@@ -5,21 +7,14 @@ from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
 class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
     name = "ApiKey"
     name_plural = "ApiKeys"
-    column_list = [
-        ApiKeyDBM.id,
-        ApiKeyDBM.long_id,
-        ApiKeyDBM.slug,
-        ApiKeyDBM.creation_dt,
-        ApiKeyDBM.title,
-        ApiKeyDBM.value,
-        ApiKeyDBM.is_active,
-    ]
+    column_list = sqlalchemy.inspect(ApiKeyDBM).columns
     form_columns = [
         ApiKeyDBM.slug,
         ApiKeyDBM.title,
         ApiKeyDBM.value,
         ApiKeyDBM.is_active,
     ]
+    column_sortable_list = sqlalchemy.inspect(ApiKeyDBM).columns
     column_default_sort = [
         (ApiKeyDBM.creation_dt, True)
     ]
@@ -27,7 +22,5 @@ class ApiKeyMV(SimpleMV, model=ApiKeyDBM):
         ApiKeyDBM.id,
         ApiKeyDBM.long_id,
         ApiKeyDBM.slug,
-        ApiKeyDBM.title,
         ApiKeyDBM.value,
-        ApiKeyDBM.is_active,
     ]

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py

@@ -8,7 +8,7 @@ class SimpleMV(ModelView):
     can_view_details = True
     can_export = True
     page_size = 50
-    page_size_options = [50, 100, 200]
+    page_size_options = [50, 100, 200, 500, 750, 1000]
     save_as = True
     save_as_continue = True
     export_types = ["xlsx", "csv", "json"]

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py

@@ -1,3 +1,5 @@
+import sqlalchemy
+
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 
@@ -5,20 +7,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 class OperationMV(SimpleMV, model=OperationDBM):
     name = "Operation"
     name_plural = "Operations"
-    column_list = [
-        OperationDBM.id,
-        OperationDBM.long_id,
-        OperationDBM.slug,
-        OperationDBM.creation_dt,
-        OperationDBM.status,
-        OperationDBM.type,
-        OperationDBM.title,
-        OperationDBM.execution_start_dt,
-        OperationDBM.execution_finish_dt,
-        OperationDBM.input_data,
-        OperationDBM.output_data,
-        OperationDBM.error_data
-    ]
+    column_list = sqlalchemy.inspect(OperationDBM).columns
     form_columns = [
         OperationDBM.slug,
         OperationDBM.status,
@@ -28,8 +17,10 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.execution_finish_dt,
         OperationDBM.input_data,
         OperationDBM.output_data,
-        OperationDBM.error_data
+        OperationDBM.error_data,
+        OperationDBM.extra_data
     ]
+    column_sortable_list = sqlalchemy.inspect(OperationDBM).columns
     column_default_sort = [
         (OperationDBM.creation_dt, True)
     ]
@@ -37,7 +28,4 @@ class OperationMV(SimpleMV, model=OperationDBM):
         OperationDBM.id,
         OperationDBM.long_id,
         OperationDBM.slug,
-        OperationDBM.status,
-        OperationDBM.type,
-        OperationDBM.title
     ]

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py

@@ -1,3 +1,5 @@
+import sqlalchemy
+
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 
@@ -5,23 +7,15 @@ from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
 class StoryLogMV(SimpleMV, model=StoryLogDBM):
     name = "StoryLog"
     name_plural = "StoryLogs"
-    column_list = [
-        StoryLogDBM.id,
-        StoryLogDBM.long_id,
-        StoryLogDBM.slug,
-        StoryLogDBM.creation_dt,
-        StoryLogDBM.level,
-        StoryLogDBM.type,
-        StoryLogDBM.title,
-        StoryLogDBM.data
-    ]
+    column_list = sqlalchemy.inspect(StoryLogDBM).columns
     form_columns = [
         StoryLogDBM.slug,
         StoryLogDBM.level,
         StoryLogDBM.type,
         StoryLogDBM.title,
-        StoryLogDBM.data
+        StoryLogDBM.extra_data
     ]
+    column_sortable_list = sqlalchemy.inspect(StoryLogDBM).columns
     column_default_sort = [
         (StoryLogDBM.creation_dt, True)
     ]
@@ -29,8 +23,4 @@ class StoryLogMV(SimpleMV, model=StoryLogDBM):
         StoryLogDBM.id,
         StoryLogDBM.long_id,
         StoryLogDBM.slug,
-        StoryLogDBM.level,
-        StoryLogDBM.type,
-        StoryLogDBM.title,
-        StoryLogDBM.data
     ]

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -1,3 +1,5 @@
+import sqlalchemy
+
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
@@ -5,18 +7,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 class UserMV(SimpleMV, model=UserDBM):
     name = "User"
     name_plural = "Users"
-    column_list = [
-        UserDBM.id,
-        UserDBM.long_id,
-        UserDBM.slug,
-        UserDBM.creation_dt,
-        UserDBM.email,
-        UserDBM.roles,
-        UserDBM.is_active,
-        UserDBM.tg_id,
-        UserDBM.tg_bot_last_action_dt,
-        UserDBM.tg_data,
-    ]
+    column_list = sqlalchemy.inspect(UserDBM).columns
     form_columns = [
         UserDBM.slug,
         UserDBM.email,
@@ -25,7 +16,9 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.tg_id,
         UserDBM.tg_bot_last_action_dt,
         UserDBM.tg_data,
+        UserDBM.extra_data
     ]
+    column_sortable_list = sqlalchemy.inspect(UserDBM).columns
     column_default_sort = [
         (UserDBM.creation_dt, True)
     ]
@@ -33,8 +26,5 @@ class UserMV(SimpleMV, model=UserDBM):
         UserDBM.id,
         UserDBM.long_id,
         UserDBM.slug,
-        UserDBM.email,
-        UserDBM.roles,
-        UserDBM.is_active,
         UserDBM.tg_id,
     ]