indico_toolkit 7.2.0__tar.gz → 7.2.1__tar.gz

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: indico-toolkit
-Version: 7.2.0
+Version: 7.2.1
 Summary: Classes, functions, and abstractions for Indico IPA
 License: MIT
 Author: Indico Solutions Engineering

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/indico_toolkit/__init__.py

@@ -21,4 +21,4 @@ __all__ = (
     "ToolkitStaggeredLoopError",
     "ToolkitStatusError",
 )
-__version__ = "7.2.0"
+__version__ = "7.2.1"

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/indico_toolkit/etloutput/etloutput.py

@@ -96,15 +96,11 @@ class EtlOutput:
         else:
             raise TableCellNotFoundError(f"no table contains {token!r}")
 
-        try:
-            row_index = bisect_left(
-                table.rows, token_vmid, key=lambda row: row[0].box.bottom
-            )
-            row = table.rows[row_index]
-
-            cell_index = bisect_left(row, token_hmid, key=attrgetter("box.right"))
-            cell = row[cell_index]
-        except (IndexError, ValueError) as error:
-            raise TableCellNotFoundError(f"no cell contains {token!r}") from error
-
-        return table, cell
+        for cell in table.cells:
+            if (
+                (cell.box.top  <= token_vmid <= cell.box.bottom) and
+                (cell.box.left <= token_hmid <= cell.box.right)
+            ):  # fmt: skip
+                return table, cell
+        else:
+            raise TableCellNotFoundError(f"no cell contains {token!r}")

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/indico_toolkit/etloutput/range.py

@@ -21,8 +21,8 @@ class Range:
         columns = get(cell, list, "columns")
 
         return Range(
-            row=rows[0],
-            column=columns[0],
+            row=min(rows),
+            column=min(columns),
             rowspan=len(rows),
             columnspan=len(columns),
             rows=tuple(rows),

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/indico_toolkit/etloutput/table.py

@@ -20,6 +20,8 @@ class Table:
         """
         page = get(table, int, "page_num")
         get(table, dict, "position")["page_num"] = page
+        row_count = get(table, int, "num_rows")
+        column_count = get(table, int, "num_columns")
 
         cells = tuple(
             sorted(
@@ -27,14 +29,26 @@ class Table:
                 key=attrgetter("range"),
             )
         )
+        cells_by_row_col = {
+            (row, column): cell
+            for cell in cells
+            for row in cell.range.rows
+            for column in cell.range.columns
+        }
         rows = tuple(
-            tuple(cell for cell in cells if row in cell.range.rows)
-            for row in range(get(table, int, "num_rows"))
-        )
+            tuple(
+                cells_by_row_col[row, column]
+                for column in range(column_count)
+            )
+            for row in range(row_count)
+        )  # fmt: skip
         columns = tuple(
-            tuple(cell for cell in cells if column in cell.range.columns)
-            for column in range(get(table, int, "num_columns"))
-        )
+            tuple(
+                cells_by_row_col[row, column]
+                for row in range(row_count)
+            )
+            for column in range(column_count)
+        )  # fmt: skip
 
         return Table(
             box=Box.from_dict(get(table, dict, "position")),

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/indico_toolkit/polling/autoreview.py

@@ -30,7 +30,7 @@ logger = logging.getLogger(__name__)
 
 @dataclass
 class AutoReviewed:
-    changes: "dict[str, Any] | list[dict[str, Any]]"
+    changes: "list[dict[str, Any]]"
     reject: bool = False
     stp: bool = False
 

{indico_toolkit-7.2.0 → indico_toolkit-7.2.1}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 readme = "README.md"
 urls = { source = "https://github.com/IndicoDataSolutions/Indico-Solutions-Toolkit" }
 requires-python = ">=3.10"
-version = "7.2.0"
+version = "7.2.1"
 dependencies = ["indico-client (>=6.14.0,<7.0.0)"]
 
 [project.optional-dependencies]