exstruct 0.2.3__tar.gz → 0.2.11__tar.gz

{exstruct-0.2.3 → exstruct-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: exstruct
-Version: 0.2.3
+Version: 0.2.11
 Summary: Excel to structured JSON (tables, shapes, charts) for LLM/RAG pipelines
 Keywords: excel,structure,data,exstruct
 Author: harumiWeb
@@ -56,16 +56,16 @@ Description-Content-Type: text/markdown
 
 # ExStruct — Excel Structured Extraction Engine
 
-[![PyPI version](https://badge.fury.io/py/exstruct.svg)](https://pypi.org/project/exstruct/) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/exstruct?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/exstruct) ![Licence: BSD-3-Clause](https://img.shields.io/badge/license-BSD--3--Clause-blue?style=flat-square) [![pytest](https://github.com/harumiWeb/exstruct/actions/workflows/pytest.yml/badge.svg)](https://github.com/harumiWeb/exstruct/actions/workflows/pytest.yml)
+[![PyPI version](https://badge.fury.io/py/exstruct.svg)](https://pypi.org/project/exstruct/) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/exstruct?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/exstruct) ![Licence: BSD-3-Clause](https://img.shields.io/badge/license-BSD--3--Clause-blue?style=flat-square) [![CI](https://github.com/harumiWeb/exstruct/actions/workflows/ci.yml/badge.svg)](https://github.com/harumiWeb/exstruct/actions/workflows/ci.yml)
 
 ![ExStruct Image](/docs/assets/icon.webp)
 
-ExStruct reads Excel workbooks and outputs structured data (cells, table candidates, shapes, charts, print areas/views, hyperlinks) as JSON by default, with optional YAML/TOON formats. It targets both COM/Excel environments (rich extraction) and non-COM environments (cells + table candidates + print areas), with tunable detection heuristics and multiple output modes to fit LLM/RAG pipelines.
+ExStruct reads Excel workbooks and outputs structured data (tables, shapes, charts) as JSON by default, with optional YAML/TOON formats. It targets both COM/Excel environments (rich extraction) and non-COM environments (cells + table candidates), with tunable detection heuristics and multiple output modes to fit LLM/RAG pipelines.
 
 ## Features
 
-- **Excel → Structured JSON**: cells, shapes, charts, table candidates, and print areas/views per sheet.
-- **Output modes**: `light` (cells + table candidates + print areas; no COM, shapes/charts empty), `standard` (texted shapes + arrows, charts, print areas), `verbose` (all shapes with width/height, charts with size, print areas). Verbose also emits cell hyperlinks. Size output is flag-controlled.
+- **Excel → Structured JSON**: cells, shapes, charts, and table candidates per sheet.
+- **Output modes**: `light` (cells + table candidates only), `standard` (texted shapes + arrows, charts), `verbose` (all shapes with width/height).
 - **Formats**: JSON (compact by default, `--pretty` available), YAML, TOON (optional dependencies).
 - **Table detection tuning**: adjust heuristics at runtime via API.
 - **CLI rendering** (Excel required): optional PDF and per-sheet PNGs.
@@ -77,18 +77,17 @@ ExStruct reads Excel workbooks and outputs structured data (cells, table candida
 pip install exstruct
 ```
 
-Optional extras:
-
-- YAML: `pip install pyyaml`
-- TOON: `pip install python-toon`
-- Rendering (PDF/PNG): Excel + `pip install pypdfium2 pillow`
-- All extras at once: `pip install exstruct[yaml,toon,render]`
-
-Platform note:
-
-- Full extraction (shapes/charts) targets Windows + Excel (COM via xlwings). On other platforms, use `mode=light` to get cells + `table_candidates`.
-
-## Quick Start (CLI)
+Optional extras:
+
+- YAML: `pip install pyyaml`
+- TOON: `pip install python-toon`
+- Rendering (PDF/PNG): Excel + `pip install pypdfium2 pillow`
+- All extras at once: `pip install exstruct[yaml,toon,render]`
+
+Platform note:
+- Full extraction (shapes/charts) targets Windows + Excel (COM via xlwings). On other platforms, use `mode=light` to get cells + `table_candidates` safely.
+
+## Quick Start (CLI)
 
 ```bash
 exstruct input.xlsx > output.json          # compact JSON to stdout (default)
@@ -96,7 +95,6 @@ exstruct input.xlsx -o out.json --pretty   # pretty JSON to a file
 exstruct input.xlsx --format yaml          # YAML (needs pyyaml)
 exstruct input.xlsx --format toon          # TOON (needs python-toon)
 exstruct input.xlsx --sheets-dir sheets/   # split per sheet in chosen format
-exstruct input.xlsx --print-areas-dir areas/  # split per print area (if any)
 exstruct input.xlsx --mode light           # cells + table candidates only
 exstruct input.xlsx --pdf --image          # PDF and PNGs (Excel required)
 ```
@@ -114,7 +112,7 @@ set_table_detection_params(table_score_threshold=0.3, density_min=0.04)
 wb = extract("input.xlsx", mode="standard")
 export(wb, Path("out.json"), pretty=False)  # compact JSON
 
-# Model helpers: iterate, index, and serialize directly
+# Model helpers: iterate, index, and serialize directly from the models
 first_sheet = wb["Sheet1"]           # __getitem__ access
 for name, sheet in wb:               # __iter__ yields (name, SheetData)
     print(name, len(sheet.rows))
@@ -126,19 +124,11 @@ print(first_sheet.to_yaml())         # YAML text (requires pyyaml)
 from exstruct import ExStructEngine, StructOptions, OutputOptions
 
 engine = ExStructEngine(
-    options=StructOptions(mode="verbose"),  # verbose includes hyperlinks by default
+    options=StructOptions(mode="standard"),
     output=OutputOptions(include_shapes=False, pretty=True),
 )
 wb2 = engine.extract("input.xlsx")
 engine.export(wb2, Path("out_filtered.json"))  # drops shapes via OutputOptions
-
-# Enable hyperlinks in other modes
-engine_links = ExStructEngine(options=StructOptions(mode="standard", include_cell_links=True))
-with_links = engine_links.extract("input.xlsx")
-
-# Export per print area (if print areas exist)
-from exstruct import export_print_areas_as
-export_print_areas_as(wb, "areas", fmt="json", pretty=True)
 ```
 
 **Note (non-COM environments):** If Excel COM is unavailable, extraction still runs and returns cells + `table_candidates`; `shapes`/`charts` will be empty.
@@ -161,8 +151,8 @@ Use higher thresholds to reduce false positives; lower them if true tables are m
 ## Output Modes
 
 - **light**: cells + table candidates (no COM needed).
-- **standard**: texted shapes + arrows, charts (COM if available), table candidates. Hyperlinks are off unless `include_cell_links=True`.
-- **verbose**: all shapes (with width/height), charts, table candidates, and cell hyperlinks.
+- **standard**: texted shapes + arrows, charts (COM if available), table candidates.
+- **verbose**: all shapes (with width/height), charts, table candidates.
 
 ## Error Handling / Fallbacks
 
@@ -191,7 +181,6 @@ To show how well exstruct can structure Excel, we parse a workbook that combines
 (Screenshot below is the actual sample Excel sheet)
 ![Sample Excel](/docs/assets/demo_sheet.png)
 Sample workbook: `sample/sample.xlsx`
-Sample workbook: `sample/sample.xlsx`
 
 ### 1. Input: Excel Sheet Overview
 
@@ -378,12 +367,6 @@ In short, **exstruct = “an engine that converts Excel into a format AI can und
 - Default JSON is compact to reduce tokens; use `--pretty` or `pretty=True` when readability matters.
 - Field `table_candidates` replaces `tables`; adjust downstream consumers accordingly.
 
-## Print Areas (PrintArea / PrintAreaView)
-
-- `SheetData.print_areas` holds print areas (cell coordinates) in light/standard/verbose.
-- Use `export_print_areas_as(...)` or CLI `--print-areas-dir` to write one file per print area (nothing is written if none exist).
-- `PrintAreaView` includes rows and table candidates inside the area, plus shapes/charts that overlap the area (size-less shapes are treated as points). `normalize=True` rebases row/col indices to the area origin.
-
 ## License
 
 BSD-3-Clause. See `LICENSE` for details.
@@ -391,3 +374,17 @@ BSD-3-Clause. See `LICENSE` for details.
 ## Documentation
 
 - API Reference (GitHub Pages): https://harumiweb.github.io/exstruct/
+# Engine option cheat sheet
+
+| Option class   | Field               | Meaning |
+| -------------- | ------------------- | ------- |
+| StructOptions  | mode                | "light"/"standard"/"verbose" |
+|                | table_params        | Dict passed to `set_table_detection_params` (table_score_threshold, density_min, coverage_min, min_nonempty_cells) |
+| OutputOptions  | fmt                 | Default format ("json"/"yaml"/"yml"/"toon") |
+|                | pretty / indent     | Pretty-print JSON and control indent |
+|                | include_rows        | Include rows (False to drop) |
+|                | include_shapes      | Include shapes |
+|                | include_charts      | Include charts |
+|                | include_tables      | Include table_candidates |
+|                | sheets_dir          | Optional directory for per-sheet exports |
+|                | stream              | Default stream when output_path is None |

{exstruct-0.2.3 → exstruct-0.2.11}/README.md

@@ -1,15 +1,15 @@
 # ExStruct — Excel Structured Extraction Engine
 
-[![PyPI version](https://badge.fury.io/py/exstruct.svg)](https://pypi.org/project/exstruct/) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/exstruct?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/exstruct) ![Licence: BSD-3-Clause](https://img.shields.io/badge/license-BSD--3--Clause-blue?style=flat-square) [![pytest](https://github.com/harumiWeb/exstruct/actions/workflows/pytest.yml/badge.svg)](https://github.com/harumiWeb/exstruct/actions/workflows/pytest.yml)
+[![PyPI version](https://badge.fury.io/py/exstruct.svg)](https://pypi.org/project/exstruct/) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/exstruct?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/exstruct) ![Licence: BSD-3-Clause](https://img.shields.io/badge/license-BSD--3--Clause-blue?style=flat-square) [![CI](https://github.com/harumiWeb/exstruct/actions/workflows/ci.yml/badge.svg)](https://github.com/harumiWeb/exstruct/actions/workflows/ci.yml)
 
 ![ExStruct Image](/docs/assets/icon.webp)
 
-ExStruct reads Excel workbooks and outputs structured data (cells, table candidates, shapes, charts, print areas/views, hyperlinks) as JSON by default, with optional YAML/TOON formats. It targets both COM/Excel environments (rich extraction) and non-COM environments (cells + table candidates + print areas), with tunable detection heuristics and multiple output modes to fit LLM/RAG pipelines.
+ExStruct reads Excel workbooks and outputs structured data (tables, shapes, charts) as JSON by default, with optional YAML/TOON formats. It targets both COM/Excel environments (rich extraction) and non-COM environments (cells + table candidates), with tunable detection heuristics and multiple output modes to fit LLM/RAG pipelines.
 
 ## Features
 
-- **Excel → Structured JSON**: cells, shapes, charts, table candidates, and print areas/views per sheet.
-- **Output modes**: `light` (cells + table candidates + print areas; no COM, shapes/charts empty), `standard` (texted shapes + arrows, charts, print areas), `verbose` (all shapes with width/height, charts with size, print areas). Verbose also emits cell hyperlinks. Size output is flag-controlled.
+- **Excel → Structured JSON**: cells, shapes, charts, and table candidates per sheet.
+- **Output modes**: `light` (cells + table candidates only), `standard` (texted shapes + arrows, charts), `verbose` (all shapes with width/height).
 - **Formats**: JSON (compact by default, `--pretty` available), YAML, TOON (optional dependencies).
 - **Table detection tuning**: adjust heuristics at runtime via API.
 - **CLI rendering** (Excel required): optional PDF and per-sheet PNGs.
@@ -21,18 +21,17 @@ ExStruct reads Excel workbooks and outputs structured data (cells, table candida
 pip install exstruct
 ```
 
-Optional extras:
-
-- YAML: `pip install pyyaml`
-- TOON: `pip install python-toon`
-- Rendering (PDF/PNG): Excel + `pip install pypdfium2 pillow`
-- All extras at once: `pip install exstruct[yaml,toon,render]`
-
-Platform note:
-
-- Full extraction (shapes/charts) targets Windows + Excel (COM via xlwings). On other platforms, use `mode=light` to get cells + `table_candidates`.
-
-## Quick Start (CLI)
+Optional extras:
+
+- YAML: `pip install pyyaml`
+- TOON: `pip install python-toon`
+- Rendering (PDF/PNG): Excel + `pip install pypdfium2 pillow`
+- All extras at once: `pip install exstruct[yaml,toon,render]`
+
+Platform note:
+- Full extraction (shapes/charts) targets Windows + Excel (COM via xlwings). On other platforms, use `mode=light` to get cells + `table_candidates` safely.
+
+## Quick Start (CLI)
 
 ```bash
 exstruct input.xlsx > output.json          # compact JSON to stdout (default)
@@ -40,7 +39,6 @@ exstruct input.xlsx -o out.json --pretty   # pretty JSON to a file
 exstruct input.xlsx --format yaml          # YAML (needs pyyaml)
 exstruct input.xlsx --format toon          # TOON (needs python-toon)
 exstruct input.xlsx --sheets-dir sheets/   # split per sheet in chosen format
-exstruct input.xlsx --print-areas-dir areas/  # split per print area (if any)
 exstruct input.xlsx --mode light           # cells + table candidates only
 exstruct input.xlsx --pdf --image          # PDF and PNGs (Excel required)
 ```
@@ -58,7 +56,7 @@ set_table_detection_params(table_score_threshold=0.3, density_min=0.04)
 wb = extract("input.xlsx", mode="standard")
 export(wb, Path("out.json"), pretty=False)  # compact JSON
 
-# Model helpers: iterate, index, and serialize directly
+# Model helpers: iterate, index, and serialize directly from the models
 first_sheet = wb["Sheet1"]           # __getitem__ access
 for name, sheet in wb:               # __iter__ yields (name, SheetData)
     print(name, len(sheet.rows))
@@ -70,19 +68,11 @@ print(first_sheet.to_yaml())         # YAML text (requires pyyaml)
 from exstruct import ExStructEngine, StructOptions, OutputOptions
 
 engine = ExStructEngine(
-    options=StructOptions(mode="verbose"),  # verbose includes hyperlinks by default
+    options=StructOptions(mode="standard"),
     output=OutputOptions(include_shapes=False, pretty=True),
 )
 wb2 = engine.extract("input.xlsx")
 engine.export(wb2, Path("out_filtered.json"))  # drops shapes via OutputOptions
-
-# Enable hyperlinks in other modes
-engine_links = ExStructEngine(options=StructOptions(mode="standard", include_cell_links=True))
-with_links = engine_links.extract("input.xlsx")
-
-# Export per print area (if print areas exist)
-from exstruct import export_print_areas_as
-export_print_areas_as(wb, "areas", fmt="json", pretty=True)
 ```
 
 **Note (non-COM environments):** If Excel COM is unavailable, extraction still runs and returns cells + `table_candidates`; `shapes`/`charts` will be empty.
@@ -105,8 +95,8 @@ Use higher thresholds to reduce false positives; lower them if true tables are m
 ## Output Modes
 
 - **light**: cells + table candidates (no COM needed).
-- **standard**: texted shapes + arrows, charts (COM if available), table candidates. Hyperlinks are off unless `include_cell_links=True`.
-- **verbose**: all shapes (with width/height), charts, table candidates, and cell hyperlinks.
+- **standard**: texted shapes + arrows, charts (COM if available), table candidates.
+- **verbose**: all shapes (with width/height), charts, table candidates.
 
 ## Error Handling / Fallbacks
 
@@ -135,7 +125,6 @@ To show how well exstruct can structure Excel, we parse a workbook that combines
 (Screenshot below is the actual sample Excel sheet)
 ![Sample Excel](/docs/assets/demo_sheet.png)
 Sample workbook: `sample/sample.xlsx`
-Sample workbook: `sample/sample.xlsx`
 
 ### 1. Input: Excel Sheet Overview
 
@@ -322,12 +311,6 @@ In short, **exstruct = “an engine that converts Excel into a format AI can und
 - Default JSON is compact to reduce tokens; use `--pretty` or `pretty=True` when readability matters.
 - Field `table_candidates` replaces `tables`; adjust downstream consumers accordingly.
 
-## Print Areas (PrintArea / PrintAreaView)
-
-- `SheetData.print_areas` holds print areas (cell coordinates) in light/standard/verbose.
-- Use `export_print_areas_as(...)` or CLI `--print-areas-dir` to write one file per print area (nothing is written if none exist).
-- `PrintAreaView` includes rows and table candidates inside the area, plus shapes/charts that overlap the area (size-less shapes are treated as points). `normalize=True` rebases row/col indices to the area origin.
-
 ## License
 
 BSD-3-Clause. See `LICENSE` for details.
@@ -335,3 +318,17 @@ BSD-3-Clause. See `LICENSE` for details.
 ## Documentation
 
 - API Reference (GitHub Pages): https://harumiweb.github.io/exstruct/
+# Engine option cheat sheet
+
+| Option class   | Field               | Meaning |
+| -------------- | ------------------- | ------- |
+| StructOptions  | mode                | "light"/"standard"/"verbose" |
+|                | table_params        | Dict passed to `set_table_detection_params` (table_score_threshold, density_min, coverage_min, min_nonempty_cells) |
+| OutputOptions  | fmt                 | Default format ("json"/"yaml"/"yml"/"toon") |
+|                | pretty / indent     | Pretty-print JSON and control indent |
+|                | include_rows        | Include rows (False to drop) |
+|                | include_shapes      | Include shapes |
+|                | include_charts      | Include charts |
+|                | include_tables      | Include table_candidates |
+|                | sheets_dir          | Optional directory for per-sheet exports |
+|                | stream              | Default stream when output_path is None |

{exstruct-0.2.3 → exstruct-0.2.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "exstruct"
-version = "0.2.3"
+version = "0.2.11"
 description = "Excel to structured JSON (tables, shapes, charts) for LLM/RAG pipelines"
 readme = "README.md"
 license = { file = "LICENSE" }

exstruct-0.2.11/src/exstruct/__init__.py

@@ -0,0 +1,121 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Literal, Optional, TextIO
+
+from .core.integrate import extract_workbook
+from .core.cells import set_table_detection_params
+from .engine import ExStructEngine, OutputOptions, StructOptions
+from .io import save_as_json, save_as_toon, save_as_yaml, save_sheets, serialize_workbook
+from .models import CellRow, Chart, ChartSeries, Shape, SheetData, WorkbookData
+from .render import export_pdf, export_sheet_images
+
+__all__ = [
+    "extract",
+    "export",
+    "export_sheets",
+    "export_pdf",
+    "export_sheet_images",
+    "process_excel",
+    "ExtractionMode",
+    "CellRow",
+    "Shape",
+    "ChartSeries",
+    "Chart",
+    "SheetData",
+    "WorkbookData",
+    "set_table_detection_params",
+    "ExStructEngine",
+    "StructOptions",
+    "OutputOptions",
+]
+
+
+ExtractionMode = Literal["light", "standard", "verbose"]
+
+
+def extract(file_path: str | Path, mode: ExtractionMode = "standard") -> WorkbookData:
+    """Extract workbook semantic structure and return WorkbookData."""
+    engine = ExStructEngine(options=StructOptions(mode=mode))
+    return engine.extract(file_path, mode=mode)
+
+
+def export(
+    data: WorkbookData,
+    path: str | Path,
+    fmt: Optional[Literal["json", "yaml", "yml", "toon"]] = None,
+    *,
+    pretty: bool = False,
+    indent: int | None = None,
+) -> None:
+    """Export WorkbookData to supported file formats (json/yaml/toon)."""
+    dest = Path(path)
+    format_hint = (fmt or dest.suffix.lstrip(".") or "json").lower()
+    match format_hint:
+        case "json":
+            save_as_json(data, dest, pretty=pretty, indent=indent)
+        case "yaml" | "yml":
+            save_as_yaml(data, dest)
+        case "toon":
+            save_as_toon(data, dest)
+        case _:
+            raise ValueError(f"Unsupported export format: {format_hint}")
+
+
+def export_sheets(data: WorkbookData, dir_path: str | Path) -> dict[str, Path]:
+    """
+    Export each sheet as a JSON file (book_name + SheetData) into a directory.
+    Returns a mapping of sheet name to written path.
+    """
+    return save_sheets(data, Path(dir_path), fmt="json")
+
+
+def export_sheets_as(
+    data: WorkbookData,
+    dir_path: str | Path,
+    fmt: Literal["json", "yaml", "yml", "toon"] = "json",
+    *,
+    pretty: bool = False,
+    indent: int | None = None,
+) -> dict[str, Path]:
+    """
+    Export each sheet in the given format (json/yaml/toon), including book_name and SheetData; returns sheet name → path map.
+    """
+    return save_sheets(data, Path(dir_path), fmt=fmt, pretty=pretty, indent=indent)
+
+
+def process_excel(
+    file_path: Path,
+    output_path: Path | None = None,
+    out_fmt: str = "json",
+    image: bool = False,
+    pdf: bool = False,
+    dpi: int = 72,
+    mode: ExtractionMode = "standard",
+    pretty: bool = False,
+    indent: int | None = None,
+    sheets_dir: Path | None = None,
+    stream: TextIO | None = None,
+) -> None:
+    """
+    Convenience wrapper for CLI: export workbook and optionally PDF/PNG images (Excel required for rendering).
+    - If output_path is None, writes the serialized workbook to stdout (or provided stream).
+    - If sheets_dir is given, also writes per-sheet files into that directory.
+    """
+    engine = ExStructEngine(
+        options=StructOptions(mode=mode),
+        output=OutputOptions(fmt=out_fmt, pretty=pretty, indent=indent, sheets_dir=sheets_dir, stream=stream),
+    )
+    engine.process(
+        file_path=file_path,
+        output_path=output_path,
+        out_fmt=out_fmt,
+        image=image,
+        pdf=pdf,
+        dpi=dpi,
+        mode=mode,
+        pretty=pretty,
+        indent=indent,
+        sheets_dir=sheets_dir,
+        stream=stream,
+    )

{exstruct-0.2.3 → exstruct-0.2.11}/src/exstruct/cli/main.py

@@ -57,11 +57,6 @@ def build_parser() -> argparse.ArgumentParser:
         type=Path,
         help="Optional directory to write one file per sheet (format follows --format).",
     )
-    parser.add_argument(
-        "--print-areas-dir",
-        type=Path,
-        help="Optional directory to write one file per print area (format follows --format).",
-    )
     return parser
 
 
@@ -85,7 +80,6 @@ def main(argv: list[str] | None = None) -> int:
             mode=args.mode,
             pretty=args.pretty,
             sheets_dir=args.sheets_dir,
-            print_areas_dir=args.print_areas_dir,
         )
         return 0
     except Exception as e:

{exstruct-0.2.3 → exstruct-0.2.11}/src/exstruct/core/cells.py

@@ -33,64 +33,25 @@ def warn_once(key: str, message: str) -> None:
         _warned_keys.add(key)
 
 
-def extract_sheet_cells(file_path: Path) -> Dict[str, List[CellRow]]:
-    """Read all sheets via pandas and convert to CellRow list while skipping empty cells."""
-    dfs = pd.read_excel(file_path, header=None, sheet_name=None, dtype=str)
-    result: Dict[str, List[CellRow]] = {}
-    for sheet_name, df in dfs.items():
-        df = df.fillna("")
-        rows: List[CellRow] = []
-        for excel_row, row in enumerate(df.itertuples(index=False, name=None), start=1):
-            filtered: Dict[str, int | float | str] = {}
-            for j, v in enumerate(row):
-                s = "" if v is None else str(v)
-                if s.strip() == "":
-                    continue
-                filtered[str(j)] = _coerce_numeric_preserve_format(s)
-            if not filtered:
-                continue
-            rows.append(CellRow(r=excel_row, c=filtered))
-        result[sheet_name] = rows
-    return result
-
-
-def extract_sheet_cells_with_links(file_path: Path) -> Dict[str, List[CellRow]]:
-    """
-    Extract cells and hyperlinks per sheet.
-
-    Returns:
-        {sheet_name: [CellRow(r=..., c=..., links={"col_index": url, ...}), ...]}
-
-    Notes:
-        - Uses pandas extraction for values (same filtering as extract_sheet_cells).
-        - Collects hyperlinks via openpyxl (requires read_only=False because border maps/hyperlinks need full objects).
-        - Links are mapped by column index string (e.g., "0") to hyperlink.target.
-    """
-    cell_rows = extract_sheet_cells(file_path)
-    wb = load_workbook(file_path, data_only=True, read_only=False)
-    links_by_sheet: Dict[str, Dict[int, Dict[str, str]]] = {}
-    for ws in wb.worksheets:
-        sheet_links: Dict[int, Dict[str, str]] = {}
-        for row in ws.iter_rows():
-            for cell in row:
-                link = getattr(cell, "hyperlink", None)
-                target = getattr(link, "target", None) if link else None
-                if not target:
-                    continue
-                col_str = str(cell.col_idx - 1)  # zero-based to align with extract_sheet_cells
-                sheet_links.setdefault(cell.row, {})[col_str] = target
-        links_by_sheet[ws.title] = sheet_links
-
-    merged: Dict[str, List[CellRow]] = {}
-    for sheet_name, rows in cell_rows.items():
-        sheet_links = links_by_sheet.get(sheet_name, {})
-        merged_rows: List[CellRow] = []
-        for row in rows:
-            links = sheet_links.get(row.r, {})
-            merged_rows.append(CellRow(r=row.r, c=row.c, links=links or None))
-        merged[sheet_name] = merged_rows
-    wb.close()
-    return merged
+def extract_sheet_cells(file_path: Path) -> Dict[str, List[CellRow]]:
+    """Read all sheets via pandas and convert to CellRow list while skipping empty cells."""
+    dfs = pd.read_excel(file_path, header=None, sheet_name=None, dtype=str)
+    result: Dict[str, List[CellRow]] = {}
+    for sheet_name, df in dfs.items():
+        df = df.fillna("")
+        rows: List[CellRow] = []
+        for excel_row, row in enumerate(df.itertuples(index=False, name=None), start=1):
+            filtered: Dict[str, int | float | str] = {}
+            for j, v in enumerate(row):
+                s = "" if v is None else str(v)
+                if s.strip() == "":
+                    continue
+                filtered[str(j)] = _coerce_numeric_preserve_format(s)
+            if not filtered:
+                continue
+            rows.append(CellRow(r=excel_row, c=filtered))
+        result[sheet_name] = rows
+    return result
 
 
 def shrink_to_content(

{exstruct-0.2.3 → exstruct-0.2.11}/src/exstruct/core/charts.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Dict, List, Optional, Literal
+from typing import Dict, List, Optional
 
 import xlwings as xw
 
@@ -166,7 +166,7 @@ def parse_series_formula(formula: str) -> Optional[Dict[str, Optional[str]]]:
     }
 
 
-def get_charts(sheet: xw.Sheet, mode: Literal["light", "standard", "verbose"] = "standard") -> List[Chart]:
+def get_charts(sheet: xw.Sheet) -> List[Chart]:
     """Parse charts in a sheet into Chart models; failed charts carry an error field."""
     charts: List[Chart] = []
     for ch in sheet.charts:
@@ -182,14 +182,6 @@ def get_charts(sheet: xw.Sheet, mode: Literal["light", "standard", "verbose"] =
             chart_type_label = XL_CHART_TYPE_MAP.get(
                 chart_type_num, f"unknown_{chart_type_num}"
             )
-            chart_width: Optional[int] = None
-            chart_height: Optional[int] = None
-            try:
-                chart_width = int(ch.width)
-                chart_height = int(ch.height)
-            except Exception:
-                chart_width = None
-                chart_height = None
 
             for s in chart_com.SeriesCollection():
                 parsed = parse_series_formula(getattr(s, "Formula", ""))
@@ -228,8 +220,6 @@ def get_charts(sheet: xw.Sheet, mode: Literal["light", "standard", "verbose"] =
                 title=title,
                 y_axis_title=y_axis_title,
                 y_axis_range=y_axis_range,  # type: ignore
-                w=chart_width,
-                h=chart_height,
                 series=series_list,
                 l=int(ch.left),
                 t=int(ch.top),