jarvisplot 2.0.1__tar.gz → 2.0.2__tar.gz

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/JarvisPLOT.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 2.0.1
+Version: 2.0.2
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 2.0.1
+Version: 2.0.2
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/jarvisplot/Figure/figure.py

@@ -26,6 +26,7 @@ from .layout_runtime import (
     apply_manual_ticks,
     ensure_numbered_rect_axes,
     has_manual_ticks,
+    hide_log_minor_tick_labels,
     is_numbered_ax,
 )
 from .colorbar_runtime import (
@@ -802,6 +803,7 @@ class Figure:
             self.ax.set_yscale("log")
             from matplotlib.ticker import LogLocator
             self.ax.yaxis.set_minor_locator(LogLocator(subs='auto'))
+            hide_log_minor_tick_labels(self.ax, "y")
         else:
             self.ax.yaxis.set_minor_locator(AutoMinorLocator())
         
@@ -809,6 +811,7 @@ class Figure:
             self.ax.set_xscale("log")
             from matplotlib.ticker import LogLocator
             self.ax.xaxis.set_minor_locator(LogLocator(subs='auto'))
+            hide_log_minor_tick_labels(self.ax, "x")
         else:
             self.ax.xaxis.set_minor_locator(AutoMinorLocator())
         
@@ -838,8 +841,8 @@ class Figure:
 
         # Apply manual ticks here at initialization if provided in YAML
         ax_ticks_cfg = self.frame.get('ax', {}).get('ticks', {})
-        # self._apply_manual_ticks(self.ax, "x", ax_ticks_cfg.get('x', {}))
-        # self._apply_manual_ticks(self.ax, "y", ax_ticks_cfg.get('y', {}))
+        self._apply_manual_ticks(self.ax, "x", ax_ticks_cfg.get('x', {}))
+        self._apply_manual_ticks(self.ax, "y", ax_ticks_cfg.get('y', {}))
 
 
         self.ax.tick_params(**self.frame['ax']['ticks'].get("both", {}))

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/jarvisplot/Figure/layout_runtime.py

@@ -61,6 +61,19 @@ def apply_axis_title(fig, ax_obj, ax_name: str) -> None:
     ax_obj.text(s=str(title), **text_params)
 
 
+def hide_log_minor_tick_labels(ax_obj, which: str) -> None:
+    """Keep log minor tick marks, but hide their labels by default."""
+    target = ax_obj.ax if hasattr(ax_obj, "ax") else ax_obj
+    if which == "x":
+        target.tick_params(
+            axis="x", which="minor", labelbottom=False, labeltop=False
+        )
+    elif which == "y":
+        target.tick_params(
+            axis="y", which="minor", labelleft=False, labelright=False
+        )
+
+
 def ensure_numbered_rect_axes(fig, ax_name: str, kwgs: dict):
     if not is_numbered_ax(ax_name):
         raise ValueError(f"Illegal dynamic axes name '{ax_name}'. Only ax<NUMBER> is allowed.")
@@ -88,12 +101,14 @@ def ensure_numbered_rect_axes(fig, ax_name: str, kwgs: dict):
     if fig.frame.get(ax_name, {}).get("yscale", "").lower() == "log":
         ax_obj.set_yscale("log")
         ax_obj.yaxis.set_minor_locator(LogLocator(subs="auto"))
+        hide_log_minor_tick_labels(ax_obj, "y")
     else:
         ax_obj.yaxis.set_minor_locator(AutoMinorLocator())
 
     if fig.frame.get(ax_name, {}).get("xscale", "").lower() == "log":
         ax_obj.set_xscale("log")
         ax_obj.xaxis.set_minor_locator(LogLocator(subs="auto"))
+        hide_log_minor_tick_labels(ax_obj, "x")
     else:
         ax_obj.xaxis.set_minor_locator(AutoMinorLocator())
 

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/jarvisplot/core.py

@@ -285,11 +285,22 @@ class JarvisPLOT():
     def _maybe_write_agent_digest(self, figure_cfg, figobj) -> None:
         """Write figure-level agent_output digest after a successful plot."""
         try:
-            from .agent_digest import load_figure_source_dataframe, maybe_write_figure_digest
+            from .agent_digest import (
+                load_figure_source_dataframe,
+                maybe_write_figure_digest,
+                parse_agent_output,
+            )
             from .cli import JPLOT_VERSION
 
             if not isinstance(figure_cfg, dict):
                 return
+            # Do not load the source dataframe just to discover that no agent
+            # digest was requested. This matters after rendering releases the
+            # last layer's source data.
+            root_config = getattr(self.yaml, "config", {}) or {}
+            root_output = root_config.get("output", {}) if isinstance(root_config, dict) else {}
+            if parse_agent_output(figure_cfg, root_output=root_output) is None:
+                return
             # Prefer raw YAML figure block (pre type-expand may have type: fields).
             # After expand_figure_types, config figures are already expanded; still OK.
             df = load_figure_source_dataframe(self, figure_cfg)

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "JarvisPLOT"
-version = "2.0.1"
+version = "2.0.2"
 description = "Jarvis-PLOT: YAML-driven plotting engine"
 readme = "README.md"
 requires-python = ">=3.10"

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/tests/test_agent_digest.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import json
 import textwrap
 from pathlib import Path
+from types import SimpleNamespace
 
 import numpy as np
 
@@ -18,6 +19,30 @@ from jarvisplot.client import main
 from jarvisplot.diagnostics import DiagnosticBag
 
 
+def test_render_skips_agent_digest_source_load_when_not_requested(monkeypatch):
+    from jarvisplot.core import JarvisPLOT
+
+    core = JarvisPLOT()
+    core.yaml = SimpleNamespace(config={"output": {}})
+    core.logger = SimpleNamespace(warning=lambda *args, **kwargs: None)
+
+    def fail_if_source_is_loaded(*args, **kwargs):
+        raise AssertionError("agent digest source should not load when disabled")
+
+    monkeypatch.setattr(
+        "jarvisplot.agent_digest.load_figure_source_dataframe",
+        fail_if_source_is_loaded,
+    )
+
+    core._maybe_write_agent_digest(
+        {
+            "name": "plain_plot",
+            "layers": [{"data": [{"source": "samples"}]}],
+        },
+        SimpleNamespace(),
+    )
+
+
 def test_strip_digest_axes_stash_removes_key(tmp_path):
     from jarvisplot.agent_digest import strip_digest_axes_stash
 

{jarvisplot-2.0.1 → jarvisplot-2.0.2}/tests/test_figure_contracts.py

@@ -716,6 +716,39 @@ def test_colorbar_manual_y_ticks_override_auto_ticks(axc_name):
     plt.close(fig.fig)
 
 
+def test_main_axis_manual_log_x_ticks_are_applied_and_preserved():
+    positions = [0.1, 1.0, 5.0]
+    labels = ["0.1", "1", "5"]
+
+    fig = Figure()
+    fig.logger = _logger()
+    fig.frame = {
+        "figure": {"figsize": (2, 2)},
+        "ax": {
+            "labels": {"x": "", "y": ""},
+            "xlim": [0.1, 5.0],
+            "ylim": [0.1, 5.0],
+            "xscale": "log",
+            "yscale": "linear",
+            "ticks": {"x": {"positions": positions, "labels": labels}},
+        },
+    }
+    fig.fig = plt.figure(figsize=(2, 2))
+    fig.axes = {}
+    fig.ax = {"rect": [0.1, 0.1, 0.8, 0.8]}
+
+    fig.render()
+    fig.fig.canvas.draw()
+
+    np.testing.assert_allclose(fig.ax.xaxis.get_majorticklocs(), positions)
+    assert [label.get_text() for label in fig.ax.get_xticklabels()] == labels
+    assert all(
+        not tick.label1.get_visible() and not tick.label2.get_visible()
+        for tick in fig.ax.xaxis.get_minor_ticks()
+    )
+    plt.close(fig.fig)
+
+
 @pytest.mark.parametrize("ax_type", ["rect", "tri"])
 def test_render_layer_does_not_mutate_layer_data(monkeypatch, ax_type):
     original_data = object()