excel-mcp-server 2.2.3__tar.gz → 2.2.4__tar.gz

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: excel-mcp-server
-Version: 2.2.3
+Version: 2.2.4
 Summary: MCP server for creating, reading and editing Excel workbooks without Microsoft Excel
 Keywords: mcp,mcp-server,model-context-protocol,excel,xlsx,xlsm,spreadsheet,openpyxl,charts,pivot-table,formulas,vba,llm,ai,claude,cursor
 Author: Haris Musa

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "excel-mcp-server"
-version = "2.2.3"
+version = "2.2.4"
 description = "MCP server for creating, reading and editing Excel workbooks without Microsoft Excel"
 readme = "README.md"
 license = "MIT"

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "excel-mcp-server"
-version = "2.2.3"
+version = "2.2.4"
 description = "MCP server for creating, reading and editing Excel workbooks without Microsoft Excel"
 readme = "README.md"
 license = "MIT"

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/src/excel_mcp/operations/slicer_place.py

@@ -7,6 +7,7 @@ from openpyxl.workbook import Workbook
 from openpyxl.workbook.defined_name import DefinedName
 from openpyxl.worksheet.worksheet import Worksheet
 
+from excel_mcp.errors import WorkbookError
 from excel_mcp.operations import slicer_xml as xml
 from excel_mcp.package import Link, Part, SheetPackage, state_of
 from excel_mcp.package.anchors import Geometry
@@ -119,7 +120,8 @@ def _list_in(extensions: dict[str, str], uri: str, element: str) -> None:
     assert reference is not None
     existing = extensions[uri]
     closing = re.search(r"</(?:\w+:)(?:slicerCaches|timelineCacheRefs)>", existing)
-    assert closing is not None
+    if closing is None:
+        raise WorkbookError("The workbook's list of slicer or timeline caches is malformed.")
     extensions[uri] = existing[: closing.start()] + reference[0] + existing[closing.start() :]
 
 

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/src/excel_mcp/operations/sparklines.py

@@ -17,7 +17,7 @@ from excel_mcp.operations.sparkline_style import SparklineInfo, SparklineStyle,
 from excel_mcp.operations.sparkline_xml import build_group, read_groups
 from excel_mcp.operations.x14_xml import X14, XM, sheet_prefix
 from excel_mcp.package import state_of
-from excel_mcp.package.extensions import SPARKLINES, edit_sparklines
+from excel_mcp.package.extensions import SPARKLINES, edit_sparklines, sparkline_location
 from excel_mcp.refs import CellRange, cell_name, parse_range
 from excel_mcp.workspace import get_sheet
 
@@ -117,9 +117,7 @@ def _delete(extensions: dict[str, str], doomed: Callable[[str], bool]) -> int:
 
     def handle(item: str) -> list[str]:
         nonlocal removed
-        location = _LOCATION.search(item)
-        assert location is not None
-        if doomed(location[1]):
+        if doomed(sparkline_location(item)):
             removed += 1
             return []
         return [item]

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/src/excel_mcp/package/extensions.py

@@ -12,6 +12,7 @@ from xml.sax.saxutils import escape
 
 from openpyxl.utils.cell import column_index_from_string, get_column_letter
 
+from excel_mcp.errors import WorkbookError
 from excel_mcp.package.lines import LineEdit
 from excel_mcp.package.scan import unescape
 from excel_mcp.refs import CellRange, clip_areas, parse_range
@@ -232,11 +233,21 @@ def _sparklines(xml: str, handle: Callable[[str], list[str]]) -> str | None:
     return xml if re.search(r"<x14:sparklineGroup\b", xml) else None
 
 
-def _moved_sparkline(item: str, rewriter: Rewriter) -> list[str]:
+def sparkline_location(item: str) -> str:
+    """The cell of a ``<x14:sparkline>``. Excel refuses a file with a sparkline that has none."""
     location = _RANGE.search(item)
+    if location is None:
+        raise WorkbookError(
+            "The workbook has a sparkline without a location (<xm:sqref>), which Excel "
+            "cannot open. Remove it from the file."
+        )
+    return location[1]
+
+
+def _moved_sparkline(item: str, rewriter: Rewriter) -> list[str]:
+    location = sparkline_location(item)
     source = _FORMULA.search(item)
-    assert location is not None
-    moved = rewriter.ranges(location[1], grow=False)
+    moved = rewriter.ranges(location, grow=False)
     if moved is None:
         return []
     item = _RANGE.sub(lambda _: f"<xm:sqref>{moved}</xm:sqref>", item)
@@ -246,7 +257,7 @@ def _moved_sparkline(item: str, rewriter: Rewriter) -> list[str]:
             item = item.replace(source[0], "")
         else:
             item = item.replace(source[0], f"<xm:f>{escape(read)}</xm:f>")
-    return [item, *_inserted_copies(item, location[1], rewriter)]
+    return [item, *_inserted_copies(item, location, rewriter)]
 
 
 def _moved_formula(match: re.Match[str], rewriter: Rewriter) -> str:

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/src/excel_mcp/package/patch.py

@@ -2,6 +2,7 @@
 
 import re
 from collections.abc import Callable
+from itertools import pairwise
 
 from excel_mcp.errors import WorkbookError
 from excel_mcp.package.scan import Scan, scan
@@ -146,18 +147,44 @@ def _with_extension(rule: bytes, qname: str, extension: str, offset: int) -> Edi
     return (offset, offset + len(rule), text)
 
 
+# Looking each cell up by its address reads the sheet once per cell, which is fastest for a
+# few cells; for more, one pass over all the cells does not grow with the number to patch.
+_FEW_CELLS = 16
+_CELL = re.compile(rb'<c r="([^"]*)"([^>]*?)(?:/>|>(.*?)</c>)', re.S)
+
+
 def patch_cells(data: bytes, edits: dict[str, CellEdit]) -> bytes:
     """Rewrite chosen cells of ``sheetData``; an edit gets a cell's attributes and its content."""
     if not edits:
         return data
-    cell = re.compile(rb'<c r="([^"]*)"([^>]*?)(?:/>|>(.*?)</c>)', re.S)
+    if len(edits) <= _FEW_CELLS:
+        return splice(data, _located_edits(data, edits))
 
     def rewrite(match: re.Match[bytes]) -> bytes:
-        coordinate = match[1].decode()
-        if coordinate not in edits:
-            return match[0]
-        attributes, body = edits[coordinate](match[2].decode(), (match[3] or b"").decode())
-        start = f'<c r="{coordinate}"{attributes}'
-        return f"{start}>{body}</c>".encode() if body else f"{start}/>".encode()
-
-    return cell.sub(rewrite, data)
+        edit = edits.get(match[1].decode())
+        return _rewritten(match, edit) if edit else match[0]
+
+    return _CELL.sub(rewrite, data)
+
+
+def _located_edits(data: bytes, edits: dict[str, CellEdit]) -> list[Edit]:
+    found: list[Edit] = []
+    for coordinate, edit in edits.items():
+        opening = b'<c r="%b"' % coordinate.encode()
+        start = data.find(opening)
+        while start >= 0:
+            match = _CELL.match(data, start)
+            if match is None:
+                raise WorkbookError(f"Cell {coordinate} of a worksheet is malformed.")
+            found.append((match.start(), match.end(), _rewritten(match, edit)))
+            start = data.find(opening, match.end())
+    found.sort()
+    if any(before[1] > after[0] for before, after in pairwise(found)):
+        raise WorkbookError("A worksheet has cells inside other cells.")
+    return found
+
+
+def _rewritten(match: re.Match[bytes], edit: CellEdit) -> bytes:
+    attributes, body = edit(match[2].decode(), (match[3] or b"").decode())
+    start = f'<c r="{match[1].decode()}"{attributes}'
+    return f"{start}>{body}</c>".encode() if body else f"{start}/>".encode()

{excel_mcp_server-2.2.3 → excel_mcp_server-2.2.4}/src/excel_mcp/package/references.py

@@ -26,6 +26,7 @@ from xml.sax.saxutils import escape
 from openpyxl import Workbook
 from openpyxl.worksheet.worksheet import Worksheet
 
+from excel_mcp.errors import WorkbookError
 from excel_mcp.package import extensions
 from excel_mcp.package.anchors import Geometry, Moved, move_anchors, move_vml_shape
 from excel_mcp.package.lines import LineEdit
@@ -120,7 +121,8 @@ def _ranged_items(xml: str, item: str, attribute: str, rewriter: _Rewriter) -> s
     def move(match: re.Match[str]) -> str:
         text = match[0]
         value = re.search(rf'\b{attribute}="([^"]*)"', text)
-        assert value is not None
+        if value is None:
+            raise WorkbookError(f"A <{item}> of the workbook has no {attribute} attribute.")
         moved = rewriter.ranges(value[1], grow=attribute == "sqref")
         return "" if moved is None else text.replace(value[0], f'{attribute}="{moved}"', 1)
 
@@ -134,7 +136,8 @@ def _sort_state(xml: str, rewriter: _Rewriter) -> str | None:
 
     def move(match: re.Match[str]) -> str:
         found = ref.search(match[0])
-        assert found is not None
+        if found is None:
+            raise WorkbookError("A <sortCondition> of the workbook has no ref attribute.")
         moved = rewriter.ranges(found[1])
         return "" if moved is None else match[0].replace(found[0], f'ref="{moved}"', 1)