arpakitlib 1.8.37__tar.gz → 1.8.40__tar.gz

{arpakitlib-1.8.37 → arpakitlib-1.8.40}/PKG-INFO

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

arpakitlib-1.8.40/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "8"
+}

arpakitlib-1.8.40/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/check_sqlalchemy_db.py

@@ -0,0 +1,43 @@
+import fastapi
+from fastapi import APIRouter
+
+from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
+    require_user_token_dbm_api_authorize_middleware, api_authorize
+from project.api.schema.common import BaseRouteSO
+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
+
+
+class CheckSQLAlchemyDbRouteSO(BaseRouteSO, RawDataCommonSO):
+    pass
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Check sqlalchemy db",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=CheckSQLAlchemyDbRouteSO | 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.admin]
+            )
+        ]))
+):
+    get_cached_sqlalchemy_db().is_conn_good()
+    return CheckSQLAlchemyDbRouteSO(
+        data={"is_conn_good": get_cached_sqlalchemy_db().is_conn_good()}
+    )

arpakitlib-1.8.40/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -0,0 +1,44 @@
+import fastapi
+from fastapi import APIRouter
+
+from arpakitlib.ar_logging_util import init_log_file
+from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
+    require_user_token_dbm_api_authorize_middleware, api_authorize
+from project.api.schema.common import BaseRouteSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+
+class ClearLogFileRouteSO(BaseRouteSO, RawDataCommonSO):
+    pass
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Clear log file",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=ClearLogFileRouteSO | ErrorCommonSO
+)
+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.admin]
+            )
+        ]))
+):
+    init_log_file(log_filepath=get_cached_settings().log_filepath)
+    with open(file=get_cached_settings().log_filepath, mode="w") as f:
+        f.write("")
+    return ClearLogFileRouteSO()

arpakitlib-1.8.40/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_log_file.py

@@ -0,0 +1,33 @@
+import fastapi
+from fastapi import APIRouter
+
+from arpakitlib.ar_logging_util import init_log_file
+from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
+    require_user_token_dbm_api_authorize_middleware, api_authorize
+from project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Get log file",
+    status_code=fastapi.status.HTTP_200_OK,
+)
+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.admin]
+            )
+        ]))
+):
+    init_log_file(log_filepath=get_cached_settings().log_filepath)
+    return fastapi.responses.FileResponse(path=get_cached_settings().log_filepath)

arpakitlib-1.8.40/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_settings.py

@@ -0,0 +1,42 @@
+import fastapi.requests
+from fastapi import APIRouter
+
+from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
+    require_user_token_dbm_api_authorize_middleware
+from project.api.schema.common import BaseRouteSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.core.settings import get_cached_settings
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+
+class GetSettingsRouteSO(BaseRouteSO, RawDataCommonSO):
+    pass
+
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get settings",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=GetSettingsRouteSO | 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.admin]
+            )
+        ]))
+):
+    return GetSettingsRouteSO(
+        data=get_cached_settings().model_dump(mode="json")
+    )

{arpakitlib-1.8.37 → arpakitlib-1.8.40}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py

@@ -2,7 +2,8 @@ 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, init_sqlalchemy_db, get_sqlalchemy_db_table_name_to_amount, \
-    get_operation_allowed_statuses, get_operation, create_operation, get_operation_allowed_types
+    get_operation_allowed_statuses, get_operation, create_operation, get_operation_allowed_types, get_log_file, \
+    clear_log_file, check_sqlalchemy_db, get_settings
 
 main_admin_api_router = APIRouter()
 
@@ -60,3 +61,23 @@ main_admin_api_router.include_router(
     router=create_operation.api_router,
     prefix="/create_operation"
 )
+
+main_admin_api_router.include_router(
+    router=get_log_file.api_router,
+    prefix="/get_log_file"
+)
+
+main_admin_api_router.include_router(
+    router=clear_log_file.api_router,
+    prefix="/clear_log_file"
+)
+
+main_admin_api_router.include_router(
+    router=check_sqlalchemy_db.api_router,
+    prefix="/check_sqlalchemy_db"
+)
+
+main_admin_api_router.include_router(
+    router=get_settings.api_router,
+    prefix="/get_settings"
+)

{arpakitlib-1.8.37 → arpakitlib-1.8.40}/arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py

@@ -45,7 +45,18 @@ class OperationExecutorWorker(BaseWorker):
         elif operation_dbm.type == OperationDBM.Types.raise_fake_error_:
             self._logger.error(f"{OperationDBM.Types.raise_fake_error_}")
             raise Exception(f"{OperationDBM.Types.raise_fake_error_}")
-        # ...
+        else:
+            with self.sqlalchemy_db.new_session() as session:
+                operation_dbm: OperationDBM = session.query(
+                    OperationDBM
+                ).filter(OperationDBM.id == operation_dbm.id).one()
+                operation_dbm.output_data = combine_dicts(
+                    operation_dbm.output_data,
+                    {"warning": f"unknown operation_type = {operation_dbm.type=}"}
+                )
+                session.commit()
+                session.refresh(operation_dbm)
+            self._logger.info(f"unknown operation_type, {operation_dbm.id=}, {operation_dbm.type=}")
 
     async def async_execute_operation(self, *, operation_dbm: OperationDBM):
         if operation_dbm.type == OperationDBM.Types.healthcheck_:
@@ -53,7 +64,19 @@ class OperationExecutorWorker(BaseWorker):
         elif operation_dbm.type == OperationDBM.Types.raise_fake_error_:
             self._logger.error(f"{OperationDBM.Types.raise_fake_error_}")
             raise Exception(f"{OperationDBM.Types.raise_fake_error_}")
-        # ...
+        else:
+            async with self.sqlalchemy_db.new_async_session() as session:
+                result = await session.execute(
+                    sqlalchemy.select(OperationDBM).filter(OperationDBM.id == operation_dbm.id)
+                )
+                operation_dbm: OperationDBM = result.scalar_one()
+                operation_dbm.output_data = combine_dicts(
+                    operation_dbm.output_data,
+                    {"warning": f"unknown operation_type = {operation_dbm.type}"}
+                )
+                await session.commit()
+                await session.refresh(operation_dbm)
+            self._logger.info(f"unknown operation_type, {operation_dbm.id=}, {operation_dbm.type=}")
 
     def sync_run(self):
         # 1

{arpakitlib-1.8.37 → arpakitlib-1.8.40}/pyproject.toml

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

arpakitlib-1.8.37/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "6"
-}