arpakitlib 1.7.253__tar.gz → 1.7.256__tar.gz

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/PKG-INFO

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

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/alembic/env.py

@@ -4,14 +4,16 @@ from alembic import context
 from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
+from arpakitlib.ar_type_util import raise_for_type
 from src.core.settings import get_cached_settings
-from src.sql_db.util import get_base_dbm
+from src.sqlalchemy_db.util import get_base_dbm
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
 
-config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sync_sql_db_url)
+raise_for_type(get_cached_settings().sqlalchemy_sync_db_url, str)
+config.set_section_option("alembic", "sqlalchemy.url", get_cached_settings().sqlalchemy_sync_db_url)
 
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/example.env

@@ -0,0 +1,32 @@
+# mode_type=
+# project_name=
+# sqlalchemy_db_user=
+# sqlalchemy_db_password=
+# sqlalchemy_db_host=
+# sqlalchemy_db_port=
+# sqlalchemy_db_database=
+# sqlalchemy_sync_db_url=
+# sqlalchemy_async_db_url=
+# sqlalchemy_db_echo=
+# api_port=
+# api_init_sqlalchemy_db=
+# api_init_json_db=
+# api_logging__api_func_before_in_handle_exception=
+# api_story_log__api_func_before_in_handle_exception=
+# api_correct_api_key=
+# api_correct_token=
+# api_enable_admin1=
+# api_start_operation_executor_worker=
+# api_start_scheduled_operation_creator_worker=
+# admin1_secret_key=
+# tg_bot_token=
+# tg_bot_proxy_url=
+# tg_bot_init_sqlalchemy_db=
+# tg_bot_init_json_db=
+# var_dirpath=
+# log_filepath=
+# cache_dirpath=
+# media_dirpath=
+# dump_dirpath=
+# local_timezone=
+# json_db_dirpath=

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/manage/docker_run_postgres.sh

@@ -0,0 +1,5 @@
+cd ..
+source .env
+docker rm ${project_name}_postgres
+docker run --name ${project_name}_postgres -d -p ${sqlalchemy_db_port}:5432 -e POSTGRES_USER=${sqlalchemy_db_user} -e POSTGRES_PASSWORD=${sqlalchemy_db_password} -e POSTGRES_DB=${sqlalchemy_db_database} postgres:16 -c max_connections=100
+docker start ${project_name}_postgres

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -0,0 +1,43 @@
+from fastapi import FastAPI
+
+from arpakitlib.ar_fastapi_util import create_fastapi_app
+from src.api.create_handle_exception_ import create_handle_exception_
+from src.api.event import get_startup_api_events, get_shutdown_api_events
+from src.api.router.main_router import main_api_router
+from src.api.util import get_transmitted_api_data
+from src.core.const import ProjectPaths
+from src.core.util import setup_logging
+
+
+def create_api_app() -> FastAPI:
+    setup_logging()
+
+    transmitted_api_data = get_transmitted_api_data()
+
+    handle_exception_ = create_handle_exception_(transmitted_api_data=transmitted_api_data)
+
+    startup_api_events = get_startup_api_events(transmitted_api_data=transmitted_api_data)
+
+    shutdown_api_events = get_shutdown_api_events(transmitted_api_data=transmitted_api_data)
+
+    api_app = create_fastapi_app(
+        title=transmitted_api_data.settings.project_name,
+        description=transmitted_api_data.settings.project_name,
+        handle_exception_=handle_exception_,
+        startup_api_events=startup_api_events,
+        shutdown_api_events=shutdown_api_events,
+        transmitted_api_data=transmitted_api_data,
+        main_api_router=main_api_router,
+        media_dirpath=transmitted_api_data.settings.media_dirpath,
+        static_dirpath=ProjectPaths.static_dirpath
+    )
+
+    if transmitted_api_data.settings.api_enable_admin1:
+        from src.admin1.add_admin_in_app import add_admin1_in_app
+        add_admin1_in_app(app=api_app)
+
+    return api_app
+
+
+if __name__ == '__main__':
+    create_api_app()

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/src/api/event.py

@@ -1,8 +1,6 @@
 from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
 from arpakitlib.ar_fastapi_util import BaseStartupAPIEvent, BaseShutdownAPIEvent
 from arpakitlib.ar_operation_execution_util import OperationExecutorWorker, ScheduledOperationCreatorWorker
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
-from arpakitlib.ar_type_util import raise_for_type
 from src.api.transmitted_api_data import TransmittedAPIData
 from src.operation_execution.operation_executor import OperationExecutor
 from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
@@ -28,12 +26,13 @@ class StartupAPIEvent(BaseStartupAPIEvent):
         if self.transmitted_api_data.dump_file_storage_in_dir is not None:
             self.transmitted_api_data.dump_file_storage_in_dir.init()
 
-        if self.transmitted_api_data.settings.api_init_sql_db_at_start:
-            raise_for_type(self.transmitted_api_data.sqlalchemy_db, SQLAlchemyDb)
+        if self.transmitted_api_data.settings.api_init_sqlalchemy_db:
             self.transmitted_api_data.sqlalchemy_db.init()
 
+        if self.transmitted_api_data.settings.api_init_json_db:
+            self.transmitted_api_data.json_db.init()
+
         if self.transmitted_api_data.settings.api_start_operation_executor_worker:  # TODO
-            raise_for_type(self.transmitted_api_data.sqlalchemy_db, SQLAlchemyDb)
             _ = safe_run_worker_in_background(
                 worker=OperationExecutorWorker(
                     sqlalchemy_db=self.transmitted_api_data.sqlalchemy_db,
@@ -44,7 +43,6 @@ class StartupAPIEvent(BaseStartupAPIEvent):
             )
 
         if self.transmitted_api_data.settings.api_start_scheduled_operation_creator_worker:  # TODO
-            raise_for_type(self.transmitted_api_data.sqlalchemy_db, SQLAlchemyDb)
             _ = safe_run_worker_in_background(
                 worker=ScheduledOperationCreatorWorker(
                     sqlalchemy_db=self.transmitted_api_data.sqlalchemy_db,

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/api/util.py

@@ -0,0 +1,44 @@
+from functools import lru_cache
+
+from src.api.transmitted_api_data import TransmittedAPIData
+from src.core.settings import get_cached_settings
+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
+from src.json_db.util import get_json_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
+
+
+def create_transmitted_api_data() -> TransmittedAPIData:
+    settings = get_cached_settings()
+
+    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
+
+    json_db = get_json_db() if settings.json_db_dirpath is not None else None
+
+    media_file_storage_in_dir = (
+        get_cached_media_file_storage_in_dir() if settings.media_dirpath is not None else None
+    )
+
+    cache_file_storage_in_dir = (
+        get_cached_cache_file_storage_in_dir() if settings.cache_dirpath is not None else None
+    )
+
+    dump_file_storage_in_dir = (
+        get_cached_dump_file_storage_in_dir() if settings.dump_dirpath is not None else None
+    )
+
+    transmitted_api_data = TransmittedAPIData(
+        sqlalchemy_db=sqlalchemy_db,
+        json_db=json_db,
+        media_file_storage_in_dir=media_file_storage_in_dir,
+        cache_file_storage_in_dir=cache_file_storage_in_dir,
+        dump_file_storage_in_dir=dump_file_storage_in_dir,
+        settings=settings
+    )
+
+    return transmitted_api_data
+
+
+@lru_cache()
+def get_transmitted_api_data() -> TransmittedAPIData:
+    return create_transmitted_api_data()

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/_drop_json_db.py

@@ -0,0 +1,13 @@
+from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
+from src.json_db.util import get_json_db
+
+
+def _init_json_db():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    get_json_db().drop()
+
+
+if __name__ == '__main__':
+    _init_json_db()

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/_init_json_db.py

@@ -0,0 +1,11 @@
+from src.core.util import setup_logging
+from src.json_db.util import get_json_db
+
+
+def _init_json_db():
+    setup_logging()
+    get_json_db().init()
+
+
+if __name__ == '__main__':
+    _init_json_db()

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/_reinit_json_db.py

@@ -0,0 +1,13 @@
+from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
+from src.json_db.util import get_json_db
+
+
+def _init_json_db():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    get_json_db().reinit()
+
+
+if __name__ == '__main__':
+    _init_json_db()

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/_rm_all_records_in_json_db.py

@@ -0,0 +1,13 @@
+from src.core.settings import get_cached_settings
+from src.core.util import setup_logging
+from src.json_db.util import get_json_db
+
+
+def _init_json_db():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    get_json_db().rm_all_records()
+
+
+if __name__ == '__main__':
+    _init_json_db()

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/json_db.py

@@ -0,0 +1,11 @@
+import os
+
+from arpakitlib.ar_json_db_util import BaseJSONDb
+
+
+class JSONDb(BaseJSONDb):
+    def __init__(self, dirpath: str):
+        super().__init__()
+        self.story_log = self.create_json_db_file(
+            filepath=os.path.join(dirpath, "story_log.json"), use_memory=True, beautify_json=False
+        )

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/json_db/util.py

@@ -0,0 +1,17 @@
+from functools import lru_cache
+
+from src.core.settings import get_cached_settings
+from src.json_db.json_db import JSONDb
+
+
+def create_json_db() -> JSONDb:
+    return JSONDb(
+        dirpath=get_cached_settings().json_db_dirpath
+    )
+
+
+@lru_cache()
+def get_json_db() -> JSONDb:
+    return JSONDb(
+        dirpath=get_cached_settings().json_db_dirpath
+    )

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/src/operation_execution/_start_operation_executor_worker.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import OperationExecutorWorker
 from src.core.util import setup_logging
 from src.operation_execution.operation_executor import OperationExecutor
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _start_operation_executor_worker():

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/src/operation_execution/_start_scheduled_operation_creator_worker.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import ScheduledOperationCreatorWorker
 from src.core.util import setup_logging
 from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _start_scheduled_operation_creator_worker():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_check_conn_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _check_conn_sqlalchemy_db():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_drop_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_init_sqlalchemy_db.py

@@ -1,5 +1,5 @@
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _init_sqlalchemy_db():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_reinit_sqlalchemy_db.py

@@ -1,6 +1,6 @@
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_remove_operations.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_operation_execution_util import remove_operations
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_operations():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/_remove_story_logs.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
-from src.sql_db.util import get_cached_sqlalchemy_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_story_logs():

{arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db → arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/sqlalchemy_db}/util.py

@@ -8,16 +8,16 @@ from src.core.settings import get_cached_settings
 def get_base_dbm() -> type[BaseDBM]:
     from arpakitlib.ar_sqlalchemy_model_util import import_ar_sqlalchemy_models
     import_ar_sqlalchemy_models()
-    from src.sql_db.sqlalchemy_model import import_project_sqlalchemy_models
+    from src.sqlalchemy_db.sqlalchemy_model import import_project_sqlalchemy_models
     import_project_sqlalchemy_models()
     return BaseDBM
 
 
 def create_sqlalchemy_db() -> SQLAlchemyDb:
     return SQLAlchemyDb(
-        sync_db_url=get_cached_settings().sync_sql_db_url,
-        async_db_url=get_cached_settings().async_sql_db_url,
-        db_echo=get_cached_settings().sql_db_echo,
+        sync_db_url=get_cached_settings().sqlalchemy_sync_db_url,
+        async_db_url=get_cached_settings().sqlalchemy_async_db_url,
+        db_echo=get_cached_settings().sqlalchemy_db_echo,
         base_dbm=get_base_dbm()
     )
 

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/src/tg_bot/event.py

@@ -9,7 +9,7 @@ class StartupTgBotEvent:
         self.transmitted_tg_bot_data = transmitted_tg_bot_data
 
     async def on_startup(self, *args, **kwargs):
-        self._logger.info("on_startup start")
+        self._logger.info("start")
 
         if self.transmitted_tg_bot_data.media_file_storage_in_dir is not None:
             self.transmitted_tg_bot_data.media_file_storage_in_dir.init()
@@ -20,7 +20,13 @@ class StartupTgBotEvent:
         if self.transmitted_tg_bot_data.dump_file_storage_in_dir is not None:
             self.transmitted_tg_bot_data.dump_file_storage_in_dir.init()
 
-        self._logger.info("on_startup was done")
+        if self.transmitted_tg_bot_data.settings.api_init_sqlalchemy_db:
+            self.transmitted_tg_bot_data.sqlalchemy_db.init()
+
+        if self.transmitted_tg_bot_data.settings.api_init_json_db:
+            self.transmitted_tg_bot_data.json_db.init()
+
+        self._logger.info("finish")
 
 
 class ShutdownTgBotEvent:

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py

@@ -1,11 +1,10 @@
-from src.core.settings import get_cached_settings
 from src.core.util import setup_logging
 
 
 def start_tg_bot():
     setup_logging()
 
-    settings = get_cached_settings()
+    # ...
 
 
 if __name__ == '__main__':

arpakitlib-1.7.256/arpakitlib/_arpakit_project_template/src/tg_bot/util.py

@@ -0,0 +1,44 @@
+from functools import lru_cache
+
+from src.core.settings import get_cached_settings
+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
+from src.json_db.util import get_json_db
+from src.sqlalchemy_db.util import get_cached_sqlalchemy_db
+from src.tg_bot.transmitted_tg_data import TransmittedTgData
+
+
+def create_transmitted_tg_bot_data() -> TransmittedTgData:
+    settings = get_cached_settings()
+
+    sqlalchemy_db = get_cached_sqlalchemy_db() if settings.sqlalchemy_sync_db_url is not None else None
+
+    json_db = get_json_db() if settings.json_db_dirpath is not None else None
+
+    media_file_storage_in_dir = (
+        get_cached_media_file_storage_in_dir() if settings.media_dirpath is not None else None
+    )
+
+    cache_file_storage_in_dir = (
+        get_cached_cache_file_storage_in_dir() if settings.cache_dirpath is not None else None
+    )
+
+    dump_file_storage_in_dir = (
+        get_cached_dump_file_storage_in_dir() if settings.dump_dirpath is not None else None
+    )
+
+    transmitted_api_data = TransmittedTgData(
+        sqlalchemy_db=sqlalchemy_db,
+        json_db=json_db,
+        media_file_storage_in_dir=media_file_storage_in_dir,
+        cache_file_storage_in_dir=cache_file_storage_in_dir,
+        dump_file_storage_in_dir=dump_file_storage_in_dir,
+        settings=settings
+    )
+
+    return transmitted_api_data
+
+
+@lru_cache()
+def get_transmitted_tg_bot_data() -> TransmittedTgData:
+    return create_transmitted_tg_bot_data()

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/ar_aiogram_util.py

@@ -4,7 +4,7 @@ import asyncio
 import logging
 from typing import Optional, Any, Union, Callable, Iterable
 
-from aiogram import types, Bot, Dispatcher
+from aiogram import types, Bot
 from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ChatType, ParseMode
@@ -14,10 +14,10 @@ from aiogram.filters.callback_data import CallbackData
 from pydantic import BaseModel, ConfigDict
 
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
-from arpakitlib.ar_json_db_util import JSONDb
+from arpakitlib.ar_json_db_util import BaseJSONDb
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import BadCommandFormat, parse_command
-from arpakitlib.ar_settings_util import SimpleSettings, BaseSettings2
+from arpakitlib.ar_settings_util import BaseSettings2
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_types, raise_for_type
 
@@ -325,7 +325,7 @@ class SimpleTransmittedTgBotData(BaseTransmittedTgBotData):
 
 class AdvancedTransmittedTgBotData(SimpleTransmittedTgBotData):
     sqlalchemy_db: SQLAlchemyDb | None = None
-    json_db: JSONDb | None = None
+    json_db: BaseJSONDb | None = None
     media_file_storage_in_dir: FileStorageInDir | None = None
     cache_file_storage_in_dir: FileStorageInDir | None = None
     dump_file_storage_in_dir: FileStorageInDir | None = None
@@ -334,7 +334,7 @@ class AdvancedTransmittedTgBotData(SimpleTransmittedTgBotData):
 def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs) -> Bot:
     kwargs["token"] = token
 
-    if proxy_url_:
+    if proxy_url_ is not None:
         kwargs["session"] = AiohttpSession(proxy=proxy_url_)
 
     if kwargs.get("default") is None:
@@ -349,18 +349,6 @@ def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs
     return tg_bot
 
 
-# def create_tg_bot_dispatcher(
-#         *,
-#         settings:
-# ):
-#     tg_dp = Dispatcher(
-#         storage=MemoryStorage(),
-#         settings=get_settings(),
-#         db=db,
-#         transmitted_tg_bot_data=transmitted_tg_bot_data
-#     )
-
-
 def __example():
     pass
 

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/ar_arpakitlib_cli_util.py

@@ -27,10 +27,12 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         print("Commands:")
         print()
         print("-c init_arpakit_project_template")
-        print("-project_dirpath ...")
         print("-overwrite_if_exists ...")
         print("-ignore_paths_startswith ...")
         print("-only_paths_startswith ...")
+        print("-param1 ...")
+        print("-param2 ...")
+        print("-param3 ...")
         print("\n")
 
     elif command == "init_arpakit_project_template":
@@ -54,9 +56,9 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
         init_arpakit_project_template(
             project_dirpath=project_dirpath,
             overwrite_if_exists=overwrite_if_exists,
-            params=params,
             ignore_paths_startswith=ignore_paths_startswith,
-            only_paths_startswith=only_paths_startswith
+            only_paths_startswith=only_paths_startswith,
+            params=params,
         )
 
     else:

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/ar_fastapi_util.py

@@ -31,7 +31,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
 from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_object
-from arpakitlib.ar_json_db_util import JSONDb
+from arpakitlib.ar_json_db_util import BaseJSONDb
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj, safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import BaseSettings2
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM, OperationDBM
@@ -538,7 +538,7 @@ class SimpleTransmittedAPIData(BaseTransmittedAPIData):
 
 class AdvancedTransmittedAPIData(SimpleTransmittedAPIData):
     sqlalchemy_db: SQLAlchemyDb | None = None
-    json_db: JSONDb | None = None
+    json_db: BaseJSONDb | None = None
     media_file_storage_in_dir: FileStorageInDir | None = None
     cache_file_storage_in_dir: FileStorageInDir | None = None
     dump_file_storage_in_dir: FileStorageInDir | None = None

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/ar_json_db_util.py

@@ -13,7 +13,7 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 class JSONDbFile:
 
-    def __init__(self, *, filepath: str, use_memory: bool = True, beautify_json: bool = True):
+    def __init__(self, *, filepath: str, use_memory: bool = True, beautify_json: bool = True, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
         raise_for_type(filepath, str)
         filepath = os.path.abspath(filepath.strip())
@@ -173,9 +173,9 @@ class JSONDbFile:
             os.remove(self.filepath)
 
 
-class JSONDb:
+class BaseJSONDb:
 
-    def __init__(self, json_db_files: Optional[list[JSONDbFile]] = None):
+    def __init__(self, json_db_files: list[JSONDbFile] | None = None, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
         if json_db_files is None:
             json_db_files = []
@@ -190,7 +190,9 @@ class JSONDb:
     def __len__(self) -> int:
         return len(self.json_db_files)
 
-    def create_json_db_file(self, filepath: str, use_memory: bool = False, beautify_json: bool = False) -> JSONDbFile:
+    def create_json_db_file(
+            self, filepath: str, use_memory: bool = False, beautify_json: bool = False, **kwargs
+    ) -> JSONDbFile:
         json_db_file = JSONDbFile(filepath=filepath, use_memory=use_memory, beautify_json=beautify_json)
         self.json_db_files.append(json_db_file)
         return json_db_file
@@ -215,7 +217,7 @@ class JSONDb:
             json_db_file.rm_all_records()
 
     def copy_files_to_dir(self, to_dirpath: str) -> Self:
-        json_db = JSONDb()
+        json_db = BaseJSONDb()
         for json_db_file in self.json_db_files:
             filepath = os.path.join(to_dirpath, json_db_file.filename)
             json_db_file.copy(filepath)

{arpakitlib-1.7.253 → arpakitlib-1.7.256}/arpakitlib/ar_operation_execution_util.py

@@ -322,6 +322,7 @@ class OperationExecutorWorker(BaseWorker):
             timeout_after_err_in_run=timedelta(seconds=0.3),
             startup_funcs=startup_funcs,
         )
+        raise_for_type(sqlalchemy_db, SQLAlchemyDb)
         self.sqlalchemy_db = sqlalchemy_db
         if operation_executor is None:
             operation_executor = BaseOperationExecutor(sqlalchemy_db=sqlalchemy_db)
@@ -393,6 +394,7 @@ class ScheduledOperationCreatorWorker(BaseWorker):
             timeout_after_err_in_run=timedelta(seconds=0.3),
             startup_funcs=startup_funcs
         )
+        raise_for_type(sqlalchemy_db, SQLAlchemyDb)
         self.sqlalchemy_db = sqlalchemy_db
         if scheduled_operations is None:
             scheduled_operations = []