arpakitlib 1.7.242__py3-none-any.whl → 1.7.244__py3-none-any.whl

arpakitlib/_arpakit_project_template/example.env

@@ -9,7 +9,8 @@
 # api_init_sql_db_at_start=
 # api_title=
 # api_description=
-# api_create_story_log_before_response_in_handle_exception=
+# api_logging_func_before_response=
+# api_story_log_func_before_response=
 # api_start_operation_executor_worker=
 # api_start_scheduled_operation_creator_worker=
 # api_port=

arpakitlib/_arpakit_project_template/src/api/create_api_app.py

@@ -1,11 +1,7 @@
 from fastapi import FastAPI
-from starlette import status
 
-from arpakitlib.ar_fastapi_util import create_fastapi_app, \
-    create_handle_exception, create_story_log_before_response_in_handle_exception
-from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
-from arpakitlib.ar_type_util import raise_for_type
-from src.api.const import APIErrorCodes
+from arpakitlib.ar_fastapi_util import create_fastapi_app
+from src.api.create_handle_exception_ import create_handle_exception_
 from src.api.event import StartupAPIEvent, ShutdownAPIEvent
 from src.api.router.main_router import main_api_router
 from src.api.transmitted_api_data import TransmittedAPIData
@@ -31,23 +27,6 @@ def create_api_app() -> FastAPI:
         dump_file_storage_in_dir=get_cached_dump_file_storage_in_dir()
     )
 
-    funcs_before_response = []
-
-    if settings.api_create_story_log_before_response_in_handle_exception:
-        raise_for_type(sqlalchemy_db, SQLAlchemyDB)
-        funcs_before_response.append(
-            create_story_log_before_response_in_handle_exception(
-                sqlalchemy_db=sqlalchemy_db,
-                ignore_api_error_codes=[APIErrorCodes.not_found],
-                ignore_status_codes=[status.HTTP_404_NOT_FOUND]
-            )
-        )
-
-    handle_exception = create_handle_exception(
-        funcs_before_response=funcs_before_response,
-        async_funcs_after_response=[]
-    )
-
     startup_api_events = []
 
     startup_api_events.append(StartupAPIEvent(transmitted_api_data=transmitted_api_data))
@@ -56,11 +35,13 @@ def create_api_app() -> FastAPI:
 
     shutdown_api_events.append(ShutdownAPIEvent(transmitted_api_data=transmitted_api_data))
 
+    handle_exception_ = create_handle_exception_(transmitted_api_data=transmitted_api_data)
+
     api_app = create_fastapi_app(
         title=settings.api_title.strip(),
         description=settings.api_description.strip(),
         log_filepath=settings.log_filepath,
-        handle_exception_=handle_exception,
+        handle_exception_=handle_exception_,
         startup_api_events=startup_api_events,
         shutdown_api_events=shutdown_api_events,
         transmitted_api_data=transmitted_api_data,

arpakitlib/_arpakit_project_template/src/api/create_handle_exception_.py

@@ -0,0 +1,59 @@
+import fastapi.exceptions
+import starlette.exceptions
+import starlette.status
+
+from arpakitlib.ar_fastapi_util import create_handle_exception, story_log_func_before_response, \
+    logging_func_before_response
+from src.api.const import APIErrorCodes
+from src.api.transmitted_api_data import TransmittedAPIData
+
+
+def create_handle_exception_(*, transmitted_api_data: TransmittedAPIData):
+    funcs_before_response = []
+
+    if transmitted_api_data.settings.api_logging_func_before_response:
+        funcs_before_response.append(
+            logging_func_before_response(
+                ignore_api_error_codes=[
+                    APIErrorCodes.cannot_authorize,
+                    APIErrorCodes.error_in_request,
+                    APIErrorCodes.not_found
+                ],
+                ignore_status_codes=[
+                    starlette.status.HTTP_401_UNAUTHORIZED,
+                    starlette.status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    starlette.status.HTTP_404_NOT_FOUND
+                ],
+                ignore_exception_types=[
+                    fastapi.exceptions.RequestValidationError
+                ],
+                need_exc_info=False
+            )
+        )
+
+    if transmitted_api_data.settings.api_story_log_func_before_response:
+        funcs_before_response.append(
+            story_log_func_before_response(
+                sqlalchemy_db=transmitted_api_data.sqlalchemy_db,
+                ignore_api_error_codes=[
+                    APIErrorCodes.cannot_authorize,
+                    APIErrorCodes.error_in_request,
+                    APIErrorCodes.not_found
+                ],
+                ignore_status_codes=[
+                    starlette.status.HTTP_401_UNAUTHORIZED,
+                    starlette.status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    starlette.status.HTTP_404_NOT_FOUND
+                ],
+                ignore_exception_types=[
+                    fastapi.exceptions.RequestValidationError
+                ],
+            )
+        )
+
+    async_funcs_after_response = []
+
+    return create_handle_exception(
+        funcs_before_response=funcs_before_response,
+        async_funcs_after_response=async_funcs_after_response
+    )

arpakitlib/_arpakit_project_template/src/core/settings.py

@@ -8,6 +8,7 @@ from pydantic_core.core_schema import ValidationInfo
 
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
+from arpakitlib.ar_sqlalchemy_util import generate_sqlalchemy_url
 from src.core.const import ProjectPaths
 
 
@@ -27,14 +28,40 @@ class Settings(SimpleSettings):
     @field_validator("sql_db_url", mode="after")
     def validate_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
         if v is not None:
-            return None
-        user = validation_info.data.get('sql_db_user')
-        password = validation_info.data.get('sql_db_password')
-        port = validation_info.data.get('sql_db_port')
-        database = validation_info.data.get('sql_db_database')
-        if user is not None and password is not None and port is not None and database is not None:
-            return f"postgresql://{user}:{password}@127.0.0.1:{port}/{database}"
-        return None
+            return v
+
+        user = validation_info.data.get("sql_db_user")
+        password = validation_info.data.get("sql_db_password")
+        port = validation_info.data.get("sql_db_port")
+        database = validation_info.data.get("sql_db_database")
+
+        return generate_sqlalchemy_url(
+            base="postgresql",
+            user=user,
+            password=password,
+            port=port,
+            database=database
+        )
+
+    async_sql_db_url: str | None = None
+
+    @field_validator("async_sql_db_url", mode="after")
+    def validate_async_sql_db_url(cls, v: Any, validation_info: ValidationInfo) -> str | None:
+        if v is not None:
+            return v
+
+        user = validation_info.data.get("sql_db_user")
+        password = validation_info.data.get("sql_db_password")
+        port = validation_info.data.get("sql_db_port")
+        database = validation_info.data.get("sql_db_database")
+
+        return generate_sqlalchemy_url(
+            base="postgresql+asyncpg",
+            user=user,
+            password=password,
+            port=port,
+            database=database
+        )
 
     sql_db_echo: bool = False
 
@@ -44,7 +71,9 @@ class Settings(SimpleSettings):
 
     api_description: str = f"{project_name} (arpakitlib)"
 
-    api_create_story_log_before_response_in_handle_exception: bool = True
+    api_logging_func_before_response: bool = True
+
+    api_story_log_func_before_response: bool = True
 
     api_start_operation_executor_worker: bool = False
 

arpakitlib/_arpakit_project_template/src/db/util.py

@@ -16,6 +16,7 @@ def get_base_dbm() -> type[BaseDBM]:
 def create_sqlalchemy_db() -> SQLAlchemyDB:
     return SQLAlchemyDB(
         db_url=get_cached_settings().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()
     )

arpakitlib/_arpakit_project_template/src/tg_bot/blank/blank.py

@@ -0,0 +1,10 @@
+from emoji import emojize
+
+from arpakitlib.ar_blank_util import BaseBlank
+
+
+class TgBotBlank(BaseBlank):
+
+    def healthcheck(self) -> str:
+        res = "healthcheck"
+        return emojize(res.strip())

arpakitlib/_arpakit_project_template/src/tg_bot/blank/util.py

@@ -0,0 +1,12 @@
+from functools import lru_cache
+
+from src.tg_bot.blank.blank import TgBotBlank
+
+
+def get_create_tg_bot_blank() -> TgBotBlank:
+    return TgBotBlank()
+
+
+@lru_cache()
+def get_cached_tg_bot_blank() -> TgBotBlank:
+    return get_create_tg_bot_blank()

arpakitlib/_arpakit_project_template/src/tg_bot/const.py

@@ -0,0 +1,19 @@
+from arpakitlib.ar_enumeration_util import Enumeration
+
+
+class TgBotPublicCommands(Enumeration):
+    start = "start"
+
+
+class TgBotPrivateCommands(Enumeration):
+    init_db = "init_db"
+    reinit_db = "reinit_db"
+    drop_db = "drop_db"
+    set_tg_bot_commands = "set_tg_bot_commands"
+    raise_fake_err = "raise_fake_err"
+    log_file = "log_file"
+    clear_log_file = "clear_log_file"
+    kb_with_old_data = "kb_with_old_data"
+    kb_with_not_modified = "kb_with_not_modified"
+    kb_with_fake_error = "kb_with_fake_error"
+    kb_with_remove_message = "kb_with_remove_message"

arpakitlib/_arpakit_project_template/src/tg_bot/router/error.py

@@ -0,0 +1,3 @@
+from aiogram import Router
+
+tg_bot_router = Router()

arpakitlib/_arpakit_project_template/src/tg_bot/router/router.py

@@ -0,0 +1,7 @@
+from aiogram import Router
+
+from src.tg_bot.router import error
+
+main_tg_bot_router = Router()
+
+main_tg_bot_router.include_router(error.tg_bot_router)

arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py

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

arpakitlib/ar_aiogram_util.py

@@ -2,10 +2,9 @@
 
 import asyncio
 import logging
-from abc import ABC
 from typing import Optional, Any, Union, Callable, Iterable
 
-from aiogram import types, BaseMiddleware, Bot
+from aiogram import types, Bot
 from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ChatType, ParseMode
@@ -312,12 +311,6 @@ def as_tg_command(
     return decorator
 
 
-class SimpleMiddleware(BaseMiddleware, ABC):
-    def __init__(self):
-        self.middleware_name = self.__class__.__name__
-        self._logger = logging.getLogger(self.__class__.__name__)
-
-
 class BaseTransmittedTgBotData(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 

arpakitlib/ar_blank_util.py

@@ -0,0 +1,8 @@
+# arpakit
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class BaseBlank:
+    def __init__(self, **kwargs):
+        pass

arpakitlib/ar_fastapi_util.py

@@ -7,7 +7,6 @@ import datetime as dt
 import logging
 import os.path
 import pathlib
-import traceback
 from contextlib import suppress
 from typing import Any, Callable
 
@@ -27,8 +26,9 @@ from starlette.staticfiles import StaticFiles
 
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
-from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_function, is_async_object
-from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj
+from arpakitlib.ar_exception_util import exception_to_traceback_str
+from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_object
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str_to_json_obj, safely_transfer_obj_to_json_str
 from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM, OperationDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
@@ -239,19 +239,15 @@ def create_handle_exception(
             old_error_data = error_so.error_data
             error_so = exception.error_so
             error_so.error_data = combine_dicts(old_error_data, error_so.error_data)
-            _need_exc_info = False
 
         elif isinstance(exception, starlette.exceptions.HTTPException):
             status_code = exception.status_code
             if status_code in (starlette.status.HTTP_403_FORBIDDEN, starlette.status.HTTP_401_UNAUTHORIZED):
                 error_so.error_code = BaseAPIErrorCodes.cannot_authorize
-                _need_exc_info = False
             elif status_code == starlette.status.HTTP_404_NOT_FOUND:
                 error_so.error_code = BaseAPIErrorCodes.not_found
-                _need_exc_info = False
             else:
                 status_code = starlette.status.HTTP_500_INTERNAL_SERVER_ERROR
-                _need_exc_info = True
             with suppress(Exception):
                 error_so.error_data["exception.detail"] = exception.detail
 
@@ -260,13 +256,10 @@ def create_handle_exception(
             error_so.error_code = BaseAPIErrorCodes.error_in_request
             with suppress(Exception):
                 error_so.error_data["exception.errors"] = str(exception.errors()) if exception.errors() else {}
-            _need_exc_info = False
 
         else:
             status_code = starlette.status.HTTP_500_INTERNAL_SERVER_ERROR
             error_so.error_code = BaseAPIErrorCodes.unknown_error
-            _logger.exception(exception)
-            _need_exc_info = True
 
         if error_so.error_code:
             error_so.error_code = error_so.error_code.upper().replace(" ", "_").strip()
@@ -282,17 +275,12 @@ def create_handle_exception(
         if error_so.error_code == BaseAPIErrorCodes.cannot_authorize:
             status_code = status.HTTP_401_UNAUTHORIZED
 
-        if _need_exc_info:
-            _logger.error(str(exception), exc_info=exception)
-        else:
-            _logger.error(str(exception))
-
         _kwargs = {}
         for func in funcs_before_response:
             _func_data = func(
                 status_code=status_code, error_so=error_so, request=request, exception=exception, **_kwargs
             )
-            if is_async_function(_func_data):
+            if is_async_object(_func_data):
                 _func_data = await _func_data
             if _func_data is not None:
                 status_code, error_so, _kwargs = _func_data[0], _func_data[1], _func_data[2]
@@ -314,13 +302,49 @@ def create_handle_exception(
     return handle_exception
 
 
-def create_story_log_before_response_in_handle_exception(
+def logging_func_before_response(
+        *,
+        ignore_api_error_codes: list[str] | None = None,
+        ignore_status_codes: list[int] | None = None,
+        ignore_exception_types: list[type[Exception]] | None = None,
+        need_exc_info: bool = False
+):
+    def func(
+            *,
+            status_code: int,
+            error_so: ErrorSO,
+            request: starlette.requests.Request,
+            exception: Exception,
+            **kwargs
+    ) -> (int, ErrorSO, dict[str, Any]):
+        kwargs["logging_before_response_in_handle_exception"] = True
+
+        if ignore_api_error_codes and error_so.error_code in ignore_api_error_codes:
+            return status_code, error_so, kwargs
+
+        if ignore_status_codes and status_code in ignore_status_codes:
+            return status_code, error_so, kwargs
+
+        if ignore_exception_types and (
+                exception in ignore_exception_types or type(exception) in ignore_exception_types
+        ):
+            return status_code, error_so, kwargs
+
+        _logger.error(safely_transfer_obj_to_json_str(error_so.model_dump()), exc_info=need_exc_info)
+
+    return func
+
+
+def story_log_func_before_response(
         *,
         sqlalchemy_db: SQLAlchemyDB,
         ignore_api_error_codes: list[str] | None = None,
-        ignore_status_codes: list[int] | None = None
+        ignore_status_codes: list[int] | None = None,
+        ignore_exception_types: list[type[Exception]] | None = None
 ) -> Callable:
-    def func(
+    raise_for_type(sqlalchemy_db, SQLAlchemyDB)
+
+    async def async_func(
             *,
             status_code: int,
             error_so: ErrorSO,
@@ -328,31 +352,38 @@ def create_story_log_before_response_in_handle_exception(
             exception: Exception,
             **kwargs
     ) -> (int, ErrorSO, dict[str, Any]):
+        kwargs["create_story_log_before_response_in_handle_exception"] = True
+
         if ignore_api_error_codes and error_so.error_code in ignore_api_error_codes:
             return status_code, error_so, kwargs
 
         if ignore_status_codes and status_code in ignore_status_codes:
             return status_code, error_so, kwargs
 
-        sqlalchemy_db.init()
-        traceback_str = "".join(traceback.format_exception(type(exception), exception, exception.__traceback__))
-        with sqlalchemy_db.new_session() as session:
+        if ignore_exception_types and (
+                exception in ignore_exception_types or type(exception) in ignore_exception_types
+        ):
+            return status_code, error_so, kwargs
+
+        async with sqlalchemy_db.new_async_session() as session:
             story_log_dbm = StoryLogDBM(
                 level=StoryLogDBM.Levels.error,
-                title=str(exception),
+                title=f"{status_code}, {type(exception)}",
                 data={
                     "error_so": error_so.model_dump(),
-                    "traceback_str": traceback_str
+                    "traceback_str": exception_to_traceback_str(exception=exception)
                 }
             )
             session.add(story_log_dbm)
-            session.commit()
-            session.refresh(story_log_dbm)
+            await session.commit()
+            await session.refresh(story_log_dbm)
+
         error_so.error_data.update({"story_log_long_id": story_log_dbm.long_id})
         kwargs["story_log_id"] = story_log_dbm.id
+
         return status_code, error_so, kwargs
 
-    return func
+    return async_func
 
 
 def add_exception_handler_to_app(*, app: FastAPI, handle_exception: Callable) -> FastAPI:

arpakitlib/ar_sqlalchemy_util.py

@@ -3,9 +3,11 @@ import asyncio
 import logging
 from datetime import timedelta, datetime
 from typing import Any
+from urllib.parse import quote_plus
 from uuid import uuid4
 
-from sqlalchemy import create_engine, QueuePool, text, func
+from sqlalchemy import create_engine, QueuePool, text, func, inspect, AsyncAdaptedQueuePool
+from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
 from sqlalchemy.orm import sessionmaker, DeclarativeBase
 from sqlalchemy.orm.session import Session
 
@@ -22,28 +24,105 @@ def get_string_info_from_declarative_base(class_: type[DeclarativeBase]):
     return res
 
 
+def generate_sqlalchemy_url(
+        *,
+        base: str = "postgresql",
+        user: str | None = None,
+        password: str | None = None,
+        host: str = "127.0.0.1",
+        port: int | None = None,
+        database: str | None = None,
+        **query_params
+) -> str:
+    """
+    Генерация URL для SQLAlchemy.
+
+    :param base: Базовая строка для подключения, например "postgresql+asyncpg" или "sqlite".
+    :param user: Имя пользователя (необязательно).
+    :param password: Пароль (необязательно).
+    :param host: Хост (по умолчанию "127.0.0.1").
+    :param port: Порт (необязательно).
+    :param database: Имя базы данных или путь к файлу для SQLite (необязательно).
+    :param query_params: Дополнительные параметры строки подключения.
+    :return: Строка подключения для SQLAlchemy.
+    """
+    # Формируем часть с авторизацией
+    auth_part = ""
+    if user and password:
+        auth_part = f"{quote_plus(user)}:{quote_plus(password)}@"
+    elif user:
+        auth_part = f"{quote_plus(user)}@"
+
+    # Формируем часть с хостом и портом
+    host_part = ""
+    if base.startswith("sqlite"):
+        # Для SQLite хост и порт не нужны
+        host_part = ""
+    else:
+        host_part = f"{host}"
+        if port:
+            host_part += f":{port}"
+
+    # Формируем часть с базой данных
+    database_part = f"/{database}" if database else ""
+    if base.startswith("sqlite") and database:
+        # Для SQLite путь указывается как абсолютный
+        database_part = f"/{database}"
+
+    # Дополнительные параметры
+    query_part = ""
+    if query_params:
+        query_items = [f"{key}={quote_plus(str(value))}" for key, value in query_params.items()]
+        query_part = f"?{'&'.join(query_items)}"
+
+    return f"{base}://{auth_part}{host_part}{database_part}{query_part}"
+
+
 class SQLAlchemyDB:
     def __init__(
             self,
             *,
-            db_url: str = "postgresql://arpakitlib:arpakitlib@localhost:50629/arpakitlib",
+            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,
             db_models: list[Any] | None = None,
     ):
-        self._logger = logging.getLogger(self.__class__.__name__)
-        self.engine = create_engine(
-            url=db_url,
-            echo=db_echo,
-            pool_size=5,
-            max_overflow=10,
-            poolclass=QueuePool,
-            pool_timeout=timedelta(seconds=30).total_seconds()
-        )
+        self._logger = logging.getLogger()
+
+        self.db_url = db_url
+        if self.db_url is not None:
+            self.engine = create_engine(
+                url=db_url,
+                echo=db_echo,
+                pool_size=10,
+                max_overflow=10,
+                poolclass=QueuePool,
+                pool_timeout=timedelta(seconds=30).total_seconds(),
+            )
         self.sessionmaker = sessionmaker(bind=self.engine)
         self.func_new_session_counter = 0
+
+        self.async_db_url = async_db_url
+        if self.async_db_url is not None:
+            self.async_engine = create_async_engine(
+                url=async_db_url,
+                echo=db_echo,
+                pool_size=10,
+                max_overflow=10,
+                poolclass=AsyncAdaptedQueuePool,
+                pool_timeout=timedelta(seconds=30).total_seconds()
+            )
+        self.async_sessionmaker = async_sessionmaker(bind=self.async_engine)
+        self.func_new_async_session_counter = 0
+
         self.base_dbm = base_dbm
 
+    def is_table_exists(self, table_name: str) -> bool:
+        with self.engine.connect() as connection:
+            inspector = inspect(connection)
+            return table_name in inspector.get_table_names()
+
     def drop_celery_tables(self):
         with self.engine.connect() as connection:
             connection.execute(text("DROP TABLE IF EXISTS celery_tasksetmeta CASCADE;"))
@@ -52,32 +131,42 @@ class SQLAlchemyDB:
             self._logger.info("celery tables were dropped")
 
     def remove_celery_tables_data(self):
+        if not self.is_table_exists("celery_tasksetmeta"):
+            self._logger.info("table celery_tasksetmeta not exists")
+            return
         with self.engine.connect() as connection:
             connection.execute(text("DELETE FROM celery_tasksetmeta;"))
             connection.execute(text("DELETE FROM celery_taskmeta;"))
             connection.commit()
             self._logger.info("celery tables data were removed")
 
+    def drop_alembic_tables(self):
+        with self.engine.connect() as connection:
+            connection.execute(text("DROP TABLE IF EXISTS alembic_version CASCADE;"))
+            connection.execute(text("DROP TABLE IF EXISTS alembic_version CASCADE;"))
+            connection.commit()
+            self._logger.info("alembic_version tables were dropped")
+
     def remove_alembic_tables_data(self):
+        if not self.is_table_exists("alembic_version"):
+            self._logger.info("table alembic_version not exists")
+            return
         with self.engine.connect() as connection:
             connection.execute(text("DELETE FROM alembic_version;"))
             connection.commit()
             self._logger.info("alembic tables data were removed")
 
     def init(self):
-        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
-        BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)
+        self.base_dbm.metadata.create_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was inited")
 
     def drop(self):
-        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
-        BaseDBM.metadata.drop_all(bind=self.engine, checkfirst=True)
+        self.base_dbm.metadata.drop_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was dropped")
 
     def reinit(self):
-        from arpakitlib.ar_sqlalchemy_model_util import BaseDBM
-        BaseDBM.metadata.drop_all(bind=self.engine, checkfirst=True)
-        BaseDBM.metadata.create_all(bind=self.engine, checkfirst=True)
+        self.base_dbm.metadata.drop_all(bind=self.engine, checkfirst=True)
+        self.base_dbm.metadata.create_all(bind=self.engine, checkfirst=True)
         self._logger.info("db was reinited")
 
     def check_conn(self):
@@ -88,6 +177,10 @@ class SQLAlchemyDB:
         self.func_new_session_counter += 1
         return self.sessionmaker(**kwargs)
 
+    def new_async_session(self, **kwargs) -> AsyncSession:
+        self.func_new_async_session_counter += 1
+        return self.async_sessionmaker(**kwargs)
+
     def is_conn_good(self) -> bool:
         try:
             self.check_conn()

{arpakitlib-1.7.242.dist-info → arpakitlib-1.7.244.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.7.242
+Version: 1.7.244
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company
@@ -39,6 +39,7 @@ Requires-Dist: paramiko (>=3.5.0,<4.0.0)
 Requires-Dist: pika (>=1.3.2,<2.0.0)
 Requires-Dist: poetry (>=2.0.1,<3.0.0)
 Requires-Dist: psycopg2-binary (>=2.9.10,<3.0.0)
+Requires-Dist: pulp (>=2.9.0,<3.0.0)
 Requires-Dist: pydantic (>=2.10.5,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.10.1,<3.0.0)
@@ -46,6 +47,7 @@ Requires-Dist: pymongo (>=4.10.1,<5.0.0)
 Requires-Dist: pytz (>=2024.2,<2025.0)
 Requires-Dist: pyzabbix (>=1.3.1,<2.0.0)
 Requires-Dist: requests[socks] (>=2.32.3,<3.0.0)
+Requires-Dist: scipy (>=1.15.1,<2.0.0)
 Requires-Dist: sqladmin (>=0.20.1,<0.21.0)
 Requires-Dist: sqlalchemy (>=2.0.37,<3.0.0)
 Requires-Dist: twine (>=6.1.0,<7.0.0)

{arpakitlib-1.7.242.dist-info → arpakitlib-1.7.244.dist-info}/RECORD

@@ -4,7 +4,7 @@ arpakitlib/_arpakit_project_template/.python-version,sha256=XMd40XBnlTFfBSmMldd-
 arpakitlib/_arpakit_project_template/ARPAKITLIB,sha256=3-iAkMXtesLzJXHw_IIv2k2M0oH8cTjHzW22Vvbi0IE,4
 arpakitlib/_arpakit_project_template/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
 arpakitlib/_arpakit_project_template/README.md,sha256=AwqCtmMeywF2dJhZbKwCBA_wPnLF_VmoLGfPbFjH3bM,62
-arpakitlib/_arpakit_project_template/example.env,sha256=Ko4SnDj-vlgfjmSDiZsu3qw8SJQaDgeTCnwc5RZfHFI,611
+arpakitlib/_arpakit_project_template/example.env,sha256=ZlAMMUEHEYncVpGu2urz-P34CDG5Ljs8_lPp-oCCpYI,625
 arpakitlib/_arpakit_project_template/manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/manage/docker_ps.sh,sha256=uwm8vHgeuNLCOn0o9hgP_uc-PUkS9FwLyzZh6ItZ3do,15
 arpakitlib/_arpakit_project_template/manage/docker_ps_a.sh,sha256=nOQejihYlzstg9oROvYwHIsSLt2Sw0DWQEeT3GBaBNs,18
@@ -69,7 +69,8 @@ arpakitlib/_arpakit_project_template/src/api/_start_api_without_reload.py,sha256
 arpakitlib/_arpakit_project_template/src/api/asgi.py,sha256=a5UBxOyNC8NG3E0ayhiDo3t5tPoB3WtOf2gbZJFWBAA,74
 arpakitlib/_arpakit_project_template/src/api/auth.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template/src/api/const.py,sha256=7d4qD5hedqr7QxVzbfsA7E1bNZn2Pm2U8joXGtpANu0,287
-arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=BeH-GxQyzx7t3vzUQHM9xdKEJTyKJiRjBtd2KR0D_n4,2915
+arpakitlib/_arpakit_project_template/src/api/create_api_app.py,sha256=lpn_AYx39hyuwOev9Yzrji_2gJfRSgP3G1-CXTbz9rU,2211
+arpakitlib/_arpakit_project_template/src/api/create_handle_exception_.py,sha256=Q0YvleHXdKQKVXslXUgSdTqkEWHVkfE0m8vrpiJSb-c,2213
 arpakitlib/_arpakit_project_template/src/api/event.py,sha256=Ld4Ww3QyglvqEDm8LD-VmBB4KwkaXj9vc7JFlbJcEkM,3035
 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=Yv699WCJDcdiJMXFg1kPTvolqj-NAGoXfqe-vzbMzIU,228
@@ -89,7 +90,7 @@ arpakitlib/_arpakit_project_template/src/core/_check_logging.py,sha256=APQp8jQa3
 arpakitlib/_arpakit_project_template/src/core/_check_settings.py,sha256=BQUcr-yj3cxz5GQo0jXe99wMoqHKrrrKD3-UovsJAt0,284
 arpakitlib/_arpakit_project_template/src/core/_generate_settings_env_example.py,sha256=SiEJe8AYQPOWicsaCwf9RdXp6UAmfkBdBT18AAInGb4,483
 arpakitlib/_arpakit_project_template/src/core/const.py,sha256=e2Y0NIQHfzm3bmnbQnGy3Z5YKt6OYnIsRoqVY8oIV2E,1008
-arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=a_HfbAkl0hUbDJHDsdkjL3rLAcC8Mkaf9hXZgc5laRc,3065
+arpakitlib/_arpakit_project_template/src/core/settings.py,sha256=R4dsQHOB9wVBn-A76sbJFQbsfCHyyR3AMKV8HZHIHmM,3819
 arpakitlib/_arpakit_project_template/src/core/util.py,sha256=mcikqcjljZa2qhYeoR1tR9JUSprrVSod8XcIK_PqS6o,1547
 arpakitlib/_arpakit_project_template/src/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/db/_check_conn_sqlalchemy_db.py,sha256=GPK7-w7x8ESqbZ0v1nI8m_ysWfnmjgRwyyh6kM8vYBQ,249
@@ -98,7 +99,7 @@ arpakitlib/_arpakit_project_template/src/db/_init_sqlalchemy_db.py,sha256=tHJ1NB
 arpakitlib/_arpakit_project_template/src/db/_reinit_sqlalchemy_db.py,sha256=_4O_xr6FXt3qcWOmO82CKG3XX6_RqbqaOYSEygxpBfA,339
 arpakitlib/_arpakit_project_template/src/db/const.py,sha256=dcvj5C9E2F2KCsGZPBBncQf_EvVJAC1qQgnyD8P4ZEw,6
 arpakitlib/_arpakit_project_template/src/db/sqlalchemy_model.py,sha256=tIdSerx8m6FA0cx4PDNJF8cWY1utpS_g0sZ0jBzUAbI,286
-arpakitlib/_arpakit_project_template/src/db/util.py,sha256=Ww0CYifxFcNkRvMedmDu806_Ic_Hbb1C5KQX8UsiLdc,787
+arpakitlib/_arpakit_project_template/src/db/util.py,sha256=wYMVXtw_XURv4DFSx4n6CXnKYE-xskzpYSRk9lBIELY,848
 arpakitlib/_arpakit_project_template/src/operation_execution/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/operation_execution/_remove_operations.py,sha256=KsvAk2zQCp0PX6-QiRW0LKHoJfmH0wVJcBZviFqAoBI,471
 arpakitlib/_arpakit_project_template/src/operation_execution/_start_operation_executor_worker.py,sha256=K861UI9LFNxfCoPpQ5AJX-oUwjB6bfFNKScKsyU9Xd8,575
@@ -114,6 +115,10 @@ arpakitlib/_arpakit_project_template/src/test_data/make_test_data_3.py,sha256=t5
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_4.py,sha256=t1iYFim7v9NNR7Y10rUVRMVyq76Pdc82d5tQKpNlUFI,100
 arpakitlib/_arpakit_project_template/src/test_data/make_test_data_5.py,sha256=ptptUxpEa7sX7coToAYZHvy8oxXXQExxS1zqng5ET2I,100
 arpakitlib/_arpakit_project_template/src/tg_bot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/blank/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/blank/blank.py,sha256=ylQGIhLV3CMEW9qmQ4jr9rcXi0B72qIhbRmx9VLBzHc,204
+arpakitlib/_arpakit_project_template/src/tg_bot/blank/util.py,sha256=zhMRY4BUA8XMhfo8R4Jri655w4fwl0uniGq48SjchrY,247
+arpakitlib/_arpakit_project_template/src/tg_bot/const.py,sha256=oz6kWH00rtu4WvAMnrR4CNgT8rVl-gyMqEqWuZwwyZM,578
 arpakitlib/_arpakit_project_template/src/tg_bot/event.py,sha256=YMwoBH8TQhdjoTQBrxoxOvJqHqlw1yYVE5ymDp2D_Ak,1260
 arpakitlib/_arpakit_project_template/src/tg_bot/filter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/tg_bot/filter/not_prod_mode.py,sha256=uzkYsquQ5UKD68lEqe0478rbKFQYXZhbLIbxW0QhI44,235
@@ -127,12 +132,15 @@ arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/callback.py,sha256=47
 arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/tg_bot/kb/static_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/tg_bot/kb/static_/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template/src/tg_bot/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py,sha256=C-bscqmpBZgUwDbVx7e35sNDfs2f677dlvZ-RwrAa6U,77
+arpakitlib/_arpakit_project_template/src/tg_bot/router/error.py,sha256=5ktxguLc2pI7BUlJ9jgMp_VnH5gtOt1jzJZskKkmhzI,53
+arpakitlib/_arpakit_project_template/src/tg_bot/router/router.py,sha256=ZxfPNouuewz3uEW7jLxXdCuT7v-HVjl9YagrKbUMzwc,151
+arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py,sha256=7JWCdhyRyYkwV198PjKl6YPqPl7qr-_1Z2tVItfPZlQ,218
 arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py,sha256=XPNROag9Aq-eSIY7_KxaIxNvAp4orTkpkghRCh3nuz4,585
 arpakitlib/_arpakit_project_template/src/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/ar_additional_model_util.py,sha256=GFg-glLCxH9X95R2bhTJsscVwv37FgE1qbaAAyXrnIE,917
-arpakitlib/ar_aiogram_util.py,sha256=lv2aXUmXLm3f2JltT1i683de6MnTTp9b5HihjO4KM5s,12194
+arpakitlib/ar_aiogram_util.py,sha256=GFoIVjuKStzpR_PYPZdyfP3txpjJq1oaCsXTCNMp4Qw,11966
 arpakitlib/ar_api_key_util.py,sha256=E84JlJXiDHtxLQmV8BNHvqNKu_G8-Dox0XxknYJQ37Q,422
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=g9uWwTK2eEzmErqwYeVgXDYVMREN8m5CdmgEumAEQfw,5919
 arpakitlib/ar_arpakit_project_template_util.py,sha256=c7yc8w2IvZGH5hH8eOpL7JuD005hUxZ0GVDcSkJF5iI,3705
@@ -141,6 +149,7 @@ arpakitlib/ar_arpakit_schedule_uust_site_util.py,sha256=8wLct9Gd4MWkXzB6nSmETAwT
 arpakitlib/ar_arpakitlib_cli_util.py,sha256=208k_kWc-XHTYqL39k-rYrLcTKFF-3og21PVIsq5b2k,3171
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=8xKNo_ob-VZsZ2THwM_cJDcA3Y4R-ruM7vKUfzKI94U,5600
+arpakitlib/ar_blank_util.py,sha256=6O54Z8NnCg8BXxUVWt-oo1kqzt0836k9KJeJofwmj0g,113
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
 arpakitlib/ar_class_util.py,sha256=Eb4orGm2EFSaHfmrY2A_Nis5iwFMDKFaz1_nxTnfmnQ,487
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
@@ -169,7 +178,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=v4IVYpI7Vd72WwuiRH2b194pjZO66vhX0B9qNI_YFe4,27420
+arpakitlib/ar_fastapi_util.py,sha256=KQTiZ9it3ZYmatwBB0k_J9QOvNGGpAtQYkGNMRWazh4,28550
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_func_util.py,sha256=bCuWbSMoFXBaMNhb89sevj2oaXRk4Jk6Qjot8OXMDT4,1319
@@ -196,14 +205,14 @@ arpakitlib/ar_settings_util.py,sha256=rnoTqbRuhiq7294D4crD5kbnU8-gNWJbwGU_Ls2gJo
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqladmin_util.py,sha256=6Nv9VQssk9PB0piyuss__soYKdjVhdbIeXIv4AgUxmQ,2660
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ezui1VEVuABYgrywpP_A2wYvDBlIxwQTZ0HQgBJfZE0,6293
-arpakitlib/ar_sqlalchemy_util.py,sha256=NbOGSqsnt5xGWJg80gM2CPMs2puSfzIrBapswMHQDc4,4283
+arpakitlib/ar_sqlalchemy_util.py,sha256=9dXCdKWmUPyMt19sF2YVBB-4x_tl5g2Bsfhn0c_SQ6M,8184
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,3378
 arpakitlib/ar_type_util.py,sha256=9C3ErtUVs0tAUqtK-foFzjJOykfBOntfCz2IogDOgfA,4134
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.242.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.242.dist-info/METADATA,sha256=NdsumMFL8O2w2vvWJZAfVjnrX3NCfTV3zw1MZHchudg,3310
-arpakitlib-1.7.242.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.242.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.242.dist-info/RECORD,,
+arpakitlib-1.7.244.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.244.dist-info/METADATA,sha256=7Q2Y0Wb_OIUHWc5aXYt1L2EHIfYCEeelb-JrayEGrA0,3386
+arpakitlib-1.7.244.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.244.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.244.dist-info/RECORD,,