arpakitlib 1.8.105__py3-none-any.whl → 1.8.107__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py

@@ -5,17 +5,18 @@ import fastapi.exceptions
 import fastapi.responses
 import fastapi.security
 import sqlalchemy
-from arpakitlib.ar_func_util import is_async_func, is_sync_func
-from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from fastapi import Security
 from fastapi.security import APIKeyHeader
+from pydantic import BaseModel, ConfigDict
+from sqlalchemy.orm import joinedload
+
+from arpakitlib.ar_func_util import is_async_func, is_sync_func
+from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.const import APIErrorCodes
 from project.api.exception import APIException
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserTokenDBM
-from pydantic import BaseModel, ConfigDict
-from sqlalchemy.orm import joinedload
 
 
 class APIAuthorizeData(BaseModel):

arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -5,6 +5,7 @@ import starlette.types
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
+
 from project.api.event import get_startup_api_events, get_shutdown_api_events
 from project.api.exception_handler import add_exception_handler_to_api_app
 from project.api.openapi_ui import add_local_openapi_ui_to_api_app

arpakitlib/_arpakit_project_template_v_5/project/api/exception.py

@@ -1,6 +1,7 @@
 from typing import Any
 
 import fastapi.security
+
 from project.api.const import APIErrorCodes
 from project.api.schema.out.common.error import ErrorCommonSO
 

arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -6,6 +6,7 @@ from typing import Any, Callable
 
 import fastapi
 import starlette.exceptions
+
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str

arpakitlib/_arpakit_project_template_v_5/project/api/response.py

@@ -1,6 +1,7 @@
 from typing import Any
 
 import fastapi
+
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.schema.common import BaseSO
 

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -1,6 +1,7 @@
 import fastapi
-from arpakitlib.ar_logging_util import init_log_file
 from fastapi import APIRouter
+
+from arpakitlib.ar_logging_util import init_log_file
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -2,6 +2,7 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
+
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
 from project.api.schema.common import BaseSI

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -2,6 +2,7 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
+
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py

@@ -1,8 +1,9 @@
 from typing import Any
 
 import fastapi.requests
-from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from fastapi import APIRouter
+
+from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_log_file.py

@@ -1,6 +1,7 @@
 import fastapi
-from arpakitlib.ar_logging_util import init_log_file
 from fastapi import APIRouter
+
+from arpakitlib.ar_logging_util import init_log_file
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.core.settings import get_cached_settings

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -1,7 +1,8 @@
 import fastapi.requests
 import sqlalchemy
-from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
 from fastapi import APIRouter
+
+from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.operation import Operation1AdminSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_settings.py

@@ -2,6 +2,7 @@ from typing import Any
 
 import fastapi.requests
 from fastapi import APIRouter
+
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_sqlalchemy_db_table_name_to_amount.py

@@ -2,6 +2,7 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
+
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -1,7 +1,8 @@
 import fastapi.requests
 import sqlalchemy
-from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 from fastapi import APIRouter
+
+from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.story_log import StoryLog1AdminSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -1,7 +1,8 @@
 import fastapi.requests
 import sqlalchemy
-from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
 from fastapi import APIRouter
+
+from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.user import User1AdminSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -3,13 +3,14 @@ from __future__ import annotations
 import fastapi.requests
 import sqlalchemy
 from fastapi import APIRouter
+from sqlalchemy.orm import joinedload
+
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.client.complicated_user_1 import ComplicatedUser1ClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
-from sqlalchemy.orm import joinedload
 
 api_router = APIRouter()
 

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import fastapi.requests
 from fastapi import APIRouter
+
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.client.complicated_user_token_1 import ComplicatedUserToken1ClientSO

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py

@@ -1,8 +1,9 @@
 import datetime as dt
 
 import fastapi
-from arpakitlib.ar_datetime_util import now_utc_dt
 from fastapi import APIRouter
+
+from arpakitlib.ar_datetime_util import now_utc_dt
 from project.api.schema.common import BaseSO
 from project.api.schema.out.common.error import ErrorCommonSO
 

arpakitlib/_arpakit_project_template_v_5/project/api/router/general/now_utc_datetime.py

@@ -1,6 +1,7 @@
 import fastapi
-from arpakitlib.ar_datetime_util import now_utc_dt
 from fastapi import APIRouter
+
+from arpakitlib.ar_datetime_util import now_utc_dt
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
 from project.api.schema.out.common.datetime_ import DatetimeCommonSO
 from project.api.schema.out.common.error import ErrorCommonSO

arpakitlib/_arpakit_project_template_v_5/project/core/jinja2_templates.py

@@ -1,6 +1,7 @@
 from functools import lru_cache
 
 from fastapi.templating import Jinja2Templates
+
 from project.core.const import ProjectPaths
 
 

arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -3,13 +3,14 @@ from functools import lru_cache
 from typing import Any
 
 import pytz
+from pydantic import field_validator
+from pydantic_core.core_schema import ValidationInfo
+
 from arpakitlib.ar_json_util import transfer_data_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
 from arpakitlib.ar_sqlalchemy_util import generate_sqlalchemy_url
 from arpakitlib.ar_type_util import raise_for_type
 from project.core.const import ProjectPaths
-from pydantic import field_validator
-from pydantic_core.core_schema import ValidationInfo
 
 
 class Settings(SimpleSettings):

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py

@@ -5,6 +5,8 @@ from datetime import timedelta
 from typing import Any
 
 import sqlalchemy
+from sqlalchemy import asc
+
 from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
@@ -13,7 +15,6 @@ from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
-from sqlalchemy import asc
 
 
 class OperationExecutorWorker(BaseWorker):

arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py

@@ -1,11 +1,12 @@
 from datetime import timedelta
 from typing import Any, Callable
 
-from project.operation_execution.util import every_timedelta_is_time_func
-from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
 from pydantic import ConfigDict
 from pydantic.v1 import BaseModel
 
+from project.operation_execution.util import every_timedelta_is_time_func
+from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
+
 
 class ScheduledOperation(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py

@@ -4,10 +4,11 @@ from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import sqlalchemy
+from sqlalchemy.orm import Mapped, mapped_column, validates
+
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
-from sqlalchemy.orm import Mapped, mapped_column, validates
 
 if TYPE_CHECKING:
     pass

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -3,11 +3,12 @@ from typing import Any
 from uuid import uuid4
 
 import sqlalchemy
-from arpakitlib.ar_datetime_util import now_utc_dt
-from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
 from sqlalchemy import func
 from sqlalchemy.orm import mapped_column, Mapped, validates
 
+from arpakitlib.ar_datetime_util import now_utc_dt
+from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
+
 
 def generate_default_long_id() -> str:
     return (

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -4,11 +4,12 @@ from datetime import datetime, timedelta
 from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.orm import mapped_column, Mapped, validates
+
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
-from sqlalchemy.dialects import postgresql
-from sqlalchemy.orm import mapped_column, Mapped, validates
 
 if TYPE_CHECKING:
     pass

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -3,10 +3,11 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import sqlalchemy
+from sqlalchemy.orm import mapped_column, Mapped, validates
+
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
-from sqlalchemy.orm import mapped_column, Mapped, validates
 
 if TYPE_CHECKING:
     pass

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -4,9 +4,10 @@ from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import sqlalchemy
+from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
+
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
-from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
 
 if TYPE_CHECKING:
     from project.sqlalchemy_db_.sqlalchemy_model.user import UserDBM

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/admin.py

@@ -1,7 +1,8 @@
 from functools import lru_cache
 
-from arpakitlib.ar_json_util import transfer_data_to_json_str
 from emoji import emojize
+
+from arpakitlib.ar_json_util import transfer_data_to_json_str
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.blank.common import SimpleBlankTgBot
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/client.py

@@ -1,6 +1,7 @@
 from functools import lru_cache
 
 from emoji import emojize
+
 from project.tg_bot.blank.common import SimpleBlankTgBot
 from project.tg_bot.const import ClientTgBotCommands
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/{callback → callback_data_}/admin.py

@@ -1,4 +1,4 @@
-from project.tg_bot.callback.common import BaseCD
+from project.tg_bot.callback_data_.common import BaseCD
 
 
 class HelloWorldAdminCD(BaseCD):

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/callback_data_/client.py

@@ -0,0 +1,5 @@
+from project.tg_bot.callback_data_.common import BaseCD
+
+
+class RemoveMessageClientCD(BaseCD):
+    pass

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/event.py

@@ -3,6 +3,7 @@ import logging
 from typing import Callable
 
 from aiogram import Dispatcher
+
 from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.core.cache_file_storage_in_dir import get_cached_cache_file_storage_in_dir

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/message_text.py

@@ -2,6 +2,7 @@ from typing import Iterable
 
 import aiogram.types
 from aiogram.filters import Filter
+
 from arpakitlib.ar_type_util import raise_for_type
 
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/inline_/admin/hello_world.py

@@ -2,7 +2,7 @@ from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
-from project.tg_bot.callback.admin import HelloWorldAdminCD
+from project.tg_bot.callback_data_.admin import HelloWorldAdminCD
 
 
 def hello_world_admin_inline_kb_tg_bot() -> InlineKeyboardMarkup:

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/middleware/common.py

@@ -1,8 +1,9 @@
 from typing import Any
 
-from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from pydantic import BaseModel, ConfigDict
 
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
 
 class MiddlewareDataTgBot(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/middleware/init_user.py

@@ -5,6 +5,7 @@ import aiogram
 import sqlalchemy
 from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject
+
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/hello_world.py

@@ -5,7 +5,7 @@ from aiogram.fsm.context import FSMContext
 from arpakitlib.ar_str_util import remove_html
 from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
-from project.tg_bot.callback.admin import HelloWorldAdminCD
+from project.tg_bot.callback_data_.admin import HelloWorldAdminCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_old_cd.py

@@ -4,7 +4,7 @@ from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.tg_bot.callback.common import BaseCD
+from project.tg_bot.callback_data_.common import BaseCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_raise_error.py

@@ -5,7 +5,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from arpakitlib.ar_aiogram_util import as_tg_command
 from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
-from project.tg_bot.callback.common import BaseCD
+from project.tg_bot.callback_data_.common import BaseCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_remove_message.py

@@ -5,7 +5,7 @@ from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from arpakitlib.ar_aiogram_util import as_tg_command
 from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
-from project.tg_bot.callback.client import RemoveMessageClientCD
+from project.tg_bot.callback_data_.client import RemoveMessageClientCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/log_file.py

@@ -5,6 +5,7 @@ from aiogram import Router, types
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.types import FSInputFile
+
 from arpakitlib.ar_aiogram_util import as_tg_command
 from project.core.settings import get_cached_settings
 from project.tg_bot.const import AdminTgBotCommands

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/about.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/author.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/cancel.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/error_handler.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.fsm.context import FSMContext
+
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/raw_callback_query.py

@@ -3,6 +3,7 @@ import logging
 import aiogram.filters
 from aiogram.exceptions import AiogramError
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/remove_message.py

@@ -3,7 +3,8 @@ import logging
 from aiogram import Router, types
 from aiogram.exceptions import AiogramError
 from aiogram.fsm.context import FSMContext
-from project.tg_bot.callback.client import RemoveMessageClientCD
+
+from project.tg_bot.callback_data_.client import RemoveMessageClientCD
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/start.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/support.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
+
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/start_tg_bot.py

@@ -3,6 +3,7 @@ import asyncio
 import aiohttp
 import aiohttp.web
 from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application
+
 from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.tg_bot.tg_bot import get_cached_tg_bot

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot.py

@@ -4,6 +4,7 @@ import aiogram
 from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ParseMode
+
 from project.core.settings import get_cached_settings
 
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/notify_admins.py

@@ -4,8 +4,9 @@ from datetime import timedelta
 
 import sqlalchemy
 from aiogram.exceptions import AiogramError
-from arpakitlib.ar_str_util import remove_tags_and_html
 from emoji import emojize
+
+from arpakitlib.ar_str_util import remove_tags_and_html
 from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py

@@ -2,6 +2,7 @@ import asyncio
 import logging
 
 from aiogram.types import BotCommand, BotCommandScopeChat
+
 from arpakitlib.ar_str_util import return_str_if_none
 from project.core.settings import get_cached_settings
 from project.core.util import setup_logging

arpakitlib/_arpakit_project_template_v_5/todo.txt

@@ -0,0 +1 @@
+...

arpakitlib/ar_base64_util.py

@@ -15,6 +15,13 @@ def convert_base64_string_to_bytes(base64_string: str, raise_for_error: bool = F
         return None
 
 
+def convert_base64_string_to_string(base64_string: str, raise_for_error: bool = False) -> Optional[str]:
+    return convert_base64_string_to_bytes(
+        base64_string=base64_string,
+        raise_for_error=raise_for_error
+    ).decode()
+
+
 def convert_bytes_to_base64_string(bytes_: bytes, raise_for_error: bool = False) -> Optional[str]:
     try:
         return base64.b64encode(bytes_).decode()
@@ -24,8 +31,15 @@ def convert_bytes_to_base64_string(bytes_: bytes, raise_for_error: bool = False)
         return None
 
 
+def convert_file_to_base64_string(*, filepath: str, raise_for_error: bool = False) -> Optional[str]:
+    with open(filepath, "rb") as f:
+        return convert_bytes_to_base64_string(bytes_=f.read(), raise_for_error=raise_for_error)
+
+
 def __example():
-    pass
+    print(convert_base64_string_to_string(
+        base64_string=convert_file_to_base64_string(filepath="./ar_arpakitlib_cli_util.py")
+    ))
 
 
 if __name__ == '__main__':