librus-python-api 1.8.1__tar.gz → 1.8.3__tar.gz

{librus_python_api-1.8.1 → librus_python_api-1.8.3}/API.md

@@ -470,7 +470,9 @@ The initial handoff already includes that GET; subsequent sends cost one GET plu
 one POST. Expiry before dispatch raises `SessionExpiredError` and leaves
 NOT_DISPATCHED. An exact launch-to-native-login redirect is expiry, not denial.
 Messages-origin failures clear only modern binding/cookies/cache; valid legacy
-sessions stay usable. A later explicit modern call can rebind, but no modern
+sessions stay usable. A cancelled mailbox read, or one stopped by a reached limit,
+keeps them, so the next call needs no new launch; a limit that emptied the cookie
+jar does not, and neither does a transport timeout. A later explicit modern call can rebind, but no modern
 read/send is automatically retried. A race after preflight can still yield UNKNOWN.
 
 - `modern_identity(*, budget=None, max_age_seconds=0)` returns `ModernIdentity`:

{librus_python_api-1.8.1 → librus_python_api-1.8.3}/CHANGELOG.md

@@ -1,5 +1,46 @@
 # Changelog
 
+## 1.8.3 (2026-11-06) - Reported grade, attendance and announcement layouts
+
+Thank you, @wiktorw and @Witoso, for the reports and the careful synthetic
+reproductions. Signatures are unchanged.
+
+- Announcements: "Aktualnie brak ogłoszeń" is an empty page; it used to fail
+  as `ParseError` and stop notification polls (#120, reported by @Witoso).
+- Grades: a behaviour-row entry with a grade symbol such as `wz`, linking to
+  a behaviour detail, is a `NumericGrade`. Its tooltip's unlabelled first
+  line, such as `wzorowe`, is the `category`, as a point entry's first line
+  names its category; the day is `Data wystawienia` and `Dodał` stays in
+  `metadata`. The whole grades read used to fail (#114, reported by @wiktorw).
+- Grades: a new-schema descriptive table whose semester cells already hold
+  plain text, such as `5` or `Brak ocen`, is read as undated semester
+  summaries and makes no gateway request. The all view used to fail with
+  `UnsupportedCapabilityError` (#115, reported by @wiktorw). Blank cells,
+  cells with attributes or markup, mixed layouts and filled tables with
+  gateway detail rows still fail.
+- Grades: the new-schema table's header row is no longer read as a subject
+  named "Przedmiot" with "Okres 1" and "Okres 2" summaries.
+- Attendance: an absence excused through the e-Usprawiedliwienia module
+  carries a fixed notice line in its tooltip, which failed every attendance
+  read with `ParseError` (observed live on 2026-11-06 on two logins). The
+  notice is now the metadata pair `("Usprawiedliwienie", "dodane za pomocą
+  modułu e-Usprawiedliwienia")`; other unlabelled lines still fail.
+- `inspect_page grades` also runs the new-schema table check that `grades()`
+  runs in the all view, so a saved page reproduces such a failure offline.
+
+The #114 and #115 layouts come from the reporters' synthetic examples, not an
+observed page: the owner's logins have neither. Live checks show they cause no
+regression, not that the fix matches every school's page.
+
+## 1.8.2 (2026-11-01) - Modern session kept across cancels, honest User-Agent
+
+- A cancelled modern mailbox read or a reached limit no longer drops the modern
+  session, so the next call needs no new launch. Other failures still drop it,
+  an unrecognized body and a cookie limit, which empties the jar, included.
+- The `User-Agent` carries the package version; it said 0.4 since that release.
+- `config.ATTENDANCE_RESULT_CACHE_SIZE` is renamed `ACCOUNT_RESULT_CACHE_SIZE`:
+  it caps every cached read of an account.
+
 ## 1.8.1 (2026-10-29) - Session recovery, lucky number, consent error and diagnostics
 
 Signatures are unchanged; one error kind is added.

{librus_python_api-1.8.1 → librus_python_api-1.8.3}/PKG-INFO

@@ -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 → librus_python_api-1.8.3}/README.md

@@ -16,7 +16,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
@@ -37,7 +40,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
@@ -53,7 +56,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 → librus_python_api-1.8.3}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling==1.32.4"]
+requires = ["hatchling==1.33.0"]
 build-backend = "hatchling.build"
 
 [project]
@@ -29,7 +29,7 @@ Issues = "https://github.com/krzysztofbury/librus-python-api/issues"
 
 [dependency-groups]
 dev = [
-  "hatchling==1.32.4",
+  "hatchling==1.33.0",
   "twine>=7,<8",
   "mypy>=1.19,<3",
   "openapi-spec-validator>=0.7,<0.10",

{librus_python_api-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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-1.8.1 → librus_python_api-1.8.3}/src/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 "")