arpakitlib 1.8.3__tar.gz → 1.8.4__tar.gz

{arpakitlib-1.8.3 → arpakitlib-1.8.4}/PKG-INFO

@@ -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/arpakitlib/_arpakit_project_template_v_1/api/router/v1/arpakit_project_template.py → arpakitlib-1.8.4/arpakitlib/_arpakit_project_template_v_1/api/router/v1/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-1.8.3 → arpakitlib-1.8.4}/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-1.8.4/arpakitlib/_arpakit_project_template_v_1/api/router/v1/get_log_file.py

@@ -0,0 +1,33 @@
+import fastapi
+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
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Get log file",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_class=FileResponse
+)
+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-1.8.3 → arpakitlib-1.8.4}/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-1.8.3 → arpakitlib-1.8.4}/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-1.8.3 → arpakitlib-1.8.4}/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-1.8.3 → arpakitlib-1.8.4}/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 → arpakitlib-1.8.4}/pyproject.toml

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

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

@@ -1,23 +0,0 @@
-import fastapi
-from fastapi import APIRouter
-from fastapi.responses import FileResponse
-
-from arpakitlib.ar_logging_util import init_log_file
-from core.settings import get_cached_settings
-
-api_router = APIRouter()
-
-
-@api_router.get(
-    path="",
-    name="Get log file",
-    status_code=fastapi.status.HTTP_200_OK,
-    response_class=FileResponse
-)
-async def _(
-        *,
-        request: fastapi.requests.Request,
-        response: fastapi.responses.Response,
-):
-    init_log_file(log_filepath=get_cached_settings().log_filepath)
-    return FileResponse(path=get_cached_settings().log_filepath)