schoolmospy 0.2.2__tar.gz → 0.2.3__tar.gz

{schoolmospy-0.2.2 → schoolmospy-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: schoolmospy
-Version: 0.2.2
+Version: 0.2.3
 Summary: A lightweight async Python wrapper for school.mos.ru APIs
 License: GPL-3.0-only
 License-File: LICENSE
@@ -67,19 +67,19 @@ async def main():
     print(f"Name: {profile.name}")
 
     # Get marks
-    marks = await client.marks.get_marks(
+    marks = await client.marks.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
 
     # Get homeworks
-    homeworks = await client.homeworks.get_homeworks(
+    homeworks = await client.homeworks.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
 
     # Get events/schedule
-    events = await client.events.get_events(
+    events = await client.events.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
@@ -103,6 +103,3 @@ This project is licensed under the GPL-3.0 License. See the [LICENSE](LICENSE) f
 Ivan Kriventsev - [xd2dd@icloud.com](mailto:xd2dd@icloud.com)
 
 ---
-
-⭐ If you like this project, please give it a star on GitHub!
-

{schoolmospy-0.2.2 → schoolmospy-0.2.3}/README.md

@@ -44,19 +44,19 @@ async def main():
     print(f"Name: {profile.name}")
 
     # Get marks
-    marks = await client.marks.get_marks(
+    marks = await client.marks.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
 
     # Get homeworks
-    homeworks = await client.homeworks.get_homeworks(
+    homeworks = await client.homeworks.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
 
     # Get events/schedule
-    events = await client.events.get_events(
+    events = await client.events.get(
         from_date="2024-01-01",
         to_date="2024-12-31"
     )
@@ -79,6 +79,4 @@ This project is licensed under the GPL-3.0 License. See the [LICENSE](LICENSE) f
 
 Ivan Kriventsev - [xd2dd@icloud.com](mailto:xd2dd@icloud.com)
 
----
-
-⭐ If you like this project, please give it a star on GitHub!
+---

{schoolmospy-0.2.2 → schoolmospy-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "schoolmospy"
-version = "0.2.2"
+version = "0.2.3"
 description = "A lightweight async Python wrapper for school.mos.ru APIs"
 authors = [{ name = "Ivan Kriventsev", email = "xd2dd@icloud.com" }]
 readme = "README.md"

{schoolmospy-0.2.2 → schoolmospy-0.2.3}/schoolmospy/core/basic_client.py

@@ -20,6 +20,7 @@ class BasicClient:
         self.profile_id = profile_id
         self.profile_type = profile_type
         self.timeout = timeout
+        self.extra_headers: dict[str, str] = {}
 
     @property
     def headers(self) -> dict[str, str]:
@@ -35,7 +36,8 @@ 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
+        if self.extra_headers:
+            headers.update(self.extra_headers)
         return headers
 
     async def _handle_response(
@@ -66,7 +68,10 @@ class BasicClient:
         **kwargs: Any,
     ) -> Any:
         url = f"{self.base_url}/{endpoint.lstrip('/')}"
-        async with httpx.AsyncClient(headers=self.headers, timeout=self.timeout) as client:
+        headers = self.headers
+        if "headers" in kwargs:
+            headers = {**headers, **kwargs.pop("headers")}
+        async with httpx.AsyncClient(headers=headers, timeout=self.timeout) as client:
             try:
                 resp = await client.get(url, **kwargs)
             except httpx.RequestError as e:
@@ -81,7 +86,10 @@ class BasicClient:
         **kwargs: Any,
     ) -> Any:
         url = f"{self.base_url}/{endpoint.lstrip('/')}"
-        async with httpx.AsyncClient(headers=self.headers, timeout=self.timeout) as client:
+        headers = self.headers
+        if "headers" in kwargs:
+            headers = {**headers, **kwargs.pop("headers")}
+        async with httpx.AsyncClient(headers=headers, timeout=self.timeout) as client:
             try:
                 resp = await client.post(url, json=data, **kwargs)
             except httpx.RequestError as e:

{schoolmospy-0.2.2 → schoolmospy-0.2.3}/schoolmospy/core/events_client.py

@@ -53,10 +53,11 @@ class EventClient:
             "/api/eventcalendar/v1/api/events",
             Events,
             params={
-                "from": from_date.strftime("%Y-%m-%d"),
-                "to": to_date.strftime("%Y-%m-%d"),
+                "begin_date": from_date.strftime("%Y-%m-%d"),
+                "end_date": 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",
             },
+            headers={"X-Mes-Role": "student"},
         )