arpakitlib 1.8.22__py3-none-any.whl → 1.8.23__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/{auth.py → authorize.py}

@@ -19,7 +19,7 @@ from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserTokenDBM
 
 
-class APIAuthData(BaseModel):
+class APIAuthorizeData(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
     api_key_string: str | None = None
@@ -35,7 +35,7 @@ class APIAuthData(BaseModel):
     extra_data: dict[str, Any] = {}
 
 
-def api_auth(
+def api_authorize(
         *,
         middlewares: list[Callable] | None = None
 ) -> Callable:
@@ -51,9 +51,9 @@ def api_auth(
                 APIKeyHeader(name="apikey", auto_error=False)
             ),
             request: fastapi.requests.Request
-    ) -> APIAuthData:
+    ) -> APIAuthorizeData:
 
-        api_auth_data = APIAuthData(
+        api_auth_data = APIAuthorizeData(
             prod_mode=get_cached_settings().prod_mode
         )
 
@@ -167,8 +167,8 @@ def api_auth(
     return async_func
 
 
-def require_prod_mode_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_prod_mode_api_authorize_middleware():
+    def func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if not get_cached_settings().prod_mode:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -177,13 +177,13 @@ def require_prod_mode_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    func.__name__ = require_prod_mode_api_middleware.__name__
+    func.__name__ = require_prod_mode_api_authorize_middleware.__name__
 
     return func
 
 
-def require_not_prod_mode_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_not_prod_mode_api_authorize_middleware():
+    def func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if get_cached_settings().prod_mode:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -192,13 +192,13 @@ def require_not_prod_mode_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    func.__name__ = require_not_prod_mode_api_middleware.__name__
+    func.__name__ = require_not_prod_mode_api_authorize_middleware.__name__
 
     return func
 
 
-def require_api_key_string_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_api_key_string_api_authorize_middleware():
+    def func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if api_auth_data.api_key_string is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -207,13 +207,13 @@ def require_api_key_string_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    func.__name__ = require_api_key_string_api_middleware.__name__
+    func.__name__ = require_api_key_string_api_authorize_middleware.__name__
 
     return func
 
 
-def require_user_token_string_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_user_token_string_api_authorize_middleware():
+    def func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if api_auth_data.user_token_string is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -222,13 +222,13 @@ def require_user_token_string_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    func.__name__ = require_user_token_string_api_middleware.__name__
+    func.__name__ = require_user_token_string_api_authorize_middleware.__name__
 
     return func
 
 
-def require_correct_api_key_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_correct_api_key_api_authorize_middleware():
+    def func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if not api_auth_data.is_api_key_correct:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -237,13 +237,13 @@ def require_correct_api_key_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    func.__name__ = require_correct_api_key_api_middleware.__name__
+    func.__name__ = require_correct_api_key_api_authorize_middleware.__name__
 
     return func
 
 
-def require_api_key_dbm_api_middleware(*, require_active: bool = True):
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_api_key_dbm_api_authorize_middleware(*, require_active: bool = True):
+    async def async_func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if api_auth_data.api_key_dbm is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -259,13 +259,13 @@ def require_api_key_dbm_api_middleware(*, require_active: bool = True):
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    async_func.__name__ = require_api_key_dbm_api_middleware.__name__
+    async_func.__name__ = require_api_key_dbm_api_authorize_middleware.__name__
 
     return async_func
 
 
-def require_correct_api_key_or_api_key_dbm_api_middleware(*, require_active_api_key_dbm: bool = True):
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+def require_correct_api_key_or_api_key_dbm_api_authorize_middleware(*, require_active_api_key_dbm: bool = True):
+    async def async_func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if not api_auth_data.is_api_key_correct and (
                 api_auth_data.api_key_dbm is None
                 or (require_active_api_key_dbm and not api_auth_data.api_key_dbm.is_active)
@@ -279,16 +279,16 @@ def require_correct_api_key_or_api_key_dbm_api_middleware(*, require_active_api_
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-    async_func.__name__ = require_correct_api_key_or_api_key_dbm_api_middleware.__name__
+    async_func.__name__ = require_correct_api_key_or_api_key_dbm_api_authorize_middleware.__name__
 
     return async_func
 
 
-def require_user_token_dbm_api_middleware(
+def require_user_token_dbm_api_authorize_middleware(
         *, require_active_user_token: bool = True,
         require_user_roles: list[str] | None = None
 ):
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+    async def async_func(*, api_auth_data: APIAuthorizeData, request: fastapi.requests.Request):
         if api_auth_data.user_token_dbm is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
@@ -312,6 +312,6 @@ def require_user_token_dbm_api_middleware(
                     error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
                 )
 
-    async_func.__name__ = require_user_token_dbm_api_middleware.__name__
+    async_func.__name__ = require_user_token_dbm_api_authorize_middleware.__name__
 
     return async_func

arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -64,7 +64,7 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
 
     if get_cached_settings().api_enable_sqladmin:
         from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app
-        add_sqladmin_in_app(app=api_app)
+        add_sqladmin_in_app(app=api_app, favicon_url="/static/openapi-favicon.png")
 
     _logger.info("finish")
 

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

@@ -1,8 +1,8 @@
 import fastapi
 from fastapi import APIRouter
 
-from project.api.auth import require_user_token_dbm_api_middleware, APIAuthData, \
-    api_auth, require_correct_api_key_or_api_key_dbm_api_middleware
+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.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
@@ -21,9 +21,10 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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]
             )

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

@@ -2,8 +2,8 @@ import fastapi.requests
 from fastapi import APIRouter
 
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
@@ -21,9 +21,11 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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]
             )

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

@@ -2,8 +2,8 @@ import fastapi.requests
 import sqlalchemy
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.admin.story_log import StoryLogAdminSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
@@ -22,15 +22,18 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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),
 ):
     if filter_id is None and filter_long_id is None:
         return None
@@ -40,7 +43,11 @@ async def _(
         query = query.filter(StoryLogDBM.id == filter_id)
     if filter_long_id is not None:
         query = query.filter(StoryLogDBM.long_id == filter_long_id)
+    if filter_slug is not None:
+        query = query.filter(StoryLogDBM.slug == filter_slug)
 
     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 StoryLogAdminSO.from_dbm(simple_dbm=result)

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

@@ -0,0 +1,36 @@
+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, require_not_prod_mode_api_authorize_middleware
+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
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Init sqlalchemy db",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=RawDataCommonSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
+            require_not_prod_mode_api_authorize_middleware(),
+            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],
+            ),
+        ]))
+):
+    get_cached_sqlalchemy_db().init()
+    return RawDataCommonSO()

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

@@ -1,7 +1,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
+    reinit_sqlalchemy_db, get_story_log, init_sqlalchemy_db
 
 main_admin_api_router = APIRouter()
 
@@ -29,3 +29,8 @@ main_admin_api_router.include_router(
     router=get_story_log.api_router,
     prefix="/get_story_log"
 )
+
+main_admin_api_router.include_router(
+    router=init_sqlalchemy_db.api_router,
+    prefix="/init_sqlalchemy_db"
+)

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

@@ -1,8 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
@@ -20,9 +20,11 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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]
             )

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

@@ -1,9 +1,9 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_not_prod_mode_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.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
@@ -22,10 +22,12 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_not_prod_mode_api_middleware(),
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        api_auth_data: APIAuthorizeData = fastapi.Depends(api_authorize(middlewares=[
+            require_not_prod_mode_api_authorize_middleware(),
+            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],
             ),

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

@@ -0,0 +1,35 @@
+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.schema.out.client.api_key import ApiKeyClientSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get current api key",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=ApiKeyClientSO | str | 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.client]
+            )
+        ]))
+):
+    return ApiKeyClientSO.from_dbm(
+        simple_dbm=api_auth_data.api_key_dbm
+    )

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

@@ -1,8 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.user import UserClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
@@ -20,9 +20,11 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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.client]
             )

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

@@ -1,8 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.user_token import UserTokenClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
@@ -20,9 +20,11 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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.client]
             )

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

@@ -1,8 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_correct_api_key_or_api_key_dbm_api_middleware
+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.const import APIErrorCodes, APIErrorSpecificationCodes
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.general.errors_info_general import ErrorsInfoGeneralSO
@@ -20,9 +20,11 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
-            require_user_token_dbm_api_middleware(
+        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
             )
         ]))

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

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from project.api.router.client import get_errors_info, get_current_user, get_current_user_token
+from project.api.router.client import get_errors_info, get_current_user, get_current_user_token, get_current_api_key
 
 main_client_api_router = APIRouter()
 
@@ -18,3 +18,8 @@ main_client_api_router.include_router(
     router=get_current_user_token.api_router,
     prefix="/get_current_user_token"
 )
+
+main_client_api_router.include_router(
+    router=get_current_api_key.api_router,
+    prefix="/get_current_api_key"
+)

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

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM
+
+
+class ApiKeyClientSO(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())

arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -106,10 +106,10 @@ class Settings(SimpleSettings):
 
     sqladmin_secret_key: str | None = "85a9583cb91c4de7a78d7eb1e5306a04418c9c43014c447ea8ec8dd5deb4cf71"
 
-    sqladmin_auth_keys: list[str] | None = ["1"]
+    sqladmin_authorize_keys: list[str] | None = ["1"]
 
-    @field_validator("sqladmin_auth_keys", mode="before")
-    def validate_sqladmin_auth_keys(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> list[str] | None:
+    @field_validator("sqladmin_authorize_keys", mode="before")
+    def validate_sqladmin_authorize_keys(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> list[str] | None:
         if isinstance(v, str):
             v = [v]
         if isinstance(v, int):

arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py

@@ -2,9 +2,7 @@ import asyncio
 
 
 def __sandbox():
-    a = {1, 2, 3}
-    a += [1, 2]
-    print(a)
+    pass
 
 
 async def __async_sandbox():

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py

@@ -2,12 +2,17 @@ from fastapi import FastAPI
 from sqladmin import Admin
 
 from project.core.settings import get_cached_settings
-from project.sqladmin_.admin_auth import SQLAdminAuth
+from project.sqladmin_.admin_authorize import SQLAdminAuth
 from project.sqladmin_.model_view import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 
 
-def add_sqladmin_in_app(*, app: FastAPI, base_url: str = "/sqladmin") -> FastAPI:
+def add_sqladmin_in_app(
+        *,
+        app: FastAPI,
+        base_url: str = "/sqladmin",
+        favicon_url: str | None = None
+) -> FastAPI:
     authentication_backend = SQLAdminAuth()
 
     admin = Admin(
@@ -15,7 +20,8 @@ def add_sqladmin_in_app(*, app: FastAPI, base_url: str = "/sqladmin") -> FastAPI
         engine=get_cached_sqlalchemy_db().engine,
         base_url=base_url,
         authentication_backend=authentication_backend,
-        title=get_cached_settings().project_name
+        title=get_cached_settings().project_name,
+        favicon_url=favicon_url
     )
 
     for model_view in SimpleMV.__subclasses__():

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py

@@ -0,0 +1,86 @@
+import logging
+
+import fastapi
+from sqladmin.authentication import AuthenticationBackend
+
+from arpakitlib.ar_str_util import make_none_if_blank
+from project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+
+SQLADMIN_AUTH_KEY = "sqladmin_auth_key"
+
+
+class SQLAdminAuth(AuthenticationBackend):
+    def __init__(self):
+        self._logger = logging.getLogger(self.__class__.__name__)
+        super().__init__(secret_key=get_cached_settings().sqladmin_secret_key)
+
+    async def login(self, request: fastapi.Request) -> bool:
+        form = await request.form()
+
+        username = form.get("username")
+        if username:
+            username = username.strip()
+        username = make_none_if_blank(username)
+
+        password = form.get("password")
+        if password:
+            password = password.strip()
+        password = make_none_if_blank(password)
+
+        if (
+                get_cached_settings().sqladmin_authorize_keys is not None
+                and (username is not None or password is not None)
+        ):
+            if (
+                    (
+                            is_username_correct := username in get_cached_settings().sqladmin_authorize_keys
+                    )
+                    or
+                    (
+                            is_password_correct := password in get_cached_settings().sqladmin_authorize_keys
+                    )
+            ):
+                if is_username_correct is True:
+                    request.session.update({SQLADMIN_AUTH_KEY: username})
+                elif is_password_correct is True:
+                    request.session.update({SQLADMIN_AUTH_KEY: password})
+                return True
+
+        if get_cached_sqlalchemy_db() is not None and (username is not None or password is not None):
+            with get_cached_sqlalchemy_db().new_session() as session:
+                query = session.query(UserTokenDBM)
+                if username is not None:
+                    query = query.filter(UserTokenDBM.value == username)
+                elif password is not None:
+                    query = query.filter(UserTokenDBM.value == password)
+                user_token = query.one_or_none()
+            if user_token is not None:
+                request.session.update({SQLADMIN_AUTH_KEY: user_token.value})
+                return True
+
+        return False
+
+    async def logout(self, request: fastapi.Request) -> bool:
+        request.session.clear()
+        return True
+
+    async def authenticate(self, request: fastapi.Request) -> bool:
+        sqladmin_auth_key = request.session.get(SQLADMIN_AUTH_KEY)
+        if sqladmin_auth_key:
+            sqladmin_auth_key = sqladmin_auth_key.strip()
+        sqladmin_auth_key = make_none_if_blank(sqladmin_auth_key)
+
+        if get_cached_settings().sqladmin_authorize_keys is not None and sqladmin_auth_key is not None:
+            if sqladmin_auth_key in get_cached_settings().sqladmin_authorize_keys:
+                return True
+
+        if get_cached_sqlalchemy_db() is not None and sqladmin_auth_key is not None:
+            with get_cached_sqlalchemy_db().new_session() as session:
+                query = session.query(UserTokenDBM).filter(UserTokenDBM.value == sqladmin_auth_key)
+                user_token = query.one_or_none()
+                if user_token is not None:
+                    return True
+
+        return False

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

@@ -1,3 +1,6 @@
+from project.sqladmin_.model_view.api_key import ApiKeyMV
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqladmin_.model_view.operation import OperationMV
 from project.sqladmin_.model_view.story_log import StoryLogMV
+from project.sqladmin_.model_view.user import UserMV
+from project.sqladmin_.model_view.user_token import UserTokenMV

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

@@ -0,0 +1,33 @@
+from project.sqladmin_.model_view import SimpleMV
+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,
+    ]
+    form_columns = [
+        ApiKeyDBM.slug,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+    ]
+    column_default_sort = [
+        (ApiKeyDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        ApiKeyDBM.id,
+        ApiKeyDBM.long_id,
+        ApiKeyDBM.slug,
+        ApiKeyDBM.title,
+        ApiKeyDBM.value,
+        ApiKeyDBM.is_active,
+    ]

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

@@ -0,0 +1,40 @@
+from project.sqladmin_.model_view import SimpleMV
+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,
+    ]
+    form_columns = [
+        UserDBM.slug,
+        UserDBM.email,
+        UserDBM.roles,
+        UserDBM.is_active,
+        UserDBM.tg_id,
+        UserDBM.tg_bot_last_action_dt,
+        UserDBM.tg_data,
+    ]
+    column_default_sort = [
+        (UserDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        UserDBM.id,
+        UserDBM.long_id,
+        UserDBM.slug,
+        UserDBM.email,
+        UserDBM.roles,
+        UserDBM.is_active,
+        UserDBM.tg_id,
+    ]

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

@@ -0,0 +1,34 @@
+from project.sqladmin_.model_view import SimpleMV
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+
+
+class UserTokenMV(SimpleMV, model=UserTokenDBM):
+    name = "UserToken"
+    name_plural = "UserTokens"
+    column_list = [
+        UserTokenDBM.id,
+        UserTokenDBM.long_id,
+        UserTokenDBM.slug,
+        UserTokenDBM.creation_dt,
+        UserTokenDBM.value,
+        UserTokenDBM.user,
+        UserTokenDBM.is_active,
+    ]
+    form_columns = [
+        UserTokenDBM.slug,
+        UserTokenDBM.creation_dt,
+        UserTokenDBM.value,
+        UserTokenDBM.user,
+        UserTokenDBM.is_active,
+    ]
+    column_default_sort = [
+        (UserTokenDBM.creation_dt, True)
+    ]
+    column_searchable_list = [
+        UserTokenDBM.id,
+        UserTokenDBM.long_id,
+        UserTokenDBM.slug,
+        UserTokenDBM.value,
+        UserTokenDBM.user_id,
+        UserTokenDBM.is_active,
+    ]

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -97,7 +97,3 @@ class OperationDBM(SimpleDBM):
         То есть префикс sdp_ и даёт этот бонус.
         """
         return self.duration_total_seconds
-
-
-def get_operation_dbm_class() -> type[OperationDBM]:
-    return OperationDBM

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -49,7 +49,3 @@ class StoryLogDBM(SimpleDBM):
         server_default="{}",
         nullable=False
     )
-
-
-def get_story_log_dbm_class() -> type[StoryLogDBM]:
-    return StoryLogDBM

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -23,7 +23,7 @@ class UserDBM(SimpleDBM):
 
     email: Mapped[str | None] = mapped_column(
         sqlalchemy.TEXT,
-        index=True,
+        unique=True,
         insert_default=None,
         nullable=True
     )

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -16,8 +16,8 @@ class UserTokenDBM(SimpleDBM):
 
     value: Mapped[str] = mapped_column(
         sqlalchemy.TEXT,
-        index=True,
-        nullable=False
+        unique=True,
+        nullable=False,
     )
     user_id: Mapped[int] = mapped_column(
         sqlalchemy.INTEGER,

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py

@@ -11,6 +11,8 @@ _logger = logging.getLogger(__name__)
 def make_test_data_1():
     get_cached_settings().raise_if_prod_mode()
     with get_cached_sqlalchemy_db().new_session() as session:
+        session.query(ApiKeyDBM).delete()
+        session.commit()
         for i in range(10):
             api_key = ApiKeyDBM(value=str(i))
             session.add(api_key)

{arpakitlib-1.8.22.dist-info → arpakitlib-1.8.23.dist-info}/METADATA

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

{arpakitlib-1.8.22.dist-info → arpakitlib-1.8.23.dist-info}/RECORD

@@ -78,9 +78,9 @@ arpakitlib/_arpakit_project_template_v_5/project/additional_model/__init__.py,sh
 arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py,sha256=BRz-B699ZY52DfUD6kmhpuThBWpPzpZpD0QXIjlkwC8,168
 arpakitlib/_arpakit_project_template_v_5/project/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/asgi.py,sha256=ES3YGwNxWUHVyD6e2ii6QkvTyB-vlVmr8_PhfVIXQ4Y,78
-arpakitlib/_arpakit_project_template_v_5/project/api/auth.py,sha256=2UwEB5dcSERsVIjRYaK4dUtFcl7SLzszBVTz0awIIqo,13921
+arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py,sha256=86NyfOV0_SQcyXFrZoJph27bTK4IqtfETl46yOPfRWs,14141
 arpakitlib/_arpakit_project_template_v_5/project/api/const.py,sha256=J9bqaRRiIc3RLn6SJTvdfDvFrSsM_Ixii9t2M8dA5Jc,433
-arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py,sha256=-taA-OJ69donUlCUIl4tNxjHjRGnjwXl796lThef-uA,2284
+arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py,sha256=C7VhAh7cTYLUBg8HyEgNTCdzvRlAC6hGYKdDrweWq6I,2327
 arpakitlib/_arpakit_project_template_v_5/project/api/event.py,sha256=xKfJ3UnOx_g1s7KNZjWRp0eZbVRTsSlyJhT3wkfwT6k,2414
 arpakitlib/_arpakit_project_template_v_5/project/api/exception.py,sha256=cNZaI2DacGLl8Hyn1qIfFpVjvQzOQjwXWsVW4auBrCo,1280
 arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py,sha256=Uyt0gB_8QnMFcZuNoUaEiAAJEjziWQpsXY1OM36e3YU,11125
@@ -88,17 +88,19 @@ arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py,sha256=PLhH-W
 arpakitlib/_arpakit_project_template_v_5/project/api/response.py,sha256=xZMymP2BuQaRNVWLeIp3UgUUo-MFN8MJnsn9Al4vOb8,1028
 arpakitlib/_arpakit_project_template_v_5/project/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=VSnyxswDMrD4MEhLK77hrm4UYNHerzBV-92ASgEOqis,1293
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=F_nqzPr2q6ssDv3RNqyn8CyRQBJ89rzpOHrgjkNYS8I,1216
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py,sha256=DUSPKlXhITe5Ah5gq4d7dAls5H_K42AHj6pLSMZJ6RM,1785
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=dYjl8mrxCmQjTinqvimowzgYbLm_zAtYLYNWyvI3y10,814
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py,sha256=I8g9PeguugvBZYrC4gzLtPBBoJw7U8joxYFmwqFW0mE,1088
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py,sha256=IfjKMlDwkEt_fRcYxjCDZT1rYdpUXUhSoL4VyYTZzSA,1299
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=qF1ClV0D8mYi3mfk_BbJqyTVa7Yor7ULJ9RCxCVhC1A,1326
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=ml2IanYaDow2nWhCCVeGEp1PkTZAem5I5XQowdQV_Bg,1261
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py,sha256=y0YcC0i7XSPJz0Doy8atxBilRY2FJZn2IdzKsCQFVKs,2038
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/init_sqlalchemy_db.py,sha256=fO6FqSFxSGEvmiCbuTAgVo2wrg9iFxqEmFz0DNWx6bg,1354
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=I_M-ipqOnrY-sVi0jCNhSreQQi1Y8dRGqpj0koT-Vd0,950
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py,sha256=-6zsihzxSUVve-5M71y5NDKXywlMSRIsDQn19vQ3yJo,1133
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py,sha256=KoCoKndAdJi0xkuOhVv9toC0ZWvwstrOtdtgp_Bw-0Q,1364
 arpakitlib/_arpakit_project_template_v_5/project/api/router/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py,sha256=q-ViMaj6dv09qYegh9ApbT1_tKFqqL-HlpvxCbeZWVw,1133
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py,sha256=9EsbkMg1nmTPyVbkb847DOo-HkFTZUpySeTOnVmqMbA,1155
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py,sha256=55khAkCurF5DLhkFXDpb85ex5PULOLag9Z5EezMpUEs,1192
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=S20kGyWjfPS0Ue1s8tpAqQsQlJ63m3uSSiOgKkHOuNk,514
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_api_key.py,sha256=gS8JJLpuqaq83BBsEh5MOLgse4i3t4Z9stSmTBd9m70,1188
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py,sha256=txTSIee352vky9xIuQpptncAV7gpzC9WgRxc_0Ib9WY,1178
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py,sha256=lRkChLNHiSdiAgPTPNn7GBU1vrPYIUoJ_fXBq1Sc2Jc,1200
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py,sha256=BIGsJIxjE5Mh4fILbfvf9yGZi2J-pxtEUF-9CZ9CYiY,1237
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=u5boqPilcW9ivGuOyNKRoang8-Vp3Faovu6R34RpRBY,654
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py,sha256=xQNMi81IaroNE2H3LvYNUYV6X1dcGSeS2kAUSvGEcWA,523
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/main_router.py,sha256=OPKujYKPInDozmfZrffQnMGtdwyxMBQv1k2f-LttMDY,356
@@ -120,6 +122,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=8oPqCofV5KJMB6JB-Cozi_5l-2t8EPSvfossT0wIZBM,699
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=EenBUvs9qENEGuCpZrBRSd4TNVjR-ER55g44QGPLAzY,482
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/api_key.py,sha256=opXOQvpC3turivtLkf-BOJ9Octq5HW8HaM-oRTLhrX0,429
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py,sha256=cm7FAsZf5GlGAcR_w0tr2fR9gUMNcY--ifqE-BuFGpU,447
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py,sha256=S93SizBPg5evgycr3Y_AF0Ds0M5gvO2o_W2VsDZXFeY,629
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py,sha256=XRUs3ieMDZGGnMMst-QXptBWXqBL-qPQa25NJVbSI9I,436
@@ -142,7 +145,7 @@ arpakitlib/_arpakit_project_template_v_5/project/core/const.py,sha256=hgiiPIYL95
 arpakitlib/_arpakit_project_template_v_5/project/core/dump_file_storage_in_dir.py,sha256=u3-vStMGaseMsRLuJmQK04UDhaez9vw6o5jyHb1fwNg,617
 arpakitlib/_arpakit_project_template_v_5/project/core/jinja2_templates.py,sha256=jCNLaBauGC7YNvZdTLNHuPp7hmRGt94O23Skg6ewo7o,352
 arpakitlib/_arpakit_project_template_v_5/project/core/media_file_storage_in_dir.py,sha256=fMofTsfJtA8pp5lEUhucEUu3PBsmj-elaRZzExDsdLI,623
-arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=UR9EM_Fw2WfVRACwrZTkJMMA5IV2YYiWa87qi_IcMvg,5828
+arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=MRf_7zUPGI11zw2PfbY1dgPJV7ZUIVA5kuALyNmyJkI,5843
 arpakitlib/_arpakit_project_template_v_5/project/core/util.py,sha256=1ha9UrguVPsTSjoMHhVZVCD0_mNBfhIDGEvcG1nA4Zw,667
 arpakitlib/_arpakit_project_template_v_5/project/json_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/json_db/json_db.py,sha256=tBML-z4Y7uY8f_0ggcxvlDNt15Sf93Jr_OUeHwWxqOA,724
@@ -159,6 +162,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/static/healthcheck,sha
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/helloworld,sha256=eH7Hbcr9IMGQjrCTahL5Ht0QWrXNfswrGuIDJkg0Xf8,11
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/openapi-favicon.png,sha256=CuptowzQaCQsbXlunWIr_9akhvJ0TDIXHyuXBAFtM4I,5279
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/redoc/redoc.standalone.js,sha256=WCuodUNv1qVh0oW5fjnJDwb5AwOue73jKHdI9z8iGKU,909365
+arpakitlib/_arpakit_project_template_v_5/project/resource/static/sqladmin-favicon.png,sha256=CuptowzQaCQsbXlunWIr_9akhvJ0TDIXHyuXBAFtM4I,5279
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/favicon-16x16.png,sha256=ryStYE3Xs7zaj5dauXMHX0ovcKQIeUShL474tjo-B8I,665
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/favicon-32x32.png,sha256=PtYS9B4FDKXnAAytbxy-fn2jn2X8qZwC6Z5lkQVuWDc,628
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/index.css,sha256=kySAfUJFZaFjm7KfN1TI1NRcEAnGdnTpluMzVfaSnOc,202
@@ -178,7 +182,7 @@ arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swag
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swagger-ui.js,sha256=yHKu9z0C2kOO5j9n9D8oQzuBLeEoMGrFcMWQN27V554,339285
 arpakitlib/_arpakit_project_template_v_5/project/resource/static/swagger-ui/swagger-ui.js.map,sha256=jeX-b8zAm2jsTGGCznrc49McbLKSfXspwECPhEAp0Xc,1159444
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=LRhiMDKy-yCcUftonjvDGxHvigYJjSJSPXsCXij9xF0,201
+arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_1.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_2.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_3.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
 arpakitlib/_arpakit_project_template_v_5/project/sandbox/sandbox_4.py,sha256=xKSp7tIBu3Ffp_kgJkwVtdam3BcoFZ44JPVHoRRaP0E,163
@@ -194,28 +198,31 @@ arpakitlib/_arpakit_project_template_v_5/project/site/exception_handler.py,sha25
 arpakitlib/_arpakit_project_template_v_5/project/site/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/site/router/main_router.py,sha256=J5jNfgd-3OiWTtuubimEUz6wrOogupj9PkUdDmwz-2U,62
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=V1O-gF4QaGNVOLnVDgscED3vMpLNo61bFUwo0-tSeSg,747
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_auth.py,sha256=9y1s1KJkvaPBxx6S_m7lDlTBIRYilfm7WvxKFsfX4kk,2420
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=JTXLf18DQVsZtoe6yFpZIVJI95rgJofnTe9YKyVwwhQ,851
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=otas9GzslibQlW4DpCguMnXy2UKMOvR9adULHCcF7E0,3485
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=DRlRPkcOGXOccfP73oKEXolZTsc5VWdQgEG-qoW03ms,99
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=x5F8--5KA4cmTrb6kAAmp6fVd2TiqxPOzxqUkSEhSG4,1298
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUYNlsX9Sj_QLMzYuTQbbYYbIMHhbsSjTXt-G7lOE,849
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py,sha256=fHKKdhJK-6h6tNNEK5FkoZWUpr-BtugLZ1DXz0p91hw,182
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py,sha256=MtEk37LR9xg5XltEbIAw1hh74BsS70I2G3C21QSbjVQ,357
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=t4IBg1k1pgTpAEGPMZ3TYDWfsZZcK2fCZz5C9aQ-YSA,805
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/common.py,sha256=WSlZ2wOyrUVX-6nO0NRCZJ9dgPrY2ytANrhkooYq_w8,560
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/operation.py,sha256=UILyxYDPi1jbjoBEV6ipSBUvswWd0gCbfBD8pAhpZHE,1225
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/story_log.py,sha256=vHTewzi0zo6Eg06Jci9wyswSHqyxRbyiHsbYDtNXeeM,911
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py,sha256=lT0zEjIcnm_Y3N-f4TM5145H_65XFOtNyWUQKjEUjuA,956
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py,sha256=0oSZLYneZSDSl3dnqaojHc1ldZSJCc7dPw4_i1N8Uvk,908
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=1y3FaMFzm_5UM2poqtBve_UP_mh1vjs--krq6yO8PsA,742
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=btSjCQ7RJqomeXzYs9HePCu1dZHs0z6-RuboYKG89_8,598
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=a-xSHsnE8EkiH9g1ZoxaQQ7Y7q0urIm3SynlGYiSE8E,1038
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=yK0fFdRYZUpjWl8Vq9S9DKMLBkj9ZT9TXhGyPuR6asU,1876
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=4jahuEqTD7OgIDB1TDVDb7occhgid_TLpEBtbi8vu2E,3367
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=Hm6DTPAvK9f1WgIvBXBO00DAeienEXr3CZIVG_Odrfg,1383
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=lCgNR-SLUL6JN-Q1pstxGKF0PiSTKTWGzWANF5u9u7o,2354
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=9yGVRC4Ns1TgM7IOaZvbQWuiLYpxDTQKzitokpCGRoQ,1013
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=xm_0X5DNoLtw_2HkDVd386cleOFBeA-Ll7Cr2hw-fgk,3288
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=uB7nKEqvUKJyE_xybJUjXIJtVXh0IKyoPDnDUogq8lE,1306
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=GaOJkxsQ6B3B4pO43_MOOrJSUE8d7VzXyYLQcoEvCCw,2355
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=k3_p7S_oNDfzDIQ1daLYL9TgGn-nZRug_Puwsn73RTs,1015
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util.py,sha256=QSA_nT6aWdtE412-Uj3VTd7yh3dzS4HugDK9FivjTPo,570
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py,sha256=0T2NXyh2Voy8SmtFNMvvD8HSPVz0OXjsQFDWig5pAAs,834
+arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py,sha256=RXIEB5zOFHtQ_B0t_JlQ0ihjFbkVtW7six6CLdxft3w,901
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py,sha256=fioAaw5sWtZdOuHsl1kbVxuU_g0IK8N-gyKlMzVi8FE,416
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_2.py,sha256=VcCvxRLA0XnLaQcsaoZkIVV8rTO3uMyLTYoEsdxKtYE,416
 arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_3.py,sha256=9QJTgM4qsJXPgFhfVueQ9vObXr_dAldzP_p8dPO42uA,416
@@ -346,8 +353,8 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.8.22.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.22.dist-info/METADATA,sha256=cvdlrD2PV6wby8sBnDnqxT7mHA4N_0t6dGQkmnLVJ7U,3432
-arpakitlib-1.8.22.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.22.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.22.dist-info/RECORD,,
+arpakitlib-1.8.23.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.23.dist-info/METADATA,sha256=_GjT6D8Z0BfsOBLxwfXwQMEPNivlHJgUrbaKs7zBXdk,3432
+arpakitlib-1.8.23.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.23.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.23.dist-info/RECORD,,

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_auth.py

@@ -1,66 +0,0 @@
-import logging
-
-import fastapi
-from sqladmin.authentication import AuthenticationBackend
-
-from arpakitlib.ar_str_util import make_none_if_blank
-from project.core.settings import get_cached_settings
-
-
-class SQLAdminAuth(AuthenticationBackend):
-    def __init__(self):
-        self._logger = logging.getLogger(self.__class__.__name__)
-        super().__init__(secret_key=get_cached_settings().sqladmin_secret_key)
-
-    async def login(self, request: fastapi.Request) -> bool:
-        form = await request.form()
-
-        username = form.get("username")
-        if username:
-            username = username.strip()
-        username = make_none_if_blank(username)
-
-        password = form.get("password")
-        if password:
-            password = password.strip()
-        password = make_none_if_blank(password)
-
-        if get_cached_settings().sqladmin_auth_keys is not None:
-            if (
-                    (
-                            is_username_correct := (
-                                    username is not None
-                                    and username in get_cached_settings().sqladmin_auth_keys
-                            )
-                    )
-                    or
-                    (
-                            is_password_correct := (
-                                    password is not None
-                                    and password in get_cached_settings().sqladmin_auth_keys
-                            )
-                    )
-            ):
-                if is_username_correct is True:
-                    request.session.update({"sqladmin_auth_key": username})
-                elif is_password_correct is True:
-                    request.session.update({"sqladmin_auth_key": password})
-                return True
-
-        return False
-
-    async def logout(self, request: fastapi.Request) -> bool:
-        request.session.clear()
-        return True
-
-    async def authenticate(self, request: fastapi.Request) -> bool:
-        sqladmin_auth_key = request.session.get("sqladmin_auth_key")
-        if sqladmin_auth_key:
-            sqladmin_auth_key = sqladmin_auth_key.strip()
-        sqladmin_auth_key = make_none_if_blank(sqladmin_auth_key)
-
-        if get_cached_settings().sqladmin_auth_keys is not None:
-            if sqladmin_auth_key is not None and sqladmin_auth_key in get_cached_settings().sqladmin_auth_keys:
-                return True
-
-        return False