arpakitlib 1.7.68__tar.gz → 1.7.70__tar.gz

{arpakitlib-1.7.68 → arpakitlib-1.7.70}/PKG-INFO

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

{arpakitlib-1.7.68 → arpakitlib-1.7.70}/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-1.7.68 → arpakitlib-1.7.70}/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-1.7.68 → arpakitlib-1.7.70}/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-1.7.68 → arpakitlib-1.7.70}/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-1.7.68 → arpakitlib-1.7.70}/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,7 +29,7 @@ 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
 

{arpakitlib-1.7.68 → arpakitlib-1.7.70}/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-1.7.70/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-1.7.68 → arpakitlib-1.7.70}/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-1.7.68 → arpakitlib-1.7.70}/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-1.7.70/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-1.7.70/arpakitlib/ar_fastapi_static/healthcheck

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

{arpakitlib-1.7.68 → arpakitlib-1.7.70}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.7.68"
+version = "1.7.70"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit_support <support@arpakit.com>"]
 license = "Apache License 2.0"