arpakitlib 1.7.214__tar.gz → 1.7.216__tar.gz

{arpakitlib-1.7.214 → arpakitlib-1.7.216}/PKG-INFO

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

{arpakitlib-1.7.214 → arpakitlib-1.7.216}/arpakitlib/ar_arpakit_schedule_uust_api_client_util.py

@@ -3,21 +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_enumeration_util import Enumeration
-from arpakitlib.ar_sleep_util import async_safe_sleep
-from arpakitlib.ar_type_util import raise_for_type
+from arpakitlib.ar_http_request_util import async_make_http_request
+from arpakitlib.ar_json_util import safely_transfer_obj_to_json_str
 
 _ARPAKIT_LIB_MODULE_VERSION = "3.0"
 
@@ -53,23 +50,28 @@ class BaseAPIModel(BaseModel):
 
 class CurrentSemesterAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
     value: str
-    raw_value: str
 
 
 class CurrentWeekAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
-    value: str
+    entity_type: str
+    actualization_dt: datetime
+    value: int
 
 
 class GroupAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
     uust_api_id: int
     title: str
     faculty: str | None
@@ -80,8 +82,10 @@ class GroupAPIModel(BaseAPIModel):
 
 class TeacherAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
     uust_api_id: int
     name: str | None
     surname: str | None
@@ -98,8 +102,10 @@ class TeacherAPIModel(BaseAPIModel):
 
 class GroupLessonAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
     uust_api_id: int
     type: str
     title: str
@@ -134,8 +140,10 @@ class GroupLessonAPIModel(BaseAPIModel):
 
 class TeacherLessonAPIModel(BaseAPIModel):
     id: int
+    long_id: str
     creation_dt: datetime
-    sync_from_uust_api_dt: datetime
+    entity_type: str
+    actualization_dt: datetime
     uust_api_id: int
     type: str
     title: str
@@ -209,104 +217,63 @@ class ARPAKITScheduleUUSTAPIClient:
         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_http_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_http_request(method="GET", url=urljoin(self.base_url, "check_auth"))
         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
+        return json_data
 
-    async def auth_healthcheck(self) -> bool:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "check_auth"))
-        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:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "get_current_week"))
-        response.raise_for_status()
+    async def get_current_week(self) -> CurrentWeekAPIModel | None:
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_current_week")
+        )
         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"))
+        response = await self._async_make_http_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_http_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:
-
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "extra/get_log_file"))
-        response.raise_for_status()
+        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_request(method="GET", url=urljoin(self.base_url, "group/get_groups"))
-        response.raise_for_status()
+        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_groups"))
         json_data = await response.json()
-        return [GroupAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+        return [GroupAPIModel.model_validate(d) for d in json_data]
 
     async def get_group(
             self, *, filter_id: int | None = None, filter_uust_api_id: int | None = None
@@ -316,34 +283,25 @@ 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_request(
-            method="GET",
-            url=urljoin(self.base_url, "group/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 "error_code" in json_data and json_data["error_code"] == "GROUP_NOT_FOUND":
+        if json_data is None:
             return None
-        response.raise_for_status()
-        return GroupAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=json_data)
+        return GroupAPIModel.model_validate(json_data)
 
     async def find_groups(
             self, *, q: str
     ) -> list[GroupAPIModel]:
-        response = await self._async_make_request(
-            method="GET",
-            url=urljoin(self.base_url, "group/find_groups"),
-            params={"q": q.strip()}
-        )
-        response.raise_for_status()
+        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.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+        return [GroupAPIModel.model_validate(d) for d in json_data]
 
     async def get_teachers(self) -> list[TeacherAPIModel]:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "teacher/get_teachers"))
-        response.raise_for_status()
+        response = await self._async_make_http_request(method="GET", url=urljoin(self.base_url, "get_teachers"))
         json_data = await response.json()
-        return [TeacherAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+        return [TeacherAPIModel.model_validate(d) for d in json_data]
 
     async def get_teacher(
             self, *, filter_id: int | None = None, filter_uust_api_id: int | None = None
@@ -353,28 +311,37 @@ 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_request(
-            method="GET",
-            url=urljoin(self.base_url, "teacher/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 "error_code" in json_data and json_data["error_code"] == "TEACHER_NOT_FOUND":
+        if json_data is None:
             return None
-        response.raise_for_status()
-        return TeacherAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=json_data)
+        return TeacherAPIModel.model_validate(json_data)
 
     async def find_teachers(
             self, *, q: str
     ) -> list[TeacherAPIModel]:
-        response = await self._async_make_request(
-            method="GET",
-            url=urljoin(self.base_url, "teacher/find_teachers"),
-            params={"q": q.strip()}
-        )
-        response.raise_for_status()
+        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.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+        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()})
+        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))
+            else:
+                pass
+        return results
 
     async def get_group_lessons(
             self,
@@ -387,14 +354,11 @@ class ARPAKITScheduleUUSTAPIClient:
             params["filter_group_id"] = filter_group_id
         if filter_group_uust_api_id is not None:
             params["filter_group_uust_api_id"] = filter_group_uust_api_id
-        response = await self._async_make_request(
-            method="GET",
-            url=urljoin(self.base_url, "group_lesson/get_group_lessons"),
-            params=params
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_group_lessons"), params=params
         )
-        response.raise_for_status()
         json_data = await response.json()
-        return [GroupLessonAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+        return [GroupLessonAPIModel.model_validate(d) for d in json_data]
 
     async def get_teacher_lessons(
             self,
@@ -407,20 +371,11 @@ class ARPAKITScheduleUUSTAPIClient:
             params["filter_teacher_id"] = filter_teacher_id
         if filter_teacher_uust_api_id is not None:
             params["filter_teacher_uust_api_id"] = filter_teacher_uust_api_id
-        response = await self._async_make_request(
-            method="GET",
-            url=urljoin(self.base_url, "teacher_lesson/get_teacher_lessons"),
-            params=params
+        response = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_teacher_lessons"), params=params
         )
-        response.raise_for_status()
         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)
+        return [TeacherLessonAPIModel.model_validate(d) for d in json_data]
 
 
 def __example():
@@ -428,28 +383,67 @@ def __example():
 
 
 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 'Не найдено'}")
-
-    current_semester = await client.get_current_semester()
-    print(f"Текущий семестр: {current_semester.simple_json() if current_semester else 'Не найдено'}")
-
-    groups = await client.get_groups()
-    print(f"Группы: {[group.simple_json() for group in groups]}")
-
-    teachers = await client.get_teachers()
-    print(f"Преподаватели: {[teacher.simple_json() for teacher in teachers]}")
-
-    weather = await client.get_weather_in_ufa()
-    print(f"Погода в Уфе: {weather.simple_json()}")
+    client = ARPAKITScheduleUUSTAPIClient(api_key="viewer", use_cache=True)
+
+    print(f"check_auth")
+    print(safely_transfer_obj_to_json_str(await client.check_auth()))
+
+    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="ПИ"))))
 
 
 if __name__ == '__main__':

{arpakitlib-1.7.214 → arpakitlib-1.7.216}/arpakitlib/ar_fastapi_util.py

@@ -282,7 +282,8 @@ def create_handle_exception(
 def create_story_log_before_response_in_handle_exception(
         *,
         sqlalchemy_db: SQLAlchemyDB,
-        ignore_api_error_code_not_found: bool = True
+        ignore_api_error_codes: list[str] | None = None,
+        ignore_status_codes: list[int] | None = None
 ) -> Callable:
     def func(
             *,
@@ -292,8 +293,12 @@ def create_story_log_before_response_in_handle_exception(
             exception: Exception,
             **kwargs
     ) -> (int, ErrorSO, dict[str, Any]):
-        if ignore_api_error_code_not_found and error_so.error_code == BaseAPIErrorCodes.not_found:
+        if ignore_api_error_codes and error_so.error_code in ignore_api_error_codes:
             return status_code, error_so, kwargs
+
+        if ignore_status_codes and status_code in ignore_status_codes:
+            return status_code, error_so, kwargs
+
         sqlalchemy_db.init()
         traceback_str = "".join(traceback.format_exception(type(exception), exception, exception.__traceback__))
         with sqlalchemy_db.new_session() as session:

{arpakitlib-1.7.214 → arpakitlib-1.7.216}/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.214 → arpakitlib-1.7.216}/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.214 → arpakitlib-1.7.216}/pyproject.toml

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