arpakitlib 1.7.252__tar.gz → 1.7.253__tar.gz

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

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

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

@@ -5,7 +5,7 @@ from sqlalchemy import engine_from_config
 from sqlalchemy import pool
 
 from src.core.settings import get_cached_settings
-from src.db.util import get_base_dbm
+from src.sql_db.util import get_base_dbm
 
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/manage/docker_rm_postgres.sh

@@ -0,0 +1,3 @@
+cd ..
+source .env
+docker rm -f ${project_name}_postgres

arpakitlib-1.7.253/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 ${sql_db_port}:5432 -e POSTGRES_USER=${sql_db_user} -e POSTGRES_PASSWORD=${sql_db_password} -e POSTGRES_DB=${sql_db_database} postgres:16 -c max_connections=100
+docker start ${project_name}_postgres

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/manage/docker_start_postgres.sh

@@ -0,0 +1,3 @@
+cd ..
+source .env
+docker start ${project_name}_postgres

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/manage/docker_stop_postgres.sh

@@ -0,0 +1,3 @@
+cd ..
+source .env
+docker stop ${project_name}_postgres

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_company_origin.sh

@@ -3,7 +3,7 @@ cd ..
 source .env
 
 git remote remove arpakit_company_github_1
-git remote add arpakit_company_github_1 git@github.com:ARPAKIT-Company/${PROJECT_NAME}.git
+git remote add arpakit_company_github_1 git@github.com:ARPAKIT-Company/${project_name}.git
 
 git remote remove arpakit_company_gitlab_1
-git remote add arpakit_company_gitlab_1 git@gitlab.com:ARPAKIT-Company/${PROJECT_NAME}.git
+git remote add arpakit_company_gitlab_1 git@gitlab.com:ARPAKIT-Company/${project_name}.git

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -0,0 +1,9 @@
+cd ..
+
+source .env
+
+git remote remove arpakit_github_1
+git remote add arpakit_github_1 git@github.com:arpakit/${project_name}.git
+
+git remote remove arpakit_gitlab_1
+git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/${project_name}.git

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -9,7 +9,7 @@ from src.core.const import ProjectPaths
 from src.core.settings import get_cached_settings
 from src.core.util import setup_logging, get_cached_media_file_storage_in_dir, get_cached_cache_file_storage_in_dir, \
     get_cached_dump_file_storage_in_dir
-from src.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def create_api_app() -> FastAPI:

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

@@ -1,7 +1,7 @@
 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_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
@@ -29,11 +29,11 @@ class StartupAPIEvent(BaseStartupAPIEvent):
             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)
+            raise_for_type(self.transmitted_api_data.sqlalchemy_db, SQLAlchemyDb)
             self.transmitted_api_data.sqlalchemy_db.init()
 
         if self.transmitted_api_data.settings.api_start_operation_executor_worker:  # TODO
-            raise_for_type(self.transmitted_api_data.sqlalchemy_db, SQLAlchemyDB)
+            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 +44,7 @@ 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)
+            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.252 → arpakitlib-1.7.253}/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.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.operation_executor import OperationExecutor
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _start_operation_executor_worker():

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/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.db.util import get_cached_sqlalchemy_db
 from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _start_scheduled_operation_creator_worker():

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/db → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db}/_check_conn_sqlalchemy_db.py

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

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/db → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_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.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/db → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db}/_init_sqlalchemy_db.py

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

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/db → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_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.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _reinit_sqlalchemy_db():

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/operation_execution → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_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.db.util import get_cached_sqlalchemy_db
+from src.sql_db.util import get_cached_sqlalchemy_db
 
 
 def _remove_operations():

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db/_remove_story_logs.py

@@ -0,0 +1,16 @@
+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
+
+
+def _remove_story_logs():
+    setup_logging()
+    get_cached_settings().raise_if_mode_type_prod()
+    with get_cached_sqlalchemy_db().new_session() as session:
+        session.query(StoryLogDBM).delete()
+        session.commit()
+
+
+if __name__ == '__main__':
+    _remove_story_logs()

{arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/db → arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/sql_db}/util.py

@@ -1,21 +1,21 @@
 from functools import lru_cache
 
 from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 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.db.sqlalchemy_model import import_project_sqlalchemy_models
+    from src.sql_db.sqlalchemy_model import import_project_sqlalchemy_models
     import_project_sqlalchemy_models()
     return BaseDBM
 
 
-def create_sqlalchemy_db() -> SQLAlchemyDB:
-    return SQLAlchemyDB(
-        db_url=get_cached_settings().sql_db_url,
+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,
         base_dbm=get_base_dbm()
@@ -23,5 +23,5 @@ def create_sqlalchemy_db() -> SQLAlchemyDB:
 
 
 @lru_cache()
-def get_cached_sqlalchemy_db() -> SQLAlchemyDB:
+def get_cached_sqlalchemy_db() -> SQLAlchemyDb:
     return create_sqlalchemy_db()

arpakitlib-1.7.253/arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py

@@ -0,0 +1,6 @@
+from arpakitlib.ar_aiogram_util import AdvancedTransmittedTgBotData
+from src.core.settings import Settings
+
+
+class TransmittedTgData(AdvancedTransmittedTgBotData):
+    settings: Settings | None = None

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/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
+from aiogram import types, Bot, Dispatcher
 from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ChatType, ParseMode
@@ -13,8 +13,12 @@ from aiogram.filters import CommandObject, Filter
 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_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_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_types, raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -315,6 +319,18 @@ class BaseTransmittedTgBotData(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
 
+class SimpleTransmittedTgBotData(BaseTransmittedTgBotData):
+    settings: BaseSettings2 | None = None
+
+
+class AdvancedTransmittedTgBotData(SimpleTransmittedTgBotData):
+    sqlalchemy_db: SQLAlchemyDb | None = None
+    json_db: JSONDb | 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
+
+
 def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs) -> Bot:
     kwargs["token"] = token
 
@@ -333,9 +349,16 @@ def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs
     return tg_bot
 
 
-def create_tg_bot_dispatcher():
-    # TODO
-    pass
+# 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():

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

@@ -31,10 +31,11 @@ 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_util import safely_transfer_obj_to_json_str_to_json_obj, safely_transfer_obj_to_json_str
-from arpakitlib.ar_settings_util import SimpleSettings
+from arpakitlib.ar_settings_util import BaseSettings2
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM, OperationDBM
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type, raise_if_none
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -355,12 +356,12 @@ def logging__api_func_before_in_handle_exception(
 
 def story_log__api_func_before_in_handle_exception(
         *,
-        sqlalchemy_db: SQLAlchemyDB,
+        sqlalchemy_db: SQLAlchemyDb,
         ignore_api_error_codes: list[str] | None = None,
         ignore_status_codes: list[int] | None = None,
         ignore_exception_types: list[type[Exception]] | None = None
 ) -> Callable:
-    raise_for_type(sqlalchemy_db, SQLAlchemyDB)
+    raise_for_type(sqlalchemy_db, SQLAlchemyDb)
 
     current_func_name = inspect.currentframe().f_code.co_name
 
@@ -532,11 +533,12 @@ class BaseTransmittedAPIData(BaseModel):
 
 
 class SimpleTransmittedAPIData(BaseTransmittedAPIData):
-    settings: SimpleSettings | None = None
+    settings: BaseSettings2 | None = None
 
 
 class AdvancedTransmittedAPIData(SimpleTransmittedAPIData):
-    sqlalchemy_db: SQLAlchemyDB | None = None
+    sqlalchemy_db: SQLAlchemyDb | None = None
+    json_db: JSONDb | 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.252 → arpakitlib-1.7.253}/arpakitlib/ar_operation_execution_util.py

@@ -19,7 +19,7 @@ from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 from arpakitlib.ar_sqlalchemy_model_util import OperationDBM, StoryLogDBM, BaseOperationTypes
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -30,7 +30,7 @@ _logger = logging.getLogger(__name__)
 def get_operation_for_execution(
         *,
         session: Session | None = None,
-        sqlalchemy_db: SQLAlchemyDB | None = None,
+        sqlalchemy_db: SQLAlchemyDb | None = None,
         filter_operation_types: list[str] | str | None = None,
         lock: bool = False
 ) -> OperationDBM | None:
@@ -65,7 +65,7 @@ def get_operation_for_execution(
 def get_operation_by_id(
         *,
         session: Session | None = None,
-        sqlalchemy_db: SQLAlchemyDB | None = None,
+        sqlalchemy_db: SQLAlchemyDb | None = None,
         filter_operation_id: int,
         raise_if_not_found: bool = False,
         lock: bool = False
@@ -101,7 +101,7 @@ def get_operation_by_id(
 def remove_operations(
         *,
         session: Session | None = None,
-        sqlalchemy_db: SQLAlchemyDB | None = None,
+        sqlalchemy_db: SQLAlchemyDb | None = None,
         filter_operation_ids: list[int] | int | None = None,
         filter_operation_types: list[str] | str | None = None,
         filter_operation_statuses: list[str] | str | None = None
@@ -141,7 +141,7 @@ def remove_operations(
 
 
 class BaseOperationExecutor:
-    def __init__(self, *, sqlalchemy_db: SQLAlchemyDB, **kwargs):
+    def __init__(self, *, sqlalchemy_db: SQLAlchemyDb, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
         self.sql_alchemy_db = sqlalchemy_db
 
@@ -311,7 +311,7 @@ class OperationExecutorWorker(BaseWorker):
     def __init__(
             self,
             *,
-            sqlalchemy_db: SQLAlchemyDB,
+            sqlalchemy_db: SQLAlchemyDb,
             operation_executor: BaseOperationExecutor | None = None,
             filter_operation_types: str | list[str] | None = None,
             startup_funcs: list[Any] | None = None,
@@ -384,7 +384,7 @@ class ScheduledOperationCreatorWorker(BaseWorker):
     def __init__(
             self,
             *,
-            sqlalchemy_db: SQLAlchemyDB,
+            sqlalchemy_db: SQLAlchemyDb,
             scheduled_operations: ScheduledOperation | list[ScheduledOperation] | None = None,
             startup_funcs: list[Any] | None = None
     ):

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/arpakitlib/ar_settings_util.py

@@ -125,7 +125,7 @@ class AdvancedSettings(SimpleSettings):
             return v
 
         return generate_sqlalchemy_url(
-            base="postgresql+asyncpg",
+            base="postgresql",
             user=validation_info.data.get("sql_db_user"),
             password=validation_info.data.get("sql_db_password"),
             port=validation_info.data.get("sql_db_port"),

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/arpakitlib/ar_sqlalchemy_util.py

@@ -78,11 +78,11 @@ def generate_sqlalchemy_url(
     return f"{base}://{auth_part}{host_part}{database_part}{query_part}"
 
 
-class SQLAlchemyDB:
+class SQLAlchemyDb:
     def __init__(
             self,
             *,
-            db_url: str | None = "postgresql://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
+            sync_db_url: str | None = "postgresql://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
             async_db_url: str | None = "postgresql+asyncpg://arpakitlib:arpakitlib@localhost:50517/arpakitlib",
             db_echo: bool = False,
             base_dbm: type[BaseDBM] | None = None,
@@ -90,10 +90,10 @@ class SQLAlchemyDB:
     ):
         self._logger = logging.getLogger()
 
-        self.db_url = db_url
+        self.db_url = sync_db_url
         if self.db_url is not None:
             self.engine = create_engine(
-                url=db_url,
+                url=sync_db_url,
                 echo=db_echo,
                 pool_size=10,
                 max_overflow=10,

{arpakitlib-1.7.252 → arpakitlib-1.7.253}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.252"
+version = "1.7.253"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },

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

@@ -1,5 +0,0 @@
-cd ..
-source .env
-docker rm ${PROJECT_NAME}_postgres
-docker run --name ${PROJECT_NAME}_postgres -d -p ${SQL_DB_PORT}:5432 -e POSTGRES_USER=${SQL_DB_USER} -e POSTGRES_PASSWORD=${SQL_DB_PASSWORD} -e POSTGRES_DB=${SQL_DB_DATABASE} postgres:16 -c max_connections=100
-docker start ${PROJECT_NAME}_postgres

arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/manage/docker_start_postgres.sh

@@ -1,3 +0,0 @@
-cd ..
-source .env
-docker start ${PROJECT_NAME}_postgres

arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/manage/docker_stop_postgres.sh

@@ -1,3 +0,0 @@
-cd ..
-source .env
-docker stop ${PROJECT_NAME}_postgres

arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/manage/git_set_arpakit_origin.sh

@@ -1,9 +0,0 @@
-cd ..
-
-source .env
-
-git remote remove arpakit_github_1
-git remote add arpakit_github_1 git@github.com:arpakit/${PROJECT_NAME}.git
-
-git remote remove arpakit_gitlab_1
-git remote add arpakit_gitlab_1 git@gitlab.com:arpakit/${PROJECT_NAME}.git

arpakitlib-1.7.252/arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py

@@ -1,17 +0,0 @@
-from aiogram import Bot
-
-from arpakitlib.ar_aiogram_util import BaseTransmittedTgBotData
-from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
-from src.core.settings import Settings
-
-
-class TransmittedTgData(BaseTransmittedTgBotData):
-    settings: Settings
-    sqlalchemy_db: SQLAlchemyDB | 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
-    tg_bot: Bot
-
-    # ...