athena-python-docx 0.21.5__tar.gz → 0.21.7__tar.gz

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: athena-python-docx
-Version: 0.21.5
+Version: 0.21.7
 Summary: Drop-in replacement for python-docx that connects to Athena's DOCX Studio collaborative document stack
 Project-URL: Homepage, https://athenaintelligence.ai
 Author-email: Athena Intelligence <engineering@athenaintelligence.ai>

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/docx/__init__.py

@@ -6,7 +6,7 @@ See CLAUDE.md for the API parity contract.
 
 from __future__ import annotations
 
-__version__ = "0.21.5"
+__version__ = "0.21.7"
 
 from docx.api import Document
 from docx._buffer import discard_all, flush_all

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/docx/document.py

@@ -1222,7 +1222,23 @@ class Document:
             ),
         )
         if isinstance(result, dict):
-            return result
+            # Tolerate an older docx-studio deployment that returned only
+            # ``{"matches": [...]}``. The SDK's public contract promises
+            # ``count`` and ``truncated`` too; normalizing here prevents a
+            # model script from crashing with ``KeyError: 'count'`` during a
+            # rolling deploy. The server now supplies the true total count,
+            # while this fallback can conservatively report the returned size.
+            matches_obj: object = result.get("matches", [])
+            matches: list[object] = matches_obj if isinstance(matches_obj, list) else []
+            count_obj: object = result.get("count", len(matches))
+            count: int = int(count_obj) if isinstance(count_obj, (int, float)) else len(matches)
+            truncated_obj: object = result.get("truncated", count > len(matches))
+            return {
+                **result,
+                "count": count,
+                "matches": matches,
+                "truncated": bool(truncated_obj),
+            }
         return {"count": 0, "matches": [], "truncated": False}
 
     @athena_extension(

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/docx/table.py

@@ -1477,8 +1477,9 @@ class _Cell:
 
     def _cell_info_at(self, row: int, col: int) -> dict | None:
         """Raw ``tables.getCells`` for (row, col). Returns ``None`` when
-        DOCX Studio reports no cell at that grid position — either an
-        out-of-bounds query or a secondary slot covered by a colspan."""
+        DOCX Studio reports no cell at that grid position. Current servers
+        resolve a secondary slot covered by a colspan to its master cell;
+        older servers returned ``None`` for that case."""
         nid: str = self._table._fresh_node_id()
         result: object = run_sync(
             self._table._session.doc.tables.get_cells(
@@ -1500,8 +1501,8 @@ class _Cell:
     def _cell_info(self) -> dict | None:
         """Return the cell info backing ``(self._row, self._col)``.
 
-        When ``self`` is the secondary slot of a horizontal merge, real
-        DOCX Studio returns an empty cell list (only the master is
+        When ``self`` is the secondary slot of a horizontal merge, older
+        DOCX Studio deployments return an empty cell list (only the master is
         addressable by its top-left position). Mirror python-docx's
         ``_Cell``-on-merge semantics by walking back along the row to
         find the first cell whose ``colspan`` covers our grid column,

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/docx/text/run.py

@@ -668,12 +668,27 @@ class Run:
         h_px: float = _emu_to_px(h_emu)
         w_pt: float = w_emu / 12700.0
         h_pt: float = h_emu / 12700.0
+        # Anchor inside this run's paragraph so the picture lands inline and
+        # inherits the paragraph's alignment/spacing — python-docx semantics,
+        # where ``run.add_picture`` places the image in that run's paragraph.
+        # Cell-inner paragraphs keep the legacy document-end block: their
+        # blockIds are not addressable by the applier's selection resolver.
+        at: dict = {"kind": "documentEnd"}
+        if not getattr(self, "_in_cell", False) and self._block_id:
+            at = {
+                "kind": "selection",
+                "start": {
+                    "kind": "text",
+                    "blockId": self._block_id,
+                    "offset": self._range[1],
+                },
+            }
         result: object = run_sync(
             self._session.doc.create.image(
                 {
                     "src": data_uri,
                     "size": {"width": w_px, "height": h_px},
-                    "at": {"kind": "documentEnd"},
+                    "at": at,
                 },
             ),
         )

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "athena-python-docx"
-version = "0.21.5"
+version = "0.21.7"
 description = "Drop-in replacement for python-docx that connects to Athena's DOCX Studio collaborative document stack"
 readme = "README.md"
 license = "MIT"
@@ -56,3 +56,9 @@ markers = [
 [tool.ruff]
 line-length = 100
 target-version = "py311"
+
+[tool.ruff.lint]
+# Keep the SDK's historical Ruff contract explicit. Ruff 0.16 expanded its
+# implicit defaults, which otherwise turns an unpinned CI upgrade into hundreds
+# of unrelated findings. Broader rule families should be adopted deliberately.
+select = ["E4", "E7", "E9", "F"]

{athena_python_docx-0.21.5 → athena_python_docx-0.21.7}/tests/test_find_replace_session_open.py

@@ -231,3 +231,22 @@ def test_find_text_returns_server_context(fake_sd_methods: Any) -> None:
     assert result["truncated"] is True
     assert session.open.await_count == 1
     assert session.send_command.await_count == 1
+
+
+def test_find_text_normalizes_legacy_matches_only_response(
+    fake_sd_methods: Any,
+) -> None:
+    """Rolling deploys must not make ``result['count']`` raise KeyError."""
+    session = _make_unopened_session(fake_sd_methods)
+    session.send_command.return_value = {
+        "matches": [{"text": "Buyer"}, {"text": "Buyer"}],
+    }
+    doc = _make_unopened_document(session)
+
+    result = doc.find_text("Buyer")
+
+    assert result == {
+        "count": 2,
+        "matches": [{"text": "Buyer"}, {"text": "Buyer"}],
+        "truncated": False,
+    }

athena_python_docx-0.21.7/tests/test_run_add_picture_anchor.py

@@ -0,0 +1,69 @@
+"""``Run.add_picture`` anchors inside its own paragraph (python-docx parity).
+
+The picture must land inline in the run's paragraph so it inherits that
+paragraph's alignment and spacing. An unanchored ``documentEnd`` create makes
+the applier wrap the image in a fresh left-aligned paragraph — so e.g. a
+centered logo paragraph stays empty while the logo renders left-aligned in its
+own block. Cell-inner runs and ``Document.add_picture`` keep the document-end
+block form.
+"""
+
+from __future__ import annotations
+
+import base64
+from typing import Any
+
+# Minimal valid 1x1 PNG.
+_PNG = bytes.fromhex(
+    "89504e470d0a1a0a0000000d49484452000000010000000108060000001f15c489"
+    "0000000a49444154789c6360000002000154a24f5e0000000049454e44ae426082"
+)
+_PNG_URI = f"data:image/png;base64,{base64.b64encode(_PNG).decode()}"
+
+
+def _image_call(fake_sd_methods: Any) -> dict:
+    return next(c for c in fake_sd_methods.calls if c[0] == "create.image")[1]
+
+
+def test_run_add_picture_anchors_in_its_paragraph(
+    mock_session: Any, fake_sd_methods: Any
+) -> None:
+    from docx.text.run import Run
+
+    run = Run(session=mock_session, block_id="p-42", range_=(0, 11))
+    run.add_picture(_PNG_URI)
+    params = _image_call(fake_sd_methods)
+    assert params["at"] == {
+        "kind": "selection",
+        "start": {"kind": "text", "blockId": "p-42", "offset": 11},
+    }
+
+
+def test_cell_inner_run_add_picture_keeps_document_end(
+    mock_session: Any, fake_sd_methods: Any
+) -> None:
+    # Cell-inner paragraphs are not addressable by the applier's selection
+    # resolver — a blockId anchor would abort the whole batch.
+    from docx.text.run import Run
+
+    run = Run(session=mock_session, block_id="tc:0:0:0", range_=(0, 0), in_cell=True)
+    run.add_picture(_PNG_URI)
+    assert _image_call(fake_sd_methods)["at"] == {"kind": "documentEnd"}
+
+
+def test_document_add_picture_keeps_document_end(
+    mock_session: Any, fake_sd_methods: Any
+) -> None:
+    # python-docx parity: Document.add_picture appends a new paragraph holding
+    # the picture, so the block-creating document-end form is correct there.
+    from docx.document import Document as DocClass
+
+    doc = DocClass.__new__(DocClass)
+    doc._session = mock_session
+    doc._saved = False
+    doc._closed = False
+    doc._pending_user_name = None
+    doc._pending_user_email = None
+    doc._pending_track_revisions = False
+    doc.add_picture(_PNG_URI)
+    assert _image_call(fake_sd_methods)["at"] == {"kind": "documentEnd"}