arpakitlib 1.8.4__py3-none-any.whl → 1.8.6__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/filter_.py

@@ -0,0 +1,69 @@
+from typing import Iterable
+
+import aiogram.types
+from aiogram.filters import Filter
+
+from arpakitlib.ar_type_util import raise_for_type
+from project.core.settings import get_cached_settings
+
+
+class NotProdModeFilterTgBotFilter(Filter):
+    async def __call__(self, *args, **kwargs) -> bool:
+        return get_cached_settings().is_mode_type_not_prod
+
+
+class ProdModeFilterTgBotFilter(Filter):
+    async def __call__(self, *args, **kwargs) -> bool:
+        return get_cached_settings().is_mode_type_prod
+
+
+class TextFilterTgBotFilter(Filter):
+
+    def __init__(
+            self,
+            *texts: str | Iterable[str],
+            ignore_case: bool = True
+    ) -> None:
+        self.ignore_case = ignore_case
+        self.texts = set()
+
+        for text in texts:
+
+            if isinstance(text, str):
+                if ignore_case is True:
+                    text = text.lower()
+                text = text.strip()
+                self.texts.add(text)
+
+            elif isinstance(text, Iterable):
+                for text_ in text:
+                    raise_for_type(text_, str)
+                    if ignore_case is True:
+                        text_ = text_.lower()
+                    text_ = text_.strip()
+                    self.texts.add(text_)
+
+            else:
+                raise TypeError(f"text has bad type = {type(text)}")
+
+    async def __call__(self, message: aiogram.types.Message, *args, **kwargs) -> bool:
+        raise_for_type(message, aiogram.types.Message)
+
+        if message.text is None:
+            return False
+
+        text = message.text.strip()
+        if self.ignore_case is True:
+            text = text.lower()
+
+        return text in self.texts
+
+
+class IsPrivateChatTgBotFilter(Filter):
+    async def __call__(self, update: aiogram.types.Message | aiogram.types.CallbackQuery) -> bool:
+        if isinstance(update, aiogram.types.Message):
+            return update.chat.type == aiogram.enums.ChatType.PRIVATE
+        elif isinstance(update, aiogram.types.CallbackQuery):
+            return update.message.chat.type == aiogram.enums.ChatType.PRIVATE
+        else:
+            return False

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/kb/inline_/callback.py

@@ -0,0 +1,37 @@
+from aiogram.filters.callback_data import CallbackData
+
+_used_cd_prefixes = set()
+
+
+def get_used_cd_prefixes() -> set[str]:
+    return _used_cd_prefixes
+
+
+def generate_callback_data_prefix(string: str) -> str:
+    res = 0
+    for s_ in string:
+        res += ord(s_)
+    res += len(string)
+    res = str(res)
+    return res
+
+
+class BaseCD(CallbackData, prefix="BaseCD"):
+
+    def __init_subclass__(cls, **kwargs):
+        if not cls.__name__.endswith("CD"):
+            raise ValueError("callback data class should ends with CD")
+
+        if "prefix" not in kwargs:
+            kwargs["prefix"] = str(generate_callback_data_prefix(cls.__name__.lower().removesuffix("cd")))
+        prefix = kwargs["prefix"]
+
+        if prefix in _used_cd_prefixes:
+            raise ValueError(f"prefix({prefix}) already in _used_cd_prefixes({_used_cd_prefixes})")
+        _used_cd_prefixes.add(prefix)
+
+        super().__init_subclass__(**kwargs)
+
+
+class WithFromCD(BaseCD, prefix="WithFromCD"):
+    from_: str | None = None

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/kb/inline_/common.py

@@ -0,0 +1,15 @@
+from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
+from aiogram.utils.keyboard import InlineKeyboardBuilder
+
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
+
+
+def groups_inline_kb() -> InlineKeyboardMarkup:
+    kb_builder = InlineKeyboardBuilder()
+
+    kb_builder.row(InlineKeyboardButton(
+        text=get_cached_tg_bot_blank().hello_world(),
+        callback_data="Hello world"
+    ))
+
+    return kb_builder.as_markup()

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/kb/static_/common.py

@@ -0,0 +1,14 @@
+from aiogram.types import ReplyKeyboardMarkup, KeyboardButton
+from aiogram.utils.keyboard import ReplyKeyboardBuilder
+
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
+
+
+def hello_world_static_kb() -> ReplyKeyboardMarkup:
+    kb_builder = ReplyKeyboardBuilder()
+
+    kb_builder.row(KeyboardButton(
+        text=get_cached_tg_bot_blank().hello_world()
+    ))
+
+    return kb_builder.as_markup(resize_keyboard=True, one_time_keyboard=False)

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/middleware/init_user.py

@@ -4,8 +4,6 @@ from typing import Any, Awaitable, Callable, Dict
 from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject
 
-from tg_bot.transmitted_tg_data import TransmittedTgBotData
-
 _logger = logging.getLogger(__name__)
 
 
@@ -18,7 +16,6 @@ class InitUserTgBotMiddleware(BaseMiddleware):
             data: Dict[str, Any],
     ) -> Any:
         _logger.info("start")
-        transmitted_tg_bot_data: TransmittedTgBotData = data["transmitted_tg_bot_data"]
         # ...
         _logger.info("finish")
         return await handler(event, data)

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/middleware/middleware.py

@@ -0,0 +1,12 @@
+import aiogram
+
+from project.tg_bot.middleware.init_user import InitUserTgBotMiddleware
+
+
+def register_middlewares_to_tg_bot(
+        *,
+        tg_bot_dispatcher: aiogram.Dispatcher,
+        **kwargs
+) -> aiogram.Dispatcher:
+    tg_bot_dispatcher.update.outer_middleware.register(InitUserTgBotMiddleware())
+    return tg_bot_dispatcher

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/router/arpakitlib_project_template_info.py

@@ -0,0 +1,14 @@
+import aiogram.filters
+
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
+from project.tg_bot.const import TgBotCommands
+from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
+
+tg_bot_router = aiogram.Router()
+
+
+@tg_bot_router.message(aiogram.filters.Command(TgBotCommands.arpakitlib_project_template_info))
+async def _(m: aiogram.types.Message, **kwargs):
+    await m.answer(
+        text=safely_transfer_obj_to_json_str(data=get_arpakitlib_project_template_info())
+    )

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/error.py

@@ -1,7 +1,9 @@
+import logging
+
 import aiogram
 from aiogram import Router
 
-from tg_bot.transmitted_tg_data import TransmittedTgBotData
+_logger = logging.getLogger(__name__)
 
 tg_bot_router = Router()
 
@@ -9,7 +11,6 @@ tg_bot_router = Router()
 @tg_bot_router.error()
 async def _(
         event: aiogram.types.ErrorEvent,
-        transmitted_tg_bot_data: TransmittedTgBotData,
         **kwargs
 ):
-    pass
+    _logger.exception(event.exception)

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/router/healthcheck.py

@@ -1,10 +1,11 @@
 import aiogram.filters
 
-from tg_bot.const import TgBotCommands
+from project.tg_bot.blank.blank import get_cached_tg_bot_blank
+from project.tg_bot.const import TgBotCommands
 
 tg_bot_router = aiogram.Router()
 
 
 @tg_bot_router.message(aiogram.filters.Command(TgBotCommands.healthcheck))
 async def _(m: aiogram.types.Message, **kwargs):
-    await m.answer(text="healthcheck")
+    await m.answer(text=get_cached_tg_bot_blank().healthcheck())

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/router/main_router.py

@@ -0,0 +1,12 @@
+from aiogram import Router
+
+from project.tg_bot.router import arpakitlib_project_template_info
+from project.tg_bot.router import error, healthcheck
+
+main_tg_bot_router = Router()
+
+main_tg_bot_router.include_router(router=error.tg_bot_router)
+
+main_tg_bot_router.include_router(router=healthcheck.tg_bot_router)
+
+main_tg_bot_router.include_router(router=arpakitlib_project_template_info.tg_bot_router)

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/start_tg_bot.py

@@ -0,0 +1,39 @@
+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 create_tg_bot
+from project.tg_bot.tg_bot_dispatcher import create_tg_bot_dispatcher
+
+
+def start_tg_bot():
+    setup_logging()
+
+    tg_bot = create_tg_bot()
+
+    tg_bot_dispatcher = create_tg_bot_dispatcher()
+
+    if not get_cached_settings().tg_bot_webhook_enabled:
+        asyncio.run(tg_bot_dispatcher.start_polling(tg_bot))
+    else:
+        app = aiohttp.web.Application()
+        simple_requests_handler = SimpleRequestHandler(
+            dispatcher=tg_bot_dispatcher,
+            bot=tg_bot,
+            secret_token=get_cached_settings().tg_bot_webhook_secret
+        )
+        simple_requests_handler.register(app, path=get_cached_settings().tg_bot_webhook_path)
+        setup_application(app, tg_bot_dispatcher, bot=tg_bot)
+        aiohttp.web.run_app(
+            app=app,
+            host=get_cached_settings().tg_bot_webhook_server_hostname,
+            port=get_cached_settings().tg_bot_webhook_server_port
+        )
+
+
+if __name__ == '__main__':
+    start_tg_bot()

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/tg_bot.py

@@ -3,7 +3,7 @@ from aiogram.client.default import DefaultBotProperties
 from aiogram.client.session.aiohttp import AiohttpSession
 from aiogram.enums import ParseMode
 
-from core.settings import get_cached_settings
+from project.core.settings import get_cached_settings
 
 
 def create_tg_bot() -> aiogram.Bot:

arpakitlib/{_arpakit_project_template_v_1 → _arpakit_project_template_v_2/project}/tg_bot/tg_bot_dispatcher.py

@@ -1,19 +1,20 @@
 import aiogram
 from aiogram.fsm.storage.memory import MemoryStorage
 
-from tg_bot.event import add_events_to_tg_bot_dispatcher
-from tg_bot.router.main_router import main_tg_bot_router
-from tg_bot.transmitted_tg_data import get_cached_transmitted_tg_bot_data
+from project.tg_bot.event import add_events_to_tg_bot_dispatcher
+from project.tg_bot.middleware.middleware import register_middlewares_to_tg_bot
+from project.tg_bot.router.main_router import main_tg_bot_router
 
 
 def create_tg_bot_dispatcher() -> aiogram.Dispatcher:
     tg_bot_dispatcher = aiogram.Dispatcher(
         storage=MemoryStorage(),
-        transmitted_tg_bot_data=get_cached_transmitted_tg_bot_data()
     )
 
     add_events_to_tg_bot_dispatcher(tg_bot_dispatcher=tg_bot_dispatcher)
 
+    register_middlewares_to_tg_bot(tg_bot_dispatcher=tg_bot_dispatcher)
+
     tg_bot_dispatcher.include_router(router=main_tg_bot_router)
 
     return tg_bot_dispatcher

arpakitlib/_arpakit_project_template_v_2/project/tg_bot/util.py

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

arpakitlib/_arpakit_project_template_v_2/project/util/arpakitlib_project_template.py

@@ -0,0 +1,17 @@
+import json
+from typing import Any
+
+from project.core.const import ProjectPaths
+
+
+def get_arpakitlib_project_template_info() -> dict[str, Any]:
+    with open(ProjectPaths.arpakit_lib_project_template_info_filepath, mode="r", encoding="utf-8") as fr:
+        return json.load(fp=fr)
+
+
+def __example():
+    print(get_arpakitlib_project_template_info())
+
+
+if __name__ == '__main__':
+    __example()

arpakitlib/ar_aiogram_util.py

@@ -2,118 +2,22 @@
 
 import asyncio
 import logging
-from typing import Optional, Any, Union, Callable, Iterable
+from typing import Optional, Any, Callable
 
-import aiogram
-import aiohttp
-import aiohttp.web
 from aiogram import types
-from aiogram.enums import ChatType
 from aiogram.exceptions import AiogramError
-from aiogram.filters import CommandObject, Filter
-from aiogram.filters.callback_data import CallbackData
-from aiogram.webhook.aiohttp_server import SimpleRequestHandler, setup_application
-from aiohttp import web
+from aiogram.filters import CommandObject
 from pydantic import BaseModel
 
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import BadCommandFormat, parse_command
-from arpakitlib.ar_type_util import raise_for_types, raise_for_type
+from arpakitlib.ar_type_util import raise_for_types
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 _logger = logging.getLogger(__name__)
 
 
-class TextFilter(Filter):
-
-    def __init__(
-            self,
-            *texts: Union[str, Iterable[str]],
-            ignore_case: bool = True
-    ) -> None:
-        self.ignore_case = ignore_case
-        self.texts = set()
-
-        for text in texts:
-
-            if isinstance(text, str):
-                if ignore_case is True:
-                    text = text.lower()
-                text = text.strip()
-                self.texts.add(text)
-
-            elif isinstance(text, Iterable):
-                for text_ in text:
-                    raise_for_type(text_, str)
-                    if ignore_case is True:
-                        text_ = text_.lower()
-                    text_ = text_.strip()
-                    self.texts.add(text_)
-
-            else:
-                raise TypeError(f"text has bad type = {type(text)}")
-
-    async def __call__(self, message: types.Message, *args, **kwargs) -> bool:
-        raise_for_type(message, types.Message)
-
-        if message.text is None:
-            return False
-
-        text = message.text.strip()
-        if self.ignore_case is True:
-            text = text.lower()
-
-        return text in self.texts
-
-
-class IsPrivateChat(Filter):
-    async def __call__(self, update: types.Message | types.CallbackQuery) -> bool:
-        if isinstance(update, types.Message):
-            return update.chat.type == ChatType.PRIVATE
-        elif isinstance(update, types.CallbackQuery):
-            return update.message.chat.type == ChatType.PRIVATE
-        else:
-            return False
-
-
-_used_cd_prefixes = set()
-
-
-def get_used_cd_prefixes() -> set[str]:
-    return _used_cd_prefixes
-
-
-def generate_cd_prefix(string: str) -> str:
-    res = 0
-    for s_ in string:
-        res += ord(s_)
-    res += len(string)
-    res = str(res)
-    return res
-
-
-class BaseCD(CallbackData, prefix="BaseCD"):
-
-    def __init_subclass__(cls, **kwargs):
-        if not cls.__name__.endswith("CD"):
-            raise ValueError("callback data class should ends with CD")
-
-        if "prefix" not in kwargs:
-            kwargs["prefix"] = str(generate_cd_prefix(cls.__name__.lower().removesuffix("cd")))
-        prefix = kwargs["prefix"]
-
-        if prefix in _used_cd_prefixes:
-            raise ValueError(f"prefix({prefix}) already in _used_cd_prefixes({_used_cd_prefixes})")
-        _used_cd_prefixes.add(prefix)
-
-        super().__init_subclass__(**kwargs)
-
-
-class WithFromCD(BaseCD, prefix="WithFromCD"):
-    from_: Optional[str] = None
-
-
 class BadTgCommandFormat(BadCommandFormat):
     pass
 
@@ -314,30 +218,6 @@ def as_tg_command(
     return decorator
 
 
-def start_aiogram_tg_bot_with_webhook(
-        *,
-        dispatcher: aiogram.Dispatcher,
-        bot: aiogram.Bot,
-        webhook_secret: str = "123",
-        webhook_path: str = "/tg_bot_webhook",
-        webhook_server_hostname: str = "127.0.0.1",
-        webhook_server_port: int = 8080
-):
-    app = aiohttp.web.Application()
-    simple_requests_handler = SimpleRequestHandler(
-        dispatcher=dispatcher,
-        bot=bot,
-        secret_token=webhook_secret
-    )
-    simple_requests_handler.register(app, path=webhook_path)
-    setup_application(app, dispatcher, bot=bot)
-    web.run_app(
-        app=app,
-        host=webhook_server_hostname,
-        port=webhook_server_port
-    )
-
-
 def __example():
     pass
 

{arpakitlib-1.8.4.dist-info → arpakitlib-1.8.6.dist-info}/METADATA

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