arpakitlib 1.7.69__py3-none-any.whl → 1.7.71__py3-none-any.whl

arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_check_conn.py

@@ -1,4 +1,5 @@
-from src.core.util import setup_logging, get_cached_sqlalchemy_db
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 
 
 def command():

arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_init.py

@@ -1,4 +1,5 @@
-from src.core.util import setup_logging, get_cached_sqlalchemy_db
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 
 
 def command():

arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_reinit.py

@@ -1,4 +1,5 @@
-from src.core.util import setup_logging, get_cached_sqlalchemy_db
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 
 
 def command():

arpakitlib/_arpakit_project_template/resource/static/healthcheck

@@ -0,0 +1 @@
+Healthcheck

arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -12,8 +12,9 @@ from src.api.router.main_router import main_api_router
 from src.api.transmitted_api_data import TransmittedAPIData
 from src.core.const import STATIC_DIRPATH
 from src.core.settings import get_cached_settings
-from src.core.util import get_cached_sqlalchemy_db, get_cached_media_file_storage_in_dir, \
+from src.core.util import get_cached_media_file_storage_in_dir, \
     get_cached_cache_file_storage_in_dir, get_cached_dump_file_storage_in_dir, setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.operation_executor import OperationExecutor
 from src.operation_execution.scheduled_operations import ALL_SCHEDULED_OPERATIONS
 

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -13,7 +13,7 @@ from src.core.const import BASE_DIRPATH, ENV_FILEPATH
 class Settings(SimpleSettings):
     sql_db_url: str | None = (
         "postgresql://{PROJECT_NAME}:{PROJECT_NAME}@127.0.0.1:{SQL_DB_PORT}/{PROJECT_NAME}"
-    )
+    ) if (str("{PROJECT_NAME}") and str("{SQL_DB_PORT}").strip().isdigit()) else None
 
     sql_db_echo: bool = False
 
@@ -29,9 +29,9 @@ class Settings(SimpleSettings):
 
     api_start_scheduled_operation_creator_worker: bool = False
 
-    api_port: int | None = int("{API_PORT}") if "{API_PORT}".isdigit() else None
+    api_port: int | None = int("{API_PORT}") if "{API_PORT}".strip().isdigit() else None
 
-    api_correct_api_key: str | None = None
+    api_correct_api_key: str | None = "1"
 
     var_dirname: str | None = "var"
 

arpakitlib/_arpakit_project_template/src/core/util.py

@@ -1,13 +1,10 @@
 import asyncio
-import importlib
-from contextlib import suppress
 from datetime import datetime
 from functools import lru_cache
 
 from arpakitlib.ar_datetime_util import now_dt
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
 from arpakitlib.ar_logging_util import setup_normal_logging
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from arpakitlib.ar_type_util import raise_if_none
 from src.core.settings import get_cached_settings
 
@@ -43,21 +40,6 @@ def get_cached_dump_file_storage_in_dir() -> FileStorageInDir:
     return create_dump_file_storage_in_dir()
 
 
-def create_sqlalchemy_db() -> SQLAlchemyDB:
-    with suppress(Exception):
-        importlib.import_module("src.db.sqlalchemy_model")
-
-    return SQLAlchemyDB(
-        db_url=get_cached_settings().sql_db_url,
-        db_echo=get_cached_settings().sql_db_echo
-    )
-
-
-@lru_cache()
-def get_cached_sqlalchemy_db() -> SQLAlchemyDB:
-    return create_sqlalchemy_db()
-
-
 def now_local_dt() -> datetime:
     raise_if_none(get_cached_settings().local_timezone_as_pytz)
     return now_dt(tz=get_cached_settings().local_timezone_as_pytz)

arpakitlib/_arpakit_project_template/src/db/util.py

@@ -0,0 +1,21 @@
+import importlib
+from contextlib import suppress
+from functools import lru_cache
+
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from src.core.settings import get_cached_settings
+
+
+def create_sqlalchemy_db() -> SQLAlchemyDB:
+    with suppress(Exception):
+        importlib.import_module("src.db.sqlalchemy_model")
+
+    return SQLAlchemyDB(
+        db_url=get_cached_settings().sql_db_url,
+        db_echo=get_cached_settings().sql_db_echo
+    )
+
+
+@lru_cache()
+def get_cached_sqlalchemy_db() -> SQLAlchemyDB:
+    return create_sqlalchemy_db()

arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_worker_for_dev.py

@@ -1,5 +1,6 @@
 from arpakitlib.ar_operation_execution_util import OperationExecutorWorker
-from src.core.util import get_cached_sqlalchemy_db, setup_logging
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.operation_executor import OperationExecutor
 
 

arpakitlib/_arpakit_project_template/src/operation_execution/start_scheduled_operation_creator_worker_for_dev.py

@@ -1,5 +1,6 @@
 from arpakitlib.ar_operation_execution_util import ScheduledOperationCreatorWorker
-from src.core.util import get_cached_sqlalchemy_db, setup_logging
+from src.core.util import setup_logging
+from src.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.scheduled_operations import ALL_SCHEDULED_OPERATIONS
 
 

arpakitlib/_arpakit_project_template/src/operation_execution/util.py

@@ -0,0 +1,21 @@
+from datetime import timedelta
+from functools import lru_cache
+
+from arpakitlib.ar_operation_execution_util import ScheduledOperationCreatorWorker
+from src.db.util import get_cached_sqlalchemy_db
+
+
+def create_scheduled_operation_creator_worker() -> ScheduledOperationCreatorWorker:
+    from src.operation_execution.scheduled_operations import ALL_SCHEDULED_OPERATIONS
+    scheduled_operation_creator_worker = ScheduledOperationCreatorWorker(
+        sqlalchemy_db=get_cached_sqlalchemy_db(),
+        scheduled_operations=ALL_SCHEDULED_OPERATIONS,
+        timeout_after_run=timedelta(seconds=0.1).total_seconds(),
+        timeout_after_err_in_run=timedelta(seconds=1).total_seconds()
+    )
+    return scheduled_operation_creator_worker
+
+
+@lru_cache()
+def get_scheduled_operation_creator_worker() -> ScheduledOperationCreatorWorker:
+    return create_scheduled_operation_creator_worker()

arpakitlib/ar_fastapi_util.py

@@ -21,6 +21,7 @@ from fastapi import FastAPI, APIRouter, Query, Security, Depends
 from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
 from fastapi.security import APIKeyHeader
 from pydantic import BaseModel, ConfigDict
+from starlette import status
 from starlette.middleware.cors import CORSMiddleware
 from starlette.staticfiles import StaticFiles
 
@@ -221,6 +222,9 @@ def create_handle_exception(
                 error_so.error_specification_code.upper().replace(" ", "_").strip()
             )
 
+        if error_so.error_code == BaseAPIErrorCodes.not_found:
+            status_code = status.HTTP_404_NOT_FOUND
+
         if _need_exc_info:
             _logger.error(str(exception), exc_info=exception)
         else:

{arpakitlib-1.7.69.dist-info → arpakitlib-1.7.71.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.7.69
+Version: 1.7.71
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.7.69.dist-info → arpakitlib-1.7.71.dist-info}/RECORD

@@ -61,11 +61,12 @@ arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_8.sh,sha256=47DEQpj8
 arpakitlib/_arpakit_project_template/manage/sandbox/sandbox_9.sh,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/settings_check.py,sha256=DeOGoWXgk2_VXpCIFbQgf1k2zcnv4hOLWIVc5BDv80c,260
 arpakitlib/_arpakit_project_template/manage/settings_generate_env_example.py,sha256=BLLeF4JenexXbO1mMj8X-lB81TG3-QTmN4DjPYEUI8o,288
-arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_check_conn.py,sha256=3Q4QfvFVBZsbMMH5yr6v3a6v6UjQuIEIujlxGpvykNA,190
-arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_init.py,sha256=FqKVuakafDndHKBsyPcSowhss6MZb0Soy5oREUPVLUw,184
-arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_reinit.py,sha256=twBWh64WU-sqHUte8v9ZJUZ_bCsFABExgIWLOnfLu4w,186
+arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_check_conn.py,sha256=wv1N33nTGpsT9nk94OePlOSZ-O9UVKlMfRf8y5UeK1Y,213
+arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_init.py,sha256=cBkdDS4i1dbt0HsV6vyTTZvtCXYTfCdkvCHgVFrafUU,207
+arpakitlib/_arpakit_project_template/manage/sqlalchemy_db_reinit.py,sha256=YhXC7zwdN3L4MDrNxCaI379M7u27n-BXw5qIAG1uZEE,209
 arpakitlib/_arpakit_project_template/resource/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/resource/static/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/resource/static/healthcheck,sha256=IIO7Wvjwlr2-LPSQ7Y8O35hcI6t0_s8zqITDxkYCO8I,11
 arpakitlib/_arpakit_project_template/resource/static/helloworld,sha256=eH7Hbcr9IMGQjrCTahL5Ht0QWrXNfswrGuIDJkg0Xf8,11
 arpakitlib/_arpakit_project_template/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/additional_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -74,7 +75,7 @@ arpakitlib/_arpakit_project_template/src/api/__init__.py,sha256=47DEQpj8HBSa-_TI
 arpakitlib/_arpakit_project_template/src/api/asgi.py,sha256=a5UBxOyNC8NG3E0ayhiDo3t5tPoB3WtOf2gbZJFWBAA,74
 arpakitlib/_arpakit_project_template/src/api/auth.py,sha256=Ljq_VjjiAaW3HEzq60nkSI-HkHfuv6j5-8Q6Qs8V9bU,261
 arpakitlib/_arpakit_project_template/src/api/const.py,sha256=7d4qD5hedqr7QxVzbfsA7E1bNZn2Pm2U8joXGtpANu0,287
-arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=sSVf1Ft8VqdW_IAApYsL4C9mnK4M0wNUw8YafKXYJO4,4571
+arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=lDE77W6WkeAeRB_vJY3TXRTa3HeiO-t26eTtG7v8j6U,4594
 arpakitlib/_arpakit_project_template/src/api/event.py,sha256=58wCVyVSIe_kydWi44M0Wvp7bTnV8xvO30gMXzjbFYc,750
 arpakitlib/_arpakit_project_template/src/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/api/router/main_router.py,sha256=__Z-pGoeooYCub7besFXGJJvZR3V-4IakXd3cKo6ZIM,209
@@ -92,18 +93,18 @@ arpakitlib/_arpakit_project_template/src/api/util.py,sha256=47DEQpj8HBSa-_TImW-5
 arpakitlib/_arpakit_project_template/src/business_service/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/core/const.py,sha256=CZZew674y7LhCAlYhvuF5cV4Zb9nQ17j2Tcuj2GEBf4,1232
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=O3uVuw9TSSIR2R32EWALAuUK05B6ufdWHl0LKVOuY98,2060
-arpakitlib/_arpakit_project_template/src/core/util.py,sha256=J1_AiI4DW_VB8ldLNATP6mjxz254CSxceGcqUbT0SVU,2006
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=QbW0A2UuYMmYG4wOHPbsrm0YdaqA3a1rsmA7k2gQyv8,2147
+arpakitlib/_arpakit_project_template/src/core/util.py,sha256=5R8gvcZdvuDQes45FBnLC2IDv2Jhajp1VhJJYNKYjMQ,1539
 arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=nXtayUkBaVb6tWx5qJgXZLbLOTVAjnSLpSDxBm7yZLc,234
-arpakitlib/_arpakit_project_template/src/db/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/db/util.py,sha256=8Jg9TtTwvyxVYIN_W5_lk9y-Pyh8To1aMRFUKCRDuuA,550
 arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/operation_execution/const.py,sha256=HjupGEDUWVijQlbzxZPI9vBbAVOETUYzYU9pdnc9IcI,176
 arpakitlib/_arpakit_project_template/src/operation_execution/operation_executor.py,sha256=5sZpn3tVxnmcuIVRD5sbBhiMY5SAqPCc4tHzoNzDe4c,619
 arpakitlib/_arpakit_project_template/src/operation_execution/scheduled_operations.py,sha256=hBPZIOJAX7ym54s2tJ2QRky15FqqDF9r4yTr8Nh2YqI,985
-arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_worker_for_dev.py,sha256=DC0UYP6XpFz-AoatzvqYSBqSYRwK7mvIUhbqxDkaiPk,603
-arpakitlib/_arpakit_project_template/src/operation_execution/start_scheduled_operation_creator_worker_for_dev.py,sha256=RyHCafGTJaY-o3mgt7MReqgJ2txoBDhhsFzrjRiZWe4,574
-arpakitlib/_arpakit_project_template/src/operation_execution/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/operation_execution/start_operation_executor_worker_for_dev.py,sha256=uC9KxA3n9ul4YVg2bD4626ikUIv_kLc6TqyUQV_tWtc,626
+arpakitlib/_arpakit_project_template/src/operation_execution/start_scheduled_operation_creator_worker_for_dev.py,sha256=qZFXZqdrL_vMSeajwhVFZrWhAlyU9G1PjKYMMgZn4sA,597
+arpakitlib/_arpakit_project_template/src/operation_execution/util.py,sha256=wEplkGcSCA9PV2-BgUNHRpuZnaC6z4FouyzVT-UFm48,886
 arpakitlib/_arpakit_project_template/src/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_1.py,sha256=3WVPgRsNCIxWpA-6t_Phe-nFULdHPhS1S_DO11XRmqk,80
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_2.py,sha256=MVDc71sj5I1muWin50GwrSxMwYtOOSDOtRmeFErHcXs,80
@@ -147,7 +148,7 @@ arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css,sha256=jzPZlgJTFwSdSphk9C
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.css.map,sha256=5wq8eXMLU6Zxb45orZPL1zAsBFJReFw6GjYqGpUX3hg,262650
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js,sha256=ffrLZHHEQ_g84A-ul3yWa10Kk09waOAxHcQXPuZuavg,339292
 arpakitlib/ar_fastapi_static/swagger-ui/swagger-ui.js.map,sha256=9UhIW7MqCOZPAz1Sl1IKfZUuhWU0p-LJqrnjjJD9Xhc,1159454
-arpakitlib/ar_fastapi_util.py,sha256=eOErnvI8ujwC_yN0XGN2xHm2RUoDk103OCpIkFGJ8A4,24555
+arpakitlib/ar_fastapi_util.py,sha256=7NcRLArsrZgzihbDLWzI9JAH8i2SKwPwig8UdANq-jw,24700
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -176,9 +177,9 @@ arpakitlib/ar_str_util.py,sha256=tFoGSDYoGpfdVHWor5Li9pEOFmDFlHkX-Z8iOy1LK7Y,353
 arpakitlib/ar_type_util.py,sha256=46ZMuWls3uN0Re5T0sfEAmyNUDnxn9yvj6dHivSDZKs,3915
 arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.69.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.69.dist-info/METADATA,sha256=dxNepy8YzjKwnSx2U3JkJXMfSueYkKre7eKe-c1G8U8,2824
-arpakitlib-1.7.69.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
-arpakitlib-1.7.69.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.7.69.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.69.dist-info/RECORD,,
+arpakitlib-1.7.71.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.71.dist-info/METADATA,sha256=qnzJ63_6S3mfsYCd1NzDVXVh8brXxO9JAvpW_sS0KCI,2824
+arpakitlib-1.7.71.dist-info/NOTICE,sha256=95aUzaPJjVpDsGAsNzVnq7tHTxAl0s5UFznCTkVCau4,763
+arpakitlib-1.7.71.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.7.71.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.71.dist-info/RECORD,,