librus-python-api 1.8.1__py3-none-any.whl → 1.8.3__py3-none-any.whl

librus_python_api/__init__.py

@@ -1,5 +1,8 @@
 """Independent bounded async client. General live compatibility is unqualified."""
 
+# Before the imports: config reads it for the User-Agent.
+__version__ = "1.8.3"
+
 from librus_python_api.attachments import AttachmentStream, ModernAttachmentStream
 from librus_python_api.budget import RequestBudget
 from librus_python_api.config import (
@@ -138,8 +141,6 @@ from librus_python_api.models import (
 from librus_python_api.sending import SendAttempt
 from librus_python_api.service import AccountClient, LibrusService
 
-__version__ = "1.8.1"
-
 __all__ = [
     "ArchiveAbsences",
     "ArchiveAchievement",

librus_python_api/attachments.py

@@ -15,7 +15,10 @@ from librus_python_api.attachment_routes import (
 )
 from librus_python_api.budget import RequestBudget
 from librus_python_api.config import ATTACHMENT_MAX_BYTES
-from librus_python_api.exceptions import ErrorKind, LibrusError, SessionExpiredError
+from librus_python_api.exceptions import (
+    ErrorKind,
+    LibrusError,
+)
 from librus_python_api.lifecycle import join_owned
 from librus_python_api.models import (
     AttachmentHeaders,
@@ -283,9 +286,7 @@ class ModernAttachmentStream(AttachmentStream):
                 budget,
             )
         except BaseException as error:
-            client._invalidate_modern()
-            if isinstance(error, SessionExpiredError):
-                error._messages_origin = True
+            client._modern_read_failed(error)
             raise
         await client._transport.stream_download(
             key,

librus_python_api/attendance.py

@@ -11,6 +11,7 @@ from librus_python_api.config import (
     ATTENDANCE_EMPTY_MARKERS,
     ATTENDANCE_MAX_RECORDS,
     ATTENDANCE_SEMESTER_LABELS,
+    ATTENDANCE_TOOLTIP_NOTICES,
     GRADE_MAX_METADATA_LENGTH,
     GRADE_MAX_VALUE_LENGTH,
 )
@@ -29,6 +30,17 @@ def _entry(element: html.HtmlElement, semester: Literal[1, 2]) -> AttendanceReco
     title = element.get("title", "")
     if len(title) > GRADE_MAX_METADATA_LENGTH:
         raise LibrusError(ErrorKind.LIMIT)
+    # A known Librus notice is a whole line of its own; other unlabelled lines
+    # still fail in tooltip_fields.
+    notices: list[tuple[str, str]] = []
+    lines = []
+    for line in re.split(r"<br\s*/?>|\n", title, flags=re.I):
+        notice = ATTENDANCE_TOOLTIP_NOTICES.get(markup.tooltip_line(line))
+        if notice is None or notice in notices:
+            lines.append(line)
+        else:
+            notices.append(notice)
+    title = "<br>".join(lines)
     holder = html.Element("span")
     holder.set("title", re.sub(r"</b>\s*(?=<b[ >])", "</b>\n", title, flags=re.I))
     fields = markup.tooltip_fields(holder)
@@ -57,7 +69,7 @@ def _entry(element: html.HtmlElement, semester: Literal[1, 2]) -> AttendanceReco
         fields.get("Temat zajęć"),
         fields.get("Lekcja"),
         markup.attendance_detail_id(element),
-        tuple(fields.items()),
+        (*fields.items(), *notices),
     )
 
 

librus_python_api/config.py

@@ -31,6 +31,7 @@ from pydantic import (
     model_validator,
 )
 
+from librus_python_api import __version__
 from librus_python_api.exceptions import ErrorKind, LibrusError
 from librus_python_api.models import (
     AttendanceView,
@@ -113,7 +114,7 @@ UPSTREAM_ORIGINS = MappingProxyType(
 OAUTH_QUERY = (("client_id", "46"),)
 SESSION_COOKIE = "oauth_token"
 AUTH_COOKIES = frozenset({SESSION_COOKIE, "DZIENNIKSID", "SDZIENNIKSID"})
-USER_AGENT = "librus-python-api/0.4 (independent client)"
+USER_AGENT = f"librus-python-api/{__version__} (independent client)"
 ENDPOINTS: Mapping[str, Endpoint] = MappingProxyType(
     {
         item.operation_id: item
@@ -435,7 +436,7 @@ ENDPOINTS: Mapping[str, Endpoint] = MappingProxyType(
             ),
             # Gateway reads behind the grades page's new-schema descriptive
             # table. Routes and field names come from public client code and the
-            # official page script, not from an observed populated response.
+            # official page script; one authorized read parsed four records.
             Endpoint(
                 "descriptive_token_info",
                 "GET",
@@ -786,6 +787,7 @@ GRADE_PERIOD_HEADERS = MappingProxyType(
 # semester cells and its script loads the grades from the gateway routes above.
 DESCRIPTIVE_TABLE_CLASS = "newSchemaGradesByStudentTable"
 DESCRIPTIVE_ROW_CLASS = "studentRow"
+DESCRIPTIVE_DETAILS_ROW_CLASS = "studentGradesDetailsRow"
 # Gateway account and student identifiers are opaque strings, unlike every
 # other `{id}` route, which takes a numeric ID.
 DESCRIPTIVE_IDENTIFIER = re.compile(r"[A-Za-z0-9_-]{1,128}")
@@ -837,6 +839,17 @@ ATTENDANCE_SEMESTER_LABELS = MappingProxyType(
     }
 )
 ATTENDANCE_EMPTY_MARKERS = frozenset({"", "-", "Brak nieobecności"})
+# Fixed unlabelled tooltip lines Librus appends to an attendance entry, and the
+# metadata pair each becomes. Observed live on 2026-11-06 on two logins: an
+# absence excused through the e-Usprawiedliwienia module.
+ATTENDANCE_TOOLTIP_NOTICES = MappingProxyType(
+    {
+        "Usprawiedliwienie dodane za pomocą modułu e-Usprawiedliwienia": (
+            "Usprawiedliwienie",
+            "dodane za pomocą modułu e-Usprawiedliwienia",
+        )
+    }
+)
 ATTENDANCE_MAX_RECORDS = 2048
 ATTENDANCE_MAX_WINDOW_DAYS = 371
 # Whole-school gateway collections resolve attendance metadata in two requests.
@@ -848,6 +861,8 @@ ATTENDANCE_DETAIL_PATH_PREFIX = "/przegladaj_nb/szczegoly/"
 FORMATIVE_DETAIL_PATH_PREFIX = "/przegladaj_oceny/szczegoly/ksztaltujace/"
 # Recognition only: behaviour-point detail links are classified, never requested.
 BEHAVIOUR_POINTS_DETAIL_PATH_PREFIX = "/przegladaj_oceny/zachowanie_szczegoly/"
+# Tooltip labels of a behaviour grade symbol entry (#114, synthetic example).
+BEHAVIOUR_GRADE_LABELS = frozenset({"Data wystawienia", "Dodał", "Komentarz"})
 # Recognition only: point-grade detail links are classified, never requested.
 POINT_GRADE_DETAIL_PATH_PREFIX = "/przegladaj_oceny_punktowe/szczegoly/"
 FORMATIVE_HEADERS = (
@@ -862,9 +877,11 @@ FORMATIVE_TEMPLATE_ID = "000000"
 FORMATIVE_MAX_TEXT_LENGTH = 65536
 ATTENDANCE_DETAIL_MAX_FIELDS = 32
 ATTENDANCE_METADATA_CACHE_SIZE = 256
-ATTENDANCE_RESULT_CACHE_SIZE = 64
 ATTENDANCE_METADATA_TTL_SECONDS = 3600
 
+# Entries of every cached read of one account, oldest first out.
+ACCOUNT_RESULT_CACHE_SIZE = 64
+
 ANNOUNCEMENT_MAX_ITEMS = 256
 ANNOUNCEMENT_MAX_FIELD_LENGTH = 1024
 ANNOUNCEMENT_MAX_CONTENT_LENGTH = 65536
@@ -913,7 +930,10 @@ ANNOUNCEMENT_LABELS = MappingProxyType(
 ANNOUNCEMENT_EMPTY_CLASSES = frozenset(
     {"container", "border-red", "resizeable", "center"}
 )
-ANNOUNCEMENT_EMPTY_MARKERS = frozenset({"brak ogłoszeń", "nie ma ogłoszeń"})
+# "Aktualnie brak ogłoszeń" reported in #120 on two accounts.
+ANNOUNCEMENT_EMPTY_MARKERS = frozenset(
+    {"brak ogłoszeń", "nie ma ogłoszeń", "aktualnie brak ogłoszeń"}
+)
 TIMETABLE_MAX_PERIODS = 32
 TIMETABLE_MAX_LESSONS_PER_SLOT = 16
 TIMETABLE_MAX_CHANGES_PER_SLOT = 16

librus_python_api/exceptions.py

@@ -136,7 +136,9 @@ class OperationTimeoutError(LibrusError):
 
 
 class LimitError(LibrusError):
-    pass
+    # Library-private: the bound was the cookie count and the jar was emptied,
+    # so the session behind it is gone.
+    _cookies_cleared = False
 
 
 class ParseError(LibrusError):

librus_python_api/gateway_grades.py

@@ -3,8 +3,14 @@
 The grades page of a school on the new descriptive grading schema renders a
 subject table whose semester cells are empty; the page script then loads the
 grades from gateway JSON routes. Routes and field names come from public client
-code and the official page script, not from an observed populated response,
-so every unexpected shape fails instead of producing a partial collection.
+code and the official page script. One authorized read on 2026-10-28 parsed four
+PartialGrades records on one school; pagination keys are still unknown, so every
+unexpected shape fails instead of producing a partial collection.
+
+Another school renders the same table with plain text in its semester cells and
+no script hooks (#115, from a reporter's synthetic example). The grade record
+parser reads those cells like any descriptive row, so that table needs no
+gateway read.
 """
 
 import re
@@ -19,6 +25,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError, field_valida
 
 from librus_python_api import markup
 from librus_python_api.config import (
+    DESCRIPTIVE_DETAILS_ROW_CLASS,
     DESCRIPTIVE_IDENTIFIER,
     DESCRIPTIVE_MAX_NAME_LENGTH,
     DESCRIPTIVE_MAX_SUBJECTS,
@@ -330,9 +337,13 @@ def parse_gateway_users(body: bytes) -> Mapping[str, str]:
 
 @dataclass(frozen=True, slots=True)
 class DescriptiveTable:
-    """Numeric subject ID to the subject name the grades page shows."""
+    """Numeric subject ID to the subject name the grades page shows.
+
+    A filled table already holds its grades and has no gateway grades.
+    """
 
     subjects: Mapping[int, str] = field(repr=False)
+    filled: bool = False
 
 
 def _classes(element: html.HtmlElement) -> set[str]:
@@ -342,9 +353,11 @@ def _classes(element: html.HtmlElement) -> set[str]:
 def read_descriptive_table(document: html.HtmlElement) -> DescriptiveTable | None:
     """The new-schema subject table, or None when the page has none.
 
-    Its rows hold an expander, the subject and two empty semester cells that
-    the page script fills from the gateway. A cell the page already filled
-    would duplicate the gateway records, so it is an unsupported layout.
+    Its rows hold an expander, the subject and two semester cells. Either
+    every row has empty `gradesCell` cells that the page script fills from
+    the gateway, or every row has plain cells the page filled itself, which
+    `read_grade_records` reads and validates. A script cell the page already
+    filled would duplicate the gateway records, so it is unsupported.
     """
     tables = [
         table
@@ -368,20 +381,33 @@ def read_descriptive_table(document: html.HtmlElement) -> DescriptiveTable | Non
     tables = populated
     subjects: dict[int, str] = {}
     students: set[str | None] = set()
+    layouts: set[bool] = set()
     for row in markup.rows(tables[0]):
         if DESCRIPTIVE_ROW_CLASS not in _classes(row):
             continue
         cells = markup.cells(row)
-        if (
-            len(cells) != 4
-            or not {"micro", "center", "screen-only"} <= _classes(cells[0])
-            or [cell.get("data-semester") for cell in cells[2:]] != ["1", "2"]
-            or not all("gradesCell" in _classes(cell) for cell in cells[2:])
+        if len(cells) != 4 or not {"micro", "center", "screen-only"} <= _classes(
+            cells[0]
         ):
             raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
-        if any(
+        semesters = cells[2:]
+        # A filled cell is bare text: no attributes and no markup, so a renamed
+        # or moved script hook never passes as a filled table.
+        filled = all(
+            not cell.attrib
+            and markup.text(cell)
+            and not any(isinstance(node.tag, str) for node in cell)
+            for cell in semesters
+        )
+        if not filled and (
+            [cell.get("data-semester") for cell in semesters] != ["1", "2"]
+            or not all("gradesCell" in _classes(cell) for cell in semesters)
+        ):
+            raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
+        layouts.add(filled)
+        if not filled and any(
             markup.text(cell) or any(isinstance(node.tag, str) for node in cell)
-            for cell in cells[2:]
+            for cell in semesters
         ):
             raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
         identifier = row.get("data-subject_id", "")
@@ -397,7 +423,15 @@ def read_descriptive_table(document: html.HtmlElement) -> DescriptiveTable | Non
     if len(students) > 1:
         # One page shows one student; rows of several students are unknown.
         raise LibrusError(ErrorKind.PARSE)
-    return DescriptiveTable(MappingProxyType(subjects))
+    if len(layouts) > 1:
+        raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
+    if layouts == {True} and any(
+        DESCRIPTIVE_DETAILS_ROW_CLASS in _classes(row) for row in markup.rows(tables[0])
+    ):
+        # Detail rows are what the page script fills from the gateway; a filled
+        # table that still has them may also have gateway grades.
+        raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
+    return DescriptiveTable(MappingProxyType(subjects), layouts == {True})
 
 
 def parse_grade_page(body: bytes) -> tuple[GradeRecords, DescriptiveTable | None]:

librus_python_api/grade_records.py

@@ -8,6 +8,7 @@ from lxml import html
 
 from librus_python_api import markup
 from librus_python_api.config import (
+    BEHAVIOUR_GRADE_LABELS,
     BEHAVIOUR_POINTS_DETAIL_PATH_PREFIX,
     FORMATIVE_DETAIL_PATH_PREFIX,
     GRADE_AVERAGE_HEADERS,
@@ -26,6 +27,7 @@ from librus_python_api.config import (
     GRADE_PUBLICATION_DATE_LABEL,
     GRADE_PUBLICATION_PERIOD_LABELS,
     GRADE_PUBLICATION_TEACHER_LABEL,
+    TOOLTIP_LABELS,
 )
 from librus_python_api.exceptions import ErrorKind, LibrusError
 from librus_python_api.formative_grades import is_formative_table, read_formative_table
@@ -126,6 +128,51 @@ def _numeric(
     )
 
 
+def _behaviour_grade(
+    element: html.HtmlElement,
+    subject: str,
+    semester: Literal[0, 1, 2],
+    kind: GradeKind = GradeKind.CURRENT,
+) -> NumericGrade:
+    """A behaviour entry with a grade symbol, such as `wz`, instead of points.
+
+    Its tooltip has the point entries' layout: an unlabelled first line, then
+    `Data wystawienia` and `Dodał`. The first line names the entry, as the
+    point category does, so it is the category. `Dodał` stays in metadata. A
+    label with digits, a point entry's range labels or any other label fails.
+    """
+    heading: list[str] = []
+    metadata = markup.tooltip_fields(element, heading)
+    raw = markup.text(element)
+    if (
+        not heading
+        # A labelled first line means the heading is missing.
+        or heading[0].partition(":")[0].strip() in TOOLTIP_LABELS
+        # Symbols carry no digits; points or a range are a point entry.
+        or not raw
+        or re.search(r"[0-9]", raw)
+        or not BEHAVIOUR_GRADE_LABELS >= metadata.keys()
+    ):
+        raise LibrusError(ErrorKind.PARSE)
+    href = element.get("href")
+    if href is not None and len(href) > GRADE_MAX_METADATA_LENGTH:
+        raise LibrusError(ErrorKind.LIMIT)
+    return NumericGrade(
+        subject,
+        raw,
+        markup.civil_date(metadata.get("Data wystawienia")),
+        semester,
+        None,
+        None,
+        heading[0],
+        None,
+        metadata.get("Komentarz"),
+        href,
+        tuple(metadata.items()),
+        kind,
+    )
+
+
 def _descriptive(
     box: html.HtmlElement,
     element: html.HtmlElement,
@@ -284,7 +331,21 @@ def _entries(
         if len(anchors) + len(descriptions) != 1:
             raise LibrusError(ErrorKind.PARSE)
         if anchors:
-            record = _numeric(anchors[0], subject, period, kind)
+            behaviour = (
+                subject in GRADE_MERGED_SUBJECTS
+                and markup.detail_id(
+                    anchors[0].get("href"), BEHAVIOUR_POINTS_DETAIL_PATH_PREFIX
+                )
+                is not None
+            )
+            if behaviour and descriptive:
+                # A descriptive record has no category for the first line.
+                raise LibrusError(ErrorKind.PARSE)
+            record = (
+                _behaviour_grade(anchors[0], subject, period, kind)
+                if behaviour
+                else _numeric(anchors[0], subject, period, kind)
+            )
             if descriptive:
                 href = record.href
                 if href is not None and re.sub(
@@ -540,6 +601,9 @@ def read_grade_records(document: html.HtmlElement) -> GradeRecords:
             _read_numeric_table(table, collection, points=True)
         else:
             for row in markup.rows(table):
+                if markup.in_header(row):
+                    # The new-schema table's column labels, not a subject.
+                    continue
                 cells = markup.cells(row)
                 if _descriptive_row(cells):
                     _read_descriptive_row(cells, collection)

librus_python_api/inspect_page.py

@@ -19,8 +19,8 @@ from librus_python_api import __version__
 from librus_python_api.config import TransportLimits
 from librus_python_api.diagnostics import describe_failure, failure_frames
 from librus_python_api.exceptions import LibrusError
+from librus_python_api.gateway_grades import parse_grade_page
 from librus_python_api.grade_parsers import parse_final_grades
-from librus_python_api.grade_records import parse_grade_records
 from librus_python_api.models import Availability
 from librus_python_api.parsers import parse_profile
 
@@ -31,7 +31,8 @@ NOTICE = (
 
 
 def _grades(body: bytes) -> dict[str, int]:
-    records = parse_grade_records(body)
+    # The all view also checks the new-schema table, as `grades()` does.
+    records, table = parse_grade_page(body)
     return {
         "numeric": sum(1 for g in records.numeric if g.point_grade_id is None),
         "point": sum(1 for g in records.numeric if g.point_grade_id is not None),
@@ -41,6 +42,8 @@ def _grades(body: bytes) -> dict[str, int]:
         "averages": len(records.averages),
         "point_results": len(records.point_results),
         "formative": len(records.formative),
+        "descriptive_table": int(table is not None),
+        "descriptive_table_filled": int(table is not None and table.filled),
     }
 
 

librus_python_api/markup.py

@@ -81,11 +81,14 @@ def colspan(cell: html.HtmlElement) -> int:
     return span
 
 
-def tooltip_fields(element: html.HtmlElement) -> dict[str, str]:
+def tooltip_fields(
+    element: html.HtmlElement, heading: list[str] | None = None
+) -> dict[str, str]:
     """Parse a 'Label: value<br>' title attribute into unique labelled fields.
 
     A free-text field may span lines; an unlabelled line after it continues
-    its value. Any other unlabelled line is an unknown layout.
+    its value. Any other unlabelled line is an unknown layout. With `heading`,
+    the first line is taken whole, colon included, and appended to it.
     """
     title = element.get("title", "")
     if len(title) > GRADE_MAX_METADATA_LENGTH:
@@ -98,12 +101,10 @@ def tooltip_fields(element: html.HtmlElement) -> dict[str, str]:
     for chunk in chunks:
         if not chunk.strip():
             continue
-        # Tooltips are HTML inside an attribute; parse markup only where present.
-        rendered = (
-            text(parse_html_document(chunk.encode()))
-            if "<" in chunk
-            else " ".join(chunk.split())
-        )
+        rendered = tooltip_line(chunk)
+        if heading is not None and not heading:
+            heading.append(rendered)
+            continue
         key, separator, value = rendered.partition(":")
         key, value = key.strip(), value.strip()
         if not separator and last in TOOLTIP_MULTILINE_LABELS:
@@ -116,6 +117,14 @@ def tooltip_fields(element: html.HtmlElement) -> dict[str, str]:
     return result
 
 
+def tooltip_line(chunk: str) -> str:
+    """One tooltip line's text, whitespace normalized."""
+    # Tooltips are HTML inside an attribute; parse markup only where present.
+    if "<" in chunk:
+        return text(parse_html_document(chunk.encode()))
+    return " ".join(chunk.split())
+
+
 def civil_date(value: str | None) -> date:
     """An ISO date, optionally followed by its weekday label in parentheses."""
     match = re.fullmatch(r"([0-9]{4}-[0-9]{2}-[0-9]{2})(?: \(([^()]+)\))?", value or "")

librus_python_api/service.py

@@ -34,11 +34,11 @@ from librus_python_api.completed_lessons import (
     validate_selection,
 )
 from librus_python_api.config import (
+    ACCOUNT_RESULT_CACHE_SIZE,
     ATTACHMENT_MAX_BYTES,
     ATTENDANCE_MAX_WINDOW_DAYS,
     ATTENDANCE_METADATA_CACHE_SIZE,
     ATTENDANCE_METADATA_TTL_SECONDS,
-    ATTENDANCE_RESULT_CACHE_SIZE,
     CHECKPOINT_TIMEOUT_SECONDS,
     ENDPOINTS,
     GRADE_MAX_RECORDS,
@@ -74,6 +74,7 @@ from librus_python_api.diagnostics import DiagnosticSink, failure_frames
 from librus_python_api.exceptions import (
     ErrorKind,
     LibrusError,
+    LimitError,
     ParseError,
     SessionExpiredError,
 )
@@ -393,6 +394,18 @@ def _require_dates(*days: date | None, max_days: int | None = None) -> None:
             raise LibrusError(ErrorKind.INVALID_INPUT)
 
 
+def _check_record_count(records: GradeRecords, added: int) -> None:
+    if (
+        len(records.numeric)
+        + len(records.descriptive)
+        + len(records.descriptive_summaries)
+        + len(records.formative)
+        + added
+        > GRADE_MAX_RECORDS
+    ):
+        raise LibrusError(ErrorKind.LIMIT)
+
+
 def _cooldown_due(error: LibrusError) -> bool:
     """A denial, an unrecovered expiry, or a logged-out page that a session
     just signed in also got: signing in again at once cannot help."""
@@ -1308,7 +1321,7 @@ class AccountClient:
         budget: RequestBudget | None = None,
         max_age_seconds: float = 0.0,
     ) -> Grades:
-        """Select a grade view with one non-replayed view-changing POST.
+        """Select a grade view with one view-changing POST.
 
         Changes the selected grade filter, not school records. A cache hit makes
         no POST. Missing inline weight/count data remains unknown. In the all
@@ -1327,7 +1340,7 @@ class AccountClient:
                 records, table = await self._page(
                     "grades", budget, parse_grade_page, form=form
                 )
-                if table is not None:
+                if table is not None and not table.filled:
                     records = await self._gateway_descriptive(records, table, budget)
             return Grades(
                 self._session_identity(), records, self._observation("grades"), view
@@ -1401,7 +1414,7 @@ class AccountClient:
         budget: RequestBudget | None = None,
         max_age_seconds: float = 0.0,
     ) -> Attendance:
-        """Read a fixed upstream attendance view without replaying its POST."""
+        """Read a fixed upstream attendance view with one view-changing POST."""
         form = attendance_view_form(view)
 
         async def fetch(budget: RequestBudget, _: bool) -> Attendance:
@@ -1540,7 +1553,7 @@ class AccountClient:
         budget: RequestBudget | None = None,
         max_age_seconds: float = 0.0,
     ) -> Timetable:
-        """Select an explicit school civil week; never replay its selection POST."""
+        """Select an explicit school civil week with one view-changing POST."""
         form = timetable_form(monday)
 
         async def fetch(budget: RequestBudget, _: bool) -> Timetable:
@@ -2143,21 +2156,22 @@ class AccountClient:
                 )
             raise
         self._cache[key] = (time.monotonic(), result)
-        if len(self._cache) > ATTENDANCE_RESULT_CACHE_SIZE:
+        if len(self._cache) > ACCOUNT_RESULT_CACHE_SIZE:
             del self._cache[next(iter(self._cache))]
         return result
 
     async def _authenticated[T](
         self, fetch: Fetch[T], budget: RequestBudget, retry_safe: bool
     ) -> T:
-        """Run a read in a session; recover proven expiry once for safe reads.
+        """Run a read in a session; recover expiry once where a repeat is safe.
 
         Initial login is never retried: a failed credential submission must not
-        be replayed. A view-changing POST is never replayed either; expiry only
-        clears the session so a later explicit call can log in again. A
-        logged-out page proves the request was not applied to the account, so
-        a read without an account effect answered with one is repeated once in
-        a fresh session; a session just signed in that gets it fails as PARSE.
+        be replayed. A retry-safe read is repeated once after a new login, and
+        so is a read without an account effect (`NONE` or `SELECT_VIEW`, never
+        mark-read) answered with a logged-out page, which proves the request
+        was not applied. Other expiry only clears the session so a later
+        explicit call can log in again. A session just signed in that gets the
+        logged-out page fails as PARSE.
         """
         fresh_login = self._identity is None
         if fresh_login:
@@ -2231,9 +2245,7 @@ class AccountClient:
                 raise expired from error
         except BaseException as error:
             if ENDPOINTS[endpoint].origin == "messages":
-                self._invalidate_modern()
-                if isinstance(error, SessionExpiredError):
-                    error._messages_origin = True
+                self._modern_read_failed(error)
             raise
 
     def _check_cooldown(self, key: str) -> None:
@@ -2249,6 +2261,22 @@ class AccountClient:
         self._metadata_maps.clear()
         self._transport.clear_auth()
 
+    def _modern_read_failed(self, error: BaseException) -> None:
+        """Drop the modern session unless the failure says nothing about it.
+
+        A cancel or a local bound keeps it. Every other failure drops it, an
+        unrecognized body included: a session the upstream no longer knows may
+        be answered with one, and keeping it would fail every later read, while
+        dropping it costs one launch.
+        """
+        if isinstance(error, asyncio.CancelledError) or (
+            isinstance(error, LimitError) and not error._cookies_cleared
+        ):
+            return
+        self._invalidate_modern()
+        if isinstance(error, SessionExpiredError):
+            error._messages_origin = True
+
     def _invalidate_modern(self) -> None:
         self._modern_account = None
         for key in tuple(self._cache):
@@ -2492,15 +2520,7 @@ class AccountClient:
             "descriptive_users", budget, parse_gateway_users, content_type=JSON
         )
         added = descriptive_grades(items, subjects, users, table)
-        if (
-            len(records.numeric)
-            + len(records.descriptive)
-            + len(records.descriptive_summaries)
-            + len(records.formative)
-            + len(added)
-            > GRADE_MAX_RECORDS
-        ):
-            raise LibrusError(ErrorKind.LIMIT)
+        _check_record_count(records, len(added))
         return replace(records, descriptive=records.descriptive + added)
 
     async def _metadata_value(

librus_python_api/transport.py

@@ -50,7 +50,12 @@ from librus_python_api.config import (
     recipient_form,
     validate_modern_query,
 )
-from librus_python_api.exceptions import ErrorKind, LibrusError, SessionExpiredError
+from librus_python_api.exceptions import (
+    ErrorKind,
+    LibrusError,
+    LimitError,
+    SessionExpiredError,
+)
 from librus_python_api.models import (
     AttachmentHeaders,
     LoginSubmission,
@@ -451,9 +456,7 @@ class AiohttpTransport:
                 proxy=proxy.get_secret_value() if proxy is not None else None,
             ) as response:
                 self._check_headers(response)
-                if len(session.cookie_jar) > self._limits.max_cookies:
-                    session.cookie_jar.clear()
-                    raise LibrusError(ErrorKind.LIMIT)
+                self._check_cookies(session)
                 if not modern or response.status not in (400, 422):
                     self._check_status(response)
                 body = await self._read_body(response, budget)
@@ -542,9 +545,7 @@ class AiohttpTransport:
             proxy=proxy.get_secret_value() if proxy is not None else None,
         ) as response:
             self._check_headers(response)
-            if len(session.cookie_jar) > self._limits.max_cookies:
-                session.cookie_jar.clear()
-                raise LibrusError(ErrorKind.LIMIT)
+            self._check_cookies(session)
             self._check_status(response)
             body = await self._read_payload(response, budget)
             if response.status == 200:
@@ -843,9 +844,7 @@ class AiohttpTransport:
             proxy=proxy.get_secret_value() if proxy is not None else None,
         ) as response:
             self._check_headers(response)
-            if len(session.cookie_jar) > self._limits.max_cookies:
-                session.cookie_jar.clear()
-                raise LibrusError(ErrorKind.LIMIT)
+            self._check_cookies(session)
             self._check_status(response)
             body = await self._read_body(response, budget)
             return TransportResponse(
@@ -863,6 +862,13 @@ class AiohttpTransport:
         ):
             raise LibrusError(ErrorKind.LIMIT)
 
+    def _check_cookies(self, session: aiohttp.ClientSession) -> None:
+        if len(session.cookie_jar) > self._limits.max_cookies:
+            session.cookie_jar.clear()
+            error = LimitError(ErrorKind.LIMIT)
+            error._cookies_cleared = True
+            raise error
+
     def _check_status(self, response: aiohttp.ClientResponse) -> None:
         if response.status in (429, 503):
             pause = self._limits.cooldown_seconds

{librus_python_api-1.8.1.dist-info → librus_python_api-1.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: librus-python-api
-Version: 1.8.1
+Version: 1.8.3
 Summary: Independent bounded async Librus Synergia client
 Project-URL: Repository, https://github.com/krzysztofbury/librus-python-api
 Project-URL: Issues, https://github.com/krzysztofbury/librus-python-api/issues
@@ -42,7 +42,10 @@ private ACLs. Windows installations include `pywin32` and `tzdata` automatically
 Network paths, reparse-point paths and unsafe storage permissions fail closed.
 See [platform requirements](contracts/persistence.md#windows-disk-boundary-25).
 
-**Status:** `1.8.1` recovers a session Synergia no longer knows (it answers
+**Status:** `1.8.3` reads behaviour grade symbols, filled descriptive
+grade tables, the "Aktualnie brak ogłoszeń" page and absences excused
+through e-Usprawiedliwienia. `1.8.2` keeps the modern mailbox session across a cancelled read
+or a reached limit and sends its own version in the `User-Agent`. `1.8.1` recovers a session Synergia no longer knows (it answers
 with a "Brak dostępu" page, not a login redirect), reads the lucky number
 from the page header and summarizes a page that fails as a whole in
 diagnostics. `1.8.0` reports where a failure
@@ -63,7 +66,7 @@ See [limitations](#supported-features-and-limitations) below.
 Install the exact release from PyPI after its gated publication completes:
 
 ```sh
-python -m pip install librus-python-api==1.8.1
+python -m pip install librus-python-api==1.8.3
 ```
 
 Pin the exact version qualified by your application. Before publication, use a
@@ -79,7 +82,7 @@ python -m pip install .
 To install a locally built wheel instead:
 
 ```sh
-python -m pip install ./dist/librus_python_api-1.8.1-py3-none-any.whl
+python -m pip install ./dist/librus_python_api-1.8.3-py3-none-any.whl
 ```
 
 No console script or background process is installed: import the library in your

{librus_python_api-1.8.1.dist-info → librus_python_api-1.8.3.dist-info}/RECORD

@@ -1,30 +1,30 @@
-librus_python_api/__init__.py,sha256=KnN3xexlc15CN1XQPtwLNhUHc9Y82MyiQrMZEs4TYl4,6513
+librus_python_api/__init__.py,sha256=Ts6HZg9LRMp-MLMbjajwEdNlxVsmW8TnnGKbnzytP1k,6571
 librus_python_api/_notification_bootstrap.py,sha256=18nzH0doXBNaZXCz-_ckIvRrlHTWV5Mm1t5m2-5eYGI,4669
 librus_python_api/_notification_codec.py,sha256=hU6G3zGJ5fR8wfPC6fV2OqBKs-7XpT9eRnKO3FGsTzY,13451
 librus_python_api/_storage.py,sha256=M_6ZAzN4zs7laOdKJBRH1I2rvy3pgqYgC_MZtsd2xtM,15893
 librus_python_api/_windows_filesystem.py,sha256=pQANIGkYrb4Q75gz5mdr5mqYhM_PFblWwTxPGM0bQ78,14063
 librus_python_api/announcements.py,sha256=13FoOR1sq7tt9w6aLf0vclcFKDqLUiIYaO5iYD2QVLA,5928
 librus_python_api/attachment_routes.py,sha256=uSg5wCQqHJiphF0KdI0GatQxZr5SLUx6xWQRsl_U4_U,4123
-librus_python_api/attachments.py,sha256=kyIBpFxeK34Al5_jCkxYKpZnsSLa5DYaGS6vHADpy_g,10921
-librus_python_api/attendance.py,sha256=HeFAfnIUn4N__yp1zr635Dve55S2jmwtkeIy_6mV5B4,6924
+librus_python_api/attachments.py,sha256=Iq-ERZWc3gYXu6Lcv6womT2EXCc-c1Q7r_Q6VyaCm2E,10818
+librus_python_api/attendance.py,sha256=Dq2IC8WERO-9x-LZIN5Nl0PTLYmL1Iq7BZtOz6nssOI,7428
 librus_python_api/attendance_frequency.py,sha256=SBhED5zuyRIHWdw4urFyTJYykb6EYB7eL4dU3mif1EY,5309
 librus_python_api/budget.py,sha256=8fvqT7eIxyVX2P2OBG27XsYHk_HbtSS4lzuecYpHtgs,2878
 librus_python_api/checkpoint.py,sha256=QBmG9GtpyaGRaFq-FXuGA3yR1BjuMFN9V3RTvvi_FNQ,1930
 librus_python_api/class_free_days.py,sha256=IwoCgr-9ZgEYYQ6717s4cDpyFzbosHMzESMabXJLGqA,2422
 librus_python_api/completed_lessons.py,sha256=ngGfBD6K4B6dR4elPYvNRvp40Q-GlrhUsUKqBbYY1KE,10727
-librus_python_api/config.py,sha256=F4w0F5r6uCObgyzO-cXkUtbz9Okh8HQEyfObAdOysig,61132
+librus_python_api/config.py,sha256=Sz6b5lWllzsKSbCbfGKqN6z-CZfwbCt9MkD2y-OG9CU,62019
 librus_python_api/detail_fields.py,sha256=vDDi5sV-e30-42SF0hwAUoldiZ5wvYtb1UlLt03lBHw,1708
 librus_python_api/diagnostics.py,sha256=5YbJB8J8RXMqMTmulcn5mJRF1vpi0Pvx00ETrXn9hUY,19036
-librus_python_api/exceptions.py,sha256=3Bt_1WbW2blSoljGAa00TK2AzU68tgYuRDd2k1onLTc,5392
+librus_python_api/exceptions.py,sha256=x8_z5UTNmuRINTK4buLYiKdYcFA2w6GZP9ZXOL-OnRU,5531
 librus_python_api/files.py,sha256=pQBsIJyfTOZDz83ZB-5fcd-nPMcxR1HJ155h4zTHmsA,9223
 librus_python_api/formative_grades.py,sha256=VykwtGvViZVOJMwPH3Re1RTDCHMr1_m9_xHjZyaXDIQ,6452
-librus_python_api/gateway_grades.py,sha256=HHXJqtC47v2BTP3ufak9i9Q68phOxwtzWjahKdxkyX4,16086
+librus_python_api/gateway_grades.py,sha256=uaCCz743aPlymAa6rDfRb0w2JFC2hJ4yis0hbKdqTeM,17663
 librus_python_api/grade_parsers.py,sha256=ROfffkCP8yj5Q708TZdpp0PDTyVmoh6X7m0y2fyJcwg,11202
-librus_python_api/grade_records.py,sha256=YltZ_OQLsfxj0nvK8_xTuv8ifMOu2jJBnVn6TTQKzaY,22722
+librus_python_api/grade_records.py,sha256=IT6A5_09Zu5h03g_p3pHVNepFCMoWag0WIJKg4A9MlQ,24978
 librus_python_api/homework_range.py,sha256=erYfvS6PhHU5XhnR6LkiLNy677hGVflY3UAuHOs-YUw,1663
-librus_python_api/inspect_page.py,sha256=AUm-n2Ewe4cQUnlFnhttcGK5B9shvFde_7t1JF7mEm0,5285
+librus_python_api/inspect_page.py,sha256=W5M21v0DlFw3eaqzwGG6hsI6fkTZVQTwkO2x-NNk4y0,5490
 librus_python_api/lifecycle.py,sha256=XzA5CEdZFo7iL5IMUrawnRvf2m9BFe0OseP-fpQFaAE,856
-librus_python_api/markup.py,sha256=p97ZRPqhGYTEBbzJq_0j4j8AKihgQzJqTv__QUNm8Ws,6084
+librus_python_api/markup.py,sha256=AS0hfJS83lnOUpyfgoNHwUKf8MKBR3WN3p_4aeZ7BOk,6408
 librus_python_api/message_content.py,sha256=v_qoEAoaYS0_9MQBaj57i5XnC7pzv_HHWefgTt4CNyM,9043
 librus_python_api/messages.py,sha256=K9F8XVs1SojfFpdxxLV8gx9E0g81YxEHjigDzLHmDCg,10230
 librus_python_api/models.py,sha256=IO-SYpqpQeuTej6kqNjBRXDbAbKITRZ1njRUyoEZ8t0,41951
@@ -44,10 +44,10 @@ librus_python_api/scheduler.py,sha256=3JplYxqvQdFz3aKXcoQUJHE9s3FPw_xRhQ2CPNLuQm
 librus_python_api/school_reads.py,sha256=YHta7DmhjS5vSa4Djq8pzp01-2jhVfGOo1Mnc738rV4,15209
 librus_python_api/school_year_archive.py,sha256=D0A1ywMKgoYgvi-d70__SFreMGvMb_72870Akkbb_m8,15492
 librus_python_api/sending.py,sha256=Nvvk2r-6D6Us53a2fH5GW9PcA6bWEfuOvy6c3M5QVcE,4549
-librus_python_api/service.py,sha256=JY-RStBHmNOgGHISaC-pB2La2pdVGlJXXn52_kwkd3U,102316
+librus_python_api/service.py,sha256=GaavbI6117fcbVuWDzZXDbbgQUczZXXFVNKEMXsFfaw,103063
 librus_python_api/timetable.py,sha256=tX1QK9fQABxzfLaHHqTe8e6rAgdOkCoTOfAHdPwNmLE,9836
-librus_python_api/transport.py,sha256=n3goXE34xcsO-bilsLVYEUW3JkJR-9rbgmqPu7ff9J8,35036
-librus_python_api-1.8.1.dist-info/METADATA,sha256=clDgcKIX4m1Q6xagOEeKjRrcTTdonbX5v37tI2Q1_7s,14071
-librus_python_api-1.8.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-librus_python_api-1.8.1.dist-info/licenses/LICENSE,sha256=IuerLb3cnZCsaB23znydjjvKqP-LmSJd3syKa9NGUts,1071
-librus_python_api-1.8.1.dist-info/RECORD,,
+librus_python_api/transport.py,sha256=yF-DnFy4xGYS_RWQ9161b9WJXOlYF8cFRgdjXmVVUIk,34988
+librus_python_api-1.8.3.dist-info/METADATA,sha256=PwGb0FBnKt-moy91gG0veDWgZZzMcEtymgI-BMFU75k,14361
+librus_python_api-1.8.3.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+librus_python_api-1.8.3.dist-info/licenses/LICENSE,sha256=IuerLb3cnZCsaB23znydjjvKqP-LmSJd3syKa9NGUts,1071
+librus_python_api-1.8.3.dist-info/RECORD,,

{librus_python_api-1.8.1.dist-info → librus_python_api-1.8.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any