arpakitlib 1.6.90__tar.gz → 1.6.92__tar.gz

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/PKG-INFO

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

arpakitlib-1.6.92/arpakitlib/_arpakit_project_template/manage/check_logging.py

@@ -0,0 +1,13 @@
+import logging
+
+from src.core.util import setup_logging
+
+_logger = logging.getLogger(__name__)
+
+def command():
+    setup_logging()
+    _logger.info("checking logging")
+
+
+if __name__ == '__main__':
+    command()

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/arpakitlib/ar_aiogram_util.py

@@ -326,19 +326,20 @@ 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) -> Bot:
-    session: AiohttpSession | None = None
+def create_aiogram_tg_bot(*, tg_bot_token: str, tg_bot_proxy_url: str | None = None, **kwargs) -> Bot:
+    kwargs["token"] = tg_bot_token
+
     if tg_bot_proxy_url:
-        session = AiohttpSession(proxy=tg_bot_proxy_url)
-    tg_bot = Bot(
-        token=tg_bot_token,
-        default=DefaultBotProperties(
+        kwargs["session"] = AiohttpSession(proxy=tg_bot_proxy_url)
+
+    if kwargs.get("default") is None:
+        kwargs["default"] = DefaultBotProperties(
             parse_mode=ParseMode.HTML,
             disable_notification=False,
             link_preview_is_disabled=True
-        ),
-        session=session
-    )
+        )
+
+    tg_bot = Bot(**kwargs)
 
     return tg_bot
 

arpakitlib-1.6.92/arpakitlib/ar_dream_ai_api_client_util.py

@@ -0,0 +1,92 @@
+# arpakit
+
+import asyncio
+import logging
+from typing import Any
+from urllib.parse import urljoin
+
+from aiohttp import ClientResponse
+from pydantic import ConfigDict, BaseModel
+
+from arpakitlib.ar_base64_util import convert_base64_string_to_bytes
+from arpakitlib.ar_http_request_util import async_make_http_request
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class BaseAPIModel(BaseModel):
+    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
+
+
+class GenerateImageFromNumberResApiModel(BaseAPIModel):
+    image_filename: str
+    image_url: str
+    image_base64: str
+
+    def save_file(self, filepath: str):
+        with open(filepath, mode="wb") as f:
+            f.write(convert_base64_string_to_bytes(base64_string=self.image_base64))
+        return filepath
+
+
+class DreamAIAPIClient:
+    def __init__(
+            self,
+            *,
+            base_url: str = "https://api.dream_ai.arpakit.com/api/v1",
+            api_key: str | None = "1"
+    ):
+        self._logger = logging.getLogger(__name__)
+        self.api_key = api_key
+        base_url = base_url.strip()
+        if not base_url.endswith("/"):
+            base_url += "/"
+        self.base_url = base_url
+        self.headers = {"Content-Type": "application/json"}
+        if api_key is not None:
+            self.headers.update({"apikey": api_key})
+
+    async def _async_make_http_request(
+            self, *, method: str = "GET", url: str, params: dict[str, Any] | None = None
+    ) -> ClientResponse:
+        response = await async_make_http_request(
+            method=method,
+            url=url,
+            headers=self.headers,
+            params=params
+        )
+        response.raise_for_status()
+        return response
+
+    async def healthcheck(self) -> bool:
+        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "healthcheck"))
+        json_data = await response.json()
+        return json_data["data"]["healthcheck"] == "healthcheck"
+
+    async def is_healthcheck_good(self) -> bool:
+        try:
+            return await self.healthcheck()
+        except Exception as exception:
+            self._logger.error(exception)
+            return False
+
+    async def generate_image_from_number(self, *, number: int) -> GenerateImageFromNumberResApiModel:
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "generate_image_from_number"),
+            params={"number": number}
+        )
+        json_data = await response.json()
+        return GenerateImageFromNumberResApiModel.model_validate(json_data)
+
+
+def __example():
+    pass
+
+
+async def __async_example():
+    pass
+
+
+if __name__ == '__main__':
+    __example()
+    asyncio.run(__async_example())

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/arpakitlib/ar_fastapi_util.py

@@ -27,6 +27,7 @@ from starlette.staticfiles import StaticFiles
 from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
+from arpakitlib.ar_file_storage_in_dir_util import FileStorageInDir
 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_sqlalchemy_model_util import StoryLogDBM
@@ -396,18 +397,29 @@ class InitSqlalchemyDBStartupAPIEvent(BaseStartupAPIEvent):
         super().__init__()
         self.sqlalchemy_db = sqlalchemy_db
 
-    def async_on_startup(self, *args, **kwargs):
+    async def async_on_startup(self, *args, **kwargs):
         self.sqlalchemy_db.init()
 
 
 class SafeRunWorkerStartupAPIEvent(BaseStartupAPIEvent):
-    def __init__(self, worker: BaseWorker, safe_run_in_background_mode: str):
+    def __init__(self, workers: list[BaseWorker], safe_run_in_background_mode: str):
         super().__init__()
-        self.worker = worker
+        self.workers = workers
         self.safe_run_in_background_mode = safe_run_in_background_mode
 
-    def async_on_startup(self, *args, **kwargs):
-        self.worker.safe_run_in_background(safe_run_in_background_mode=self.safe_run_in_background_mode)
+    async def async_on_startup(self, *args, **kwargs):
+        for worker in self.workers:
+            _ = worker.safe_run_in_background(safe_run_in_background_mode=self.safe_run_in_background_mode)
+
+
+class InitFileStoragesInDir(BaseStartupAPIEvent):
+    def __init__(self, file_storages_in_dir: list[FileStorageInDir]):
+        super().__init__()
+        self.file_storages_in_dir = file_storages_in_dir
+
+    async def async_on_startup(self, *args, **kwargs):
+        for file_storage_in_dir in self.file_storages_in_dir:
+            file_storage_in_dir.init()
 
 
 class BaseTransmittedAPIData(BaseModel):
@@ -422,7 +434,7 @@ class BaseAPIAuthData(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
     require_api_key_string: bool = False
-    require_token_string: bool = None
+    require_token_string: bool = False
 
     token_string: str | None = None
     api_key_string: str | None = None
@@ -567,7 +579,8 @@ def create_fastapi_app(
         shutdown_api_events: list[BaseShutdownAPIEvent] | None = None,
         transmitted_api_data: BaseTransmittedAPIData = BaseTransmittedAPIData(),
         main_api_router: APIRouter = simple_api_router_for_testing(),
-        contact: dict[str, Any] | None = None
+        contact: dict[str, Any] | None = None,
+        media_dirpath: str | None = None
 ):
     if contact is None:
         contact = _DEFAULT_CONTACT
@@ -591,6 +604,9 @@ def create_fastapi_app(
         contact=contact
     )
 
+    if media_dirpath is not None:
+        app.mount("/media", StaticFiles(directory=media_dirpath), name="media")
+
     app.state.transmitted_api_data = transmitted_api_data
 
     add_cors_to_app(app=app)

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/arpakitlib/ar_logging_util.py

@@ -8,6 +8,9 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
 def init_log_file(*, log_filepath: str):
+    directory = os.path.dirname(log_filepath)
+    if directory and not os.path.exists(directory):
+        os.makedirs(directory, exist_ok=True)
     if not os.path.exists(path=log_filepath):
         with open(file=log_filepath, mode="w") as file:
             file.write("")

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/arpakitlib/ar_schedule_uust_api_client_util.py

@@ -76,11 +76,11 @@ class ScheduleUUSTAPIClient:
             self,
             *,
             url: str,
-            params: dict | None = None
+            params: dict[str, Any] | None = None
     ) -> dict[str, Any]:
         response = await async_make_http_request(
-            url=url,
             method="GET",
+            url=url,
             params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
             max_tries_=9,

{arpakitlib-1.6.90 → arpakitlib-1.6.92}/pyproject.toml

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

arpakitlib-1.6.90/arpakitlib/ar_dream_ai_api_client_util.py

@@ -1,122 +0,0 @@
-# arpakit
-
-import asyncio
-import logging
-from datetime import timedelta
-from urllib.parse import urljoin
-
-import aiohttp
-from aiohttp import ClientResponseError, ClientResponse, ClientTimeout
-from pydantic import ConfigDict, BaseModel
-
-from arpakitlib.ar_base64_util import convert_base64_string_to_bytes
-from arpakitlib.ar_json_util import safely_transfer_to_json_str
-from arpakitlib.ar_sleep_util import async_safe_sleep
-
-_ARPAKIT_LIB_MODULE_VERSION = "3.0"
-
-
-class BaseAPIModel(BaseModel):
-    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
-
-    def simple_json(self) -> str:
-        return safely_transfer_to_json_str(self.model_dump(mode="json"))
-
-
-class GenerateImageFromNumberResApiModel(BaseAPIModel):
-    image_filename: str
-    image_url: str
-    image_base64: str
-
-    def save_file(self, filepath: str):
-        with open(filepath, mode="wb") as f:
-            f.write(convert_base64_string_to_bytes(base64_string=self.image_base64))
-        return filepath
-
-
-class DreamAIAPIClient:
-    def __init__(
-            self,
-            *,
-            base_url: str = "https://api.dream_ai.arpakit.com/api/v1",
-            api_key: str | None = None
-    ):
-        self._logger = logging.getLogger(__name__)
-        self.api_key = api_key
-        base_url = base_url.strip()
-        if not base_url.endswith("/"):
-            base_url += "/"
-        self.base_url = base_url
-        self.headers = {"Content-Type": "application/json"}
-        if api_key is not None:
-            self.headers.update({"apikey": api_key})
-
-    async def _async_make_request(self, *, method: str = "GET", url: str, **kwargs) -> ClientResponse:
-        max_tries = 7
-        tries = 0
-
-        kwargs["url"] = url
-        kwargs["method"] = method
-        kwargs["timeout"] = ClientTimeout(total=timedelta(seconds=15).total_seconds())
-        kwargs["headers"] = self.headers
-
-        while True:
-            tries += 1
-            self._logger.info(f"{method} {url}")
-            try:
-                async with aiohttp.ClientSession() as session:
-                    async with session.request(**kwargs) as response:
-                        await response.read()
-                        return response
-            except Exception as err:
-                self._logger.warning(f"{tries}/{max_tries} {err} {method} {url}")
-                if tries >= max_tries:
-                    raise err
-                await async_safe_sleep(timedelta(seconds=0.1).total_seconds())
-                continue
-
-    async def healthcheck(self) -> bool:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "healthcheck"))
-        response.raise_for_status()
-        json_data = await response.json()
-        return json_data["data"]["healthcheck"]
-
-    async def is_healthcheck_good(self) -> bool:
-        try:
-            return await self.healthcheck()
-        except ClientResponseError:
-            return False
-
-    async def auth_healthcheck(self) -> bool:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "auth_healthcheck"))
-        response.raise_for_status()
-        json_data = await response.json()
-        return json_data["data"]["auth_healthcheck"]
-
-    async def is_auth_healthcheck_good(self) -> bool:
-        try:
-            return await self.auth_healthcheck()
-        except ClientResponseError:
-            return False
-
-    async def generate_image_from_number(self, *, number: int) -> GenerateImageFromNumberResApiModel:
-        response = await self._async_make_request(
-            method="GET", url=urljoin(self.base_url, "generate_image_from_number"),
-            params={"number": number}
-        )
-        response.raise_for_status()
-        json_data = await response.json()
-        return GenerateImageFromNumberResApiModel.model_validate(json_data)
-
-
-def __example():
-    pass
-
-
-async def __async_example():
-    pass
-
-
-if __name__ == '__main__':
-    __example()
-    asyncio.run(__async_example())