arpakitlib 1.8.19__py3-none-any.whl → 1.8.20__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/auth.py

@@ -1,4 +1,5 @@
-from typing import Callable
+import functools
+from typing import Callable, Any
 
 import fastapi
 import fastapi.exceptions
@@ -8,10 +9,10 @@ import sqlalchemy
 from fastapi import Security
 from fastapi.security import APIKeyHeader
 from pydantic import BaseModel, ConfigDict
+from sqlalchemy.orm import joinedload
 
 from arpakitlib.ar_func_util import is_async_func, is_sync_func
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
-from arpakitlib.ar_type_util import raise_for_type
 from project.api.const import APIErrorCodes
 from project.api.exception import APIException
 from project.core.settings import get_cached_settings
@@ -22,70 +23,27 @@ from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserTokenDBM
 class APIAuthData(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
-    require_api_key_string: bool = False
-    require_user_token_string: bool = False
-
-    require_correct_api_key: bool = False
-    require_correct_user_token: bool = False
-
-    require_mode_type: str | None = None
-    require_not_mode_type: str | None = None
-
-    current_mode_type: str | None = None
-
     api_key_string: str | None = None
     user_token_string: str | None = None
 
     is_api_key_correct: bool | None = None
-    is_user_token_correct: bool | None = None
 
     api_key_dbm: ApiKeyDBM | None = None
     user_token_dbm: UserTokenDBM | None = None
 
+    prod_mode: bool = False
 
-def api_auth(
-        *,
-        require_api_key_string: bool = False,
-        require_user_token_string: bool = False,
-
-        require_correct_api_key: bool = False,
-        require_correct_user_token: bool = False,
+    extra_data: dict[str, Any] = {}
 
-        require_mode_type: str | None = None,
-        require_not_mode_type: str | None = None,
 
-        is_api_key_correct_func: Callable | None = None,
-        is_user_token_correct_func: Callable | None = None,
-        correct_api_keys: str | list[str] | None = None,
-        correct_user_tokens: str | list[str] | None = None,
+def api_auth(
+        *,
+        middlewares: list[Callable] | None = None
 ) -> Callable:
-    if isinstance(correct_api_keys, str):
-        correct_api_keys = [correct_api_keys]
-    if correct_api_keys is not None:
-        raise_for_type(correct_api_keys, list)
-
-    if is_api_key_correct_func is None and correct_api_keys is not None:
-        is_api_key_correct_func = (
-            lambda *args, **kwargs_: kwargs_["api_auth_data"].api_key_string in correct_api_keys
-        )
-
-    if isinstance(correct_user_tokens, str):
-        correct_user_tokens = [correct_user_tokens]
-    if correct_user_tokens is not None:
-        raise_for_type(correct_user_tokens, list)
-
-    if is_user_token_correct_func is None and correct_user_tokens is not None:
-        is_user_token_correct_func = (
-            lambda *args, **kwargs_: kwargs_["api_auth_data"].user_token_string in correct_user_tokens
-        )
-
-    if require_correct_api_key is True:
-        require_api_key_string = True
+    if middlewares is None:
+        middlewares = []
 
-    if require_correct_user_token is True:
-        require_user_token_string = True
-
-    async def func(
+    async def async_func(
             *,
             ac: fastapi.security.HTTPAuthorizationCredentials | None = fastapi.Security(
                 fastapi.security.HTTPBearer(auto_error=False)
@@ -97,16 +55,10 @@ def api_auth(
     ) -> APIAuthData:
 
         api_auth_data = APIAuthData(
-            require_api_key_string=require_api_key_string,
-            require_user_token_string=require_user_token_string,
-            require_correct_api_key=require_correct_api_key,
-            require_correct_user_token=require_correct_user_token,
-            require_mode_type=require_mode_type,
-            require_not_mode_type=require_not_mode_type,
-            current_mode_type=get_cached_settings().mode_type
+            prod_mode=get_cached_settings().prod_mode
         )
 
-        # parse api_key
+        # parse api_key_string
 
         api_auth_data.api_key_string = api_key_string
 
@@ -116,6 +68,8 @@ def api_auth(
             api_auth_data.api_key_string = request.headers["api-key"]
         if not api_auth_data.api_key_string and "apikey" in request.headers.keys():
             api_auth_data.api_key_string = request.headers["apikey"]
+        if not api_auth_data.api_key_string and "api_key_string" in request.headers.keys():
+            api_auth_data.api_key_string = request.headers["api_key_string"]
 
         if not api_auth_data.api_key_string and "api_key" in request.query_params.keys():
             api_auth_data.api_key_string = request.query_params["api_key"]
@@ -123,13 +77,15 @@ def api_auth(
             api_auth_data.api_key_string = request.query_params["api-key"]
         if not api_auth_data.api_key_string and "apikey" in request.query_params.keys():
             api_auth_data.api_key_string = request.query_params["apikey"]
+        if not api_auth_data.api_key_string and "api_key_string" in request.query_params.keys():
+            api_auth_data.api_key_string = request.query_params["api_key_string"]
 
         if api_auth_data.api_key_string:
             api_auth_data.api_key_string = api_auth_data.api_key_string.strip()
         if not api_auth_data.api_key_string:
             api_auth_data.api_key_string = None
 
-        # parse user token
+        # parse user_token_string
 
         api_auth_data.user_token_string = ac.credentials if ac and ac.credentials and ac.credentials.strip() else None
 
@@ -158,196 +114,165 @@ def api_auth(
         if not api_auth_data.user_token_string:
             api_auth_data.user_token_string = None
 
-        # require_mode_type
+        # is_api_key_correct
 
-        if require_mode_type is not None:
-            if get_cached_settings().mode_type != require_mode_type:
-                raise APIException(
-                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                    error_code=APIErrorCodes.cannot_authorize,
-                    error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-                )
+        if api_auth_data.api_key_string is not None:
+            if get_cached_settings().api_correct_api_keys is None:
+                api_auth_data.is_api_key_correct = None
+            else:
+                api_auth_data.is_api_key_correct = api_auth_data.api_key_string in get_cached_settings().api_correct_api_keys
 
-        # require_not_mode_type
+        # api_key_dbm
 
-        if require_not_mode_type is not None:
-            if get_cached_settings().mode_type == require_not_mode_type:
-                raise APIException(
-                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                    error_code=APIErrorCodes.cannot_authorize,
-                    error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-                )
+        if api_auth_data.api_key_string is not None:
+            if get_cached_sqlalchemy_db() is not None:
+                async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+                    api_auth_data.api_key_dbm = await async_session.scalar(
+                        sqlalchemy.select(ApiKeyDBM).where(ApiKeyDBM.value == api_auth_data.api_key_string)
+                    )
 
-        # require_api_key_string
+        # user_token_dbm
 
-        if require_api_key_string and not api_auth_data.api_key_string:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
+        if api_auth_data.api_key_string is not None:
+            if get_cached_sqlalchemy_db() is not None:
+                async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+                    api_auth_data.user_token_dbm = await async_session.scalar(
+                        sqlalchemy.select(UserTokenDBM)
+                        .options(joinedload(UserTokenDBM.user))
+                        .where(UserTokenDBM.value == api_auth_data.user_token_string)
+                    )
 
-        # require_token_string
-
-        if require_user_token_string and not api_auth_data.user_token_string:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
+        # middlewares
 
-        # is_api_key_correct_func
+        for middleware in middlewares:
+            api_auth_data.extra_data[middleware.__name__] = True
 
-        if is_api_key_correct_func is not None:
-            if is_async_func(is_api_key_correct_func):
-                await is_api_key_correct_func(
+        for middleware in middlewares:
+            if is_async_func(middleware):
+                await middleware(
                     api_auth_data=api_auth_data,
                     request=request
                 )
-            elif is_sync_func(is_api_key_correct_func):
-                is_api_key_correct_func(
+            elif is_sync_func(middleware):
+                middleware(
                     api_auth_data=api_auth_data,
                     request=request
                 )
             else:
-                raise TypeError("unknown validate_api_key_func type")
+                raise TypeError(f"unknown middleware type, {middleware.__name__}")
 
-        # is_user_token_correct_func
+        return api_auth_data
 
-        if is_user_token_correct_func is not None:
-            if is_async_func(is_user_token_correct_func):
-                await is_user_token_correct_func(
-                    api_auth_data=api_auth_data,
-                    request=request
-                )
-            elif is_sync_func(is_user_token_correct_func):
-                is_user_token_correct_func(
-                    api_auth_data=api_auth_data,
-                    request=request
-                )
-            else:
-                raise TypeError("unknown validate_token_func type")
+    return async_func
 
-        # require_correct_api_key
 
-        if require_correct_api_key:
-            if not api_auth_data.is_api_key_correct:
-                raise APIException(
-                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                    error_code=APIErrorCodes.cannot_authorize,
-                    error_description="not api_auth_data.is_api_key_correct",
-                    error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()),
-                )
+def require_prod_mode_api_middleware():
+    @functools.wraps(require_prod_mode_api_middleware)
+    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+        if not get_cached_settings().prod_mode:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description=f"prod_mode={get_cached_settings().prod_mode}",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
-        # require_correct_token
+    return func
 
-        if require_correct_user_token:
-            if not api_auth_data.is_user_token_correct:
-                raise APIException(
-                    status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                    error_code=APIErrorCodes.cannot_authorize,
-                    error_description="not api_auth_data.is_user_token_correct",
-                    error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-                )
 
-        return api_auth_data
+def require_not_prod_mode_api_middleware():
+    @functools.wraps(require_not_prod_mode_api_middleware)
+    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+        if get_cached_settings().prod_mode:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description=f"prod_mode={get_cached_settings().prod_mode}",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
     return func
 
 
-def correct_api_keys_from_settings__is_api_key_correct_func() -> Callable:
-    async def async_func(
-            *,
-            api_auth_data: APIAuthData,
-            request: fastapi.requests.Request,
-    ):
-        if get_cached_settings().api_correct_api_keys is None:
-            api_auth_data.is_api_key_correct = False
-            return
+def require_api_key_string_api_middleware():
+    @functools.wraps(require_api_key_string_api_middleware)
+    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.api_key_string is None:
-            api_auth_data.is_api_key_correct = False
-            return
-        if api_auth_data.api_key_string.strip() not in get_cached_settings().api_correct_api_keys:
-            api_auth_data.is_api_key_correct = False
-            return
-        api_auth_data.is_api_key_correct = True
-        return
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="api_key_string is required",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
-    return async_func
+    return func
 
 
-def correct_tokens_from_settings__is_user_token_correct_func() -> Callable:
-    async def async_func(
-            *,
-            api_auth_data: APIAuthData,
-            request: fastapi.requests.Request,
-    ):
-        if get_cached_settings().api_correct_tokens is None:
-            api_auth_data.is_api_key_correct = False
-            return
+def require_user_token_string_api_middleware():
+    @functools.wraps(require_user_token_string_api_middleware)
+    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.user_token_string is None:
-            api_auth_data.is_api_key_correct = False
-            return
-        if api_auth_data.user_token_string.strip() not in get_cached_settings().api_correct_tokens:
-            api_auth_data.is_api_key_correct = False
-            return
-        api_auth_data.is_api_key_correct = True
-        return
-
-    return async_func
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="user_token_string is required",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
+    return func
 
-def correct_api_key_from_sqlalchemy_db__is_api_key_correct_func() -> Callable:
-    async def async_func(
-            *,
-            api_auth_data: APIAuthData,
-            request: fastapi.requests.Request,
-    ):
-        if api_auth_data.api_key_string is None:
-            api_auth_data.is_api_key_correct = False
-            return
 
-        async with get_cached_sqlalchemy_db().new_async_session() as session:
-            api_auth_data.api_key_dbm = await session.scalar(
-                sqlalchemy.select(ApiKeyDBM).where(ApiKeyDBM.value == api_auth_data.api_key_string)
+def require_correct_api_key_dbm_api_middleware():
+    @functools.wraps(require_correct_api_key_dbm_api_middleware)
+    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+        if not api_auth_data.is_api_key_correct:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="api_key_string is not correct",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
-        if api_auth_data.api_key_dbm is None or not api_auth_data.api_key_dbm.is_enabled:
-            api_auth_data.is_api_key_correct = False
-            return
-
-        api_auth_data.is_api_key_correct = True
-        return True
+    return func
 
-    return async_func
 
+def require_api_key_dbm_api_middleware(*, require_active: bool = True):
+    @functools.wraps(require_api_key_dbm_api_middleware)
+    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+        if api_auth_data.api_key_dbm is None:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="api_key_dbm is required",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
+        if require_active and not api_auth_data.api_key_dbm.is_active:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="api_key_dbm is not active",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
-def correct_user_token_from_sqlalchemy_db__is_user_token_correct_func(
-        *, require_user_roles: list[str] | None = None
-) -> Callable:
-    async def async_func(
-            *,
-            api_auth_data: APIAuthData,
-            request: fastapi.requests.Request,
-    ):
-        if api_auth_data.user_token_string is None:
-            api_auth_data.is_user_token_correct = False
-            return
+    return async_func
 
-        with get_cached_sqlalchemy_db().new_session() as session:
-            api_auth_data.user_token_dbm = session.query(
-                UserTokenDBM
-            ).filter(
-                UserTokenDBM.value == api_auth_data.user_token_string
-            ).one_or_none()
 
+def require_user_token_dbm_api_middleware(*, require_active: bool = True):
+    @functools.wraps(require_user_token_dbm_api_middleware)
+    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.user_token_dbm is None:
-            api_auth_data.is_user_token_correct = False
-            return
-        if not api_auth_data.user_token_dbm.is_enabled:
-            pass
-
-        api_auth_data.is_user_token_correct = True
-        return
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="user_key_dbm is required",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
+        if require_active and not api_auth_data.user_token_dbm.is_active:
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description="user_key_dbm is not active",
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
 
     return async_func

arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -11,7 +11,6 @@ from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_func, is_sync_func
-from arpakitlib.ar_json_util import transfer_data_to_json_str
 from project.api.const import APIErrorCodes
 from project.api.exception import APIException
 from project.api.response import APIJSONResponse
@@ -175,7 +174,7 @@ def logging_func_before_in_api_exception_handler(
         ):
             return
 
-        _logger.error(transfer_data_to_json_str(error_common_so.model_dump()), exc_info=False)
+        _logger.exception(exception)
 
     return func
 

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

@@ -1,6 +1,8 @@
 import fastapi
 from fastapi import APIRouter
 
+from project.api.auth import require_user_token_dbm_api_middleware, require_api_key_dbm_api_middleware, APIAuthData, \
+    api_auth
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
 from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
@@ -17,7 +19,11 @@ api_router = APIRouter()
 async def _(
         *,
         request: fastapi.requests.Request,
-        response: fastapi.responses.Response
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_api_key_dbm_api_middleware(require_active=True),
+            require_user_token_dbm_api_middleware(require_active=True)
+        ]))
 ):
     arpakitlib_project_template_data = get_arpakitlib_project_template_info()
     return RawDataCommonSO(data=arpakitlib_project_template_data)

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

@@ -2,7 +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
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_api_key_dbm_api_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
 
@@ -19,12 +20,9 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        api_auth_data: APIAuthData = fastapi.Depends(api_auth(
-            require_not_prod_mode=True,
-            try_find_api_key_dbm_from_sqlalchemy_db=True,
-            try_find_user_token_dbm_from_sqlalchemy_db=True,
-            require_api_key_dbm_from_sqlalchemy_db=True,
-            require_user_token_dbm_from_sqlalchemy_db=True
-        ))
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_api_key_dbm_api_middleware(require_active=True),
+            require_user_token_dbm_api_middleware(require_active=True)
+        ]))
 ):
     return RawDataCommonSO(data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()))

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

@@ -1,3 +1,20 @@
 from fastapi import APIRouter
 
+from project.api.router.admin import get_auth_data, get_arpakitlib_project_template_info, raise_fake_error
+
 main_admin_api_router = APIRouter()
+
+main_admin_api_router.include_router(
+    router=get_arpakitlib_project_template_info.api_router,
+    prefix="/get_arpakitlib_project_template_info"
+)
+
+main_admin_api_router.include_router(
+    router=get_auth_data.api_router,
+    prefix="/get_auth_data"
+)
+
+main_admin_api_router.include_router(
+    router=raise_fake_error.api_router,
+    prefix="/raise_fake_error"
+)

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

@@ -0,0 +1,27 @@
+import fastapi.requests
+from fastapi import APIRouter
+
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_api_key_dbm_api_middleware
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.api.schema.out.common.raw_data import RawDataCommonSO
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Raise fake error",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=RawDataCommonSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_api_key_dbm_api_middleware(require_active=True),
+            require_user_token_dbm_api_middleware(require_active=True)
+        ]))
+):
+    raise Exception("fake error")

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

@@ -1,9 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth2 import APIAuthData, api_auth, require_api_key_string_api_middleware, \
-    require_user_token_string_api_middleware, try_find_api_key_dbm_api_middleware, \
-    try_find_user_token_dbm_api_middleware
+from project.api.auth import APIAuthData, api_auth, require_api_key_dbm_api_middleware, \
+    require_user_token_dbm_api_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
@@ -22,11 +21,8 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_api_key_string_api_middleware(),
-            require_user_token_string_api_middleware(),
-            try_find_api_key_dbm_api_middleware(),
-            try_find_user_token_dbm_api_middleware(),
-
+            require_api_key_dbm_api_middleware(require_active=True),
+            require_user_token_dbm_api_middleware(require_active=True)
         ]))
 ):
     return ErrorsInfoGeneralSO(

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

@@ -1,3 +1,10 @@
 from fastapi import APIRouter
 
+from project.api.router.client import get_errors_info
+
 main_client_api_router = APIRouter()
+
+main_client_api_router.include_router(
+    router=get_errors_info.api_router,
+    prefix="/get_errors_info"
+)

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

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from project.api.router.general import healthcheck
+from project.api.router.general import healthcheck, now_utc_datetime
 
 main_general_api_router = APIRouter()
 
@@ -8,3 +8,7 @@ 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"
+)

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

@@ -17,6 +17,6 @@ api_router = APIRouter()
 async def _(
         *,
         request: fastapi.requests.Request,
-        response: fastapi.responses.Response
+        response: fastapi.responses.Response,
 ):
     return DatetimeCommonSO.from_datetime(datetime_=now_utc_dt())

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

@@ -10,7 +10,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 class UserDBMSAdminSO(SimpleDBMAdminSO):
     mail: str | None
     roles: list[str]
-    is_enabled: bool
+    is_active: bool
     tg_id: int | None
     tg_bot_last_action_dt: dt.datetime | None
     tg_data: dict[str, Any] | None

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

@@ -7,7 +7,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 class UserTokenDBMSAdminSO(SimpleDBMAdminSO):
     value: str
     user_id: int
-    is_enabled: bool
+    is_active: bool
 
     @classmethod
     def from_user_token_dbm(cls, *, user_dbm: UserTokenDBM) -> UserTokenDBMSAdminSO:

arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -84,24 +84,10 @@ class Settings(SimpleSettings):
 
     api_init_json_db: bool = False
 
-    api_api_keys: list[str] | None = ["1"]
+    api_correct_api_keys: list[str] | None = ["1"]
 
-    @field_validator("api_api_keys", mode="before")
-    def validate_api_api_keys(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> list[str] | None:
-        if isinstance(v, str):
-            v = [v]
-        if isinstance(v, int):
-            v = [str(v)]
-        if isinstance(v, list):
-            for i, v_ in enumerate(v):
-                if isinstance(v_, int):
-                    v[i] = str(v_)
-        return v
-
-    api_user_tokens: list[str] | None = ["1"]
-
-    @field_validator("api_user_tokens", mode="before")
-    def validate_api_tokens(cls, v: Any, validation_info: ValidationInfo, **kwargs) -> list[str] | None:
+    @field_validator("api_correct_api_keys", mode="before")
+    def validate_api_correct_api_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/sqlalchemy_db_/sqlalchemy_model/api_key.py

@@ -35,7 +35,7 @@ class ApiKeyDBM(SimpleDBM):
         insert_default=generate_default_api_key_value,
         nullable=False
     )
-    is_enabled: Mapped[bool] = mapped_column(
+    is_active: Mapped[bool] = mapped_column(
         sqlalchemy.Boolean,
         index=True,
         insert_default=True,

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

@@ -33,7 +33,7 @@ class UserDBM(SimpleDBM):
         index=True,
         nullable=False
     )
-    is_enabled: Mapped[bool] = mapped_column(
+    is_active: Mapped[bool] = mapped_column(
         sqlalchemy.Boolean,
         index=True,
         insert_default=True,

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

@@ -25,7 +25,7 @@ class UserTokenDBM(SimpleDBM):
         index=True,
         nullable=False
     )
-    is_enabled: Mapped[bool] = mapped_column(
+    is_active: Mapped[bool] = mapped_column(
         sqlalchemy.Boolean,
         index=True,
         insert_default=True,

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py

@@ -0,0 +1,35 @@
+import asyncio
+import logging
+
+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 ApiKeyDBM
+
+_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:
+        for i in range(10):
+            api_key = ApiKeyDBM(value=str(i))
+            session.add(api_key)
+            _logger.info(api_key)
+        session.commit()
+
+
+async def async_make_test_data_1():
+    get_cached_settings().raise_if_prod_mode()
+
+
+def __example():
+    make_test_data_1()
+
+
+async def __async_example():
+    await async_make_test_data_1()
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_1.py

@@ -1,12 +1,14 @@
 import asyncio
 
+from project.core.settings import get_cached_settings
+
 
 def make_test_data_1():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 async def async_make_test_data_1():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 def __example():

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_2.py

@@ -1,12 +1,14 @@
 import asyncio
 
+from project.core.settings import get_cached_settings
+
 
 def make_test_data_2():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 async def async_make_test_data_2():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 def __example():

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_3.py

@@ -1,12 +1,14 @@
 import asyncio
 
+from project.core.settings import get_cached_settings
+
 
 def make_test_data_3():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 async def async_make_test_data_3():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 def __example():

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_4.py

@@ -1,12 +1,14 @@
 import asyncio
 
+from project.core.settings import get_cached_settings
+
 
 def make_test_data_4():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 async def async_make_test_data_4():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 def __example():

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_5.py

@@ -1,12 +1,14 @@
 import asyncio
 
+from project.core.settings import get_cached_settings
+
 
 def make_test_data_5():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 async def async_make_test_data_5():
-    pass
+    get_cached_settings().raise_if_prod_mode()
 
 
 def __example():

{arpakitlib-1.8.19.dist-info → arpakitlib-1.8.20.dist-info}/METADATA

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

{arpakitlib-1.8.19.dist-info → arpakitlib-1.8.20.dist-info}/RECORD

@@ -78,27 +78,27 @@ arpakitlib/_arpakit_project_template_v_5/project/additional_model/__init__.py,sh
 arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py,sha256=XuVbWeesA5fxD0dFPDW8D7NAk0w4RyD5jXPwGOSFchg,233
 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=dlYrosfQ-ww1D0U5oma9TXjlTdQVmNEvvTvJtqWWiGY,13867
-arpakitlib/_arpakit_project_template_v_5/project/api/auth2.py,sha256=OCQ8zifsio7_4Pa7GGl40rkbcAYHcnCkO6ThF0J3aLg,9206
+arpakitlib/_arpakit_project_template_v_5/project/api/auth.py,sha256=wuiwenDuQ6NFmYbBcui8RJ3Wzgqz85S5Rpnc5ObrZuM,12096
 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/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=kiQje9yhaqmklYBI-_cp6vL61bWWRbmbo26eaPR_rWU,11415
+arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py,sha256=BZ5myTNgruU7q92cM7832PaB4qHa8ooGcZS6CmSaqnQ,11295
 arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py,sha256=PLhH-W6zDViO-75AGCs8Vq3IoyHChdqwBYAqLvdQN0U,904
 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=fV_9T21qRJJ6AlSeFDWLeKnYJ3nKnCWvxFu9gIUc9Wg,723
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=W4xlcoCViqMAEOJ5O9UYc4hNVtf3c80tGnV-71WMbLU,1047
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=deRK2jKrDmg44ZibSq4RbytGdV4c17J9gQsfZRLDxE0,67
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=uN2yJN8NpncyvIOc-D6s9nxftDpA5XwP9ZC6wqI9FZw,1084
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=SWh7P4-D1LSTS0anBEbIxnQI6OV9nymBlqFV5P8h8j4,1007
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=wzlJlKxj-hontW8ckuyqpQvzRKs0clpSAuwpXpFiaAQ,545
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py,sha256=DNRWLRCmGoqqdjnm_zjJmFkClwyEzxpZJTT74vH_TrQ,879
 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_errors_info.py,sha256=t1sQkVh3WD-8B1RtoXhA-XdDFLB03yBCMv7D-Gzxe20,1266
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=NVpUXEp1MRkISWTWbYDcgoiqARbzwzhUUEiUtO_ij5s,68
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/now_utc_datetime.py,sha256=II82zoa1LWbSGkn8YMqzZZpkfNgWxEClT2qrrWyzM4Q,590
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py,sha256=uG5skKLpYbrXAlHu8MO8pjIHI9dIvYaL8kfTPW4iEIU,1101
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=MFYUoxo0lal7__1B7wf1NT5RhJfVtK5rqp7SYix6AaY,234
 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=cBkG92B4LD4I5TmnQdG3x81n-_9hydRzQMgO4yhv8Cs,225
+arpakitlib/_arpakit_project_template_v_5/project/api/router/general/main_router.py,sha256=OPKujYKPInDozmfZrffQnMGtdwyxMBQv1k2f-LttMDY,356
+arpakitlib/_arpakit_project_template_v_5/project/api/router/general/now_utc_datetime.py,sha256=4On6HXmhUuseuijWIIxuuzxZW1iHjnN_WsKQA8qdMsM,591
 arpakitlib/_arpakit_project_template_v_5/project/api/router/main_router.py,sha256=Y-PPHWbLoICn0O8NRdx49f7ifEw2uN_QIRwfIseo0J0,615
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/common.py,sha256=DX6Yz63JHoNlgmZnpss2PuRgEtBh3PPlxM6wImYLpXo,718
@@ -115,8 +115,8 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/__init__.p
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,sha256=i_qLlACMT7XKB4liOEG1PTYkGIL0IDNHoP2Ioh_Xugw,181
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=SrRo1HqugMGDYnc0NUTzHzoMfNdtRzd1EleejURsx_M,715
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=GQ5EDbYCDByKVwSJpdfLLULWvjUUhE3vo5c2FdK0HBY,498
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py,sha256=pae7J75tW9Oj-dCNks1J_9jUTq2TIoRiYPS6MCQuZXE,633
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user_token.py,sha256=VhD7OVewrsJmJcNG7Uzm29Dn6pDpsAa3X19-FyiXi3k,447
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py,sha256=W0g6qHEKqPa4CJvmhzyfUiLzqXLjtTR3OC07UhfdkZc,632
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user_token.py,sha256=w7LL2q58aG7zgVDW1D_lUhg4zCJLqJcfXQX4geHSPXw,446
 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/common.py,sha256=hi0ybvowgARVEQaD0V8JYxUM5f4gqaJ6U7FlLQCxABE,182
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -138,7 +138,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=qvoEDtaNO27fEBMHgOLgale9ACd9m6_2ZQpXdcCEI0g,6359
+arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=jGZSy5VNfYaoq3tiUywHV8Nlx1_Vsw2Fml22bc3UUiQ,5905
 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
@@ -203,19 +203,20 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/__init__.py,sha2
 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=w53wMkQUQjuCGBXZWvz0wSaHVJbVP1u_N5sB0jp5nSg,1039
+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=ZyK6jRVYM7K_ze2LDaYBwqTP6MkTFjtQMTD-HroX0jg,3293
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=MyXra-PNFrqe9FOjXnDXNYkzX8_A9pbj2uhk1GTPFJ8,1264
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=YQO6ZxY71C3PqgmgCqymZZbmkx5fqpgsJ4wV6J5J8eY,2354
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=HQ-j6vkVdhbsAHO9a43fVcB-ZQrzQkbYilxNC9dFw5I,1014
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=HwFXmlQD9IIFYwGh5wvp0W1RaKqg2nWtjgLFTIsw5ww,2353
+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_/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_data_1.py,sha256=yRKf6HYZ2do2g7tAUB172nHA_u-yS9cyHhbinahc7sc,285
-arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_2.py,sha256=tBhhXKKlSUh_fEYoOvGRuBKUJxPentya1h_6lcd-hk0,285
-arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_3.py,sha256=0xV1EWfadkpSIso5gReDsOwdXunhovx14m-FWGCeJj0,285
-arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_4.py,sha256=L6c4IUz9Mi2axalGgzVJVqT94lShARVmB596PJ3BCpE,285
-arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_5.py,sha256=TN-weOT2xpB0wBkdaJ1F7t8YD63MNN_bZINjPJOfV9g,285
+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_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
+arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_4.py,sha256=OyU9601WACF7cCpPT33x6CpizNJeQIPDDFezIvEO01A,416
+arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_5.py,sha256=cew0ndlJspNkeQVOS0UPoceg1ARIm5ZFCzytiDIyvbg,416
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/admin.py,sha256=RG9YRcOJAkS3Z4VNEnwyTnKj8Xb65gCZWta7NdGdxvU,1008
@@ -340,8 +341,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.19.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.19.dist-info/METADATA,sha256=Hby8JriGaGGwdPUQ4bNE_OJkSH9Dalc0loZQISb2p6s,3432
-arpakitlib-1.8.19.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.19.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.19.dist-info/RECORD,,
+arpakitlib-1.8.20.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.20.dist-info/METADATA,sha256=1-ryZ5_8onpKsykVGz1CtFYHmC6CcpHL5Uvx-xLQdLc,3432
+arpakitlib-1.8.20.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.20.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.20.dist-info/RECORD,,

arpakitlib/_arpakit_project_template_v_5/project/api/auth2.py

@@ -1,218 +0,0 @@
-from typing import Callable
-
-import fastapi
-import fastapi.exceptions
-import fastapi.responses
-import fastapi.security
-import sqlalchemy
-from fastapi import Security
-from fastapi.security import APIKeyHeader
-from pydantic import BaseModel, ConfigDict
-
-from arpakitlib.ar_func_util import is_async_func, is_sync_func
-from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
-from project.api.const import APIErrorCodes
-from project.api.exception import APIException
-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 ApiKeyDBM, UserTokenDBM
-
-
-class APIAuthData(BaseModel):
-    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
-
-    api_key_string: str | None = None
-    user_token_string: str | None = None
-
-    api_key_dbm: ApiKeyDBM | None = None
-    user_token_dbm: UserTokenDBM | None = None
-
-    prod_mode: bool = False
-
-
-def api_auth(
-        *,
-        middlewares: list[Callable] | None = None
-) -> Callable:
-    if middlewares is None:
-        middlewares = []
-
-    async def async_func(
-            *,
-            ac: fastapi.security.HTTPAuthorizationCredentials | None = fastapi.Security(
-                fastapi.security.HTTPBearer(auto_error=False)
-            ),
-            api_key_string: str | None = Security(
-                APIKeyHeader(name="apikey", auto_error=False)
-            ),
-            request: fastapi.requests.Request
-    ) -> APIAuthData:
-
-        api_auth_data = APIAuthData(
-            prod_mode=get_cached_settings().prod_mode
-        )
-
-        # parse api_key_string
-
-        api_auth_data.api_key_string = api_key_string
-
-        if not api_auth_data.api_key_string and "api_key" in request.headers.keys():
-            api_auth_data.api_key_string = request.headers["api_key"]
-        if not api_auth_data.api_key_string and "api-key" in request.headers.keys():
-            api_auth_data.api_key_string = request.headers["api-key"]
-        if not api_auth_data.api_key_string and "apikey" in request.headers.keys():
-            api_auth_data.api_key_string = request.headers["apikey"]
-        if not api_auth_data.api_key_string and "api_key_string" in request.headers.keys():
-            api_auth_data.api_key_string = request.headers["api_key_string"]
-
-        if not api_auth_data.api_key_string and "api_key" in request.query_params.keys():
-            api_auth_data.api_key_string = request.query_params["api_key"]
-        if not api_auth_data.api_key_string and "api-key" in request.query_params.keys():
-            api_auth_data.api_key_string = request.query_params["api-key"]
-        if not api_auth_data.api_key_string and "apikey" in request.query_params.keys():
-            api_auth_data.api_key_string = request.query_params["apikey"]
-        if not api_auth_data.api_key_string and "api_key_string" in request.query_params.keys():
-            api_auth_data.api_key_string = request.query_params["api_key_string"]
-
-        if api_auth_data.api_key_string:
-            api_auth_data.api_key_string = api_auth_data.api_key_string.strip()
-        if not api_auth_data.api_key_string:
-            api_auth_data.api_key_string = None
-
-        # parse user_token_string
-
-        api_auth_data.user_token_string = ac.credentials if ac and ac.credentials and ac.credentials.strip() else None
-
-        if not api_auth_data.user_token_string and "token" in request.headers.keys():
-            api_auth_data.user_token_string = request.headers["token"]
-
-        if not api_auth_data.user_token_string and "user_token" in request.headers.keys():
-            api_auth_data.user_token_string = request.headers["user_token"]
-        if not api_auth_data.user_token_string and "user-token" in request.headers.keys():
-            api_auth_data.user_token_string = request.headers["user-token"]
-        if not api_auth_data.user_token_string and "usertoken" in request.headers.keys():
-            api_auth_data.user_token_string = request.headers["usertoken"]
-
-        if not api_auth_data.user_token_string and "token" in request.query_params.keys():
-            api_auth_data.user_token_string = request.query_params["token"]
-
-        if not api_auth_data.user_token_string and "user_token" in request.query_params.keys():
-            api_auth_data.user_token_string = request.query_params["user_token"]
-        if not api_auth_data.user_token_string and "user-token" in request.query_params.keys():
-            api_auth_data.user_token_string = request.query_params["user-token"]
-        if not api_auth_data.user_token_string and "usertoken" in request.query_params.keys():
-            api_auth_data.user_token_string = request.query_params["usertoken"]
-
-        if api_auth_data.user_token_string:
-            api_auth_data.user_token_string = api_auth_data.user_token_string.strip()
-        if not api_auth_data.user_token_string:
-            api_auth_data.user_token_string = None
-
-        # middlewares
-
-        for middleware in middlewares:
-            if is_async_func(middleware):
-                await middleware(
-                    api_auth_data=api_auth_data,
-                    request=request
-                )
-            elif is_sync_func(middleware):
-                middleware(
-                    api_auth_data=api_auth_data,
-                    request=request
-                )
-            else:
-                raise TypeError(f"unknown middleware type, {middleware.__name__}")
-
-        return api_auth_data
-
-    return async_func
-
-
-def require_prod_mode_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if not get_cached_settings().prod_mode:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_description=f"prod_mode={get_cached_settings().prod_mode}",
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
-
-    return func
-
-
-def require_not_prod_mode_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if get_cached_settings().prod_mode:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_description=f"prod_mode={get_cached_settings().prod_mode}",
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
-
-    return func
-
-
-def require_api_key_string_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if api_auth_data.api_key_string is None:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_description="api_key_string is required",
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
-
-    return func
-
-
-def require_user_token_string_api_middleware():
-    def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if api_auth_data.user_token_string is None:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_description="user_token_string is required",
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
-
-    return func
-
-
-def try_find_api_key_dbm_api_middleware():
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if api_auth_data.api_key_dbm is None:
-            return
-        async with get_cached_sqlalchemy_db().new_async_session() as async_session:
-            api_auth_data.api_key_dbm = await async_session.scalar(
-                sqlalchemy.select(ApiKeyDBM).where(ApiKeyDBM.value == api_auth_data.api_key_string)
-            )
-
-    return async_func
-
-
-def try_find_user_token_dbm_api_middleware():
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if api_auth_data.user_token_dbm is None:
-            return
-        async with get_cached_sqlalchemy_db().new_async_session() as async_session:
-            api_auth_data.user_token_dbm = await async_session.scalar(
-                sqlalchemy.select(UserTokenDBM).where(UserTokenDBM.value == api_auth_data.user_token_string)
-            )
-
-    return async_func
-
-
-def require_api_key_dbm_api_middleware():
-    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
-        if api_auth_data.api_key_dbm is None:
-            raise APIException(
-                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
-                error_code=APIErrorCodes.cannot_authorize,
-                error_description="api_key_dbm is required",
-                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
-            )
-
-    return async_func