arpakitlib 1.5.29__py3-none-any.whl → 1.5.31__py3-none-any.whl

arpakitlib/ar_fastapi_util.py

@@ -6,6 +6,7 @@ import asyncio
 import logging
 import os.path
 import pathlib
+from datetime import datetime
 from typing import Any, Callable
 
 import fastapi.exceptions
@@ -52,6 +53,12 @@ class BaseAPISO(BaseAPISchema):
     pass
 
 
+class BaseAPISimpleSO(BaseAPISO):
+    id: int
+    long_id: str
+    creation_dt: datetime
+
+
 class APIErrorSO(BaseAPISO):
     class APIErrorCodes(EasyEnumeration):
         cannot_authorize = "CANNOT_AUTHORIZE"
@@ -243,7 +250,7 @@ def add_ar_fastapi_static_docs_and_redoc_handlers_to_fastapi_app(
     return fastapi_app
 
 
-class BaseAPIStartupEvent:
+class BaseAPIEvent:
     def __init__(self, *args, **kwargs):
         self._logger = logging.getLogger(self.__class__.__name__)
 
@@ -251,11 +258,6 @@ class BaseAPIStartupEvent:
         self._logger.info("on_startup starts")
         self._logger.info("on_startup ends")
 
-
-class BaseAPIShutdownEvent:
-    def __init__(self, *args, **kwargs):
-        self._logger = logging.getLogger(self.__class__.__name__)
-
     async def on_shutdown(self, *args, **kwargs):
         self._logger.info("on_shutdown starts")
         self._logger.info("on_shutdown ends")
@@ -265,8 +267,7 @@ def create_fastapi_app(
         *,
         title: str,
         description: str | None = None,
-        api_startup_event: BaseAPIStartupEvent | None = BaseAPIStartupEvent(),
-        api_shutdown_event: BaseAPIShutdownEvent | None = BaseAPIShutdownEvent(),
+        api_event: BaseAPIEvent | None = BaseAPIEvent(),
         api_handle_exception_: Callable | None = simple_api_handle_exception
 ):
     app = FastAPI(
@@ -275,8 +276,8 @@ def create_fastapi_app(
         docs_url=None,
         redoc_url=None,
         openapi_url="/openapi",
-        on_startup=[api_startup_event.on_startup] if api_startup_event else [],
-        on_shutdown=[api_shutdown_event.on_shutdown] if api_shutdown_event else []
+        on_startup=[api_event.on_startup] if api_event else [],
+        on_shutdown=[api_event.on_shutdown] if api_event else []
     )
 
     add_middleware_cors_to_fastapi_app(fastapi_app=app)

arpakitlib/ar_http_request_util.py

@@ -19,17 +19,18 @@ def sync_make_request(
         *,
         method: str = "GET",
         url: str,
-        max_tries: int = 7,
+        max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
+        timeout_: timedelta = timedelta(seconds=15).total_seconds(),
         **kwargs
 ) -> requests.Response:
     tries_counter = 0
 
     kwargs["method"] = method
     kwargs["url"] = url
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = (timedelta(seconds=15).total_seconds(), timedelta(seconds=15).total_seconds())
+    if timeout_ is not None:
+        kwargs["timeout"] = timeout_.total_seconds()
     if proxy_url_:
         kwargs["proxies"] = {
             "http": proxy_url_,
@@ -47,8 +48,8 @@ def sync_make_request(
                 response.raise_for_status()
             return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries} {method} {url} {exception}")
-            if tries_counter >= max_tries:
+            _logger.warning(f"{tries_counter}/{max_tries_} {method} {url} {exception}")
+            if tries_counter >= max_tries_:
                 raise exception
             sync_safe_sleep(timedelta(seconds=0.1).total_seconds())
             continue
@@ -58,18 +59,19 @@ async def async_make_request(
         *,
         method: str = "GET",
         url: str,
-        max_tries: int = 7,
+        max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
+        timeout_: timedelta | None = timedelta(seconds=15),
         **kwargs
 ) -> aiohttp.ClientResponse:
     tries_counter = 0
 
     kwargs["method"] = method
     kwargs["url"] = url
-    if "timeout" not in kwargs:
-        kwargs["timeout"] = aiohttp.ClientTimeout(total=timedelta(seconds=15).total_seconds())
-    if "allow_redirects" in kwargs:
+    if timeout_ is not None:
+        kwargs["timeout"] = aiohttp.ClientTimeout(total=timeout_.total_seconds())
+    if "allow_redirects" not in kwargs:
         kwargs["allow_redirects"] = True
 
     proxy_connector: ProxyConnector | None = None
@@ -87,8 +89,8 @@ async def async_make_request(
                     await response.read()
                     return response
         except BaseException as exception:
-            _logger.warning(f"{tries_counter}/{max_tries} {method} {url} {exception}")
-            if tries_counter >= max_tries:
+            _logger.warning(f"{tries_counter}/{max_tries_} {method} {url} {exception}")
+            if tries_counter >= max_tries_:
                 raise exception
             await async_safe_sleep(timedelta(seconds=0.1).total_seconds())
             continue

arpakitlib/ar_operation_execution_util.py

@@ -16,7 +16,7 @@ from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_easy_sqlalchemy_util import EasySQLAlchemyDB
 from arpakitlib.ar_enumeration import EasyEnumeration
-from arpakitlib.ar_fastapi_util import BaseAPISO
+from arpakitlib.ar_fastapi_util import BaseAPISO, BaseAPISimpleSO
 from arpakitlib.ar_sqlalchemy_model_util import SimpleDBM
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -78,10 +78,7 @@ class OperationDBM(SimpleDBM):
         return self.duration.total_seconds()
 
 
-class OperationSO(BaseAPISO):
-    id: int
-    long_id: str
-    creation_dt: datetime
+class OperationSO(BaseAPISimpleSO):
     execution_start_dt: datetime | None
     execution_finish_dt: datetime | None
     status: str

arpakitlib/ar_schedule_uust_api_client.py

@@ -10,7 +10,6 @@ import pytz
 
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_http_request_util import async_make_request
-from arpakitlib.ar_logging_util import setup_normal_logging
 from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
@@ -76,13 +75,11 @@ class ScheduleUUSTAPIClient:
             url: str,
             params: dict | None = None
     ) -> dict[str, Any]:
-        params = combine_dicts(self.auth_params(), params)
         response = await async_make_request(
             url=url,
             method="GET",
-            params=params,
+            params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
-            max_tries=9
         )
         json_data = await response.json()
         raise_for_type(json_data, dict)
@@ -190,12 +187,7 @@ def __example():
 
 
 async def __async_example():
-    setup_normal_logging()
-    client = ScheduleUUSTAPIClient(
-        api_login="arpakit",
-        api_password_first_part="bAEb2wXJNNZ8"
-    )
-    await client.check_all()
+    pass
 
 
 if __name__ == '__main__':

arpakitlib/ar_story_log_util.py

@@ -0,0 +1,37 @@
+from datetime import datetime
+from typing import Any
+
+from sqlalchemy import TEXT
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.orm import Mapped, mapped_column
+
+from arpakitlib.ar_enumeration import EasyEnumeration
+from arpakitlib.ar_fastapi_util import BaseAPISO, BaseAPISimpleSO
+from arpakitlib.ar_sqlalchemy_model_util import BaseDBM, SimpleDBM
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+class StoryLogDBM(SimpleDBM):
+    __tablename__ = "story_log"
+
+    class Levels(EasyEnumeration):
+        info = "info"
+        warning = "warning"
+        error = "error"
+
+    level: Mapped[str] = mapped_column(
+        TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
+    )
+    title: Mapped[str | None] = mapped_column(TEXT, index=True, default=None, nullable=True)
+    data: Mapped[dict[str, Any]] = mapped_column(
+        JSONB, insert_default={}, server_default="{}", index=True, nullable=False
+    )
+
+
+class AdminStoryLogSO(BaseAPISimpleSO):
+    level: str
+    title: str | None
+    data: dict[str, Any]
+
+

{arpakitlib-1.5.29.dist-info → arpakitlib-1.5.31.dist-info}/METADATA

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

{arpakitlib-1.5.29.dist-info → arpakitlib-1.5.31.dist-info}/RECORD

@@ -36,11 +36,11 @@ 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=zru-le-J139KpLlPeo9DUjMuDygh4tR2GhAJjlr7ROs,9959
+arpakitlib/ar_fastapi_util.py,sha256=A5cSh1axaqN4yE2E5QPLDK58aEZgT24fIQ4pgzAMI7I,9798
 arpakitlib/ar_file_storage_in_dir.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_generate_env_example.py,sha256=WseNlk_So6mTVQ2amMuigWYV4ZVmd940POvXtodoYj0,325
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
-arpakitlib/ar_http_request_util.py,sha256=jx0ggOVXLvsh2hVUE7tasWaEsUnXbO0WS8-rJb0Y6BU,3063
+arpakitlib/ar_http_request_util.py,sha256=DooIL24jW6Ouz771TMTTvzDZETBc12R1RBmbXp9vNqg,3129
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
 arpakitlib/ar_json_util.py,sha256=S8CskZ3uoYuJGCy1GhQ8Ikhn-fxXk-9JpLUbBvXADqI,833
@@ -51,20 +51,21 @@ arpakitlib/ar_logging_util.py,sha256=c5wX2FLqCzb4aLckLVhIJ7go52rJQ4GN9dIkJ6KMc3o
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=qCRSWlSgx-3yU0NRHZDQ5lCOmuZKcz2Na3py9nr6hJM,1618
 arpakitlib/ar_openai_util.py,sha256=d5Aj1O2yo_zYLZCLeOLvuveYYxA2jGOqhMs1oUbuVk8,1210
-arpakitlib/ar_operation_execution_util.py,sha256=i-GDXFCAXrPwi-juH1sKWNsIPQZ036QxyC4n9oN_RWw,11802
+arpakitlib/ar_operation_execution_util.py,sha256=PGyyvJoYAv01MWQl1TNWGamchfIrDkSovLrNMiyKqEg,11770
 arpakitlib/ar_parse_command.py,sha256=qpr2OwG3Bf7DFiL9S3iWgtbvtE80RSC35E5zFJvjG1I,2714
 arpakitlib/ar_postgresql_util.py,sha256=SAHEmAyMkZe516uk2gS830v_Wn2kRUZUYNcTNwmgXJk,1160
 arpakitlib/ar_run_cmd.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
-arpakitlib/ar_schedule_uust_api_client.py,sha256=hShokh3uJuTPC78-AMW2mv1WSJMy4cAuVDJ4sLaoqMs,6043
+arpakitlib/ar_schedule_uust_api_client.py,sha256=1JGUy6rrjAXdWjeAqiAOQlCAEV3xuc5FUDWfXODKB-A,5770
 arpakitlib/ar_sleep_util.py,sha256=9ZN4Qo4eZ_q3hjM7vNBQjFRcH-9-sqv3QLSjnxVJE90,1405
 arpakitlib/ar_sqlalchemy_model_util.py,sha256=3zscvaloi9XY1NR70rJ4-jJlFUIqhmTbQ9wdvK-Yjf8,1379
 arpakitlib/ar_ssh_runner.py,sha256=jlnss4V4pziBN1rBzoK_lDiWm6nMOqGXfa6NFJSKH-Y,6796
+arpakitlib/ar_story_log_util.py,sha256=NKzC1nZkjofRTePHhncatO7B25hAFPvIwG45XWjI0tQ,1060
 arpakitlib/ar_str_util.py,sha256=xSEzmsDvRiZVaxyqFFjcgzpphktCbXg2FHcvsd1DYpA,1885
 arpakitlib/ar_type_util.py,sha256=-h-SCsVl11eVo1u4hy2Asn0IfD5TIxmX3Ndug4AvnPE,1761
 arpakitlib/ar_yookassa_api_client.py,sha256=BwsTygaXf35AACVBl_09uYlSD_t-U1OOzbj58OOFT4Q,6480
 arpakitlib/ar_zabbix_util.py,sha256=MTQbmS0QpNCKNOGONNQHf6j7KTZsKGlIbd5rCH0R0WI,6313
-arpakitlib-1.5.29.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
-arpakitlib-1.5.29.dist-info/METADATA,sha256=BeKeVptEUesxJ2rNi-UpFTY2XuRep1w_3p1dXPN_4SM,2330
-arpakitlib-1.5.29.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
-arpakitlib-1.5.29.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-arpakitlib-1.5.29.dist-info/RECORD,,
+arpakitlib-1.5.31.dist-info/LICENSE,sha256=1jqWIkbnMxDfs_i0SXP5qbV6PHjBr1g8506oW7uPjfg,11347
+arpakitlib-1.5.31.dist-info/METADATA,sha256=2nk5FfCHFT4sV_hZ8MKq3LlSc6NauO5Fw6gxrQPGefs,2330
+arpakitlib-1.5.31.dist-info/NOTICE,sha256=wHwmiq3wExfFfgMsE5U5TOBP9_l72ocIG82KurEels0,43
+arpakitlib-1.5.31.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+arpakitlib-1.5.31.dist-info/RECORD,,