jarvisplot 2.1.12__tar.gz → 2.1.14__tar.gz

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/CHANGELOG.md

@@ -4,6 +4,31 @@ Release history of the `JarvisPLOT` distribution (import package `jarvisplot`,
 CLI `jplot`). User guides and reference documentation are available in
 [Jarvis-Books `Docs/Jarvis-PLOT/`](https://github.com/Pengxuan-Zhu-Phys/Jarvis-Books/blob/main/Docs/Jarvis-PLOT/README.md).
 
+## 2.1.14
+
+### Fixed
+
+- Render `pcolor` from named coordinates and keep Voronoi boundary fills from
+  acquiring Matplotlib's default cycle colour.
+- Load CSV path lists and apply `add_column.fillna` consistently across backends.
+- Allow unambiguous HDF5 leaf names in expressions while retaining full paths.
+- Make doctor honor HDF5 renaming and validity masks, load Functions, count literal
+  coordinates, detect missing style axes and avoid duplicate path diagnostics.
+- Advertise only supported `make_interp_2d` methods in capability metadata.
+
+## 2.1.13 — 2026-10-29
+### Fixed
+
+- Branch flowchart connections from a module to its output files, and give each
+  file's output variables a separate, spaced group centered on its file icon.
+- Correct A4 ternary badge image paths on case-sensitive filesystems, including
+  Linux, for the full-width, standard and colorbar cards.
+- Keep the GAMBIT `rectcmap` colorbar label inside the page with Matplotlib 3.10
+  while preserving its separation from tick labels.
+- Allow forest footer legends to meet the badge at their shared grid boundary
+  with macOS Helvetica and Matplotlib 3.10.9. Actual overlap with the badge or
+  description remains an error.
+
 ## 2.1.12 — 2026-10-19
 
 ### Added

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/JarvisPLOT.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 2.1.12
+Version: 2.1.14
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -19,6 +19,9 @@ Requires-Dist: scipy
 Requires-Dist: shapely
 Requires-Dist: deepmerge
 Requires-Dist: rich
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pyarrow; extra == "test"
 
 # Jarvis-PLOT
 
@@ -27,7 +30,7 @@ but it can also be used as a **standalone scientific plotting tool**.
 
 It provides a simple command-line interface (CLI) to generate publication-quality figures from YAML configuration files, with most layout and style decisions handled by predefined profiles and style cards.
 
-Current source candidate: **2.1.12** (`jplot -v` reports the installed version).
+Current source candidate: **2.1.14** (`jplot -v` reports the installed version).
 Release history: [CHANGELOG.md](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT/blob/main/CHANGELOG.md). Design documents and specifications: [Jarvis-Books `Docs/Jarvis-PLOT/`](https://github.com/Pengxuan-Zhu-Phys/Jarvis-Books/blob/main/Docs/Jarvis-PLOT/README.md).
 
 ---

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/JarvisPLOT.egg-info/SOURCES.txt

@@ -297,6 +297,7 @@ tests/test_fonts.py
 tests/test_fonts_cli.py
 tests/test_forest.py
 tests/test_forest_examples.py
+tests/test_forest_legend.py
 tests/test_forest_text.py
 tests/test_generated_data.py
 tests/test_imshow_adapter.py
@@ -317,6 +318,7 @@ tests/test_release_contract.py
 tests/test_render_defects.py
 tests/test_render_health.py
 tests/test_render_lifecycle.py
+tests/test_review_regressions.py
 tests/test_row_ledger.py
 tests/test_savefig_provenance.py
 tests/test_schema_catalog.py

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/JarvisPLOT.egg-info/requires.txt

@@ -13,3 +13,7 @@ scipy
 shapely
 deepmerge
 rich
+
+[test]
+pytest
+pyarrow

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/MANIFEST.in

@@ -8,7 +8,6 @@ include tests/conftest.py
 exclude jprel
 prune docs
 prune .github
-prune .claude
 prune .codex
 prune .agents
 prune .cursor

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 2.1.12
+Version: 2.1.14
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -19,6 +19,9 @@ Requires-Dist: scipy
 Requires-Dist: shapely
 Requires-Dist: deepmerge
 Requires-Dist: rich
+Provides-Extra: test
+Requires-Dist: pytest; extra == "test"
+Requires-Dist: pyarrow; extra == "test"
 
 # Jarvis-PLOT
 
@@ -27,7 +30,7 @@ but it can also be used as a **standalone scientific plotting tool**.
 
 It provides a simple command-line interface (CLI) to generate publication-quality figures from YAML configuration files, with most layout and style decisions handled by predefined profiles and style cards.
 
-Current source candidate: **2.1.12** (`jplot -v` reports the installed version).
+Current source candidate: **2.1.14** (`jplot -v` reports the installed version).
 Release history: [CHANGELOG.md](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT/blob/main/CHANGELOG.md). Design documents and specifications: [Jarvis-Books `Docs/Jarvis-PLOT/`](https://github.com/Pengxuan-Zhu-Phys/Jarvis-Books/blob/main/Docs/Jarvis-PLOT/README.md).
 
 ---

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/README.md

@@ -5,7 +5,7 @@ but it can also be used as a **standalone scientific plotting tool**.
 
 It provides a simple command-line interface (CLI) to generate publication-quality figures from YAML configuration files, with most layout and style decisions handled by predefined profiles and style cards.
 
-Current source candidate: **2.1.12** (`jplot -v` reports the installed version).
+Current source candidate: **2.1.14** (`jplot -v` reports the installed version).
 Release history: [CHANGELOG.md](https://github.com/Pengxuan-Zhu-Phys/Jarvis-PLOT/blob/main/CHANGELOG.md). Design documents and specifications: [Jarvis-Books `Docs/Jarvis-PLOT/`](https://github.com/Pengxuan-Zhu-Phys/Jarvis-Books/blob/main/Docs/Jarvis-PLOT/README.md).
 
 ---

jarvisplot-2.1.14/VERSION

@@ -0,0 +1 @@
+2.1.14

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/Figure/adapters_rect.py

@@ -379,18 +379,24 @@ class StdAxesAdapter:
         artists = self.ax.scatter(x, y, **kw)
         return _auto_clip(artists, self.ax, self._clip_path)
 
+    def pcolor(self, *args, **kwargs):
+        return self._quadmesh("pcolor", args, kwargs)
+
     def pcolormesh(self, *args, **kwargs):
-        """Render regular-grid fields, including compact tables with __grid_* metadata."""
+        return self._quadmesh("pcolormesh", args, kwargs)
+
+    def _quadmesh(self, method, args, kwargs):
+        """Render either quad-mesh method from coordinates or a compact grid table."""
         if args:
-            kw = self._merge("pcolormesh", kwargs)
-            artist = self.ax.pcolormesh(*args, **kw)
+            kw = self._merge(method, kwargs)
+            artist = getattr(self.ax, method)(*args, **kw)
             return _auto_clip(artist, self.ax, self._clip_path)
 
         x = np.asarray(kwargs.pop("x"), dtype=float)
         y = np.asarray(kwargs.pop("y"), dtype=float)
         z = np.asarray(kwargs.pop("z", np.zeros_like(x)), dtype=float)
         df = kwargs.pop("__df__", None)
-        kw = self._merge("pcolormesh", kwargs)
+        kw = self._merge(method, kwargs)
 
         # Strip kwargs that are not used by pcolormesh rendering.
         for k in ("shading", "levels", "extend", "space", "marker", "s", "c"):
@@ -451,7 +457,7 @@ class StdAxesAdapter:
             kw.setdefault("zorder", zorder)
 
         if norm is not None:
-            artist = self.ax.pcolormesh(
+            artist = getattr(self.ax, method)(
                 x_edges,
                 y_edges,
                 grid,
@@ -460,7 +466,7 @@ class StdAxesAdapter:
                 **kw,
             )
         else:
-            artist = self.ax.pcolormesh(
+            artist = getattr(self.ax, method)(
                 x_edges,
                 y_edges,
                 grid,
@@ -1251,6 +1257,11 @@ class StdAxesAdapter:
         kw_edge, kw_face, kw_rest = split_fill_kwargs(kw_all)
         kw_edge.update(kw_rest)
         kw_face.update(kw_rest)
+        if "color" in kw_all:
+            kw_edge.setdefault("facecolor", kw_all["color"])
+            kw_face.setdefault("facecolor", kw_all["color"])
+        elif "facecolor" not in kw_edge and "fc" not in kw_edge:
+            kw_edge["facecolor"] = kw_all.get("edgecolor", kw_all.get("ec", "none"))
         # ---- inputs ----
         x = _np.asarray(x)
         y = _np.asarray(y)

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/Figure/forest_legend.py

@@ -6,6 +6,17 @@ from matplotlib.patches import Rectangle
 from matplotlib.offsetbox import VPacker
 
 
+def boxes_overlap(first, second):
+    """Require positive overlap on both physical axes, measured in mm.
+
+    Footer columns and the badge share grid boundaries. Touching those edges
+    is valid; Bbox.overlaps also counts contact and floating-point roundoff.
+    """
+    width = min(first.xmax, second.xmax) - max(first.xmin, second.xmin)
+    height = min(first.ymax, second.ymax) - max(first.ymin, second.ymin)
+    return min(width, height) > 1e-9
+
+
 class PhysicalLegendColumn(VPacker):
     """Recompute physical column width for each raster/vector renderer."""
     def __init__(self, width_mm, **kwargs):

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/Figure/forest_runtime.py

@@ -91,7 +91,10 @@ class ForestFigure(Figure):
     def _render(self):
         from matplotlib.patches import Rectangle
         from .legend_runtime import apply_legend
-        from .forest_legend import ForestGlyph, HandlerForestGlyph, HandlerForestPoint, PhysicalLegendColumn, group_glyph_and_points
+        from .forest_legend import (
+            ForestGlyph, HandlerForestGlyph, HandlerForestPoint,
+            PhysicalLegendColumn, boxes_overlap, group_glyph_and_points,
+        )
         from matplotlib.collections import PathCollection
         info, layout, ax = self.info, self.forest_layout, self.axes['ax']
         g, fonts, style = layout['geometry'], layout['typography'], layout['style']
@@ -468,9 +471,9 @@ class ForestFigure(Figure):
         if legend:
             for column in legend._legend_handle_box.get_children():
                 for item in column.get_children():
-                    if any(physical_box(item).overlaps(b) for b in badge_boxes):
+                    if any(boxes_overlap(physical_box(item), b) for b in badge_boxes):
                         raise ValueError('forest footer legend overlaps axlogo; adjust forest.geometry footer/legend/logo positions or frame.ax.legend layout')
-                    if any(physical_box(item).overlaps(b) for b in description_boxes):
+                    if any(boxes_overlap(physical_box(item), b) for b in description_boxes):
                         raise ValueError('forest footer legend overlaps description; adjust forest.geometry column starts or frame.ax.legend layout')
         for row, artists in annotations:
             boxes = [physical_box(artist) for artist in artists]

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/Figure/layer_runtime.py

@@ -32,7 +32,7 @@ _MISSING_CLIP_PATH = object()
 #: coordinates: the grid methods read the ``__grid_*`` metadata off it, and
 #: corrplot reads the whole correlation table -- var names, indices, rho and
 #: the per-pair row count that significance is computed from.
-_GRID_TABLE_METHODS = frozenset({"pcolormesh", "imshow", "corrplot"})
+_GRID_TABLE_METHODS = frozenset({"pcolor", "pcolormesh", "imshow", "corrplot"})
 
 def _normalize_layer_combine(value) -> str:
     """Return the canonical combine spelling while keeping v1 YAML usable."""

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/Figure/preprocessor_runtime.py

@@ -280,7 +280,7 @@ def add_column(df, adds, logger):
             return df
         name = str(adds.get("name")).strip()
         expr = adds.get("expr")
-        value = eval_dataframe_expression(df, expr, logger=logger, allow_column=True)
+        value = eval_dataframe_expression(df, expr, logger=logger, allow_column=True, fillna=adds.get("fillna"))
         # The frame may be a table other blocks still read (a preprofile pass
         # works on the source itself); add to a copy, never into the caller's.
         df = df.copy(deep=False)

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/cards/a4paper/1x1/ternary.json

@@ -137,7 +137,7 @@
         },
         "axlogo": {
             "clip": false,
-            "file": "&JP/jarvisplot/cards/icons/jarvisHEP.png"
+            "file": "&JP/jarvisplot/cards/icons/JarvisHEP.png"
         }
     },
     "Debug": {

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/cards/a4paper/2x1/ternary.json

@@ -134,7 +134,7 @@
         },
         "axlogo": {
             "clip": false,
-            "file": "&JP/jarvisplot/cards/icons/jarvisHEP.png"
+            "file": "&JP/jarvisplot/cards/icons/JarvisHEP.png"
         }
     },
     "Debug": {

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/cards/a4paper/2x1/ternary_cmap.json

@@ -178,7 +178,7 @@
         },
         "axlogo": {
             "clip": false,
-            "file": "&JP/jarvisplot/cards/icons/jarvisHEP.png"
+            "file": "&JP/jarvisplot/cards/icons/JarvisHEP.png"
         }
     },
     "Debug": {

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/cards/a4paper/4x1/ternary_cmap.json

@@ -177,7 +177,7 @@
         },
         "axlogo": {
             "clip": false,
-            "file": "&JP/jarvisplot/cards/icons/jarvisHEP.png"
+            "file": "&JP/jarvisplot/cards/icons/JarvisHEP.png"
         }
     },
     "Style": {

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/cards/gambit/2x1/rect_cmap.json

@@ -162,7 +162,7 @@
                 "fontfamily": "STIXGeneral"
             },
             "ylabel_coords": {
-                "x": 3.7,
+                "x": 3.4,
                 "y": 0.5
             },
             "ticks": {

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/data_loader.py

@@ -25,6 +25,7 @@ JP_ROW_IDX = "__jp_row_idx__"
 
 class DataSet():
     def __init__(self):
+        self.paths: list[str] = []
         self._file: Optional[str]   = None
         self.path:  Optional[str]   = None 
         self.rootpath: Optional[str] = None
@@ -62,9 +63,14 @@ class DataSet():
             # transforms (see the ``to_df`` / ``to_ds`` steps).
             self.file = None
         else:
-            raw_path = str(dtinfo['path'])
-            resolved = resolve_project_path(raw_path, base_dir=rootpath or ".")
-            self.file = str(resolved)
+            raw_paths = dtinfo['path'] if isinstance(dtinfo['path'], list) else [dtinfo['path']]
+            paths = [str(resolve_project_path(path, base_dir=rootpath or ".")) for path in raw_paths]
+            if not paths:
+                raise ValueError("DataSet.path must contain at least one file")
+            if len(paths) > 1 and declared_type != "csv":
+                raise ValueError("DataSet.path lists currently require type: csv")
+            self.file = paths[0]
+            self.paths = paths
         self.name = dtinfo['name']
         self.type = declared_type
         self.transform = dtinfo.get("transform", None)
@@ -118,7 +124,8 @@ class DataSet():
         if not wanted:
             return None
         names = [str(c) for c in available]
-        keep = [c for c in names if c in wanted]
+        keep = [c for c in names if c in wanted or
+                (self.type == "hdf5" and c.rsplit("/", 1)[-1].rsplit(":", 1)[-1] in wanted)]
         if not any(c != JP_ROW_IDX for c in keep) or len(keep) == len(names):
             return None
         return keep
@@ -134,8 +141,8 @@ class DataSet():
         """Fetch cheap metadata only; avoid full table load."""
         if self.type == "csv":
             try:
-                head = pd.read_csv(self.path, nrows=0)
-                self.keys = list(head.columns)
+                self.keys = list(dict.fromkeys(column for path in (self.paths or [self.path])
+                                               for column in pd.read_csv(path, nrows=0).columns))
                 if self.logger:
                     self.logger.debug(
                         f"Dataset '{self.name}' registered in lazy mode (csv columns={len(self.keys)})."
@@ -182,6 +189,8 @@ class DataSet():
             "transform": self.transform,
             "columns": self.columns,
             "full_load": bool(getattr(self, "full_load", False)),
+            "sources": [(path, os.stat(path).st_size, os.stat(path).st_mtime_ns)
+                        for path in self.paths if os.path.isfile(path)],
         }
         from .distribution_1d_config import distribution_kind
 
@@ -396,13 +405,15 @@ class DataSet():
     
     @file.setter 
     def file(self, value: Optional[str]) -> None: 
-        if value is None: 
+        if value is None:
+            self.paths = []
             self._file  = None
             self.path   = None
             self.base   = None
             return
             
         p = Path(value).expanduser().resolve()
+        self.paths = [str(p)]
         self._file  = str(p)
         self.path   = os.path.abspath(p)
         self.base   = os.path.basename(p)
@@ -426,21 +437,23 @@ class DataSet():
             # of the table: dropping them here would silently apply a policy
             # across every column before an explicit transform can decide how
             # required and optional fields should be handled.
-            usecols = None
+            selected = None
             if self.required_columns:
-                header = list(pd.read_csv(self.path, nrows=0).columns)
+                header = list(dict.fromkeys(column for path in (self.paths or [self.path])
+                                            for column in pd.read_csv(path, nrows=0).columns))
                 planned = self.planned_columns(header)
                 if planned is not None:
-                    # By position: the names above are pandas' own (duplicated
-                    # headers already read as x, x.1), not the raw header text.
-                    wanted = set(planned)
-                    usecols = [i for i, name in enumerate(header) if str(name) in wanted]
-                    self._log_column_plan(len(usecols), len(header))
-            self.data = pd.read_csv(
-                self.path, low_memory=False, usecols=usecols,
+                    # Union headers allow each input to omit columns supplied
+                    # by another file; pandas keeps its duplicate-name handling.
+                    selected = set(planned)
+                    self._log_column_plan(len(selected), len(header))
+            frames = [pd.read_csv(
+                path, low_memory=False,
+                usecols=(lambda name: name in selected) if selected is not None else None,
                 dtype={name: str for name in self.literal_columns},
                 keep_default_na=not self.preserve_empty_strings,
-            )
+            ) for path in (self.paths or [self.path])]
+            self.data = pd.concat(frames, ignore_index=True, sort=False) if len(frames) > 1 else frames[0]
             self.keys = list(self.data.columns)
             runtime.apply_dataset_transform(self, stage="csv")
 

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/data_loader_runtime.py

@@ -419,6 +419,8 @@ def _apply_dataset_transform_polars(
                     lf = lf.with_columns(key.alias(skey)).sort(skey).drop(skey)
             elif "add_column" in trans:
                 adds = trans.get("add_column", {})
+                if isinstance(adds, dict) and adds.get("fillna") is not None:
+                    raise TypeError("add_column.fillna requires the shared pandas evaluator")
                 if not isinstance(adds, dict):
                     raise TypeError("add_column step must be dict")
                 problem = add_column_spec_problem(adds)

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/diagnostic_guidance.py

@@ -103,7 +103,7 @@ _GUIDANCE_BY_CODE: dict[str, tuple[str, Optional[str]]] = {
     # Data / figures / refs
     "JP-DAT-004": (
         "Paths resolve relative to the config file's directory "
-        "(or use the &JP/ prefix for package-relative paths).",
+        "(or use the &JP/ prefix for bundled resource paths).",
         "path: ./DATABASE/samples.csv",
     ),
     "JP-DAT-005": (

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/dryrun_runtime.py

@@ -152,6 +152,11 @@ def _dryrun_config(
             "type_expanded": [],
         }, bag
 
+    from .core_assets import load_interpolators
+    try:
+        load_interpolators(work, yaml_dir=base_dir)
+    except Exception as exc:
+        bag.error("JP-VIZ-003", "$.Functions", f"could not load Functions: {exc}")
     datasets_meta, frames = _load_datasets(work, base_dir=base_dir, bag=bag)
     forest_layouts = []
     observations: list[LayerObservation] = []
@@ -356,29 +361,34 @@ def _load_datasets(
             meta[name] = {"path": None, "rows": 0, "in_memory": True}
             continue
         raw_path = entry.get("path")
-        if not isinstance(raw_path, str):
-            bag.warning(
-                "JP-DAT-004",
-                f"$.DataSet[{index}].path",
-                f"dataset {name!r} has no single string path; dryrun skips it",
-            )
+        paths = raw_path if isinstance(raw_path, list) else [raw_path]
+        if not paths or not all(isinstance(path, str) for path in paths):
+            bag.error("JP-DAT-004", f"$.DataSet[{index}].path", f"dataset {name!r} needs a path or path list")
             continue
-        resolved = resolve_project_path(raw_path, base_dir)
-        if not Path(resolved).exists():
-            bag.error(
-                "JP-DAT-004",
-                f"$.DataSet[{index}].path",
-                f"data file not found: {resolved}",
-            )
-            meta[name] = {"path": str(resolved), "rows": None, "error": "missing"}
+        resolved = [resolve_project_path(path, base_dir) for path in paths]
+        missing = [path for path in resolved if not path.exists()]
+        if missing:
+            bag.error("JP-DAT-004", f"$.DataSet[{index}].path", f"data file not found: {missing[0]}")
+            meta[name] = {"path": str(missing[0]), "rows": None, "error": "missing"}
+            continue
+        kind = str(entry.get("type") or detect_type(str(resolved[0]), "auto"))
+        display_path = str(resolved[0]) if len(resolved) == 1 else [str(path) for path in resolved]
+        if len(resolved) > 1 and kind != "csv":
+            bag.error("JP-DAT-006", f"$.DataSet[{index}].path", "DataSet.path lists currently require type: csv")
             continue
-        kind = str(entry.get("type") or detect_type(str(resolved), "auto"))
         try:
-            df = load_dataframe(
-                str(resolved),
-                kind=kind if kind in {"csv", "parquet", "hdf5"} else "csv",
-                group=entry.get("dataset") if isinstance(entry.get("dataset"), str) else None,
-            )
+            if kind == "hdf5":
+                import logging
+                from .data_loader import DataSet
+                loader = DataSet()
+                loader.logger = logging.getLogger("jarvisplot.dryrun.data")
+                spec = dict(entry)
+                spec.pop("transform", None)
+                loader.setinfo(spec, rootpath=base_dir, eager=True)
+                df = loader.get_data()
+            else:
+                tables = [load_dataframe(str(path), kind=kind) for path in resolved]
+                df = pd.concat(tables, ignore_index=True, sort=False) if len(tables) > 1 else tables[0]
             # dataset-level transform (simple steps only)
             _heavy = []
             ds_transform = entry.get("transform")
@@ -387,7 +397,7 @@ def _load_datasets(
             rows = int(len(df))
             frames[name] = df
             meta[name] = {
-                "path": str(resolved),
+                "path": display_path,
                 "type": kind,
                 "rows": rows,
                 "columns": [str(c) for c in df.columns],
@@ -399,7 +409,7 @@ def _load_datasets(
                 f"$.DataSet[{index}]",
                 f"could not load dataset {name!r}: {exc}",
             )
-            meta[name] = {"path": str(resolved), "rows": None, "error": str(exc)}
+            meta[name] = {"path": display_path, "rows": None, "error": str(exc)}
     return meta, frames
 
 
@@ -598,6 +608,11 @@ def _observe_layer(
     incomplete_sources = incomplete_sources or set()
     data_blocks = layer.get("data") or []
     if not isinstance(data_blocks, list) or not data_blocks:
+        if layer.get("coordinates"):
+            import pandas as pd
+            obs = observe_layer_dataframe(figure=figure_name, layer=layer, df=pd.DataFrame(),
+                                          frame_cfg=frame_cfg, source="<literal>")
+            return obs, None, []
         return (
             LayerObservation(
                 figure=figure_name,
@@ -690,7 +705,7 @@ def _observe_layer(
                 source=", ".join(source_labels),
                 n_points=0,
                 notes=notes or ["no loadable data blocks"],
-                incomplete=incomplete_source_seen,
+                incomplete=incomplete_source_seen or bool(heavy_skipped),
             ),
             None,
             heavy_skipped,

{jarvisplot-2.1.12 → jarvisplot-2.1.14}/jarvisplot/flowchart.py

@@ -12,6 +12,8 @@ from .utils.pathing import resolve_project_path
 
 
 DEFAULT_FLOWCHART_CARD = "&JP/jarvisplot/cards/flowchart/default.json"
+_OUTPUT_FILE_Y_OFFSET = -0.18
+_OUTPUT_FILE_GROUP_GAP = 0.22
 
 
 def _deep_merge(base: dict, override: Mapping | None) -> dict:
@@ -314,6 +316,14 @@ class FlowchartRenderer:
         ax.text(x+0.12, y-0.01, "SEL", ha="center", va="center", fontsize=5, fontweight="extra bold", color="#008A34", zorder=121, path_effects=[pe.withStroke(linewidth=0.2, foreground="white")])
 
     def _draw_classic_edges(self, ax, graph) -> None:
+        output_files: dict[str, set[str]] = {}
+        for edge in graph.edges:
+            source_id = str(edge.get("source", {}).get("node", ""))
+            target_id = str(edge.get("target", {}).get("node", ""))
+            if (str(edge.get("role", "dataflow")).lower() == "fileflow"
+                    and source_id in graph.mains and target_id in graph.files):
+                output_files.setdefault(source_id, set()).add(target_id)
+
         for edge in graph.edges:
             role = str(edge.get("role", "dataflow")).lower()
             source_id = str(edge.get("source", {}).get("node", ""))
@@ -336,7 +346,10 @@ class FlowchartRenderer:
                 ax.plot(start[0] + 0.03, start[1], "s", color="gray", markersize=2.0, zorder=79)  
                 self._classic_curve(ax, start, end, color="#D45040", lw=2.2, alpha=0.95)
             elif role == "fileflow" and graph.is_main(source_id) and graph.is_file(target_id):
-                start = (start[0], end[1])
+                if len(output_files.get(source_id, ())) <= 1:
+                    start = (start[0], end[1])
+                else:
+                    start = (start[0], start[1] + _OUTPUT_FILE_Y_OFFSET)
                 self._classic_curve(ax, start, end, color="#3B4DC0", lw=2.2, alpha=0.95)
             elif role == "fileflow" and graph.is_file(source_id) and graph.is_var(target_id):
                 self._classic_curve(ax, start, end, color="#3B4DC0", lw=0.75, alpha=0.7)
@@ -660,14 +673,35 @@ class _ClassicGraph:
         counts = []
         for file_id in self._files_for_main(main_id, "input"):
             counts.append(len(self._incoming_variables(file_id)))
-        for file_id in self._files_for_main(main_id, "output"):
+        output_files = self._files_for_main(main_id, "output")
+        for file_id in output_files:
             counts.append(len(self._outgoing_variables(file_id)))
         counts.append(len(self._direct_input_variables(main_id)))
         counts.append(len(self._direct_output_variables(main_id)))
         if self.nodes[main_id].get("kind") == "source":
             counts.append(len(self._outgoing_variables(main_id)))
         max_count = max(counts or [1])
-        return max(1.25, max_count * self.var_gap + 0.45)
+        height = max(1.25, max_count * self.var_gap + 0.45)
+        if len(output_files) > 1:
+            output_height = sum(self._output_file_band_height(file_id) for file_id in output_files)
+            output_height += (len(output_files) - 1) * _OUTPUT_FILE_GROUP_GAP
+            height = max(height, output_height + 2 * abs(_OUTPUT_FILE_Y_OFFSET) + 0.45)
+        return height
+
+    def _output_file_band_height(self, file_id: str) -> float:
+        return max(0.65, len(self._outgoing_variables(file_id)) * self.var_gap)
+
+    def _output_file_centers(self, file_ids: list[str], center_y: float) -> list[float]:
+        if len(file_ids) <= 1:
+            return self._spread_y(center_y, len(file_ids), 0.65)
+        heights = [self._output_file_band_height(file_id) for file_id in file_ids]
+        total_height = sum(heights) + (len(file_ids) - 1) * _OUTPUT_FILE_GROUP_GAP
+        top = center_y + total_height / 2.0
+        centers = []
+        for height in heights:
+            centers.append(top - height / 2.0)
+            top -= height + _OUTPUT_FILE_GROUP_GAP
+        return centers
 
     def _place_main_group(self, main_id: str, x: float, y: float, height: float) -> None:
         node = self.nodes[main_id]
@@ -688,14 +722,14 @@ class _ClassicGraph:
         input_files = self._files_for_main(main_id, "input")
         output_files = self._files_for_main(main_id, "output")
         input_anchor_y = y + 0.18
-        output_anchor_y = y - 0.18
+        output_anchor_y = y + _OUTPUT_FILE_Y_OFFSET
         for file_id, fy in zip(input_files, self._spread_y(input_anchor_y, len(input_files), 0.65)):
             self._place_file(file_id, x - self.input_file_dx, fy, "input")
             incoming = self._incoming_variables(file_id)
             for var_id in incoming:
                 if var_id not in self.variables and var_id not in self.bridges:
                     self._place_variable(var_id, x - self.input_variable_dx, fy, align="right")
-        for file_id, fy in zip(output_files, self._spread_y(output_anchor_y, len(output_files), 0.65)):
+        for file_id, fy in zip(output_files, self._output_file_centers(output_files, output_anchor_y)):
             self._place_file(file_id, x + self.output_file_dx, fy, "output")
             self._place_variables(self._outgoing_variables(file_id), x + self.output_variable_dx, fy, align="right")