arpakitlib 1.7.215__tar.gz → 1.7.216__tar.gz

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

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

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

@@ -68,8 +68,10 @@ class CurrentWeekAPIModel(BaseAPIModel):
 
 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,7 +217,7 @@ class ARPAKITScheduleUUSTAPIClient:
         if self.ttl_cache is not None:
             self.ttl_cache.clear()
 
-    async def _async_make_request(
+    async def _async_make_http_request(
             self,
             *,
             method: str = "GET",
@@ -228,41 +236,44 @@ class ARPAKITScheduleUUSTAPIClient:
         return response
 
     async def check_auth(self) -> dict[str, Any]:
-        response = await self._async_make_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
 
     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 = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_current_week")
+        )
         json_data = await response.json()
         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
         return CurrentSemesterAPIModel.model_validate(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 = await self._async_make_http_request(
+            method="GET", url=urljoin(self.base_url, "get_weather_in_ufa")
+        )
         json_data = await response.json()
         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
@@ -272,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
@@ -309,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.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()
-        return [TeacherAPIModel.from_arpakit_uust_api_data(arpakit_uust_api_data=d) for d in json_data]
+
+        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,
@@ -343,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,
@@ -363,14 +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]
+        return [TeacherLessonAPIModel.model_validate(d) for d in json_data]
 
 
 def __example():
@@ -382,7 +387,6 @@ async def __async_example():
 
     print(f"check_auth")
     print(safely_transfer_obj_to_json_str(await client.check_auth()))
-    print()
 
     print(f"get_weather_in_ufa")
     print(safely_transfer_obj_to_json_str((await client.get_weather_in_ufa()).model_dump()))
@@ -393,6 +397,54 @@ async def __async_example():
     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__':
     __example()

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

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