arpakitlib 1.7.212__tar.gz → 1.7.214__tar.gz

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

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

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

@@ -15,9 +15,7 @@ import cachetools
 from aiohttp import ClientResponse, ClientTimeout, ClientResponseError
 from pydantic import ConfigDict, BaseModel
 
-from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_enumeration_util import Enumeration
-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
 
@@ -52,8 +50,20 @@ 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
+    creation_dt: datetime
+    sync_from_uust_api_dt: datetime
+    value: str
+    raw_value: str
+
+
+class CurrentWeekAPIModel(BaseAPIModel):
+    id: int
+    creation_dt: datetime
+    sync_from_uust_api_dt: datetime
+    value: str
 
 
 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,15 +197,15 @@ 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()
 
@@ -350,7 +257,7 @@ class ARPAKITScheduleUUSTAPIClient:
             return False
 
     async def auth_healthcheck(self) -> bool:
-        response = await self._async_make_request(method="GET", url=urljoin(self.base_url, "auth_healthcheck"))
+        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"]

{arpakitlib-1.7.212 → arpakitlib-1.7.214}/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.212 → arpakitlib-1.7.214}/arpakitlib/ar_sqlalchemy_model_util.py

@@ -4,8 +4,7 @@ from datetime import datetime, timedelta
 from typing import Any
 from uuid import uuid4
 
-from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func
-from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy import inspect, INTEGER, TEXT, TIMESTAMP, func, JSON
 from sqlalchemy.orm import DeclarativeBase, Mapped, mapped_column
 
 from arpakitlib.ar_datetime_util import now_utc_dt
@@ -103,7 +102,7 @@ class StoryLogDBM(SimpleDBM):
     )
     title: Mapped[str | None] = mapped_column(TEXT, index=True, default=None, nullable=True)
     data: Mapped[dict[str, Any]] = mapped_column(
-        JSONB, insert_default={}, server_default="{}", index=True, nullable=False
+        JSON, insert_default={}, server_default="{}", index=True, nullable=False
     )
 
 
@@ -131,13 +130,13 @@ class OperationDBM(SimpleDBM):
     execution_start_dt: Mapped[datetime | None] = mapped_column(TIMESTAMP(timezone=True), nullable=True)
     execution_finish_dt: Mapped[datetime | None] = mapped_column(TIMESTAMP(timezone=True), nullable=True)
     input_data: Mapped[dict[str, Any]] = mapped_column(
-        JSONB,
+        JSON,
         insert_default={},
         server_default="{}",
         nullable=False
     )
-    output_data: Mapped[dict[str, Any]] = mapped_column(JSONB, insert_default={}, server_default="{}", nullable=False)
-    error_data: Mapped[dict[str, Any]] = mapped_column(JSONB, insert_default={}, server_default="{}", nullable=False)
+    output_data: Mapped[dict[str, Any]] = mapped_column(JSON, insert_default={}, server_default="{}", nullable=False)
+    error_data: Mapped[dict[str, Any]] = mapped_column(JSON, insert_default={}, server_default="{}", nullable=False)
 
     def raise_if_executed_with_error(self):
         if self.status == self.Statuses.executed_with_error:

{arpakitlib-1.7.212 → arpakitlib-1.7.214}/pyproject.toml

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