arpakitlib 1.7.229__py3-none-any.whl → 1.7.232__py3-none-any.whl

arpakitlib/ar_arpakit_schedule_uust_api_client_util.py

@@ -3,8 +3,8 @@
 from __future__ import annotations
 
 import asyncio
+import datetime as dt
 import logging
-from datetime import timedelta, datetime, time
 from typing import Any
 from urllib.parse import urljoin
 
@@ -45,33 +45,33 @@ class Months(Enumeration):
 
 
 class BaseAPIModel(BaseModel):
-    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
+    model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
 
 class CurrentSemesterAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     value: str
 
 
 class CurrentWeekAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     value: int
 
 
 class GroupAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     uust_api_id: int
     title: str
     faculty: str | None
@@ -83,9 +83,9 @@ class GroupAPIModel(BaseAPIModel):
 class TeacherAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     uust_api_id: int
     name: str | None
     surname: str | None
@@ -103,9 +103,9 @@ class TeacherAPIModel(BaseAPIModel):
 class GroupLessonAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     uust_api_id: int
     type: str
     title: str
@@ -113,8 +113,8 @@ class GroupLessonAPIModel(BaseAPIModel):
     weekday: int
     comment: str | None
     time_title: str | None
-    time_start: time | None
-    time_end: time | None
+    time_start: dt.time | None
+    time_end: dt.time | None
     numbers: list[int]
     location: str | None
     teacher_uust_api_id: int | None
@@ -141,9 +141,9 @@ class GroupLessonAPIModel(BaseAPIModel):
 class TeacherLessonAPIModel(BaseAPIModel):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
     entity_type: str
-    actualization_dt: datetime
+    actualization_dt: dt.datetime
     uust_api_id: int
     type: str
     title: str
@@ -151,8 +151,8 @@ class TeacherLessonAPIModel(BaseAPIModel):
     weekday: int
     comment: str | None
     time_title: str | None
-    time_start: time | None
-    time_end: time | None
+    time_start: dt.time | None
+    time_end: dt.time | None
     numbers: list[int]
     location: str | None
     group_uust_api_ids: list[int]
@@ -181,13 +181,25 @@ class WeatherInUfaAPIModel(BaseAPIModel):
     temperature_feels_like: float
     description: str
     wind_speed: float
-    sunrise_dt: datetime
-    sunset_dt: datetime
+    sunrise_dt: dt.datetime
+    sunset_dt: dt.datetime
     has_rain: bool
     has_snow: bool
     data: dict
 
 
+class DatetimeAPIModel(BaseAPIModel):
+    date: dt.date
+    datetime: dt.datetime | None = None
+    year: int
+    month: int
+    day: int
+    hour: int | None = None
+    minute: int | None = None
+    second: int | None = None
+    microsecond: int | None = None
+
+
 class ARPAKITScheduleUUSTAPIClient:
     def __init__(
             self,
@@ -195,7 +207,7 @@ class ARPAKITScheduleUUSTAPIClient:
             base_url: str = "https://api.schedule-uust.arpakit.com/api/v1",
             api_key: str | None = "viewer",
             use_cache: bool = False,
-            cache_ttl: timedelta | None = timedelta(minutes=10)
+            cache_ttl: dt.timedelta | None = dt.timedelta(minutes=10)
     ):
         self._logger = logging.getLogger(__name__)
         self.api_key = api_key
@@ -236,7 +248,9 @@ class ARPAKITScheduleUUSTAPIClient:
         return response
 
     async def check_auth(self) -> dict[str, Any]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "check_auth"))
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "check_auth")
+        )
         json_data = await response.json()
         return json_data
 
@@ -265,13 +279,24 @@ class ARPAKITScheduleUUSTAPIClient:
         json_data = await response.json()
         return WeatherInUfaAPIModel.model_validate(json_data)
 
+    async def get_now_datetime_in_ufa(self) -> DatetimeAPIModel:
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_now_datetime_in_ufa")
+        )
+        json_data = await response.json()
+        return DatetimeAPIModel.model_validate(json_data)
+
     async def get_log_file_content(self) -> str | None:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_log_file"))
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_log_file")
+        )
         text_data = await response.text()
         return text_data
 
     async def get_groups(self) -> list[GroupAPIModel]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_groups"))
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_groups")
+        )
         json_data = await response.json()
         return [GroupAPIModel.model_validate(d) for d in json_data]
 
@@ -283,8 +308,8 @@ class ARPAKITScheduleUUSTAPIClient:
             params["filter_id"] = filter_id
         if filter_uust_api_id is not None:
             params["filter_uust_api_id"] = filter_uust_api_id
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_group"),
-                                                       params=params)
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_group"), params=params)
         json_data = await response.json()
         if json_data is None:
             return None
@@ -293,13 +318,16 @@ class ARPAKITScheduleUUSTAPIClient:
     async def find_groups(
             self, *, q: str
     ) -> list[GroupAPIModel]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "find_groups"),
-                                                       params={"q": q.strip()})
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "find_groups"), params={"q": q.strip()}
+        )
         json_data = await response.json()
         return [GroupAPIModel.model_validate(d) for d in json_data]
 
     async def get_teachers(self) -> list[TeacherAPIModel]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_teachers"))
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_teachers")
+        )
         json_data = await response.json()
         return [TeacherAPIModel.model_validate(d) for d in json_data]
 
@@ -311,8 +339,9 @@ class ARPAKITScheduleUUSTAPIClient:
             params["filter_id"] = filter_id
         if filter_uust_api_id is not None:
             params["filter_uust_api_id"] = filter_uust_api_id
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_teacher"),
-                                                       params=params)
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_teacher"), params=params
+        )
         json_data = await response.json()
         if json_data is None:
             return None
@@ -321,24 +350,26 @@ class ARPAKITScheduleUUSTAPIClient:
     async def find_teachers(
             self, *, q: str
     ) -> list[TeacherAPIModel]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "find_teachers"),
-                                                       params={"q": q.strip()})
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "find_teachers"), params={"q": q.strip()}
+        )
         json_data = await response.json()
         return [TeacherAPIModel.model_validate(d) for d in json_data]
 
     async def find_any(
             self, *, q: str
     ) -> list[TeacherAPIModel | GroupLessonAPIModel]:
-        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "find_any"),
-                                                       params={"q": q.strip()})
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "find_any"), params={"q": q.strip()}
+        )
         json_data = await response.json()
 
         results = []
-        for i in json_data:
-            if i.get("entity_type") == "group":
-                results.append(GroupAPIModel.model_validate(i))
-            elif i.get("entity_type") == "teacher":
-                results.append(TeacherAPIModel.model_validate(i))
+        for d in json_data:
+            if d["entity_type"] == "group":
+                results.append(GroupAPIModel.model_validate(d))
+            elif d["entity_type"] == "teacher":
+                results.append(TeacherAPIModel.model_validate(d))
             else:
                 pass
         return results
@@ -391,59 +422,62 @@ async def __async_example():
     print(f"get_weather_in_ufa")
     print(safely_transfer_obj_to_json_str((await client.get_weather_in_ufa()).model_dump()))
 
-    print(f"get_current_week")
-    print(safely_transfer_obj_to_json_str((await client.get_current_week()).model_dump()))
-
-    print(f"get_current_semester")
-    print(safely_transfer_obj_to_json_str((await client.get_current_semester()).model_dump()))
-
-    # Group
-    print(f"get_groups")
-    print(safely_transfer_obj_to_json_str((await client.get_groups())))
-
-    print(f"get_group")
-    if await client.get_group(filter_id=25285, filter_uust_api_id=6674):
-        print(safely_transfer_obj_to_json_str(
-            (await client.get_group(filter_id=25285, filter_uust_api_id=6674)).model_dump()))
-    else:
-        print("Group is none")
-
-    print(f"find_groups")
-    print(safely_transfer_obj_to_json_str((await client.find_groups(q="ПИ-427Б"))))
-
-    # Teacher
-    print(f"get_teachers")
-    print(safely_transfer_obj_to_json_str((await client.get_teachers())))
-
-    print(f"get_teacher")
-    if await client.get_teacher(filter_id=16975, filter_uust_api_id=112978):
-        print(safely_transfer_obj_to_json_str(
-            (await client.get_teacher(filter_id=16975, filter_uust_api_id=112978)).model_dump()))
-    else:
-        print("Teacher is none")
-
-    print(f"find_teachers")
-    print(safely_transfer_obj_to_json_str((await client.find_teachers(q="Казанцев"))))
-
-    # Group Lesson
-    print(f"get_group_lessons")
-    if await client.get_group_lessons(filter_group_id=25285, filter_group_uust_api_id=6674):
-        print(safely_transfer_obj_to_json_str((await client.get_group_lessons(filter_group_id=25285,
-                                                                              filter_group_uust_api_id=6674))))
-    else:
-        print("Group lessons is none")
-
-    # Teacher Lesson
-    print(f"get_teacher_lessons")
-    if await client.get_teacher_lessons(filter_teacher_id=16975, filter_teacher_uust_api_id=112978):
-        print(safely_transfer_obj_to_json_str((await client.get_teacher_lessons(filter_teacher_id=16975,
-                                                                                filter_teacher_uust_api_id=112978))))
-    else:
-        print("Teacher lessons is none")
-
-    # Find Any
-    print(f"find_any")
-    print(safely_transfer_obj_to_json_str((await client.find_any(q="ПИ"))))
+    print(f"get_now_datetime_in_ufa")
+    print(safely_transfer_obj_to_json_str((await client.get_now_datetime_in_ufa()).model_dump()))
+
+    # print(f"get_current_week")
+    # print(safely_transfer_obj_to_json_str((await client.get_current_week()).model_dump()))
+    #
+    # print(f"get_current_semester")
+    # print(safely_transfer_obj_to_json_str((await client.get_current_semester()).model_dump()))
+    #
+    # # Group
+    # print(f"get_groups")
+    # print(safely_transfer_obj_to_json_str((await client.get_groups())))
+    #
+    # print(f"get_group")
+    # if await client.get_group(filter_id=25285, filter_uust_api_id=6674):
+    #     print(safely_transfer_obj_to_json_str(
+    #         (await client.get_group(filter_id=25285, filter_uust_api_id=6674)).model_dump()))
+    # else:
+    #     print("Group is none")
+    #
+    # print(f"find_groups")
+    # print(safely_transfer_obj_to_json_str((await client.find_groups(q="ПИ-427Б"))))
+    #
+    # # Teacher
+    # print(f"get_teachers")
+    # print(safely_transfer_obj_to_json_str((await client.get_teachers())))
+    #
+    # print(f"get_teacher")
+    # if await client.get_teacher(filter_id=16975, filter_uust_api_id=112978):
+    #     print(safely_transfer_obj_to_json_str(
+    #         (await client.get_teacher(filter_id=16975, filter_uust_api_id=112978)).model_dump()))
+    # else:
+    #     print("Teacher is none")
+    #
+    # print(f"find_teachers")
+    # print(safely_transfer_obj_to_json_str((await client.find_teachers(q="Казанцев"))))
+    #
+    # # Group Lesson
+    # print(f"get_group_lessons")
+    # if await client.get_group_lessons(filter_group_id=25285, filter_group_uust_api_id=6674):
+    #     print(safely_transfer_obj_to_json_str((await client.get_group_lessons(filter_group_id=25285,
+    #                                                                           filter_group_uust_api_id=6674))))
+    # else:
+    #     print("Group lessons is none")
+    #
+    # # Teacher Lesson
+    # print(f"get_teacher_lessons")
+    # if await client.get_teacher_lessons(filter_teacher_id=16975, filter_teacher_uust_api_id=112978):
+    #     print(safely_transfer_obj_to_json_str((await client.get_teacher_lessons(filter_teacher_id=16975,
+    #                                                                             filter_teacher_uust_api_id=112978))))
+    # else:
+    #     print("Teacher lessons is none")
+    #
+    # # Find Any
+    # print(f"find_any")
+    # print(safely_transfer_obj_to_json_str((await client.find_any(q="ПИ"))))
 
 
 if __name__ == '__main__':

arpakitlib/ar_arpakit_schedule_uust_site_util.py

@@ -0,0 +1,68 @@
+# arpakit
+
+from urllib.parse import urlencode, urljoin
+
+from arpakitlib.ar_type_util import raise_for_type
+
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
+
+def generate_arpakit_schedule_uust_site_url(
+        *,
+        base_url: str = "https://schedule-uust.arpakit.com",
+        entity_type: str | None = None,
+        uust_api_id: int | None = None,
+        session: bool | None = None,
+        week: int | None = None,
+        theme: str | None = None
+) -> str:
+    raise_for_type(base_url, str)
+
+    params = {}
+
+    if entity_type is not None:  # group/teacher
+        raise_for_type(entity_type, str)
+        params["entity_type"] = entity_type
+
+    if uust_api_id is not None:  # uust_api_id of group/teacher
+        raise_for_type(uust_api_id, int)
+        params["uust_api_id"] = uust_api_id
+
+    if session is not None:  # true/false
+        raise_for_type(session, bool)
+        if session:
+            params["session"] = "true"
+        else:
+            params["session"] = "false"
+
+    if week is not None:
+        raise_for_type(week, int)
+        params["week"] = week
+
+    if theme is not None:  # dark/light
+        raise_for_type(theme, str)
+        params["theme"] = theme
+
+    if params:
+        res = urljoin(base_url, f"schedule?{urlencode(params)}")
+    else:
+        res = base_url
+
+    return res
+
+
+def __example():
+    base_url = "https://schedule-uust.arpakit.com"
+    url = generate_arpakit_schedule_uust_site_url(
+        base_url=base_url,
+        entity_type="group",
+        uust_api_id=6662,
+        session=True,
+        week=23,
+        theme="dark"
+    )
+    print(url)
+
+
+if __name__ == '__main__':
+    __example()

arpakitlib/ar_dream_ai_api_client_util.py

@@ -15,7 +15,7 @@ _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
 
 class BaseAPIModel(BaseModel):
-    model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
+    model_config = ConfigDict(extra="ignore", arbitrary_types_allowed=True, from_attributes=True)
 
 
 class GenerateImageFromNumberResApiModel(BaseAPIModel):
@@ -76,7 +76,8 @@ class DREAMAIAPIClient:
 
     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"),
+            method="GET",
+            url=urljoin(self.base_url, "generate_image_from_number"),
             params={"number": number}
         )
         json_data = await response.json()

arpakitlib/ar_fastapi_util.py

@@ -3,12 +3,12 @@
 from __future__ import annotations
 
 import asyncio
+import datetime as dt
 import logging
 import os.path
 import pathlib
 import traceback
 from contextlib import suppress
-from datetime import datetime
 from typing import Any, Callable
 
 import fastapi.exceptions
@@ -65,7 +65,7 @@ class BaseSO(BaseSchema):
 class SimpleSO(BaseSO):
     id: int
     long_id: str
-    creation_dt: datetime
+    creation_dt: dt.datetime
 
 
 class BaseAPIErrorCodes(Enumeration):
@@ -91,6 +91,41 @@ class RawDataSO(BaseSO):
     data: dict[str, Any] = {}
 
 
+class DatetimeSO(BaseSO):
+    date: dt.date
+    datetime: dt.datetime | None = None
+    year: int
+    month: int
+    day: int
+    hour: int | None = None
+    minute: int | None = None
+    second: int | None = None
+    microsecond: int | None = None
+
+    @classmethod
+    def from_datetime(cls, datetime_: dt.datetime):
+        return cls(
+            date=datetime_.date(),
+            datetime=datetime_,
+            year=datetime_.year,
+            month=datetime_.month,
+            day=datetime_.day,
+            hour=datetime_.hour,
+            minute=datetime_.minute,
+            second=datetime_.second,
+            microsecond=datetime_.microsecond
+        )
+
+    @classmethod
+    def from_date(cls, date_: dt.date):
+        return cls(
+            date=date_,
+            year=date_.year,
+            month=date_.month,
+            day=date_.day
+        )
+
+
 class StoryLogSO(SimpleSO):
     level: str
     title: str | None
@@ -102,8 +137,8 @@ class StoryLogSO(SimpleSO):
 
 
 class OperationSO(SimpleSO):
-    execution_start_dt: datetime | None
-    execution_finish_dt: datetime | None
+    execution_start_dt: dt.datetime | None
+    execution_finish_dt: dt.datetime | None
     status: str
     type: str
     input_data: dict[str, Any]
@@ -388,6 +423,10 @@ class HealthcheckSO(BaseSO):
     is_ok: bool = True
 
 
+class ARPAKITLibSO(BaseSO):
+    arpakitlib: bool = True
+
+
 def add_needed_api_router_to_app(*, app: FastAPI):
     api_router = APIRouter()
 
@@ -405,14 +444,14 @@ def add_needed_api_router_to_app(*, app: FastAPI):
 
     @api_router.get(
         "/arpakitlib",
-        response_model=RawDataSO | ErrorSO,
+        response_model=ARPAKITLibSO | ErrorSO,
         status_code=starlette.status.HTTP_200_OK,
         tags=["arpakitlib"]
     )
     async def _():
         return APIJSONResponse(
             status_code=starlette.status.HTTP_200_OK,
-            content=RawDataSO(data={"arpakitlib": True})
+            content=ARPAKITLibSO(arpakitlib=True)
         )
 
     app.include_router(router=api_router, prefix="")

arpakitlib/ar_http_request_util.py

@@ -26,7 +26,7 @@ def sync_make_http_request(
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
-        not_raise_for_statuses: list[int] | None = None,
+        not_raise_for_statuses_: list[int] | None = None,
         timeout_: timedelta | float = timedelta(seconds=15).total_seconds(),
         enable_logging_: bool = False,
         **kwargs
@@ -61,9 +61,9 @@ def sync_make_http_request(
         try:
             response = requests.request(**kwargs)
             if raise_for_status_:
-                if not_raise_for_statuses and response.status_code in not_raise_for_statuses:
+                if not_raise_for_statuses_ and response.status_code in not_raise_for_statuses_:
                     if enable_logging_:
-                        _logger.info(f"ignored status {response.status_code} for http {method} {url} {params}")
+                        _logger.info(f"ignored status {response.status_code} {method} {url} {params}")
                 else:
                     response.raise_for_status()
             if enable_logging_:
@@ -72,7 +72,7 @@ def sync_make_http_request(
         except Exception as exception:
             if enable_logging_:
                 _logger.warning(
-                    f"{tries_counter}/{max_tries_}. retry {method} {url} {params}, exception={exception}"
+                    f"{tries_counter}/{max_tries_}, bad try {method} {url} {params}, exception={exception}"
                 )
             if tries_counter >= max_tries_:
                 raise exception
@@ -89,7 +89,7 @@ async def async_make_http_request(
         max_tries_: int = 9,
         proxy_url_: str | None = None,
         raise_for_status_: bool = False,
-        not_raise_for_statuses: list[int] | None = None,
+        not_raise_for_statuses_: list[int] | None = None,
         timeout_: timedelta | None = timedelta(seconds=15),
         enable_logging_: bool = False,
         **kwargs
@@ -120,21 +120,21 @@ async def async_make_http_request(
             async with aiohttp.ClientSession(connector=proxy_connector) as session:
                 async with session.request(**kwargs) as response:
                     if raise_for_status_:
-                        if not_raise_for_statuses and response.status in not_raise_for_statuses:
+                        if not_raise_for_statuses_ and response.status in not_raise_for_statuses_:
                             if enable_logging_:
                                 _logger.info(
-                                    f"ignored status {response.status} for http {method} {url} {params}"
+                                    f"ignored status {response.status} {method} {url} {params}"
                                 )
                         else:
                             response.raise_for_status()
                     await response.read()
                     if enable_logging_:
-                        _logger.info(f"good try http {method} {url} {params}")
+                        _logger.info(f"good try {method} {url} {params}")
                     return response
         except Exception as exception:
             if enable_logging_:
                 _logger.warning(
-                    f"{tries_counter}/{max_tries_}. retry http {method} {url} {params}, exception={exception}"
+                    f"{tries_counter}/{max_tries_}, bad try {method} {url} {params}, exception={exception}"
                 )
             if tries_counter >= max_tries_:
                 raise exception

arpakitlib/ar_logging_util.py

@@ -11,8 +11,8 @@ 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:
+    if not os.path.exists(log_filepath):
+        with open(log_filepath, mode="w") as file:
             file.write("")
 
 

arpakitlib/ar_retry_func_util.py

@@ -1,9 +1,14 @@
+# arpakit
+
+
 import asyncio
 from datetime import timedelta
 from typing import Any
 
 from arpakitlib.ar_sleep_util import sync_safe_sleep, async_safe_sleep
 
+_ARPAKIT_LIB_MODULE_VERSION = "3.0"
+
 
 async def async_retry_func(
         *,

arpakitlib/ar_schedule_uust_api_client_util.py

@@ -3,7 +3,7 @@
 import asyncio
 import hashlib
 import logging
-from datetime import datetime
+from datetime import datetime, timedelta
 from typing import Any
 
 import pytz
@@ -85,8 +85,10 @@ class ScheduleUUSTAPIClient:
             url=url,
             headers=self.headers,
             params=combine_dicts(params, self.auth_params()),
+            max_tries_=9,
             proxy_url_=self.api_proxy_url,
             raise_for_status_=True,
+            timeout_=timedelta(seconds=15),
             **kwargs
         )
         json_data = await response.json()

arpakitlib/ar_yookassa_api_client_util.py

@@ -55,7 +55,10 @@ class YookassaAPIClient:
             method=method,
             url=url,
             headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            max_tries_=5,
+            raise_for_status_=True,
             timeout_=self.timeout_,
+            not_raise_for_statuses_=[404],
             auth=(self.shop_id, self.secret_key),
             **kwargs
         )
@@ -119,6 +122,9 @@ class YookassaAPIClient:
             method=method,
             url=url,
             headers=combine_dicts(self.headers, (headers if headers is not None else {})),
+            max_tries_=5,
+            raise_for_status_=True,
+            not_raise_for_statuses_=[404],
             timeout_=self.timeout_,
             auth=aiohttp.BasicAuth(login=str(self.shop_id), password=self.secret_key),
             **kwargs

{arpakitlib-1.7.229.dist-info → arpakitlib-1.7.232.dist-info}/METADATA

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

{arpakitlib-1.7.229.dist-info → arpakitlib-1.7.232.dist-info}/RECORD

@@ -135,7 +135,8 @@ arpakitlib/ar_aiogram_util.py,sha256=lv2aXUmXLm3f2JltT1i683de6MnTTp9b5HihjO4KM5s
 arpakitlib/ar_api_key_util.py,sha256=E84JlJXiDHtxLQmV8BNHvqNKu_G8-Dox0XxknYJQ37Q,422
 arpakitlib/ar_arpakit_lib_module_util.py,sha256=g9uWwTK2eEzmErqwYeVgXDYVMREN8m5CdmgEumAEQfw,5919
 arpakitlib/ar_arpakit_project_template_util.py,sha256=c7yc8w2IvZGH5hH8eOpL7JuD005hUxZ0GVDcSkJF5iI,3705
-arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=006JstWvs6JTuxRCg3toSNQvtKO0KM5pqyPJa1PRDNA,14998
+arpakitlib/ar_arpakit_schedule_uust_api_client_util.py,sha256=P4XdmQyPUwmrSGGad1XZszxWB2HMQKjyuDHCvOg0ys4,15787
+arpakitlib/ar_arpakit_schedule_uust_site_util.py,sha256=8wLct9Gd4MWkXzB6nSmETAwTPLw8lfpWgx0LoWSAOvg,1643
 arpakitlib/ar_arpakitlib_cli_util.py,sha256=208k_kWc-XHTYqL39k-rYrLcTKFF-3og21PVIsq5b2k,3171
 arpakitlib/ar_base64_util.py,sha256=aZkg2cZTuAaP2IWeG_LXJ6RO7qhyskVwec-Lks0iM-k,676
 arpakitlib/ar_base_worker_util.py,sha256=8xKNo_ob-VZsZ2THwM_cJDcA3Y4R-ruM7vKUfzKI94U,5600
@@ -143,7 +144,7 @@ arpakitlib/ar_cache_file_util.py,sha256=Fo2pH-Zqm966KWFBHG_pbiySGZvhIFCYqy7k1weR
 arpakitlib/ar_class_util.py,sha256=Eb4orGm2EFSaHfmrY2A_Nis5iwFMDKFaz1_nxTnfmnQ,487
 arpakitlib/ar_datetime_util.py,sha256=Xe1NiT9oPQzNSG7RVRkhukhbg4i-hhS5ImmV7sPUc8o,971
 arpakitlib/ar_dict_util.py,sha256=cF5LQJ6tLqyGoEXfDljMDZrikeZoWPw7CgINHIFGvXM,419
-arpakitlib/ar_dream_ai_api_client_util.py,sha256=QF9XK7xK5ny1fvkcG4e0pfCySNNFRNPy0x0cmxfsAak,2818
+arpakitlib/ar_dream_ai_api_client_util.py,sha256=Z1oii_XSsgunYx17SdcHl54S4KPQti7-MJs0xXZ8vL0,2830
 arpakitlib/ar_encrypt_decrypt_util.py,sha256=GhWnp7HHkbhwFVVCzO1H07m-5gryr4yjWsXjOaNQm1Y,520
 arpakitlib/ar_enumeration_util.py,sha256=ZOkH1-duDcjQelJrdJ-nJ8h7wePFAgmpg_8e63Cyp0E,3072
 arpakitlib/ar_exception_util.py,sha256=3hZKsj34TZVdmd4JAQz7w515smWqB8o3gTwAEjuMdnI,408
@@ -167,19 +168,19 @@ 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=BEdIlcgOHGe_K42mRHvT7YiSD_4hCZJCZGp_YmIx-KU,26497
+arpakitlib/ar_fastapi_util.py,sha256=v4IVYpI7Vd72WwuiRH2b194pjZO66vhX0B9qNI_YFe4,27420
 arpakitlib/ar_file_storage_in_dir_util.py,sha256=D3e3rGuHoI6xqAA5mVvEpVVpOWY1jyjNsjj2UhyHRbE,3674
 arpakitlib/ar_file_util.py,sha256=GUdJYm1tUZnYpY-SIPRHAZBHGra8NKy1eYEI0D5AfhY,489
 arpakitlib/ar_func_util.py,sha256=bCuWbSMoFXBaMNhb89sevj2oaXRk4Jk6Qjot8OXMDT4,1319
 arpakitlib/ar_hash_util.py,sha256=Iqy6KBAOLBQMFLWv676boI5sV7atT2B-fb7aCdHOmIQ,340
-arpakitlib/ar_http_request_util.py,sha256=ojzjBtHd6nTgAMlMYCOHGCQ2y7xf6GiduMpbRbvkvWE,5070
+arpakitlib/ar_http_request_util.py,sha256=sXzpwtHKJJqoQhwMCIxcexDONqW6GAPBRCC0VmBj1tc,5052
 arpakitlib/ar_ip_util.py,sha256=aEAa1Hvobh9DWX7cmBAPLqnXSTiKe2hRk-WJaiKMaI8,1009
 arpakitlib/ar_json_db_util.py,sha256=CEyhIU4WuNmX5mqwBVYxUKSdpFelXvWmf_tJ1fuxMSE,7187
 arpakitlib/ar_json_util.py,sha256=wJOsN8N7Rs7r8cTgMDXrmFa1GOkcD-LghqFEYXc8zGA,1083
 arpakitlib/ar_jwt_util.py,sha256=Rhm4ywoTAn6yOV8NLjDASfAtAtheROxxDP40G3XjnuQ,761
 arpakitlib/ar_list_of_dicts_to_xlsx.py,sha256=MyjEl4Jl4beLVZqLVQMMv0-XDtBD3Xh4Z_ZPDJeFu04,745
 arpakitlib/ar_list_util.py,sha256=2woOAHAU8oTIiVjZ8GLnx15odEaoQUq3Q0JPxlufFF0,457
-arpakitlib/ar_logging_util.py,sha256=mx3H6CzX9dsh29ruFmYnva8lL6mwvdBXmeHH9E2tvu8,1678
+arpakitlib/ar_logging_util.py,sha256=V4jypypFG1cj4nXae7JiBnRRfm02OTnZSEermx-wlDY,1668
 arpakitlib/ar_mongodb_util.py,sha256=2ECkTnGAZ92qxioL-fmN6R4yZOSr3bXdXLWTzT1C3vk,4038
 arpakitlib/ar_need_type_util.py,sha256=GETiREPMEYhch-yU6T--Bdawlbb04Jp1Qy7cOsUlIeA,2228
 arpakitlib/ar_openai_api_client_util.py,sha256=_XmlApvHFMSyjvZydPa_kASIt9LsFrZmSC7YEzIG8Bg,1806
@@ -187,9 +188,9 @@ arpakitlib/ar_operation_execution_util.py,sha256=YkftxZthr6knqW40mgq28y-zRXSTJPf
 arpakitlib/ar_parse_command.py,sha256=-s61xcATIsfw1eV_iD3xi-grsitbGzSDoAFc5V0OFy4,3447
 arpakitlib/ar_postgresql_util.py,sha256=1AuLjEaa1Lg4pzn-ukCVnDi35Eg1k91APRTqZhIJAdo,945
 arpakitlib/ar_rat_func_util.py,sha256=xDO3gcmZZ0VsTF5zwqyfrkct8FWcKmyl1KUwfdA1s4k,2009
-arpakitlib/ar_retry_func_util.py,sha256=zKHBuSHxtLAQzAO40xCAzdIk7F2kTlUZgzqnwGqz1sY,2155
+arpakitlib/ar_retry_func_util.py,sha256=EQtXhn0RvMiyaes9HMDBgMh_WjMIaGwds01UrKKDaBM,2204
 arpakitlib/ar_run_cmd_util.py,sha256=D_rPavKMmWkQtwvZFz-Io5Ak8eSODHkcFeLPzNVC68g,1072
-arpakitlib/ar_schedule_uust_api_client_util.py,sha256=93d-bc3S0PddqV65lSvmApcSoDV0gqxPVgIaB7zKXfY,6899
+arpakitlib/ar_schedule_uust_api_client_util.py,sha256=wvHiipgQUQiEBzQkb75h3QkG5x-CsU-653hu9KJw-jo,6980
 arpakitlib/ar_settings_util.py,sha256=rnoTqbRuhiq7294D4crD5kbnU8-gNWJbwGU_Ls2gJoU,2199
 arpakitlib/ar_sleep_util.py,sha256=OaLtRaJQWMkGjfj_mW1RB2P4RaSWsAIH8LUoXqsH0zM,1061
 arpakitlib/ar_sqladmin_util.py,sha256=6Nv9VQssk9PB0piyuss__soYKdjVhdbIeXIv4AgUxmQ,2660
@@ -198,10 +199,10 @@ arpakitlib/ar_sqlalchemy_util.py,sha256=Hcg1THrDsSR_-8dsY1CG3NWPEv0FqCbkPXFXLtjl
 arpakitlib/ar_ssh_runner_util.py,sha256=e9deuUdBW7Eh0Exx2nTBhk57SaOZYaJaSjNk8q6dbJk,6804
 arpakitlib/ar_str_util.py,sha256=yU5gOwNXUQaH5b_tM5t6fXUn9oUcv5EQbVnq2wXXIpQ,3378
 arpakitlib/ar_type_util.py,sha256=9C3ErtUVs0tAUqtK-foFzjJOykfBOntfCz2IogDOgfA,4134
-arpakitlib/ar_yookassa_api_client_util.py,sha256=sh4fcUkAkdOetFn9JYoTvjcSXP-M1wU04KEY-ECLfLg,5137
+arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.7.229.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.7.229.dist-info/METADATA,sha256=lW9jVlLU_M_qy5hKTlohhGJNxfUaA3bRHexAMJWJpzM,3310
-arpakitlib-1.7.229.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-arpakitlib-1.7.229.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.7.229.dist-info/RECORD,,
+arpakitlib-1.7.232.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.7.232.dist-info/METADATA,sha256=u5UvnCTGX9axtIbGyffi6UtPY6gVQEpExj4iOmi5qkU,3310
+arpakitlib-1.7.232.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+arpakitlib-1.7.232.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.7.232.dist-info/RECORD,,