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

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/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"},
         )

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

@@ -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.dist-info → schoolmospy-0.2.3.dist-info}/RECORD

@@ -1,10 +1,11 @@
 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/basic_client.py,sha256=WeRiIqHzQf4RjJRf9Wa_SvApoNQ7MxxtyQ1jYSYkRCo,3409
+schoolmospy/core/events_client.py,sha256=mZwC5yhf9On4Lc4aDiVezD0ppg6RbtGO6OmOIH1Srec,2193
 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/enums/usertype.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
@@ -12,7 +13,7 @@ schoolmospy/models/profile.py,sha256=vphn7so3X0gxqkmrwDzk6i5KP1U2ejOjeqKyVPLlFJo
 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.3.dist-info/METADATA,sha256=2iyF05f_TF2wpYK7Qax3-Z8FnU-SQYXO06KXPpjdaf8,2865
+schoolmospy-0.2.3.dist-info/WHEEL,sha256=kJCRJT_g0adfAJzTx2GUMmS80rTJIVHRCfG0DQgLq3o,88
+schoolmospy-0.2.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+schoolmospy-0.2.3.dist-info/RECORD,,

{schoolmospy-0.2.2.dist-info → schoolmospy-0.2.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.2.1
+Generator: poetry-core 2.3.1
 Root-Is-Purelib: true
 Tag: py3-none-any