librus-python-api 1.7.0__tar.gz → 1.7.1__tar.gz

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## 1.7.1 (2026-10-27) - Observed point-grade page and multi-line comments
+
+Fixes for layouts 1.7.0 rejected with `ParseError`, established from an
+affected school's real point-grade page and a live grade read. Public types
+and signatures are unchanged.
+
+- Grades: a teacher's multi-line `Komentarz` continues on unlabelled tooltip
+  lines and is kept with its line breaks. Every grade read of an account with
+  such a comment failed in all releases up to 1.7.0; any other unlabelled
+  tooltip line still fails.
+- Point grades: a formative entry among the point entries is accepted as the
+  formative mirror it is; the empty footer row wider than the table is
+  skipped; titles that break their own label (`Ocena śródroczna <br> z
+  pierwszego okresu`) name the period columns, so point midterm grades are
+  read. These rules apply to point tables only.
+- Formative assessments: assessment text may contain line breaks. 1.7.0 and
+  earlier failed such a table with `UnsupportedCapabilityError`.
+
 ## 1.7.0 (2026-10-27) - Point grades
 
 Reads the "Oceny punktowe" table that point-grade schools show on the grades

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: librus-python-api
-Version: 1.7.0
+Version: 1.7.1
 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,8 +42,8 @@ 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.7.0` reads point grades ("Oceny punktowe"), which made both grade
-reads fail at point-grade schools. It keeps the 1.6.4 linear-time message body
+**Status:** `1.7.1` reads point grades ("Oceny punktowe") as an affected
+school's page shows them, and multi-line grade comments. It keeps the 1.6.4 linear-time message body
 rendering and the 1.6.2 completed-lesson and grade layouts, including behaviour
 points, which are validated and not reported as grades.
 Class free days, typed capability outcomes and the live-check freshness watchdog
@@ -57,7 +57,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.7.0
+python -m pip install librus-python-api==1.7.1
 ```
 
 Pin the exact version qualified by your application. Before publication, use a
@@ -73,7 +73,7 @@ python -m pip install .
 To install a locally built wheel instead:
 
 ```sh
-python -m pip install ./dist/librus_python_api-1.7.0-py3-none-any.whl
+python -m pip install ./dist/librus_python_api-1.7.1-py3-none-any.whl
 ```
 
 No CLI or background process is installed: import the library in your own program.

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/README.md

@@ -16,8 +16,8 @@ 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.7.0` reads point grades ("Oceny punktowe"), which made both grade
-reads fail at point-grade schools. It keeps the 1.6.4 linear-time message body
+**Status:** `1.7.1` reads point grades ("Oceny punktowe") as an affected
+school's page shows them, and multi-line grade comments. It keeps the 1.6.4 linear-time message body
 rendering and the 1.6.2 completed-lesson and grade layouts, including behaviour
 points, which are validated and not reported as grades.
 Class free days, typed capability outcomes and the live-check freshness watchdog
@@ -31,7 +31,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.7.0
+python -m pip install librus-python-api==1.7.1
 ```
 
 Pin the exact version qualified by your application. Before publication, use a
@@ -47,7 +47,7 @@ python -m pip install .
 To install a locally built wheel instead:
 
 ```sh
-python -m pip install ./dist/librus_python_api-1.7.0-py3-none-any.whl
+python -m pip install ./dist/librus_python_api-1.7.1-py3-none-any.whl
 ```
 
 No CLI or background process is installed: import the library in your own program.

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/__init__.py

@@ -138,7 +138,7 @@ from librus_python_api.models import (
 from librus_python_api.sending import SendAttempt
 from librus_python_api.service import AccountClient, LibrusService
 
-__version__ = "1.7.0"
+__version__ = "1.7.1"
 
 __all__ = [
     "ArchiveAbsences",

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/config.py

@@ -659,6 +659,9 @@ GRADE_MAX_SUBJECTS = 128
 GRADE_MAX_VALUE_LENGTH = 1024
 GRADE_MERGED_SUBJECTS = frozenset({"Zachowanie"})
 GRADE_INLINE_DETAIL_LABEL = "Ocena"
+# Tooltip fields whose free text may continue on unlabelled lines. A teacher's
+# multi-line grade comment was observed on 2026-10-27.
+TOOLTIP_MULTILINE_LABELS = frozenset({"Komentarz"})
 # A point-grade ("Oceny punktowe") table marks each subject row's expander image
 # with this ID; ordinary grade rows use `przedmioty_<id>_node`.
 GRADE_POINT_ROW_NODE = re.compile(r"przedmioty_OP_[0-9A-Za-z_]{1,64}_node")

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/formative_grades.py

@@ -58,7 +58,8 @@ def _link(cell: html.HtmlElement) -> tuple[str, str]:
     """The detail ID and full text of the assessment cell.
 
     Observed: one link whose optional first child is an empty coloured
-    `span.grade-box` marker, followed by the text. Anything else is new markup.
+    `span.grade-box` marker, followed by the text, which may contain empty
+    line breaks (2026-10-27). Anything else is new markup.
     """
     _single(cell)
     anchors = [node for node in cell if isinstance(node.tag, str)]
@@ -66,6 +67,10 @@ def _link(cell: html.HtmlElement) -> tuple[str, str]:
         _fail(ErrorKind.UNSUPPORTED_CAPABILITY)
     anchor = anchors[0]
     children = [node for node in anchor.iterdescendants() if isinstance(node.tag, str)]
+    breaks = [node for node in children if node.tag == "br"]
+    if any(node.getparent() is not anchor or len(node) for node in breaks):
+        _fail(ErrorKind.UNSUPPORTED_CAPABILITY)
+    children = [node for node in children if node.tag != "br"]
     if children:
         marker = children[0]
         if (

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/grade_parsers.py

@@ -27,22 +27,34 @@ from librus_python_api.models import (
 from librus_python_api.parsers import parse_page
 
 
-def _summary_field(cell: html.HtmlElement) -> str | None:
+def title_label(title: str, *, points: bool = False) -> str:
+    """A header title's label: its first line, or for a point table all of it.
+
+    Ordinary titles append an explanation after a line break. Point tables
+    break the label itself ("Ocena śródroczna <br> z pierwszego okresu").
+    """
+    if points:
+        return " ".join(re.sub(r"<br\s*/?>", " ", title, flags=re.I).split())
+    return " ".join(re.split(r"<br\s*/?>", title, flags=re.I)[0].split())
+
+
+def _summary_field(cell: html.HtmlElement, *, points: bool = False) -> str | None:
     title = cell.get("title", "")
     if len(title) > GRADE_MAX_VALUE_LENGTH:
         raise LibrusError(ErrorKind.LIMIT)
-    label = " ".join(re.split(r"<br\s*/?>", title, flags=re.I)[0].split())
-    return GRADE_SUMMARY_HEADERS.get(label)
+    return GRADE_SUMMARY_HEADERS.get(title_label(title, points=points))
 
 
-def _header(row: html.HtmlElement) -> tuple[dict[str, int], int]:
+def _header(
+    row: html.HtmlElement, *, points: bool = False
+) -> tuple[dict[str, int], int]:
     fields: dict[str, int] = {}
     position = GRADE_BODY_PREFIX_COLUMNS
     for cell in markup.cells(row):
         span = markup.colspan(cell)
         if position + span > GRADE_MAX_COLUMNS:
             raise LibrusError(ErrorKind.LIMIT)
-        field = _summary_field(cell)
+        field = _summary_field(cell, points=points)
         if field is not None:
             if field in fields:
                 raise LibrusError(ErrorKind.PARSE)
@@ -86,7 +98,7 @@ def point_layout(table: html.HtmlElement) -> tuple[dict[str, int], int]:
     ]
     if len(headers) != 1:
         raise LibrusError(ErrorKind.PARSE)
-    return _header(headers[0])
+    return _header(headers[0], points=True)
 
 
 def _candidates(
@@ -181,7 +193,7 @@ def _summary(
 
 
 def _subject_rows(
-    table: html.HtmlElement, width: int
+    table: html.HtmlElement, width: int, *, points: bool = False
 ) -> Iterator[list[html.HtmlElement]]:
     for row in markup.rows(table):
         if next(row.iterancestors("thead"), None) is not None:
@@ -189,6 +201,14 @@ def _subject_rows(
         cells = markup.cells(row)
         if not cells:
             raise LibrusError(ErrorKind.PARSE)
+        # The observed point table closes with an empty footer cell wider than
+        # the table; only an empty footer row is skipped.
+        if (
+            points
+            and next(row.iterancestors("tfoot"), None) is not None
+            and not any(markup.text(cell) for cell in cells)
+        ):
+            continue
         if list(row.iter("table")):
             if _outside_nested_tables(row):
                 raise LibrusError(ErrorKind.PARSE)
@@ -252,7 +272,7 @@ def parse_final_grades(body: bytes) -> tuple[SubjectGradeSummary, ...]:
     items: dict[str, SubjectGradeSummary] = {}
     for table, fields, width in sources:
         family_subjects: set[str] = set()
-        for cells in _subject_rows(table, width):
+        for cells in _subject_rows(table, width, points=table in point_tables):
             item = _summary(cells, fields, width)
             if item.subject in family_subjects:
                 raise LibrusError(ErrorKind.PARSE)

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/grade_records.py

@@ -36,6 +36,7 @@ from librus_python_api.grade_parsers import (
     _summary,
     is_point_table,
     point_layout,
+    title_label,
 )
 from librus_python_api.models import (
     Availability,
@@ -51,8 +52,8 @@ from librus_python_api.models import (
 from librus_python_api.parsers import parse_page
 
 
-def _label(title: str) -> str:
-    return " ".join(re.split(r"<br\s*/?>", title, flags=re.I)[0].split())
+def _label(title: str, *, points: bool = False) -> str:
+    return title_label(title, points=points)
 
 
 def _layout(
@@ -74,7 +75,9 @@ def _layout(
                 if markup.colspan(cell) != 1:
                     raise LibrusError(ErrorKind.PARSE)
                 current.append(position)
-            period = GRADE_AVERAGE_HEADERS.get(_label(cell.get("title", "")))
+            period = GRADE_AVERAGE_HEADERS.get(
+                _label(cell.get("title", ""), points=points)
+            )
             result = GRADE_POINT_RESULT_HEADER.fullmatch(markup.text(cell))
             if points and period is None and result is not None:
                 period = GRADE_POINT_RESULT_PERIODS[result.group(1)]
@@ -333,7 +336,9 @@ def _read_descriptive_row(
                 raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
 
 
-def _period_columns(table: html.HtmlElement) -> dict[tuple[int, GradeKind], int]:
+def _period_columns(
+    table: html.HtmlElement, *, points: bool = False
+) -> dict[tuple[int, GradeKind], int]:
     result: dict[tuple[int, GradeKind], int] = {}
     for row in markup.rows(table):
         cells = markup.cells(row)
@@ -343,7 +348,7 @@ def _period_columns(table: html.HtmlElement) -> dict[tuple[int, GradeKind], int]
             continue
         position = GRADE_BODY_PREFIX_COLUMNS
         for cell in cells:
-            label = _label(cell.get("title", ""))
+            label = _label(cell.get("title", ""), points=points)
             period = GRADE_PERIOD_HEADERS.get(label)
             kind = GradeKind.ANNUAL if period == 0 else GradeKind.PERIOD
             if label == GRADE_PREDICTED_ANNUAL_HEADER:
@@ -371,11 +376,11 @@ def _read_numeric_table(
     else:
         _, fields, width = _locate(table)
     current, means = _layout(table, points=points)
-    periods = _period_columns(table)
+    periods = _period_columns(table, points=points)
     averages = collection.point_results if points else collection.averages
     # Period grades shown by both tables are one record, kept from the first.
     prior = set(collection.numeric) if points else set()
-    for cells in _subject_rows(table, width):
+    for cells in _subject_rows(table, width, points=points):
         if cells[0].getparent() in collection.publication_rows:
             continue
         if points:
@@ -412,9 +417,10 @@ def _read_numeric_table(
                         columns[index], subject, cast(Literal[1, 2], period), collection
                     )
                     # A point entry without its detail link would pass as a
-                    # grade symbol; an unseen link layout fails instead.
+                    # grade symbol; an unseen link layout fails instead. The
+                    # observed point table also shows formative entries.
                     if points and any(
-                        record.point_grade_id is None
+                        record.point_grade_id is None and record.formative_id is None
                         for record in collection.numeric[start:]
                     ):
                         raise LibrusError(ErrorKind.PARSE)
@@ -558,11 +564,11 @@ def parse_grade_records(body: bytes) -> GradeRecords:
                     continue
             raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)
     for anchor in document.iter("a"):
-        # A formative link outside both known tables is a new layout.
+        # A formative link outside the known tables is a new layout.
         if markup.detail_id(
             anchor.get("href"), FORMATIVE_DETAIL_PATH_PREFIX
         ) and not any(
-            parent in numeric_tables or parent in formative_tables
+            parent in grade_tables or parent in formative_tables
             for parent in anchor.iterancestors("table")
         ):
             raise LibrusError(ErrorKind.UNSUPPORTED_CAPABILITY)

{librus_python_api-1.7.0 → librus_python_api-1.7.1}/src/librus_python_api/markup.py

@@ -13,6 +13,7 @@ from librus_python_api.config import (
     GRADE_MAX_COLUMNS,
     GRADE_MAX_METADATA_FIELDS,
     GRADE_MAX_METADATA_LENGTH,
+    TOOLTIP_MULTILINE_LABELS,
     UPSTREAM_ORIGINS,
 )
 from librus_python_api.exceptions import ErrorKind, LibrusError
@@ -81,11 +82,16 @@ def colspan(cell: html.HtmlElement) -> int:
 
 
 def tooltip_fields(element: html.HtmlElement) -> dict[str, str]:
-    """Parse a 'Label: value<br>' title attribute into unique labelled fields."""
+    """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.
+    """
     title = element.get("title", "")
     if len(title) > GRADE_MAX_METADATA_LENGTH:
         raise LibrusError(ErrorKind.LIMIT)
     result: dict[str, str] = {}
+    last: str | None = None
     chunks = re.split(r"<br\s*/?>|\n", title, flags=re.I)
     if len(chunks) > GRADE_MAX_METADATA_FIELDS:
         raise LibrusError(ErrorKind.LIMIT)
@@ -100,9 +106,13 @@ def tooltip_fields(element: html.HtmlElement) -> dict[str, str]:
         )
         key, separator, value = rendered.partition(":")
         key, value = key.strip(), value.strip()
+        if not separator and last in TOOLTIP_MULTILINE_LABELS:
+            result[last] = f"{result[last]}\n{rendered}".strip()
+            continue
         if not separator or not key or key in result:
             raise LibrusError(ErrorKind.PARSE)
         result[key] = value
+        last = key
     return result