arpakitlib 1.6.43__tar.gz → 1.6.45__tar.gz

{arpakitlib-1.6.43 → arpakitlib-1.6.45}/PKG-INFO

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

{arpakitlib-1.6.43 → arpakitlib-1.6.45}/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"
@@ -322,6 +324,17 @@ class SimpleMiddleware(BaseMiddleware, ABC):
         self._logger = logging.getLogger(self.__class__.__name__)
 
 
+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:

{arpakitlib-1.6.43 → arpakitlib-1.6.45}/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-1.6.45/arpakitlib/ar_settings_util.py

@@ -0,0 +1,33 @@
+from pydantic import ConfigDict, field_validator
+from pydantic_settings import BaseSettings
+
+from arpakitlib.ar_enumeration_util import Enumeration
+
+
+class SimpleSettings(BaseSettings):
+    model_config = ConfigDict(extra="ignore")
+
+    class ModeTypes(Enumeration):
+        local: str = "local"
+        test: str = "preprod"
+        prod: str = "prod"
+
+    mode_type: str = ModeTypes.local
+
+    @field_validator("mode_type")
+    @classmethod
+    def validate_mode_type(cls, v: str):
+        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.43 → arpakitlib-1.6.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.6.43"
+version = "1.6.45"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>", "arpakit <support@arpakit.com>"]
 license = "Apache License 2.0"

arpakitlib-1.6.43/arpakitlib/ar_settings_util.py

@@ -1,23 +0,0 @@
-from pydantic import ConfigDict, field_validator
-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")
-
-    mode_type: str
-
-    @field_validator("mode_type")
-    @classmethod
-    def validate_mode_type(cls, v: str):
-        ModeTypes.parse_and_validate_values(v)
-        return v