jarvisplot 1.3.8__tar.gz → 1.3.9__tar.gz

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/JarvisPLOT.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 1.3.8
+Version: 1.3.9
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -117,6 +117,7 @@ and evidence summary behavior.
 
 - Figures are saved automatically to the output paths defined in the YAML configuration.
 - Common output formats include PNG and PDF (backend-dependent).
+- Saved figures include file metadata such as `Creator: Jarvis-PLOT, powered by Jarvis-HEP` and `Jarvis-PLOT version: X.Y.Z`; the PNG `Description` also includes both fields for macOS Finder compatibility.
 - Jarvis-PLOT works in headless environments (SSH, batch jobs) without any GUI backend.
 
 ---

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: JarvisPLOT
-Version: 1.3.8
+Version: 1.3.9
 Summary: Jarvis-PLOT: YAML-driven plotting engine
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -117,6 +117,7 @@ and evidence summary behavior.
 
 - Figures are saved automatically to the output paths defined in the YAML configuration.
 - Common output formats include PNG and PDF (backend-dependent).
+- Saved figures include file metadata such as `Creator: Jarvis-PLOT, powered by Jarvis-HEP` and `Jarvis-PLOT version: X.Y.Z`; the PNG `Description` also includes both fields for macOS Finder compatibility.
 - Jarvis-PLOT works in headless environments (SSH, batch jobs) without any GUI backend.
 
 ---

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/README.md

@@ -97,6 +97,7 @@ and evidence summary behavior.
 
 - Figures are saved automatically to the output paths defined in the YAML configuration.
 - Common output formats include PNG and PDF (backend-dependent).
+- Saved figures include file metadata such as `Creator: Jarvis-PLOT, powered by Jarvis-HEP` and `Jarvis-PLOT version: X.Y.Z`; the PNG `Description` also includes both fields for macOS Finder compatibility.
 - Jarvis-PLOT works in headless environments (SSH, batch jobs) without any GUI backend.
 
 ---

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/jarvisplot/Figure/figure.py

@@ -47,6 +47,97 @@ except Exception:
     pl = None
 
 
+_JPLOT_VERSION_CACHE = None
+
+
+def _resolve_jplot_version() -> str:
+    """Return the source/package version used for figure metadata."""
+    global _JPLOT_VERSION_CACHE
+    if _JPLOT_VERSION_CACHE is not None:
+        return _JPLOT_VERSION_CACHE
+
+    pyproject = os.path.abspath(
+        os.path.join(os.path.dirname(__file__), "..", "..", "pyproject.toml")
+    )
+    try:
+        with open(pyproject, "r", encoding="utf-8") as handle:
+            in_project = False
+            for line in handle:
+                stripped = line.strip()
+                if stripped == "[project]":
+                    in_project = True
+                    continue
+                if in_project and stripped.startswith("["):
+                    break
+                if in_project and stripped.startswith("version"):
+                    _JPLOT_VERSION_CACHE = stripped.split("=", 1)[1].strip().strip('"').strip("'")
+                    return _JPLOT_VERSION_CACHE
+    except Exception:
+        pass
+
+    try:
+        from importlib.metadata import version as pkg_version
+
+        for dist_name in ("Jarvis-PLOT", "JarvisPLOT", "jarvisplot"):
+            try:
+                _JPLOT_VERSION_CACHE = pkg_version(dist_name)
+                return _JPLOT_VERSION_CACHE
+            except Exception:
+                continue
+    except Exception:
+        pass
+
+    _JPLOT_VERSION_CACHE = "0.0.0"
+    return _JPLOT_VERSION_CACHE
+
+
+def _savefig_metadata(fmt: str, extra=None) -> dict:
+    """Build backend-friendly figure metadata for savefig."""
+    version = _resolve_jplot_version()
+    creator = "Jarvis-PLOT, powered by Jarvis-HEP"
+    version_text = f"Jarvis-PLOT version: {version}"
+    provenance_text = f"{creator}; {version_text}"
+    fmt_key = str(fmt or "").lower().lstrip(".")
+    metadata = {
+        "Creator": creator,
+        "Title": "Jarvis-PLOT figure",
+        "Author": "Jarvis-PLOT",
+    }
+
+    if fmt_key in {"pdf", "ps", "eps"}:
+        metadata["Subject"] = provenance_text
+        metadata["Keywords"] = f"Jarvis-PLOT; Jarvis-HEP; {version_text}"
+    else:
+        metadata["Software"] = "Jarvis-PLOT"
+        metadata["Description"] = provenance_text
+        metadata["Comment"] = provenance_text
+        metadata["Jarvis-PLOT version"] = version
+
+    if isinstance(extra, dict):
+        metadata.update(extra)
+    return metadata
+
+
+def _write_png_metadata(path: str, metadata: dict) -> None:
+    try:
+        from PIL import Image, PngImagePlugin
+    except Exception:
+        return
+    try:
+        image = Image.open(path)
+        pnginfo = PngImagePlugin.PngInfo()
+        for key, value in (metadata or {}).items():
+            if value is None:
+                continue
+            pnginfo.add_text(str(key), str(value))
+        save_kwargs = {"pnginfo": pnginfo}
+        if "dpi" in image.info:
+            save_kwargs["dpi"] = image.info["dpi"]
+        image.save(path, **save_kwargs)
+    except Exception:
+        return
+
+
 class Figure:
     def _is_numbered_ax(self, name: str) -> bool:
         """Return True iff name matches ax<NUMBER>, e.g. ax1, ax2, ax10."""
@@ -99,6 +190,7 @@ class Figure:
         self._logger    = None
         self._frame     = {}
         self._outinfo   = {}
+        self._output_metadata = {}
         self._yaml_dir  = None  # directory of the active YAML file (used to resolve relative paths)
         self.axes       = {}
         self.debug      = False
@@ -134,11 +226,13 @@ class Figure:
     
     @config.setter
     def config(self, infos):
-        self.dir = self.load_path(infos['output'].get("dir", "."), base_dir=self._yaml_dir)
+        output = infos.get("output", {})
+        self.dir = self.load_path(output.get("dir", "."), base_dir=self._yaml_dir)
         if not os.path.exists(self.dir):
             os.makedirs(self.dir)
-        self.fmts   = infos['output'].get("formats", ['png'])
-        self.dpi    = infos['output'].get('dpi', 600)
+        self.fmts = output.get("formats", ["png"])
+        self.dpi = output.get("dpi", 600)
+        self._output_metadata = output.get("metadata", {}) if isinstance(output.get("metadata", {}), dict) else {}
 
     @property
     def jpstyles(self) -> Optional[dict]: 
@@ -835,7 +929,13 @@ class Figure:
                     )
             except Exception:
                 pass 
-            self.fig.savefig(spf, dpi=self.dpi)
+            metadata = _savefig_metadata(fmt, self._output_metadata)
+            try:
+                self.fig.savefig(spf, dpi=self.dpi, metadata=metadata)
+            except (TypeError, ValueError):
+                self.fig.savefig(spf, dpi=self.dpi)
+            if str(fmt).lower().lstrip(".") == "png":
+                _write_png_metadata(spf, metadata)
 
     def load_axes(self):
         for ax, kws in self.frame['axes'].items():

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/pyproject.toml

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

{jarvisplot-1.3.8 → jarvisplot-1.3.9}/tests/test_figure_contracts.py

@@ -84,6 +84,57 @@ def test_style_bundle_can_provide_default_layers(monkeypatch):
     assert fig._render_queue[0][1]["method"] == "dynesty_runplot"
 
 
+def test_savefig_writes_creator_and_version_metadata(tmp_path):
+    calls = []
+
+    class DummyFigure:
+        def savefig(self, path, *, dpi=None, metadata=None):
+            calls.append((path, dpi, metadata))
+
+    fig = Figure()
+    fig.logger = _logger()
+    fig.name = "plot"
+    fig.dir = str(tmp_path)
+    fig.fmts = ["png", "pdf"]
+    fig.dpi = 123
+    fig.fig = DummyFigure()
+    fig._output_metadata = {}
+
+    fig.savefig()
+
+    assert calls[0][2]["Creator"] == "Jarvis-PLOT, powered by Jarvis-HEP"
+    assert calls[0][2]["Description"].startswith("Jarvis-PLOT, powered by Jarvis-HEP; Jarvis-PLOT version: ")
+    assert calls[0][2]["Comment"] == calls[0][2]["Description"]
+    assert calls[0][2]["Jarvis-PLOT version"]
+    assert calls[1][2]["Creator"] == "Jarvis-PLOT, powered by Jarvis-HEP"
+    assert calls[1][2]["Subject"].startswith("Jarvis-PLOT, powered by Jarvis-HEP; Jarvis-PLOT version: ")
+
+
+def test_savefig_png_contains_metadata_text_chunks(tmp_path):
+    from PIL import Image
+
+    raw_fig, raw_ax = plt.subplots()
+    raw_ax.plot([0.0, 1.0], [0.0, 1.0])
+
+    fig = Figure()
+    fig.logger = _logger()
+    fig.name = "plot"
+    fig.dir = str(tmp_path)
+    fig.fmts = ["png"]
+    fig.dpi = 80
+    fig.fig = raw_fig
+    fig._output_metadata = {}
+
+    fig.savefig()
+    plt.close(raw_fig)
+
+    info = Image.open(tmp_path / "plot.png").info
+    assert info["Creator"] == "Jarvis-PLOT, powered by Jarvis-HEP"
+    assert info["Description"].startswith("Jarvis-PLOT, powered by Jarvis-HEP; Jarvis-PLOT version: ")
+    assert info["Comment"] == info["Description"]
+    assert info["Jarvis-PLOT version"]
+
+
 def test_console_record_formatter_escapes_braces():
     class _Time:
         def __format__(self, spec):