arpakitlib 1.8.3__py3-none-any.whl → 1.8.4__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_1/api/router/v1/{arpakit_project_template.py → arpakitlib_project_template.py}

@@ -9,7 +9,7 @@ api_router = APIRouter()
 
 @api_router.get(
     "",
-    name="Get arpakitlib info",
+    name="Get arpakitlib project template info",
     status_code=fastapi.status.HTTP_200_OK,
     response_model=RawDataCommonSO | ErrorCommonSO
 )

arpakitlib/_arpakit_project_template_v_1/api/router/v1/clear_log_file.py

@@ -1,6 +1,8 @@
 import fastapi
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
+    correct_tokens_from_settings__validate_api_key_func
 from api.schema.common.out import RawDataCommonSO, ErrorCommonSO
 from arpakitlib.ar_logging_util import init_log_file
 from core.settings import get_cached_settings
@@ -18,6 +20,14 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = Depends(api_auth(
+            require_api_key_string=True,
+            require_token_string=True,
+            validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
+            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            require_correct_api_key=True,
+            require_correct_token=True,
+        ))
 ):
     init_log_file(log_filepath=get_cached_settings().log_filepath)
     with open(file=get_cached_settings().log_filepath, mode="w") as f:

arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_log_file.py

@@ -1,7 +1,9 @@
 import fastapi
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 from fastapi.responses import FileResponse
 
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
+    correct_tokens_from_settings__validate_api_key_func
 from arpakitlib.ar_logging_util import init_log_file
 from core.settings import get_cached_settings
 
@@ -18,6 +20,14 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = Depends(api_auth(
+            require_api_key_string=True,
+            require_token_string=True,
+            validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
+            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            require_correct_api_key=True,
+            require_correct_token=True,
+        ))
 ):
     init_log_file(log_filepath=get_cached_settings().log_filepath)
     return FileResponse(path=get_cached_settings().log_filepath)

arpakitlib/_arpakit_project_template_v_1/api/router/v1/main_router.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter
 
-from api.router.v1 import healthcheck, get_errors_info, now_utc_datetime, clear_log_file, get_log_file
+from api.router.v1 import healthcheck, get_errors_info, now_utc_datetime, clear_log_file, get_log_file, \
+    arpakitlib_project_template
 from api.router.v1 import raise_fake_error, check_auth
 
 main_v1_api_router = APIRouter()
@@ -16,7 +17,7 @@ main_v1_api_router.include_router(
 # arpakitlib_
 
 main_v1_api_router.include_router(
-    router=arpakitlib_.api_router,
+    router=arpakitlib_project_template.api_router,
     prefix="/arpakitlib",
     tags=["arpakitlib"]
 )

arpakitlib/_arpakit_project_template_v_1/api/router/v1/raise_fake_error.py

@@ -1,7 +1,9 @@
 import fastapi
 import starlette.exceptions
-from fastapi import APIRouter
+from fastapi import APIRouter, Depends
 
+from api.auth import APIAuthData, api_auth, correct_api_keys_from_settings__validate_api_key_func, \
+    correct_tokens_from_settings__validate_api_key_func
 from api.schema.common.out import ErrorCommonSO
 
 api_router = APIRouter()
@@ -17,7 +19,15 @@ async def _(
         *,
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
-        n: int | None = None
+        n: int | None = None,
+        api_auth_data: APIAuthData = Depends(api_auth(
+            require_api_key_string=True,
+            require_token_string=True,
+            validate_api_key_func=correct_api_keys_from_settings__validate_api_key_func(),
+            validate_token_func=correct_tokens_from_settings__validate_api_key_func(),
+            require_correct_api_key=True,
+            require_correct_token=True,
+        ))
 ):
     if n == 1:
         raise fastapi.HTTPException(

arpakitlib/_arpakit_project_template_v_1/core/settings.py

@@ -45,7 +45,7 @@ class Settings(SimpleSettings):
         if self.is_mode_type_prod:
             raise ValueError(f"mode type = {self.mode_type}")
 
-    project_name: str | None = "arpakitlib"
+    project_name: str | None = None
 
     sqlalchemy_db_user: str | None = project_name
 

arpakitlib/_arpakit_project_template_v_1/sqladmin_/add_admin_in_app.py

@@ -7,7 +7,7 @@ from sqladmin_.model_view import get_simple_mv
 from 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") -> FastAPI:
     authentication_backend = SQLAdminAuth()
 
     admin = Admin(

{arpakitlib-1.8.3.dist-info → arpakitlib-1.8.4.dist-info}/METADATA

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

{arpakitlib-1.8.3.dist-info → arpakitlib-1.8.4.dist-info}/RECORD

@@ -22,15 +22,15 @@ arpakitlib/_arpakit_project_template_v_1/api/response.py,sha256=sN09yKNnEPawHnXh
 arpakitlib/_arpakit_project_template_v_1/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_1/api/router/main_router.py,sha256=gsrQSWsecqE-gDyB8X3Gck4pu5JIH70Y5YgE8Xxe2mU,221
 arpakitlib/_arpakit_project_template_v_1/api/router/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_1/api/router/v1/arpakit_project_template.py,sha256=Hb_zvvwel2Bvr3WJfLdOHwN0LrwkEDBs5xCfNrxuRsI,647
+arpakitlib/_arpakit_project_template_v_1/api/router/v1/arpakitlib_project_template.py,sha256=ATHsMWl3UYZvoPecQFqY26E9pZN_JvxY8FmMTJ3iRBU,664
 arpakitlib/_arpakit_project_template_v_1/api/router/v1/check_auth.py,sha256=-8venYRCA9ReAiEwUhINDn0a0zzmAEFqGsMq3rOv34o,1051
-arpakitlib/_arpakit_project_template_v_1/api/router/v1/clear_log_file.py,sha256=kkOiAYn4KwkWUtx9snhJ9-dbcKJgmjfdIpDDqimaPTI,731
+arpakitlib/_arpakit_project_template_v_1/api/router/v1/clear_log_file.py,sha256=Y_37hJJAVgEU6jXF4DqxyLgA6aFl8hqDwowhP7u5rz4,1303
 arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_errors_info.py,sha256=zBdwWNe5l44cP58wIKSsuLiITHJeR90vkMZfpMRxXDE,654
-arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_log_file.py,sha256=2SZixfH2DHYR6gG8eIvsTC9pGOONW740Zi461Ad9zQQ,597
+arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_log_file.py,sha256=p8mjwsM3RA6oGoOzWkQvafA-MFteAEsq3P2lqAEz96E,1169
 arpakitlib/_arpakit_project_template_v_1/api/router/v1/healthcheck.py,sha256=NbbTNG1ZXU1Vp4NZ2uNln3504w1Fq5oYZgZKj1k_TkQ,470
-arpakitlib/_arpakit_project_template_v_1/api/router/v1/main_router.py,sha256=xFXCEGrv7xUSQkCNHRuIfksXKCBdjpYwDev79nqoOc4,1366
+arpakitlib/_arpakit_project_template_v_1/api/router/v1/main_router.py,sha256=sEv_8I44cfBQ2qjBbJ74g9o6Qi4zfPCWxDIe-9ds4zc,1417
 arpakitlib/_arpakit_project_template_v_1/api/router/v1/now_utc_datetime.py,sha256=wrGbDHdT4l8CsiwodUKnwDpNeHBI5PURJa-wduYcGw8,526
-arpakitlib/_arpakit_project_template_v_1/api/router/v1/raise_fake_error.py,sha256=FpKqlD8d7iXJKFcUc8_gIblstmV_NaaMs3RuCK0jgKc,915
+arpakitlib/_arpakit_project_template_v_1/api/router/v1/raise_fake_error.py,sha256=My-GAWtREWw8CH_1D0qWHlzJHM_Tf0uefEjVjNYWpfA,1488
 arpakitlib/_arpakit_project_template_v_1/api/schema/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_1/api/schema/base_schema.py,sha256=DX6Yz63JHoNlgmZnpss2PuRgEtBh3PPlxM6wImYLpXo,718
 arpakitlib/_arpakit_project_template_v_1/api/schema/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -65,7 +65,7 @@ arpakitlib/_arpakit_project_template_v_1/command/git_push_arpakit_company_github
 arpakitlib/_arpakit_project_template_v_1/command/git_push_arpakit_company_gitlab_1.sh,sha256=OL3mKrRjSXdYuxNA38PRMoeyEr9Qdtv82MhEs8bJuGA,70
 arpakitlib/_arpakit_project_template_v_1/command/git_push_arpakit_github_1.sh,sha256=j2wTeg7_tmJiWEtNAXpXjRSizEauoqF9uM679n6zidU,62
 arpakitlib/_arpakit_project_template_v_1/command/git_push_arpakit_gitlab_1.sh,sha256=W-85-OhGYLTijzM39G0Es74Y0VdbczELwS12owHN_Gs,62
-arpakitlib/_arpakit_project_template_v_1/command/git_remote.sh,sha256=DIcyWmY_mve_CmM1SND2gYgAGO7HaLtso3zvJfMqTRI,19
+arpakitlib/_arpakit_project_template_v_1/command/git_remote_v.sh,sha256=DIcyWmY_mve_CmM1SND2gYgAGO7HaLtso3zvJfMqTRI,19
 arpakitlib/_arpakit_project_template_v_1/command/git_set_arpakit_company_origin.sh,sha256=zD57Uw_jF0ieegxk3c9hVzUHucpQDrbsQaML50Opy8Y,289
 arpakitlib/_arpakit_project_template_v_1/command/git_set_arpakit_origin.sh,sha256=J7qmaOAbAdwVo1_fwvbX1GcbL7AMPFG4ZU6zk45Y88s,240
 arpakitlib/_arpakit_project_template_v_1/command/git_set_divarteam_origin.sh,sha256=98p5MKUYaka5UkOH1NMaPnZt_pS_pVrY0niCvR5oHL8,135
@@ -102,7 +102,7 @@ arpakitlib/_arpakit_project_template_v_1/core/const.py,sha256=24qaTQCjxfwkqitUsl
 arpakitlib/_arpakit_project_template_v_1/core/dump_file_storage_in_dir.py,sha256=ZhmrMmppibYnFh5ZhnlO22whEBXkVkbkzg-QpVH1Ph8,609
 arpakitlib/_arpakit_project_template_v_1/core/jinja2_templates.py,sha256=YneQ2AQccv8GFaZ7uSh2q8IhR2fk7O3crZrK3uouktI,344
 arpakitlib/_arpakit_project_template_v_1/core/media_file_storage_in_dir.py,sha256=Q3Nx41qTsfswL1akg0Puh8raaKBDLc4UJxf27A5LmGg,615
-arpakitlib/_arpakit_project_template_v_1/core/settings.py,sha256=Js3FlU52ewEXtw3oQKW8PfoJLwTaCXUywu_pLKMsY88,6253
+arpakitlib/_arpakit_project_template_v_1/core/settings.py,sha256=7o-YPbYI95G2L46-U2w30tr96IMfLjzdSAy7UG0JFEc,6245
 arpakitlib/_arpakit_project_template_v_1/core/util.py,sha256=B7YOzCfI0OcjoLz8LkDxrnTn3wrsgsR5Cw4qNZ2hqx8,659
 arpakitlib/_arpakit_project_template_v_1/example.env,sha256=KAyUmiMLIHTo-q2um3kEvsD20Dz6mAX9gkLEqDXixzE,910
 arpakitlib/_arpakit_project_template_v_1/json_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -160,7 +160,7 @@ arpakitlib/_arpakit_project_template_v_1/site/exception_handler.py,sha256=47DEQp
 arpakitlib/_arpakit_project_template_v_1/site/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_1/site/router/main_router.py,sha256=J5jNfgd-3OiWTtuubimEUz6wrOogupj9PkUdDmwz-2U,62
 arpakitlib/_arpakit_project_template_v_1/sqladmin_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_1/sqladmin_/add_admin_in_app.py,sha256=z59cdBzRLkb2GpLaQMNwUOtERXeP920I7J4nWgN1M4I,725
+arpakitlib/_arpakit_project_template_v_1/sqladmin_/add_admin_in_app.py,sha256=-U8Q5zUcpVvH87xKnxMjU6DMObsdTwFyb-MvhnA3BTE,726
 arpakitlib/_arpakit_project_template_v_1/sqladmin_/admin_auth.py,sha256=ulWhRzuRg2sj2WvGQ_4RY_a88hBx8EEl_VBisQlGQBo,1840
 arpakitlib/_arpakit_project_template_v_1/sqladmin_/model_view.py,sha256=eY8J1N5jppG-MGyK8m_Q8lr-l1vZpc3A-_-E160sWKA,2325
 arpakitlib/_arpakit_project_template_v_1/sqlalchemy_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -255,8 +255,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.3.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.3.dist-info/METADATA,sha256=DmZEIn_MTLp9MM0I9EUlA7amlkVwh2zpw-uRYxVOUMo,3316
-arpakitlib-1.8.3.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.3.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.3.dist-info/RECORD,,
+arpakitlib-1.8.4.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.4.dist-info/METADATA,sha256=BPl7-lR9QUSbAsjnadKDbPMXfJBT-DcKDSsTalwjaCA,3316
+arpakitlib-1.8.4.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.4.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.4.dist-info/RECORD,,