arpakitlib 1.7.213__tar.gz → 1.7.215__tar.gz

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/PKG-INFO

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

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/arpakitlib/ar_arpakit_schedule_uust_api_client_util.py

@@ -3,23 +3,18 @@
 from __future__ import annotations
 
 import asyncio
-import hashlib
-import json
 import logging
 from datetime import timedelta, datetime, time
 from typing import Any
 from urllib.parse import urljoin
 
-import aiohttp
 import cachetools
-from aiohttp import ClientResponse, ClientTimeout, ClientResponseError
+from aiohttp import ClientResponse
 from pydantic import ConfigDict, BaseModel
 
-from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
+from arpakitlib.ar_http_request_util import async_make_http_request
 from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
-from arpakitlib.ar_sleep_util import async_safe_sleep
-from arpakitlib.ar_type_util import raise_for_type
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -52,8 +47,23 @@ class Months(Enumeration):
 class BaseAPIModel(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
 
-    def simple_json(self) -> str:
-        return safely_transfer_obj_to_json_str(self.model_dump(mode="json"))
+
+class CurrentSemesterAPIModel(BaseAPIModel):
+    id: int
+    long_id: str
+    creation_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
+    value: str
+
+
+class CurrentWeekAPIModel(BaseAPIModel):
+    id: int
+    long_id: str
+    creation_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
+    value: int
 
 
 class GroupAPIModel(BaseAPIModel):
@@ -67,15 +77,6 @@ class GroupAPIModel(BaseAPIModel):
     difference_level: int | None = None
     uust_api_data: dict[str, Any]
 
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, arpakit_uust_api_data: dict[str, Any]) -> GroupAPIModel:
-        return GroupAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data}
-        ))
-
 
 class TeacherAPIModel(BaseAPIModel):
     id: int
@@ -94,15 +95,6 @@ class TeacherAPIModel(BaseAPIModel):
     difference_level: int | None
     uust_api_data: dict[str, Any]
 
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, arpakit_uust_api_data: dict[str, Any]) -> TeacherAPIModel:
-        return TeacherAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data}
-        ))
-
 
 class GroupLessonAPIModel(BaseAPIModel):
     id: int
@@ -125,29 +117,6 @@ class GroupLessonAPIModel(BaseAPIModel):
     teacher: TeacherAPIModel | None
     uust_api_data: dict[str, Any]
 
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, arpakit_uust_api_data: dict[str, Any]) -> GroupLessonAPIModel:
-        return GroupLessonAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data},
-            {
-                "group": GroupAPIModel.from_arpakit_uust_api_data(
-                    arpakit_uust_api_data=arpakit_uust_api_data["group"]
-                )
-            },
-            {
-                "teacher": (
-                    TeacherAPIModel.from_arpakit_uust_api_data(
-                        arpakit_uust_api_data=arpakit_uust_api_data["teacher"]
-                    )
-                    if arpakit_uust_api_data["teacher"] is not None
-                    else None
-                )
-            },
-        ))
-
     def compare_type(self, *types: str | list[str]) -> bool:
         type_ = self.type.strip().lower()
         for type__ in types:
@@ -184,26 +153,6 @@ class TeacherLessonAPIModel(BaseAPIModel):
     groups: list[GroupAPIModel]
     uust_api_data: dict[str, Any]
 
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, arpakit_uust_api_data: dict[str, Any]) -> TeacherLessonAPIModel:
-        return TeacherLessonAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data},
-            {
-                "teacher": TeacherAPIModel.from_arpakit_uust_api_data(
-                    arpakit_uust_api_data=arpakit_uust_api_data["teacher"]
-                )
-            },
-            {
-                "groups": [
-                    GroupAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d)
-                    for d in arpakit_uust_api_data["groups"]
-                ]
-            },
-        ))
-
     def compare_type(self, *types: str | list[str]) -> bool:
         type_ = self.type.strip().lower()
         for type__ in types:
@@ -219,39 +168,6 @@ class TeacherLessonAPIModel(BaseAPIModel):
         return False
 
 
-class CurrentSemesterAPIModel(BaseAPIModel):
-    id: int
-    creation_dt: datetime
-    sync_from_uust_api_dt: datetime
-    value: str
-    raw_value: str
-
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, *, arpakit_uust_api_data: dict[str, Any]) -> CurrentSemesterAPIModel:
-        return CurrentSemesterAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data}
-        ))
-
-
-class CurrentWeekAPIModel(BaseAPIModel):
-    id: int
-    creation_dt: datetime
-    sync_from_uust_api_dt: datetime
-    value: str
-
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, *, arpakit_uust_api_data: dict[str, Any]) -> CurrentWeekAPIModel:
-        return CurrentWeekAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data}
-        ))
-
-
 class WeatherInUfaAPIModel(BaseAPIModel):
     temperature: float
     temperature_feels_like: float
@@ -263,15 +179,6 @@ class WeatherInUfaAPIModel(BaseAPIModel):
     has_snow: bool
     data: dict
 
-    arpakit_uust_api_data: dict[str, Any]
-
-    @classmethod
-    def from_arpakit_uust_api_data(cls, arpakit_uust_api_data: dict[float, Any]) -> WeatherInUfaAPIModel:
-        return WeatherInUfaAPIModel.model_validate(combine_dicts(
-            arpakit_uust_api_data,
-            {"arpakit_uust_api_data": arpakit_uust_api_data}
-        ))
-
 
 class ARPAKITScheduleUUSTAPIClient:
     def __init__(
@@ -280,7 +187,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: int | float | None = timedelta(minutes=10).total_seconds()
+            cache_ttl: timedelta | None = timedelta(minutes=10)
     ):
         self._logger = logging.getLogger(__name__)
         self.api_key = api_key
@@ -290,103 +197,59 @@ class ARPAKITScheduleUUSTAPIClient:
         self.base_url = base_url
         self.headers = {"Content-Type": "application/json"}
         if api_key is not None:
-            self.headers.update({"apikey": api_key})
+            self.headers.update({"apikey": self.api_key})
         self.use_cache = use_cache
         self.cache_ttl = cache_ttl
         if cache_ttl is not None:
-            self.ttl_cache = cachetools.TTLCache(maxsize=100, ttl=cache_ttl)
+            self.ttl_cache = cachetools.TTLCache(maxsize=100, ttl=cache_ttl.total_seconds())
         else:
             self.ttl_cache = None
 
-    def clear_a_s_u_api_client(self):
+    def clear_cache(self):
         if self.ttl_cache is not None:
             self.ttl_cache.clear()
 
-    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
-
-        cache_key = (
-            "_async_make_request",
-            hashlib.sha256(json.dumps(kwargs, ensure_ascii=False, default=str).encode()).hexdigest()
+    async def _async_make_request(
+            self,
+            *,
+            method: str = "GET",
+            url: str,
+            params: dict[str, Any] | None = None,
+            **kwargs
+    ) -> ClientResponse:
+        response = await async_make_http_request(
+            method=method,
+            url=url,
+            headers=self.headers,
+            params=params,
+            raise_for_status_=True,
+            **kwargs
         )
+        return response
 
-        if self.use_cache and self.ttl_cache is not None:
-            if cache_key in self.ttl_cache:
-                return self.ttl_cache[cache_key]
-
-        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()
-                        if self.use_cache and self.ttl_cache is not None:
-                            self.ttl_cache[cache_key] = response
-                        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()
+    async def check_auth(self) -> dict[str, Any]:
+        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "check_auth"))
         json_data = await response.json()
-        return json_data["data"]["healthcheck"]
+        return json_data
 
-    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 get_required_current_week_value(self) -> int:
+    async def get_current_week(self) -> CurrentWeekAPIModel | None:
         response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_current_week"))
-        response.raise_for_status()
         json_data = await response.json()
-        raise_for_type(json_data["value"], int)
-        return json_data["value"]
+        if json_data is None:
+            return None
+        return CurrentWeekAPIModel.model_validate(json_data)
 
     async def get_current_semester(self) -> CurrentSemesterAPIModel | None:
         response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_current_semester"))
         json_data = await response.json()
         if json_data is None:
             return None
-        if "error_code" in json_data and json_data["error_code"] == "CURRENT_SEMESTER_NOT_FOUND":
-            return None
-        response.raise_for_status()
-        return CurrentSemesterAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=json_data)
+        return CurrentSemesterAPIModel.model_validate(json_data)
 
-    async def get_current_week(self) -> CurrentWeekAPIModel | None:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_current_week"))
+    async def get_weather_in_ufa(self) -> WeatherInUfaAPIModel:
+        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_weather_in_ufa"))
         json_data = await response.json()
-        if json_data is None:
-            return None
-        if "error_code" in json_data and json_data["error_code"] == "CURRENT_WEEK_NOT_FOUND":
-            return None
-        response.raise_for_status()
-        return CurrentWeekAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=json_data)
+        return WeatherInUfaAPIModel.model_validate(json_data)
 
     async def get_log_file_content(self) -> str | None:
 
@@ -509,40 +372,26 @@ class ARPAKITScheduleUUSTAPIClient:
         json_data = await response.json()
         return [TeacherLessonAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
 
-    async def get_weather_in_ufa(self) -> WeatherInUfaAPIModel:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_weather_in_ufa"))
-        response.raise_for_status()
-        json_data = await response.json()
-        return WeatherInUfaAPIModel.from_arpakit_uust_api_data(json_data)
-
 
 def __example():
     pass
 
 
 async def __async_example():
-    client = ARPAKITScheduleUUSTAPIClient(api_key="TEST_API_KEY", use_cache=True)
-
-    healthcheck = await client.healthcheck()
-    print(f"Healthcheck: {healthcheck}")
-
-    auth_healthcheck = await client.auth_healthcheck()
-    print(f"Auth Healthcheck: {auth_healthcheck}")
-
-    current_week = await client.get_current_week()
-    print(f"Текущая неделя: {current_week.simple_json() if current_week else 'Не найдено'}")
+    client = ARPAKITScheduleUUSTAPIClient(api_key="viewer", use_cache=True)
 
-    current_semester = await client.get_current_semester()
-    print(f"Текущий семестр: {current_semester.simple_json() if current_semester else 'Не найдено'}")
+    print(f"check_auth")
+    print(safely_transfer_obj_to_json_str(await client.check_auth()))
+    print()
 
-    groups = await client.get_groups()
-    print(f"Группы: {[group.simple_json() for group in groups]}")
+    print(f"get_weather_in_ufa")
+    print(safely_transfer_obj_to_json_str((await client.get_weather_in_ufa()).model_dump()))
 
-    teachers = await client.get_teachers()
-    print(f"Преподаватели: {[teacher.simple_json() for teacher in teachers]}")
+    print(f"get_current_week")
+    print(safely_transfer_obj_to_json_str((await client.get_current_week()).model_dump()))
 
-    weather = await client.get_weather_in_ufa()
-    print(f"Погода в Уфе: {weather.simple_json()}")
+    print(f"get_current_semester")
+    print(safely_transfer_obj_to_json_str((await client.get_current_semester()).model_dump()))
 
 
 if __name__ == '__main__':

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/arpakitlib/ar_fastapi_util.py

@@ -391,7 +391,10 @@ def add_needed_api_router_to_app(*, app: FastAPI):
     async def _():
         return APIJSONResponse(
             status_code=starlette.status.HTTP_200_OK,
-            content=RawDataSO(data={"healthcheck": "healthcheck"})
+            content=RawDataSO(data={
+                "healthcheck": "healthcheck",
+                "is_ok": True
+            })
         )
 
     @api_router.get(
@@ -449,8 +452,8 @@ class BaseAPIAuthData(BaseModel):
     token_string: str | None = None
     api_key_string: str | None = None
 
-    is_token_string_correct: bool | None = None
-    is_api_key_string_correct: bool | None = None
+    is_token_correct: bool | None = None
+    is_api_key_correct: bool | None = None
 
 
 def base_api_auth(
@@ -580,7 +583,7 @@ def base_api_auth(
             )
             if is_async_object(validate_api_key_func_data):
                 validate_api_key_func_data = await validate_api_key_func_data
-            api_auth_data.is_api_key_string_correct = validate_api_key_func_data
+            api_auth_data.is_api_key_correct = validate_api_key_func_data
 
         # token
 
@@ -595,25 +598,27 @@ def base_api_auth(
             )
             if is_async_object(validate_token_func_data):
                 validate_token_func_data_data = await validate_token_func_data
-            api_auth_data.is_token_string_correct = validate_token_func_data_data
+            api_auth_data.is_token_correct = validate_token_func_data_data
 
         # api_key
 
         if require_correct_api_key:
-            if not api_auth_data.is_api_key_string_correct:
+            if not api_auth_data.is_api_key_correct:
                 raise APIException(
                     status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                     error_code=BaseAPIErrorCodes.cannot_authorize,
-                    error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
+                    error_description="not api_auth_data.is_api_key_correct",
+                    error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump()),
                 )
 
         # token
 
         if require_correct_token:
-            if not api_auth_data.is_token_string_correct:
+            if not api_auth_data.is_token_correct:
                 raise APIException(
                     status_code=starlette.status.HTTP_401_UNAUTHORIZED,
                     error_code=BaseAPIErrorCodes.cannot_authorize,
+                    error_description="not api_auth_data.is_token_correct",
                     error_data=safely_transfer_obj_to_json_str_to_json_obj(api_auth_data.model_dump())
                 )
 

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/arpakitlib/ar_http_request_util.py

@@ -26,6 +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,
         timeout_: timedelta | float = timedelta(seconds=15).total_seconds(),
         enable_logging_: bool = False,
         **kwargs
@@ -53,21 +54,25 @@ def sync_make_http_request(
         kwargs["allow_redirects"] = True
 
     if enable_logging_:
-        _logger.info(f"TRY HTTP {method} {url} {params}")
+        _logger.info(f"try http {method} {url} {params}")
 
     while True:
         tries_counter += 1
         try:
             response = requests.request(**kwargs)
             if raise_for_status_:
-                response.raise_for_status()
+                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}")
+                else:
+                    response.raise_for_status()
             if enable_logging_:
-                _logger.info(f"GOOD TRY HTTP {method} {url} {params}")
+                _logger.info(f"good try http {method} {url} {params}")
             return response
         except BaseException as exception:
             if enable_logging_:
                 _logger.warning(
-                    f"{tries_counter}/{max_tries_}. RETRY {method} {url} {params}, exception={exception}"
+                    f"{tries_counter}/{max_tries_}. retry {method} {url} {params}, exception={exception}"
                 )
             if tries_counter >= max_tries_:
                 raise exception
@@ -84,6 +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,
         timeout_: timedelta | None = timedelta(seconds=15),
         enable_logging_: bool = False,
         **kwargs
@@ -106,7 +112,7 @@ async def async_make_http_request(
         proxy_connector = ProxyConnector.from_url(proxy_url_)
 
     if enable_logging_:
-        _logger.info(f"TRY HTTP {method} {url} {params}")
+        _logger.info(f"try http {method} {url} {params}")
 
     while True:
         tries_counter += 1
@@ -114,15 +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_:
-                        response.raise_for_status()
+                        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}"
+                                )
+                        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 http {method} {url} {params}")
                     return response
         except BaseException as exception:
             if enable_logging_:
                 _logger.warning(
-                    f"{tries_counter}/{max_tries_}. RETRY HTTP {method} {url} {params}, exception={exception}"
+                    f"{tries_counter}/{max_tries_}. retry http {method} {url} {params}, exception={exception}"
                 )
             if tries_counter >= max_tries_:
                 raise exception

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/arpakitlib/ar_schedule_uust_api_client_util.py

@@ -77,7 +77,8 @@ class ScheduleUUSTAPIClient:
             *,
             method: str = "GET",
             url: str,
-            params: dict[str, Any] | None = None
+            params: dict[str, Any] | None = None,
+            **kwargs
     ) -> ClientResponse:
         response = await async_make_http_request(
             method=method,
@@ -85,7 +86,8 @@ class ScheduleUUSTAPIClient:
             headers=self.headers,
             params=combine_dicts(params, self.auth_params()),
             proxy_url_=self.api_proxy_url,
-            raise_for_status_=True
+            raise_for_status_=True,
+            **kwargs
         )
         json_data = await response.json()
         if "error" in json_data.keys():

{arpakitlib-1.7.213 → arpakitlib-1.7.215}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.7.213"
+version = "1.7.215"
 description = "arpakitlib"
 authors = [
     { name = "arpakit", email = "arpakit@gmail.com" },