schoolmospy 0.2.1__py3-none-any.whl → 0.2.2__py3-none-any.whl

schoolmospy/__init__.py

@@ -1,2 +1,4 @@
-from schoolmospy.core.student_client import StudentClient
-from schoolmospy.core.basic_client import BasicClient
+from schoolmospy.core.basic_client import BasicClient as BasicClient
+from schoolmospy.core.student_client import StudentClient as StudentClient
+
+__all__ = ["BasicClient", "StudentClient"]

schoolmospy/core/basic_client.py

@@ -1,18 +1,20 @@
+from typing import Any
+
 import httpx
-from typing import Any, Optional, Type
 from pydantic import BaseModel
-from schoolmospy.utils.exceptions import APIError, AuthError, NotFoundError, ServerError, HTTPError
+
+from schoolmospy.utils.exceptions import APIError, AuthError, HTTPError, NotFoundError, ServerError
 
 
 class BasicClient:
     def __init__(
         self,
         base_url: str,
-        token: Optional[str] = None,
-        profile_id: Optional[int] = None,
+        token: str | None = None,
+        profile_id: int | None = None,
         profile_type: str = "student",
         timeout: float = 15.0,
-    ):
+    ) -> None:
         self.base_url = base_url.rstrip("/")
         self.token = token
         self.profile_id = profile_id
@@ -33,10 +35,14 @@ class BasicClient:
             headers["Profile-Id"] = str(self.profile_id)
         if self.profile_type:
             headers["Profile-Type"] = self.profile_type
-            headers["X-Mes-Role"]   = self.profile_type
+            headers["X-Mes-Role"] = self.profile_type
         return headers
 
-    async def _handle_response(self, response: httpx.Response, response_model: Optional[Type[BaseModel]] = None):
+    async def _handle_response(
+        self,
+        response: httpx.Response,
+        response_model: type[BaseModel] | None = None,
+    ) -> Any:
         if response.is_success:
             if response_model:
                 return response_model.model_validate(response.json())
@@ -47,14 +53,18 @@ class BasicClient:
 
         if status == 401:
             raise AuthError("Unauthorized or invalid token", status, text)
-        elif status == 404:
+        if status == 404:
             raise NotFoundError("Resource not found", status, text)
-        elif status >= 500:
+        if status >= 500:
             raise ServerError("Server error", status, text)
-        else:
-            raise HTTPError(f"Unexpected response ({status})", status, text)
+        raise HTTPError(f"Unexpected response ({status})", status, text)
 
-    async def get(self, endpoint: str, response_model: Optional[Type[BaseModel]] = None, **kwargs: Any):
+    async def get(
+        self,
+        endpoint: str,
+        response_model: type[BaseModel] | None = None,
+        **kwargs: Any,
+    ) -> Any:
         url = f"{self.base_url}/{endpoint.lstrip('/')}"
         async with httpx.AsyncClient(headers=self.headers, timeout=self.timeout) as client:
             try:
@@ -63,7 +73,13 @@ class BasicClient:
                 raise APIError(f"Request failed: {e}") from e
             return await self._handle_response(resp, response_model)
 
-    async def post(self, endpoint: str, data: Any = None, response_model: Optional[Type[BaseModel]] = None, **kwargs: Any):
+    async def post(
+        self,
+        endpoint: str,
+        data: Any = None,
+        response_model: type[BaseModel] | None = None,
+        **kwargs: Any,
+    ) -> Any:
         url = f"{self.base_url}/{endpoint.lstrip('/')}"
         async with httpx.AsyncClient(headers=self.headers, timeout=self.timeout) as client:
             try:

schoolmospy/core/events_client.py

@@ -1,10 +1,11 @@
 from datetime import datetime
+
 from schoolmospy.core.basic_client import BasicClient
 from schoolmospy.models.events import Events
 
 
 class EventClient:
-    def __init__(self, client: BasicClient):
+    def __init__(self, client: BasicClient) -> None:
         """
         Initialization the EventClient instance.
 
@@ -14,7 +15,7 @@ class EventClient:
         """
         self.client = client
 
-    async def get(self, from_date: datetime, to_date: datetime, contingent_guid: str = None) -> Events:
+    async def get(self, from_date: datetime, to_date: datetime, contingent_guid: str) -> Events:
         """
         Method for getting events done within a certain period of time
 
@@ -36,7 +37,7 @@ class EventClient:
             from schoolmospy.clients.student_client import StudentClient
 
             client = StudentClient(token="YOUR_TOKEN", profile_id=17234613)
-            
+
             me = await client.get_me()
 
             events = await client.events.get(
@@ -48,7 +49,6 @@ class EventClient:
             ```
         """
 
-
         return await self.client.get(
             "/api/eventcalendar/v1/api/events",
             Events,
@@ -57,6 +57,6 @@ class EventClient:
                 "to": to_date.strftime("%Y-%m-%d"),
                 "person_ids": contingent_guid,
                 "expand": "marks,homework,absence_reason_id,health_status,nonattendance_reason_id",
-                "source_types": "PLAN,AE,EC,EVENTS,AFISHA,ORGANIZER,OLYMPIAD,PROF"  
-            }
+                "source_types": "PLAN,AE,EC,EVENTS,AFISHA,ORGANIZER,OLYMPIAD,PROF",
+            },
         )

schoolmospy/core/homeworks_client.py

@@ -1,10 +1,11 @@
 from datetime import datetime
+
 from schoolmospy.core.basic_client import BasicClient
 from schoolmospy.models.homeworks import Homeworks
 
 
 class HomeworkClient:
-    def __init__(self, client: BasicClient):
+    def __init__(self, client: BasicClient) -> None:
         """
         Initialization the HomeworkClient instance.
 
@@ -43,13 +44,12 @@ class HomeworkClient:
             ```
         """
 
-
         return await self.client.get(
             "/api/family/web/v1/homeworks",
             Homeworks,
             params={
                 "from": from_date.strftime("%Y-%m-%d"),
                 "to": to_date.strftime("%Y-%m-%d"),
-                "student_id": self.client.profile_id
-            }
+                "student_id": self.client.profile_id,
+            },
         )

schoolmospy/core/marks_client.py

@@ -1,10 +1,11 @@
 from datetime import datetime
+
 from schoolmospy.core.basic_client import BasicClient
 from schoolmospy.models.marks import Marks
 
 
 class MarksClient:
-    def __init__(self, client: BasicClient):
+    def __init__(self, client: BasicClient) -> None:
         self.client = client
 
     async def get(self, from_date: datetime, to_date: datetime) -> Marks:
@@ -41,6 +42,6 @@ class MarksClient:
             params={
                 "from": from_date.strftime("%Y-%m-%d"),
                 "to": to_date.strftime("%Y-%m-%d"),
-                "student_id": self.client.profile_id
-            }
+                "student_id": self.client.profile_id,
+            },
         )

schoolmospy/core/student_client.py

@@ -1,25 +1,25 @@
-from typing import Optional
 from schoolmospy.core.basic_client import BasicClient
-from schoolmospy.models.profile import Profile
-from schoolmospy.models.userinfo import Userinfo
+from schoolmospy.core.events_client import EventClient
 from schoolmospy.core.homeworks_client import HomeworkClient
 from schoolmospy.core.marks_client import MarksClient
-from schoolmospy.core.events_client import EventClient
+from schoolmospy.models.profile import Profile
+from schoolmospy.models.userinfo import Userinfo
 
 
 class StudentClient(BasicClient):
-    def __init__(self,
-                base_url: str = "https://school.mos.ru",
-                token: Optional[str] = None,
-                profile_id: Optional[int] = None,
-                profile_type: str = "student",
-                timeout: float = 15.0):
+    def __init__(
+        self,
+        base_url: str = "https://school.mos.ru",
+        token: str | None = None,
+        profile_id: int | None = None,
+        profile_type: str = "student",
+        timeout: float = 15.0,
+    ) -> None:
         super().__init__(base_url, token, profile_id, profile_type, timeout)
         self.homeworks = HomeworkClient(self)
         self.marks = MarksClient(self)
         self.events = EventClient(self)
 
-
     async def get_me(self) -> Profile:
         """
         Get the current user's profile information.
@@ -39,7 +39,4 @@ class StudentClient(BasicClient):
         Returns:
             Userinfo: Object with basic user information
         """
-        return await self.get(
-            "/v1/oauth/userinfo",
-            Userinfo
-        )
+        return await self.get("/v1/oauth/userinfo", Userinfo)

schoolmospy/models/events.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -11,27 +11,27 @@ class EventItem(BaseModel):
     source: str
     start_at: str
     finish_at: str
-    cancelled: Optional[bool] = None
-    lesson_type: Optional[str] = None
-    course_lesson_type: Optional[Any] = None
-    lesson_form: Optional[Any] = None
-    replaced: Optional[bool] = None
-    room_name: Optional[str]
-    room_number: Optional[str]
-    subject_id: Optional[int] = None
+    cancelled: bool | None = None
+    lesson_type: str | None = None
+    course_lesson_type: Any | None = None
+    lesson_form: Any | None = None
+    replaced: bool | None = None
+    room_name: str | None
+    room_number: str | None
+    subject_id: int | None = None
     subject_name: str
-    link_to_join: Optional[Any] = None
+    link_to_join: Any | None = None
     health_status: Any
     absence_reason_id: Any
     nonattendance_reason_id: Any
-    homework: Optional[Any] = None
-    marks: Optional[Any] = None
+    homework: Any | None = None
+    marks: Any | None = None
     is_missed_lesson: bool
-    esz_field_id: Optional[int] = None
-    lesson_theme: Optional[Any] = None
+    esz_field_id: int | None = None
+    lesson_theme: Any | None = None
 
 
 class Events(BaseModel):
     total_count: int
-    response: List[EventItem]
-    errors: Any
+    response: list[EventItem]
+    errors: Any

schoolmospy/models/homeworks.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -11,12 +11,12 @@ class Url(BaseModel):
 
 
 class Material(BaseModel):
-    uuid: Optional[str]
+    uuid: str | None
     type: str
-    selected_mode: Optional[str]
+    selected_mode: str | None
     type_name: str
-    id: Optional[int]
-    urls: List[Url]
+    id: int | None
+    urls: list[Url]
     description: Any
     content_type: Any
     title: str
@@ -27,11 +27,11 @@ class Material(BaseModel):
 class HomeworkItem(BaseModel):
     type: str
     description: str
-    comments: List
-    materials: List[Material]
+    comments: list
+    materials: list[Material]
     homework: str
     homework_entry_student_id: int
-    attachments: List
+    attachments: list
     subject_id: int
     group_id: int
     date: str
@@ -49,4 +49,4 @@ class HomeworkItem(BaseModel):
 
 
 class Homeworks(BaseModel):
-    payload: List[HomeworkItem]
+    payload: list[HomeworkItem]

schoolmospy/models/marks.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -23,7 +23,7 @@ class Value(BaseModel):
 class MarkItem(BaseModel):
     id: int
     value: str
-    values: List[Value]
+    values: list[Value]
     comment: str
     weight: int
     point_date: Any
@@ -42,4 +42,4 @@ class MarkItem(BaseModel):
 
 
 class Marks(BaseModel):
-    payload: List[MarkItem]
+    payload: list[MarkItem]

schoolmospy/models/profile.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any, List, Optional
+from typing import Any
 
 from pydantic import BaseModel
 
@@ -44,7 +44,7 @@ class Representative(BaseModel):
     middle_name: str
     type_id: int
     type: str
-    email: Optional[str]
+    email: str | None
     phone: str
     snils: str
 
@@ -74,9 +74,9 @@ class Child(BaseModel):
     class_unit_id: int
     class_uid: str
     age: int
-    groups: List[Group]
-    representatives: List[Representative]
-    sections: List[Section]
+    groups: list[Group]
+    representatives: list[Representative]
+    sections: list[Section]
     sudir_account_exists: bool
     sudir_login: Any
     is_legal_representative: bool
@@ -90,5 +90,5 @@ class Child(BaseModel):
 
 class Profile(BaseModel):
     profile: _Profile
-    children: List[Child]
-    hash: str
+    children: list[Child]
+    hash: str

schoolmospy/models/userinfo.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import List
-
 from pydantic import BaseModel, Field
 
 
@@ -23,7 +21,7 @@ class Class(BaseModel):
     parallel: Parallel
     organization: Organization
     education_stage_id: int
-    staff_ids: List[int]
+    staff_ids: list[int]
 
 
 class ServiceType(BaseModel):
@@ -34,7 +32,7 @@ class ServiceType(BaseModel):
 class EducationItem(BaseModel):
     training_begin_at: str
     training_end_at: str
-    class_: Class = Field(..., alias='class')
+    class_: Class = Field(..., alias="class")
     service_type: ServiceType
 
 
@@ -48,9 +46,9 @@ class Userinfo(BaseModel):
     phone: str
     name: str
     gender: str
-    education: List[EducationItem]
-    children: List
-    agents: List[str]
+    education: list[EducationItem]
+    children: list
+    agents: list[str]
     mesh_id: str
     given_name: str
     family_name: str

schoolmospy/utils/exceptions.py

@@ -1,26 +1,28 @@
-from typing import Optional, Any
+from typing import Any
 
 
 class APIError(Exception):
-    def __init__(self, message: str, status_code: Optional[int] = None, response: Optional[Any] = None):
+    def __init__(
+        self,
+        message: str,
+        status_code: int | None = None,
+        response: Any | None = None,
+    ) -> None:
         super().__init__(message)
         self.status_code = status_code
         self.response = response
 
-    def __str__(self):
-        return f"{self.__class__.__name__}: {self.args[0]} (status={self.status_code})"
+    def __str__(self) -> str:
+        return f"{self.__class__.__name__}: {self.args[0]} ({self.status_code}) {self.response}"
 
 
-class AuthError(APIError):
-    ...
+class AuthError(APIError): ...
 
-class NotFoundError(APIError):
-    ...
 
+class NotFoundError(APIError): ...
 
-class ServerError(APIError):
-    ...
 
+class ServerError(APIError): ...
 
-class HTTPError(APIError):
-    ...
+
+class HTTPError(APIError): ...

{schoolmospy-0.2.1.dist-info → schoolmospy-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schoolmospy
-Version: 0.2.1
+Version: 0.2.2
 Summary: A lightweight async Python wrapper for school.mos.ru APIs
 License: GPL-3.0-only
 License-File: LICENSE

schoolmospy-0.2.2.dist-info/RECORD

@@ -0,0 +1,18 @@
+schoolmospy/__init__.py,sha256=veFE2dpRaFNhv2GhCGv9cwU341HKt2SoXIGEn3BWGZA,188
+schoolmospy/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+schoolmospy/core/basic_client.py,sha256=jXe94Q0ioWFHBYYeiE7T217QMYpVHzHDXW9AMpvNxsc,3103
+schoolmospy/core/events_client.py,sha256=MCtXj8aR8pEPh_kYtrzVYWZcDBPoHBUyxi2qNIVwaNk,2134
+schoolmospy/core/homeworks_client.py,sha256=ycXPs5Za1opuoz0Y2A63ZLgT2K8M0SeE_45Wdy3jm6U,1825
+schoolmospy/core/marks_client.py,sha256=ukBB-eYs9rlZb2otxNZu7ak1u8s4M16NtSeuIgAnocA,1554
+schoolmospy/core/student_client.py,sha256=MfW24G7oDzGN643GDUV-Kye_BJmHgSKLa-tRFnXix4k,1343
+schoolmospy/models/events.py,sha256=NCqfqjMIMEKZJGf0gWF1tnJfCAg3ET-SJG6wRKTJG6c,867
+schoolmospy/models/homeworks.py,sha256=oiHHe2jTifc_5oIWKopymcsL4MBZQgoPb3c9q3hPl7E,976
+schoolmospy/models/marks.py,sha256=Vd3c-7c8SNul4oPcrbK2T-4apSE4kl97GuwaHH5gNuA,754
+schoolmospy/models/profile.py,sha256=vphn7so3X0gxqkmrwDzk6i5KP1U2ejOjeqKyVPLlFJo,1630
+schoolmospy/models/userinfo.py,sha256=G7uphP0CdviQxpdjGdv1xpCA84EzkID83F6TI4W57Wo,984
+schoolmospy/utils/exceptions.py,sha256=XemBxgi_7NElaO7W-_6xLZHmAU9NIAeNH2yZqAzgHtQ,570
+schoolmospy/utils/logging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+schoolmospy-0.2.2.dist-info/METADATA,sha256=8D26pY9mAJij3SVnFA9YRMDeSj7aNzA_jENP3T0w_Kc,2953
+schoolmospy-0.2.2.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+schoolmospy-0.2.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+schoolmospy-0.2.2.dist-info/RECORD,,

schoolmospy-0.2.1.dist-info/RECORD

@@ -1,18 +0,0 @@
-schoolmospy/__init__.py,sha256=TC7F5zn-EtDtAv0xJpNlIuAEcqT94ih269zYKnE3dS8,111
-schoolmospy/__main__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-schoolmospy/core/basic_client.py,sha256=_ikd_44Hlq8fm7tiYwrq917zyVl5TgrKnpwFZSZ3wbE,3010
-schoolmospy/core/events_client.py,sha256=NZeq43nEl_Yspa5NJ8CGTyOi10GMToS6o2M7cnlzoVI,2145
-schoolmospy/core/homeworks_client.py,sha256=Y_qdQBQmwkub0O6KzLeYlhuFdMEJutUx9BmrdHafpwQ,1815
-schoolmospy/core/marks_client.py,sha256=RxERCe-DJcMNTBogpd7NFeX8Nu2DB5p9nHDS5p6Baw0,1543
-schoolmospy/core/student_client.py,sha256=XxoHc2mMeg-hmdjmgdTH722m5_XUo3H1z78qO8bVX0c,1428
-schoolmospy/models/events.py,sha256=USmokcw5LwvXfbU28u9BJ3mzkNXkuijTSEEfw_g8nnE,921
-schoolmospy/models/homeworks.py,sha256=IBlNAUDmdFfbJFhEqutPVf1JHkXljTEhZ3EiaA8ddRU,1000
-schoolmospy/models/marks.py,sha256=ibxR8wKgfb2LQxLdH1BQJJqv-4AO0uTGH698l3dQxi8,759
-schoolmospy/models/profile.py,sha256=UivTgSNFFr_Eic9Dethq-ROBLLUgCFhQcrnnhKaz8tc,1648
-schoolmospy/models/userinfo.py,sha256=_-hY0ZOBU15w12B3FpiilTJxkD8rYNxi1UNCt5D0pY0,1009
-schoolmospy/utils/exceptions.py,sha256=AvfHEB2gYbJCbg4w_WTPx_2yhf8sRbyXYy1jMe_XM1U,538
-schoolmospy/utils/logging.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-schoolmospy-0.2.1.dist-info/METADATA,sha256=PURB334-0yDJY4JJ7727Lx9nztKjsq6zv7txS2xygU0,2953
-schoolmospy-0.2.1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-schoolmospy-0.2.1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-schoolmospy-0.2.1.dist-info/RECORD,,