feat: éditeur tableur — grille A → Z par blocs, barre de menus Sheets, panneau de couleurs, création .xlsx (#180 → #186)
CI / lint (push) Successful in 2m43s
CI / security (push) Successful in 1m33s
CI / test (push) Canceled after 0s
CI / build (push) Canceled after 0s
CI / e2e (push) Canceled after 0s

Restaure et termine le lot tableur resté non committé. Il n'existait que dans un
`git stash` (24 fichiers suivis) et en fichiers non suivis (menus.js, formula.js,
color-picker.js, tests, fiches) : la 2.53.3 livrée ne le contenait donc pas. Le
stash, créé avant le commit BUG-108, n'a jamais été restauré.

#180 Redimensionnement au curseur (en-tête de bord miroité + classe de repaint),
grille thémée sur les 15 thèmes et les modes contraste élevé / sépia, menu
Fichier au niveau des onglets, barre épinglée pleine largeur.

#181 Modèle de saisie Google Sheets : sélection ≠ édition (caret masqué sans
quitter contenteditable, double-clic / F2 / première frappe qui remplace,
Entrée contextuelle, Échap qui restaure) + inventaire priorisé des écarts.

#182 Désélection fiable (clic simple sans dépendre du focus), contours de plage
non empilés (sélecteur de classes sans point), couleurs texte/fond sur une
plage, clic droit qui préserve la sélection multiple.

#183 Panneau de couleurs façon Google Sheets : palette 8 × 10, STANDARD,
PERSONNALISÉ, coche selon la luminance, sortie `#rrggbb` (une valeur HSL était
rejetée par normHex).

#184 Peinture de format complète (toutes propriétés, source sans format =
réinitialisation), sélection multi-lignes/colonnes depuis les marges, grille
étendue : colonnes A → Z d'emblée, lignes ajoutées PAR BLOCS DE 100 au
défilement jusqu'à 1000 — matérialiser 1000 lignes d'un coup = ~26 000 cellules
câblées par feuille, ce qui épuisait le tas de la suite JSDOM ; index de
cellules `ref → td`, court-circuits formule/styles, marqueur data-wired.

#185 Barre de menus : les 10 menus Google Sheets (161 entrées, 125 câblées, 36
annoncées indisponibles), ruban façon Sheets, grille unie 1 px dérivée du thème.

#186 « Créer un fichier » propose .xlsx et construit un vrai classeur OPC
(openpyxl) au lieu d'une charge utile texte illisible.

Corrections trouvées en restaurant et en exerçant le lot :
- fuite mémoire : écouteur `click` anonyme posé sur #content-area à chaque
  rendu, jamais retiré — sa fermeture retenait la grille précédente en entier ;
- sorties Markdown / HTML / Imprimer de la barre de menus inertes
  (`data-xlsx-export` jamais réparti, seul `data-xlsx-action` l'était) ;
- collision de classe `.xlsx-structure-menu` entre la barre de menus et le menu
  Structure de la barre d'outils (toute requête tombait sur un nœud masqué) ;
- curseur col/row-resize absent quand le pointeur est sur la table elle-même ;
- l'export emportait les lignes et colonnes vides du quadrillage (CSV, Markdown,
  HTML, impression) ;
- clic extérieur avalé par la grâce de 250 ms du menu contextuel (destinée au
  seul appui long tactile) ;
- une entrée indisponible laissait la barre de menus ouverte.

Tests : pytest 1595 passés / 2 ignorés ; ruff et mypy 0 erreur ; bandit 0 ;
33 suites frontend vertes (xlsx-viewer 163/163, xlsx-menus 19/19,
xlsx-formula 14/14) ; E2E complet 132 passés / 12 ignorés ; E2E xlsx-viewer
19/19.
This commit is contained in:
2026-10-08 12:00:15 -04:00
parent ce1944d437
commit 634ba8a272
39 changed files with 9996 additions and 491 deletions
+11 -3
View File
@@ -323,9 +323,13 @@ def api_file_xlsx_style(
``ops`` is an ordered list applied in one locked, atomic rewrite:
``cell`` (``sheet``, ``range``/``cell``, ``style`` with ``bold``,
``italic``, ``underline``, ``font_color``/``fill_color`` as ``#rrggbb``,
``align`` and ``number_format``), ``merge``/``unmerge`` (``range``),
``col_width`` (``col``, ``width``), ``row_height`` (``row``, ``height``)
``italic``, ``underline``, ``strike``, ``font_size`` (6-72),
``font_color``/``fill_color`` as ``#rrggbb``, ``align``
(left/center/right/justify), ``valign`` (top/middle/bottom), ``wrap``,
``rotation`` (-90..90), ``border`` (all/outer/none) + ``border_style`` /
``border_color`` and ``number_format``), ``merge``/``unmerge`` (``range``),
``col_width`` (``col``, ``width``), ``row_height`` (``row``, ``height``),
``comment_set`` (``ref``, ``text``) / ``comment_clear`` (``ref``)
and ``freeze`` (``cell``, empty to release).
Without ``force`` the call fails **409** ``xlsx_lossy_content`` when the
@@ -548,6 +552,10 @@ async def api_file_create(
Returns:
FileCreateResponse confirming creation.
Note:
A ``.xlsx`` path creates an empty workbook (one ``Feuille1`` sheet) built
with openpyxl: the payload is binary, so ``content`` is ignored (#186).
"""
if not check_vault_access(vault_name, current_user):
raise HTTPException(status_code=403, detail=f"Accès refusé à la vault '{vault_name}'")
+220 -15
View File
@@ -41,6 +41,28 @@ _EXCALIDRAW_SKELETON = (
'"appState":{"viewBackgroundColor":"#ffffff"},"files":{}}'
)
# Title of the single sheet of a workbook created from scratch (#186).
_XLSX_DEFAULT_SHEET = "Feuille1"
def _empty_xlsx_bytes() -> bytes:
"""Return the bytes of a valid, empty single-sheet workbook.
An ``.xlsx`` is a ZIP archive (OPC), not a text file: writing ``""`` to it
produces a file no reader (and no spreadsheet application) can open. The
"Create a file" modal posts an empty text payload, so the archive itself is
built here with openpyxl.
"""
import io
from openpyxl import Workbook
wb = Workbook()
wb.active.title = _XLSX_DEFAULT_SHEET
buffer = io.BytesIO()
wb.save(buffer)
return buffer.getvalue()
def _rel(root: Path, path: Path) -> str:
"""Return *path* relative to *root* as a POSIX-style string."""
@@ -98,13 +120,14 @@ def create_file(
*,
overwrite: bool = False,
) -> dict[str, Any]:
"""Create a text file in a vault.
"""Create a file in a vault.
Args:
vault_name: Name of the vault.
path: Vault-relative path of the new file.
content: Initial content (an Excalidraw skeleton is injected for empty
``.excalidraw`` files).
``.excalidraw`` files). ``.xlsx`` is binary: the workbook is always
built from scratch and *content* is ignored for that extension.
overwrite: When True, replace an existing file (with a backup) instead
of raising ``already_exists``.
@@ -130,17 +153,25 @@ def create_file(
)
create_backup(file_path, vault_name, _rel(root, file_path))
suffix = file_path.suffix.lower()
try:
file_path.parent.mkdir(parents=True, exist_ok=True)
if file_path.suffix.lower() == ".excalidraw" and not content.strip():
content = _EXCALIDRAW_SKELETON
file_path.write_text(content, encoding="utf-8")
if suffix == ".xlsx":
# Binary OPC archive: a text write would leave an unopenable file
# (#186). Written as bytes, so the size below is the byte count.
payload = _empty_xlsx_bytes()
file_path.write_bytes(payload)
else:
if suffix == ".excalidraw" and not content.strip():
content = _EXCALIDRAW_SKELETON
payload = content.encode("utf-8")
file_path.write_text(content, encoding="utf-8")
except PermissionError as e:
raise ServiceError("Permission denied: cannot create file", code="permission_denied", status=403) from e
rel_path = _rel(root, file_path)
logger.info(f"File created: {vault_name}/{rel_path}")
return {"success": True, "vault": vault_name, "path": rel_path, "size": len(content)}
return {"success": True, "vault": vault_name, "path": rel_path, "size": len(payload)}
def create_directory(vault_name: str, path: str, *, exist_ok: bool = False) -> dict[str, Any]:
@@ -673,11 +704,42 @@ def mutate_xlsx_structure(
"Position 'at' / 'count' invalides", code="invalid", status=400
)
if op == "row_insert":
ws.insert_rows(at, count)
# Le modèle sparse d'openpyxl ignore les inserts
# au-delà de la dernière ligne utilisée (rien à
# décaler), et l'écrivain abandonne les cellules
# vides (None) au cycle suivant : on matérialise
# avec " " (un blanc qui persiste, relu tel quel,
# affiché vide, ignoré par la recherche) pour
# qu'une insertion « sous la dernière ligne »
# crée bien des lignes blanches, comme Excel.
if at > ws.max_row:
if at - ws.max_row > _INSERT_GAP_LIMIT:
raise ServiceError(
"Position trop éloignée de la fin de la feuille",
code="invalid", status=400,
)
for r in range(at, at + count):
cell = ws.cell(row=r, column=1)
if cell.value is None:
cell.value = " "
else:
ws.insert_rows(at, count)
elif op == "row_delete":
ws.delete_rows(at, count)
elif op == "col_insert":
ws.insert_cols(at, count)
# Idem côté colonnes : « à droite de la dernière ».
if at > ws.max_column:
if at - ws.max_column > _INSERT_GAP_LIMIT:
raise ServiceError(
"Position trop éloignée de la fin de la feuille",
code="invalid", status=400,
)
for c in range(at, at + count):
cell = ws.cell(row=1, column=c)
if cell.value is None:
cell.value = " "
else:
ws.insert_cols(at, count)
else:
ws.delete_cols(at, count)
applied.append(f"{op}:{sheet}@{at}x{count}")
@@ -725,16 +787,34 @@ def mutate_xlsx_structure(
# #156-A8 — write-side formatting. Every value is data-driven (the colours
# come from the caller, never from a hardcoded palette) and the whole batch
# rides the same lock, backup and atomic swap as the cell edits.
# Cap anti-DoS : une insertion au-delà de la fin matérialise des cellules,
# jamais un gouffre de lignes/colonnes.
_INSERT_GAP_LIMIT = 1000
_STYLE_KEYS = {
"bold",
"italic",
"underline",
"strike",
"font_size",
"font_color",
"fill_color",
"align",
"valign",
"wrap",
"rotation",
"border",
"border_style",
"border_color",
"number_format",
}
_STYLE_ALIGNS = {"left", "center", "right"}
_STYLE_ALIGNS = {"left", "center", "right", "justify"}
_STYLE_VALIGNS = {"top": "top", "middle": "center", "bottom": "bottom"}
_STYLE_BORDERS = {"all", "outer", "none"}
_STYLE_BORDER_STYLES = {
"thin", "medium", "thick", "dashed", "dotted", "double", "hair",
"mediumDashed", "dashDot", "mediumDashDot", "dashDotDot",
"mediumDashDotDot", "slantDashDot",
}
MAX_STYLE_CELLS = 10_000
_HEX_COLOR_RE = re.compile(r"^#?[0-9a-fA-F]{6}$")
@@ -760,14 +840,14 @@ def _apply_cell_style(cell: Any, style: dict[str, Any]) -> None:
"""
import copy as copy_mod
from openpyxl.styles import Alignment, Color, PatternFill
from openpyxl.styles import Alignment, Border, Color, PatternFill, Side
unknown = set(style) - _STYLE_KEYS
if unknown:
raise ServiceError(
f"Style inconnu: {sorted(unknown)}", code="invalid", status=400
)
if {"bold", "italic", "underline", "font_color"} & set(style):
if {"bold", "italic", "underline", "strike", "font_size", "font_color"} & set(style):
font = copy_mod.copy(cell.font)
if "bold" in style:
font.bold = bool(style["bold"])
@@ -775,6 +855,22 @@ def _apply_cell_style(cell: Any, style: dict[str, Any]) -> None:
font.italic = bool(style["italic"])
if "underline" in style:
font.underline = "single" if style["underline"] else None
if "strike" in style:
font.strike = bool(style["strike"])
if "font_size" in style:
try:
size = float(style["font_size"])
except (TypeError, ValueError):
raise ServiceError(
f"Taille de police invalide: {style['font_size']!r}",
code="invalid", status=400,
) from None
if not 6 <= size <= 72:
raise ServiceError(
f"Taille de police hors bornes (6-72): {style['font_size']!r}",
code="invalid", status=400,
)
font.size = size
if "font_color" in style:
rgb = _style_color(style["font_color"])
font.color = Color(rgb=rgb) if rgb else None
@@ -797,7 +893,69 @@ def _apply_cell_style(cell: Any, style: dict[str, Any]) -> None:
horizontal=align,
vertical=getattr(current, "vertical", None),
wrap_text=getattr(current, "wrap_text", None),
text_rotation=getattr(current, "text_rotation", None),
)
if "valign" in style or "wrap" in style or "rotation" in style:
current = cell.alignment
vertical = getattr(current, "vertical", None)
wrap_text = getattr(current, "wrap_text", None)
text_rotation = getattr(current, "text_rotation", None) or 0
if "valign" in style:
valign = style["valign"]
if valign not in _STYLE_VALIGNS:
raise ServiceError(
f"Alignement vertical invalide: {valign!r}", code="invalid", status=400
)
vertical = _STYLE_VALIGNS[valign]
if "wrap" in style:
wrap_text = bool(style["wrap"])
if "rotation" in style:
try:
rotation = int(style["rotation"])
except (TypeError, ValueError):
raise ServiceError(
f"Rotation invalide: {style['rotation']!r}", code="invalid", status=400
) from None
if not (-90 <= rotation <= 90 or rotation == 180):
raise ServiceError(
f"Rotation hors bornes (-90..90, 180): {rotation!r}", code="invalid", status=400
)
# OOXML stocke les angles horaires sur 91..180 (-45° → 135).
# 180 = texte vertical retourné (le lecteur le relit tel quel).
text_rotation = rotation if rotation >= 0 else 180 + rotation
cell.alignment = Alignment(
horizontal=getattr(current, "horizontal", None),
vertical=vertical,
wrap_text=wrap_text,
text_rotation=text_rotation,
)
if {"border", "border_style", "border_color"} & set(style):
which = style.get("border", "all")
if which not in _STYLE_BORDERS:
raise ServiceError(
f"Bordure invalide: {which!r}", code="invalid", status=400
)
bstyle = style.get("border_style", "thin")
if bstyle not in _STYLE_BORDER_STYLES:
raise ServiceError(
f"Style de bordure invalide: {bstyle!r}", code="invalid", status=400
)
raw_color = style.get("border_color", "#000000")
if raw_color in (None, ""):
raw_color = "FF000000"
rgb = _style_color(raw_color)
if rgb is None:
raise ServiceError(
f"Couleur de bordure invalide: {style.get('border_color')!r}",
code="invalid", status=400,
)
if which == "none":
cell.border = Border()
else:
# `all` et `outer` se rendent pareil cellule par cellule : les
# bords partagés coïncident, le contour de la plage reste net.
side = Side(style=bstyle, color=rgb)
cell.border = Border(left=side, right=side, top=side, bottom=side)
if "number_format" in style:
fmt = style["number_format"] or "General"
if not isinstance(fmt, str) or len(fmt) > 120:
@@ -821,12 +979,17 @@ def mutate_xlsx_style(
``ops`` is an ordered list (1 to 50) applied in one locked, atomic rewrite:
* ``{"op": "cell", "sheet": "X", "range": "A1:B2", "style": {…}}`` with
``bold``, ``italic``, ``underline``, ``font_color`` / ``fill_color``
(``#rrggbb``, ``""`` clears), ``align`` (left/center/right) and
``bold``, ``italic``, ``underline``, ``strike``, ``font_size`` (6-72),
``font_color`` / ``fill_color`` (``#rrggbb``, ``""`` clears),
``align`` (left/center/right/justify), ``valign`` (top/middle/bottom),
``wrap`` (bool), ``rotation`` (-90..90), ``border``
(all/outer/none) + ``border_style`` / ``border_color`` and
``number_format`` ;
* ``{"op": "merge"|"unmerge", "sheet": "X", "range": "A1:B2"}`` ;
* ``{"op": "col_width", "sheet": "X", "col": "A", "width": 24}`` ;
* ``{"op": "row_height", "sheet": "X", "row": 3, "height": 30}`` ;
* ``{"op": "comment_set", "sheet": "X", "ref": "B2", "text": "…"}``
(``author`` optional) / ``{"op": "comment_clear", ...}`` ;
* ``{"op": "freeze", "sheet": "X", "cell": "B2"}`` (``""`` releases).
Same guards as the cell edits: per-file lock, ``.bak`` backup,
@@ -960,7 +1123,17 @@ def mutate_xlsx_style(
raise ServiceError(
"Largeur invalide (0 à 255)", code="invalid", status=400
)
ws.column_dimensions[col.strip().upper()].width = float(width)
width = float(width)
if width == 0:
# 0 = largeur par défaut (équivalent « Default
# Width » d'Excel / « Reset » de Sheets) : on
# retire la mesure explicite au lieu d'écrire une
# largeur de 0, qu'Excel lirait comme une colonne
# quasi masquée pendant que l'affichage reste en
# largeur automatique.
ws.column_dimensions.pop(col.strip().upper(), None)
else:
ws.column_dimensions[col.strip().upper()].width = width
applied.append(f"col_width:{ws.title}!{col}={width}")
elif op == "row_height":
ws = _sheet(wb, action)
@@ -972,7 +1145,14 @@ def mutate_xlsx_style(
raise ServiceError(
"Hauteur invalide (0 à 409)", code="invalid", status=400
)
ws.row_dimensions[row].height = float(height)
height = float(height)
if height == 0:
# 0 = hauteur par défaut (même logique que la
# largeur ci-dessus) : la mesure explicite est
# retirée, la ligne redevient automatique.
ws.row_dimensions.pop(row, None)
else:
ws.row_dimensions[row].height = height
applied.append(f"row_height:{ws.title}!{row}={height}")
elif op == "freeze":
ws = _sheet(wb, action)
@@ -981,6 +1161,31 @@ def mutate_xlsx_style(
_range(cell_ref)
ws.freeze_panes = cell_ref.upper() or None
applied.append(f"freeze:{ws.title}!{cell_ref or '-'}")
elif op in ("comment_set", "comment_clear"):
from openpyxl.comments import Comment
ws = _sheet(wb, action)
ref = str(action.get("ref") or action.get("cell") or "")
min_col, min_row, max_col, max_row = _range(ref)
if (min_col, min_row) != (max_col, max_row):
raise ServiceError(
"Un commentaire vise une cellule (A1), pas une plage",
code="invalid", status=400,
)
if op == "comment_clear":
ws.cell(row=min_row, column=min_col).comment = None
else:
text = str(action.get("text") or "")
if not text.strip() or len(text) > 2000:
raise ServiceError(
"Texte de commentaire invalide (1 à 2000 caractères)",
code="invalid", status=400,
)
author = str(action.get("author") or "ObsiGate")[:64]
ws.cell(row=min_row, column=min_col).comment = Comment(
text, author
)
applied.append(f"{op}:{ws.title}!{ref}")
else:
raise ServiceError(
f"Action inconnue: {op!r}", code="invalid", status=400
+139 -10
View File
@@ -129,8 +129,16 @@ def _cell_fragments(cell: Any) -> tuple[list[str], str | None]:
fragments.append("font-style:italic")
# #156-A8 — underline is written from the viewer too, so it is read back
# (the toggle in the formatting menu needs to see its own effect).
decorations = []
if font and font.underline:
fragments.append("text-decoration:underline")
decorations.append("underline")
if font and getattr(font, "strike", False):
decorations.append("line-through")
if decorations:
fragments.append("text-decoration:" + " ".join(decorations))
size = getattr(font, "size", None) if font else None
if isinstance(size, (int, float)) and size != 11:
fragments.append(f"font-size:{size:g}pt")
fmt = cell.number_format
if fmt and fmt not in ("General", "@"):
# A custom number format is signalled typographically (mono font)
@@ -140,29 +148,129 @@ def _cell_fragments(cell: Any) -> tuple[list[str], str | None]:
fragments.append("font-family:'JetBrains Mono',monospace")
alignment = cell.alignment
align = alignment.horizontal if alignment else None
return fragments, (align if align in ("left", "right", "center") else None)
if alignment is not None:
vertical = getattr(alignment, "vertical", None)
if vertical == "center":
fragments.append("vertical-align:middle")
elif vertical in ("top", "bottom"):
fragments.append(f"vertical-align:{vertical}")
if getattr(alignment, "wrap_text", None) is True:
fragments.append("white-space:normal")
elif getattr(alignment, "wrap_text", None) is False:
fragments.append("white-space:nowrap")
rotation = getattr(alignment, "text_rotation", None) or 0
if rotation == 90 or rotation == 255:
fragments.append("writing-mode:vertical-rl")
elif rotation == 180:
fragments.append("writing-mode:vertical-rl;transform:scale(-1)")
else:
# Angles diagonaux (ex. ±45° du menu Format › Rotation) : OOXML
# stocke l'anti-horaire sur 0..90 et l'horaire sur 91..180 (-45°
# → 135, cf. mutations). Le CSS tourne en sens horaire : signe
# inversé pour un rendu fidèle.
excel = rotation if rotation <= 90 else -(180 - rotation)
if excel:
fragments.append(f"transform:rotate({-excel}deg)")
border = getattr(cell, "border", None)
if border is not None:
sides = []
for side_name in ("left", "right", "top", "bottom"):
side = getattr(border, side_name, None)
style = getattr(side, "style", None)
if not style:
continue
color = getattr(getattr(side, "color", None), "rgb", None)
hexpart = ""
if isinstance(color, str) and len(color) == 8:
hexpart = f" #{color[2:].lower()}"
width = {"medium": "2px", "thick": "3px"}.get(style, "1px")
css_style = {"dashed": "dashed", "dotted": "dotted", "double": "double"}.get(
style, "solid"
)
sides.append(f"border-{side_name}:{width} {css_style}{hexpart}")
fragments.extend(sides)
return fragments, (align if align in ("left", "right", "center", "justify") else None)
def _sheet_style_maps(ws: Any) -> tuple[dict[str, str], dict[str, str]]:
"""Flat ``{ref: css}`` and ``{ref: align}`` maps of one worksheet.
def _sheet_style_maps(
ws: Any,
) -> tuple[dict[str, str], dict[str, str], dict[str, str], dict[str, str]]:
"""Flat maps of one worksheet: css, align, comment text, number format.
The flat string is what the API serves and what the viewer applies
verbatim to ``td.style``; a plain cell is simply absent from the map.
``left`` is the table default and never included. Bounded by
``MAX_ROWS x MAX_COLS`` like the render itself.
``MAX_ROWS x MAX_COLS`` like the render itself. Comment texts are capped
(tooltip use) and formats only list non-General number formats.
"""
styles: dict[str, str] = {}
aligns: dict[str, str] = {}
comments: dict[str, str] = {}
formats: dict[str, str] = {}
for row in ws.iter_rows(min_row=1, max_row=MAX_ROWS, max_col=MAX_COLS):
for cell in row:
if cell.value is None and cell.number_format == "General":
comment = getattr(cell, "comment", None)
comment_text = getattr(comment, "text", None) if comment is not None else None
# Une cellule vide mais stylée (gras, diagonale, commentaire…)
# doit survivre à la relecture : `has_style` (et le commentaire)
# sont les seuls tests rapides qui la distinguent d'une cellule
# vraiment vierge — sinon le style semble « ne pas fonctionner »
# dès qu'on recharge le classeur.
if cell.value is None and cell.number_format == "General" and not cell.has_style:
if comment_text:
comments[cell.coordinate] = str(comment_text)[:500]
continue
fragments, align = _cell_fragments(cell)
if fragments:
styles[cell.coordinate] = ";".join(fragments)
if align and align != "left":
aligns[cell.coordinate] = align
return styles, aligns
if comment_text:
comments[cell.coordinate] = str(comment_text)[:500]
fmt = getattr(cell, "number_format", None)
if fmt and fmt not in ("General", "@", None):
formats[cell.coordinate] = str(fmt)
return styles, aligns, comments, formats
def _sheet_dim_maps(ws: Any) -> tuple[dict[str, float], dict[str, float]]:
"""Explicit column widths (units) and row heights (pt), by letter/number.
Only dimensions the file sets explicitly are listed (defaults are a
rendering concern of the client). Bounded like the render itself.
"""
from openpyxl.utils import column_index_from_string
colwidths: dict[str, float] = {}
try:
for key, dim in (getattr(ws, "column_dimensions", {}) or {}).items():
width = getattr(dim, "width", None)
if not isinstance(width, (int, float)):
continue
letters = str(key).split(":")
try:
cols = [column_index_from_string(a.strip()) for a in letters]
except ValueError:
continue
lo, hi = min(cols), max(cols)
for c in range(lo, min(hi, MAX_COLS) + 1):
if c >= 1:
from openpyxl.utils import get_column_letter
colwidths[get_column_letter(c)] = float(width)
except Exception:
logger.debug("xlsx column widths unavailable", exc_info=True)
rowheights: dict[str, float] = {}
try:
for r, dim in (getattr(ws, "row_dimensions", {}) or {}).items():
if not isinstance(r, int) or not 1 <= r <= MAX_ROWS:
continue
height = getattr(dim, "height", None)
if isinstance(height, (int, float)):
rowheights[str(r)] = float(height)
except Exception:
logger.debug("xlsx row heights unavailable", exc_info=True)
return colwidths, rowheights
def read_sheet_styles(file_path: Path, sheet: str) -> dict[str, dict[str, Any]]:
@@ -445,7 +553,8 @@ def invalidate_workbook_meta(file_path: Path | str) -> None:
def read_workbook_meta(file_path: Path) -> dict[str, dict[str, Any]]:
"""Return ``{sheet: {styles, aligns, merges, freeze}}`` for every sheet.
"""Return ``{sheet: {styles, aligns, comments, formats, colwidths,
rowheights, merges, freeze}}``.
One normal (non-streaming) load serves the three A15 metadata maps: the
fragments are the workbook's own values, a failure yields ``{}`` per sheet
@@ -483,12 +592,17 @@ def _read_workbook_meta_uncached(file_path: Path) -> dict[str, dict[str, Any]]:
out: dict[str, dict[str, Any]] = {}
try:
for ws in wb.worksheets:
styles, aligns = _sheet_style_maps(ws)
styles, aligns, comments, formats = _sheet_style_maps(ws)
colwidths, rowheights = _sheet_dim_maps(ws)
merged = getattr(ws, "merged_cells", None)
ranges = getattr(merged, "ranges", None) or []
out[ws.title] = {
"styles": styles,
"aligns": aligns,
"comments": comments,
"formats": formats,
"colwidths": colwidths,
"rowheights": rowheights,
"merges": [str(r) for r in ranges],
"freeze": str(getattr(ws, "freeze_panes", None) or ""),
}
@@ -496,7 +610,14 @@ def _read_workbook_meta_uncached(file_path: Path) -> dict[str, dict[str, Any]]:
except Exception:
logger.debug("xlsx meta unavailable", exc_info=True)
for t in wb.sheetnames:
out.setdefault(t, {"styles": {}, "aligns": {}, "merges": [], "freeze": ""})
out.setdefault(
t,
{
"styles": {}, "aligns": {}, "comments": {}, "formats": {},
"colwidths": {}, "rowheights": {},
"merges": [], "freeze": "",
},
)
return out
finally:
wb.close()
@@ -565,6 +686,10 @@ def render_sheets(file_path: Path) -> list[dict[str, Any]]:
"truncated": total_rows > MAX_ROWS or total_cols > MAX_COLS,
"styles": sheet_meta.get("styles", {}),
"aligns": sheet_meta.get("aligns", {}),
"comments": sheet_meta.get("comments", {}),
"formats": sheet_meta.get("formats", {}),
"colwidths": sheet_meta.get("colwidths", {}),
"rowheights": sheet_meta.get("rowheights", {}),
"merges": sheet_meta.get("merges", []),
"freeze": sheet_meta.get("freeze", ""),
}
@@ -629,6 +754,10 @@ def read_sheet_window(
"html": _table(grid, shadow, row_offset=offset, styles=meta.get("styles")),
"styles": meta.get("styles", {}),
"aligns": meta.get("aligns", {}),
"comments": meta.get("comments", {}),
"formats": meta.get("formats", {}),
"colwidths": meta.get("colwidths", {}),
"rowheights": meta.get("rowheights", {}),
"merges": meta.get("merges", []),
"freeze": meta.get("freeze", ""),
}