arpakitlib 1.6.42__py3-none-any.whl → 1.6.44__py3-none-any.whl

arpakitlib/ar_aiogram_util.py

@@ -12,10 +12,12 @@ from aiogram.enums import ChatType, ParseMode
 from aiogram.exceptions import AiogramError
 from aiogram.filters import CommandObject, Filter
 from aiogram.filters.callback_data import CallbackData
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 
 from arpakitlib.ar_need_type_util import parse_need_type, NeedTypes
 from arpakitlib.ar_parse_command import BadCommandFormat, parse_command
+from arpakitlib.ar_settings_util import SimpleSettings
+from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from arpakitlib.ar_type_util import raise_for_types, raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -112,6 +114,10 @@ class WithFromCD(BaseCD, prefix="WithFromCD"):
     from_: Optional[str] = None
 
 
+class RemoveMessageCD(WithFromCD, prefix=generate_cd_prefix("RemoveMessageCD")):
+    pass
+
+
 class BadTgCommandFormat(BadCommandFormat):
     pass
 
@@ -318,7 +324,18 @@ class SimpleMiddleware(BaseMiddleware, ABC):
         self._logger = logging.getLogger(self.__class__.__name__)
 
 
-def create_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = None) -> Bot:
+class BaseTransmittedTgBotData(BaseModel):
+    model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
+
+    tg_bot: Bot
+    settings: SimpleSettings | None = None
+
+
+class SimpleTransmittedTgBotData(BaseTransmittedTgBotData):
+    sqlalchemy_db: SQLAlchemyDB | None = None
+
+
+def create_aiogram_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = None) -> Bot:
     session: AiohttpSession | None = None
     if tg_bot_proxy_url:
         session = AiohttpSession(proxy=tg_bot_proxy_url)
@@ -331,6 +348,7 @@ def create_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = None) ->
         ),
         session=session
     )
+
     return tg_bot
 
 

arpakitlib/ar_fastapi_util.py

@@ -31,6 +31,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_json_util import safely_transfer_to_json_str_to_json_obj
 from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_operation_execution_util import ExecuteOperationWorker
+from arpakitlib.ar_settings_util import SimpleSettings
 from arpakitlib.ar_sqlalchemy_model_util import StoryLogDBM
 from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDB
 from arpakitlib.ar_type_util import raise_for_type, raise_if_not_async_func
@@ -427,6 +428,12 @@ class AsyncSafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
 class BaseTransmittedAPIData(BaseModel):
     model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
+    settings: SimpleSettings | None = None
+
+
+class SimpleTransmittedAPIData(BaseTransmittedAPIData):
+    sqlalchemy_db: SQLAlchemyDB | None = None
+
 
 def get_transmitted_api_data(request: starlette.requests.Request) -> BaseTransmittedAPIData:
     return request.app.state.transmitted_api_data

arpakitlib/ar_settings_util.py

@@ -4,20 +4,30 @@ from pydantic_settings import BaseSettings
 from arpakitlib.ar_enumeration_util import Enumeration
 
 
-class ModeTypes(Enumeration):
-    local: str = "local"
-    dev: str = "dev"
-    preprod: str = "preprod"
-    prod: str = "prod"
-
-
 class SimpleSettings(BaseSettings):
     model_config = ConfigDict(extra="ignore")
 
+    class ModeTypes(Enumeration):
+        local: str = "local"
+        test: str = "preprod"
+        prod: str = "prod"
+
     mode_type: str
 
     @field_validator("mode_type")
     @classmethod
     def validate_mode_type(cls, v: str):
-        ModeTypes.parse_and_validate_values(v)
+        cls.ModeTypes.parse_and_validate_values(v)
         return v
+
+    @property
+    def is_mode_type_local(self) -> bool:
+        return self.mode_type == self.ModeTypes.local
+
+    @property
+    def is_mode_type_test(self) -> bool:
+        return self.mode_type == self.ModeTypes.test
+
+    @property
+    def is_mode_type_prod(self) -> bool:
+        return self.mode_type == self.ModeTypes.prod

{arpakitlib-1.6.42.dist-info → arpakitlib-1.6.44.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.6.42
+Version: 1.6.44
 Summary: arpakitlib
 Home-page: https://github.com/ARPAKIT-Company/arpakitlib
 License: Apache-2.0

{arpakitlib-1.6.42.dist-info → arpakitlib-1.6.44.dist-info}/RECORD

@@ -4,7 +4,7 @@ arpakitlib/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
 arpakitlib/README.md,sha256=mBdzFR-3Dw6ADRTIbfOz2ZHvZt5589zBjhBkpEcakSY,92
 arpakitlib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/ar_additional_model_util.py,sha256=t95M4Ggl7EBRj7qOJHmuo5p2YmE7LlJdEAMNzse3vhE,309
-arpakitlib/ar_aiogram_util.py,sha256=zQ5txWe359U8LCSD-jvSz1Ol8N40bEg3DdTRbdRD8fU,11974
+arpakitlib/ar_aiogram_util.py,sha256=yOqH-Xmifw4niRtIy4EeP9xdeUA_0I-3ZrUrlE4cw_c,12508
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=V_mc3Ml73Tzz3arxmwEfIxruKMyrwbe8XZ9FfVDtUXY,5446
 arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=SYWWQDohPnw0qpBIu2hEvGZRVdaI4NUUQdEjnMnseo4,18237
 arpakitlib/ar_arpakitlib_info.py,sha256=cvgrLnEznmYkCAg1adbY46ATjD6GJd-Yk8PTgOPjpKM,248
@@ -35,7 +35,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=KPYGcpW2ys0XXipK6yg0lBD1OGgtkbrclRWTLcL551A,20993
+arpakitlib/ar_fastapi_util.py,sha256=-2SHDfssQnJuDqgy98a38vmIP2A-UtBuuTvwSsyGPyI,21196
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_generate_env_example.py,sha256=R_pdbFZe-mIZxEps2dm-K9m8rAg1pAaMzFOBPTGe4s4,370
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
@@ -55,7 +55,7 @@ arpakitlib/ar_parse_command.py,sha256=qpr2OwG3Bf7DFiL9S3iWgtbvtE80RSC35E5zFJvjG1
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
 arpakitlib/ar_schedule_uust_api_client_util.py,sha256=0X4yACjt8cxMvuoZUq4S0HuVhVUQW5fGmiPcG7vwM8Y,6027
-arpakitlib/ar_settings_util.py,sha256=vVm2_e0WQ6TH_w7TZ5FIhSfsLg_Hkpd4l1HHPAF_FdU,539
+arpakitlib/ar_settings_util.py,sha256=eomXBtK0ztokHr_LuiU4i2JunijzMyjyZbF1xdTb540,863
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=ttdgOwQfoHTKqgivBtXoSbJoBCASHDjLEFK5tJ9kNNE,4779
 arpakitlib/ar_sqlalchemy_util.py,sha256=3wejwPbH5VsTZAWvJQ4qQ8tda-PWBmqVThwRyKnyGqo,4153
@@ -64,8 +64,8 @@ arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,188
 arpakitlib/ar_type_util.py,sha256=I6jbTz7_dxR1lkhz1JfUb5ZyLLdXVhG_-hzjdgT6N6s,1932
 arpakitlib/ar_yookassa_api_client_util.py,sha256=5GMvu8paByni8buhc1vpHB7n6oXe0gPfj1LSvnyZCrQ,5307
 arpakitlib/ar_zabbix_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.6.42.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.6.42.dist-info/METADATA,sha256=bcps9OfFsy-WR2B6RKGN9_5I_l_KuuvOFrC_MIjP2-M,2320
-arpakitlib-1.6.42.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.6.42.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.6.42.dist-info/RECORD,,
+arpakitlib-1.6.44.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.6.44.dist-info/METADATA,sha256=cEWrrtcv9RspYW37sq-h_7nsEpvJuHItpY0my6q9uyM,2320
+arpakitlib-1.6.44.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.6.44.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.6.44.dist-info/RECORD,,