arpakitlib 1.7.222__tar.gz → 1.7.224__tar.gz

{arpakitlib-1.7.222 → arpakitlib-1.7.224}/PKG-INFO

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

{arpakitlib-1.7.222 → arpakitlib-1.7.224}/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-1.7.224/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-1.7.224/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-1.7.224/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-1.7.224/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-1.7.224/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-1.7.222 → arpakitlib-1.7.224}/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-1.7.222 → arpakitlib-1.7.224}/arpakitlib/ar_fastapi_util.py

@@ -384,22 +384,23 @@ def add_cors_to_app(*, app: FastAPI):
     return app
 
 
+class HealthcheckSO(BaseSO):
+    is_ok: bool = True
+
+
 def add_needed_api_router_to_app(*, app: FastAPI):
     api_router = APIRouter()
 
     @api_router.get(
         "/healthcheck",
-        response_model=RawDataSO | ErrorSO,
+        response_model=HealthcheckSO | ErrorSO,
         status_code=starlette.status.HTTP_200_OK,
         tags=["Healthcheck"]
     )
     async def _():
         return APIJSONResponse(
             status_code=starlette.status.HTTP_200_OK,
-            content=RawDataSO(data={
-                "healthcheck": "healthcheck",
-                "is_ok": True
-            })
+            content=HealthcheckSO(is_ok=True)
         )
 
     @api_router.get(
@@ -421,7 +422,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 +431,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.222 → arpakitlib-1.7.224}/pyproject.toml

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