arpakitlib 1.7.221__py3-none-any.whl → 1.7.223__py3-none-any.whl

arpakitlib/_arpakit_project_template/src/api/event.py

@@ -9,8 +9,8 @@ from src.operation_execution.scheduled_operations import SCHEDULED_OPERATIONS
 
 
 class StartupAPIEvent(BaseStartupAPIEvent):
-    def __init__(self, transmitted_api_data: TransmittedAPIData):
-        super().__init__()
+    def __init__(self, transmitted_api_data: TransmittedAPIData, **kwargs):
+        super().__init__(**kwargs)
         self.transmitted_api_data = transmitted_api_data
 
     async def async_on_startup(self, *args, **kwargs):
@@ -54,8 +54,8 @@ class StartupAPIEvent(BaseStartupAPIEvent):
 
 
 class ShutdownAPIEvent(BaseShutdownAPIEvent):
-    def __init__(self, transmitted_api_data: TransmittedAPIData):
-        super().__init__()
+    def __init__(self, transmitted_api_data: TransmittedAPIData, **kwargs):
+        super().__init__(**kwargs)
         self.transmitted_api_data = transmitted_api_data
 
     async def async_on_shutdown(self, *args, **kwargs):

arpakitlib/_arpakit_project_template/src/tg_bot/event.py

@@ -0,0 +1,33 @@
+import logging
+
+from src.tg_bot.transmitted_tg_data import TransmittedTgData
+
+
+class StartupTgBotEvent:
+    def __init__(self, *, transmitted_tg_bot_data: TransmittedTgData, **kwargs):
+        self._logger = logging.getLogger()
+        self.transmitted_tg_bot_data = transmitted_tg_bot_data
+
+    async def on_startup(self, *args, **kwargs):
+        self._logger.info("on_startup start")
+
+        if self.transmitted_tg_bot_data.media_file_storage_in_dir is not None:
+            self.transmitted_tg_bot_data.media_file_storage_in_dir.init()
+
+        if self.transmitted_tg_bot_data.cache_file_storage_in_dir is not None:
+            self.transmitted_tg_bot_data.cache_file_storage_in_dir.init()
+
+        if self.transmitted_tg_bot_data.dump_file_storage_in_dir is not None:
+            self.transmitted_tg_bot_data.dump_file_storage_in_dir.init()
+
+        self._logger.info("on_startup was done")
+
+
+class ShutdownTgBotEvent:
+    def __init__(self, *, transmitted_tg_bot_data: TransmittedTgData, **kwargs):
+        self._logger = logging.getLogger()
+        self.transmitted_tg_bot_data = transmitted_tg_bot_data
+
+    async def on_shutdown(self, *args, **kwargs):
+        self._logger.info("on_shutdown start")
+        self._logger.info("on_shutdown was done")

arpakitlib/_arpakit_project_template/src/tg_bot/filter/not_prod_mode.py

@@ -0,0 +1,8 @@
+from aiogram.filters import Filter
+
+from src.core.settings import get_cached_settings
+
+
+class NotProdModeFilter(Filter):
+    async def __call__(self, *args, **kwargs) -> bool:
+        return get_cached_settings().is_mode_type_not_prod

arpakitlib/_arpakit_project_template/src/tg_bot/filter/prod_mode.py

@@ -0,0 +1,8 @@
+from aiogram.filters import Filter
+
+from src.core.settings import get_cached_settings
+
+
+class ProdModeFilter(Filter):
+    async def __call__(self, *args, **kwargs) -> bool:
+        return get_cached_settings().is_mode_type_prod

arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.py

@@ -0,0 +1,6 @@
+def start_tg_bot():
+    pass
+
+
+if __name__ == '__main__':
+    start_tg_bot()

arpakitlib/_arpakit_project_template/src/tg_bot/transmitted_tg_data.py

@@ -0,0 +1,17 @@
+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
+
+    # ...

arpakitlib/ar_aiogram_util.py

@@ -112,10 +112,6 @@ class WithFromCD(BaseCD, prefix="WithFromCD"):
     from_: Optional[str] = None
 
 
-class RemoveMessageCD(WithFromCD, prefix=generate_cd_prefix("RemoveMessageCD")):
-    pass
-
-
 class BadTgCommandFormat(BadCommandFormat):
     pass
 
@@ -326,11 +322,11 @@ class BaseTransmittedTgBotData(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
 
-def create_aiogram_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = None, **kwargs) -> Bot:
-    kwargs["token"] = tg_bot_token
+def create_aiogram_tg_bot(*, token: str, proxy_url_: str | None = None, **kwargs) -> Bot:
+    kwargs["token"] = token
 
-    if tg_bot_proxy_url:
-        kwargs["session"] = AiohttpSession(proxy=tg_bot_proxy_url)
+    if proxy_url_:
+        kwargs["session"] = AiohttpSession(proxy=proxy_url_)
 
     if kwargs.get("default") is None:
         kwargs["default"] = DefaultBotProperties(
@@ -344,6 +340,11 @@ def create_aiogram_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = N
     return tg_bot
 
 
+def create_tg_bot_dispatcher():
+    # TODO
+    pass
+
+
 def __example():
     pass
 

arpakitlib/ar_arpakitlib_cli_util.py

@@ -44,7 +44,7 @@ def execute_arpakitlib_cli(*, full_command: str | None = None):
             allow_none=False
         )
         project_name: str = parsed_command.get_value_by_keys(keys=["pm", "project_name"])
-        project_name = project_name.strip() if project_name.strip() else None
+        project_name = project_name.strip() if project_name and project_name.strip() else None
         sql_db_port: int | None = parse_need_type(
             value=parsed_command.get_value_by_keys(keys=["sdp", "sql_db_port"]),
             need_type=NeedTypes.int_,

arpakitlib/ar_fastapi_util.py

@@ -421,7 +421,7 @@ def add_needed_api_router_to_app(*, app: FastAPI):
 
 class BaseStartupAPIEvent:
     def __init__(self, *args, **kwargs):
-        self._logger = logging.getLogger(self.__class__.__name__)
+        self._logger = logging.getLogger()
 
     async def async_on_startup(self, *args, **kwargs):
         self._logger.info("on_startup starts")
@@ -430,7 +430,7 @@ class BaseStartupAPIEvent:
 
 class BaseShutdownAPIEvent:
     def __init__(self, *args, **kwargs):
-        self._logger = logging.getLogger(self.__class__.__name__)
+        self._logger = logging.getLogger()
 
     async def async_on_shutdown(self, *args, **kwargs):
         self._logger.info("on_shutdown starts")

{arpakitlib-1.7.221.dist-info → arpakitlib-1.7.223.dist-info}/METADATA

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

{arpakitlib-1.7.221.dist-info → arpakitlib-1.7.223.dist-info}/RECORD

@@ -70,7 +70,7 @@ arpakitlib/_arpakit_project_template/src/api/asgi.py,sha256=a5UBxOyNC8NG3E0ayhiD
 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/event.py,sha256=Jd1eWUpPzGSg-wBIsCh1SNywemykQuXrf_6IlsoSO5w,2999
+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
 arpakitlib/_arpakit_project_template/src/api/router/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -113,16 +113,30 @@ 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/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
+arpakitlib/_arpakit_project_template/src/tg_bot/filter/prod_mode.py,sha256=8zqDSSm3cqWmdoarZOh0hIjSLFQS9szVXnkibSJev30,228
+arpakitlib/_arpakit_project_template/src/tg_bot/handler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/handler/cmd_arpakitlib.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/handler/cmd_healthcheck.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/kb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template/src/tg_bot/kb/inline_/callback.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+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/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template/src/tg_bot/start_tg_bot.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/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=5JPCDZpdBGTE-EIWPRez9amCZAX7XemFIVu5YrQK7Pw,12264
+arpakitlib/ar_aiogram_util.py,sha256=lv2aXUmXLm3f2JltT1i683de6MnTTp9b5HihjO4KM5s,12194
 arpakitlib/ar_api_key_util.py,sha256=E84JlJXiDHtxLQmV8BNHvqNKu_G8-Dox0XxknYJQ37Q,422
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=UEPU8wk29R_bBP_RENnhXYzNbj_RF9FWjowrj_yxWLA,5931
 arpakitlib/ar_arpakit_project_template_util.py,sha256=c7yc8w2IvZGH5hH8eOpL7JuD005hUxZ0GVDcSkJF5iI,3705
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=006JstWvs6JTuxRCg3toSNQvtKO0KM5pqyPJa1PRDNA,14998
-arpakitlib/ar_arpakitlib_cli_util.py,sha256=8lhEDxnwMSRX2PGV2xQtQru1AYKSA92SVolol5u7iBk,3154
+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=Qm_C7PFH5W-LPu1AGX1zp29zbqZ04i71Su1U-eeQBkA,5674
 arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weRfJ0,3476
@@ -153,7 +167,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=Otm6sa-xB3qUZ7ttp0A52FVEaBN3yRHQx2JKWKYDEGg,26567
+arpakitlib/ar_fastapi_util.py,sha256=S58jgkIZvIAGXredD-ptSCCe_ak0GSGDdaT1vtDk308,26521
 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
@@ -184,8 +198,8 @@ arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,337
 arpakitlib/ar_type_util.py,sha256=9C3ErtUVs0tAUqtK-foFzjJOykfBOntfCz2IogDOgfA,4134
 arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.221.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.221.dist-info/METADATA,sha256=78E1N1UsCR6GY4UgPLeuLDLfj18Qs42sNiYYHUFw9eI,3231
-arpakitlib-1.7.221.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.221.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.221.dist-info/RECORD,,
+arpakitlib-1.7.223.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.223.dist-info/METADATA,sha256=_0RcwFAU2HG-zvzv9PML6cjgrbQ8Rb_Eent07EC1GnI,3231
+arpakitlib-1.7.223.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.223.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.223.dist-info/RECORD,,