scitex 2.15.4__tar.gz → 2.15.5__tar.gz

{scitex-2.15.4 → scitex-2.15.5}/.github/workflows/test-install-modules.yml

@@ -4,8 +4,9 @@
 name: Test Module Installation
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: ["Release"]
+    types: [completed]
   workflow_dispatch:
     inputs:
       version:
@@ -22,6 +23,8 @@ jobs:
   get-modules:
     name: Get Module List
     runs-on: ubuntu-latest
+    # Only run if Release workflow succeeded
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     outputs:
       modules: ${{ steps.modules.outputs.modules }}
     steps:
@@ -65,8 +68,9 @@ jobs:
         run: |
           if [ -n "${{ github.event.inputs.version }}" ]; then
             echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
-          elif [ -n "${{ github.event.release.tag_name }}" ]; then
-            VERSION="${{ github.event.release.tag_name }}"
+          elif [ -n "${{ github.event.workflow_run.head_branch }}" ]; then
+            # Extract version from tag (workflow_run trigger)
+            VERSION="${{ github.event.workflow_run.head_branch }}"
             echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
           else
             # Get latest from PyPI

{scitex-2.15.4 → scitex-2.15.5}/.github/workflows/test-install.yml

@@ -1,11 +1,12 @@
 # Test PyPI installation
-# Triggered on release publication to verify package installs correctly
+# Triggered after Release workflow completes to verify package installs correctly
 
 name: Test Installation
 
 on:
-  release:
-    types: [published]
+  workflow_run:
+    workflows: ["Release"]
+    types: [completed]
   workflow_dispatch:
     inputs:
       version:
@@ -17,6 +18,8 @@ jobs:
   test-install-core:
     name: Test Core Install (Python ${{ matrix.python-version }})
     runs-on: ubuntu-latest
+    # Only run if Release workflow succeeded
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
       fail-fast: false
       matrix:
@@ -33,8 +36,14 @@ jobs:
         run: |
           if [ -n "${{ github.event.inputs.version }}" ]; then
             echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          elif [ -n "${{ github.event.workflow_run.head_branch }}" ]; then
+            # Extract version from tag (workflow_run trigger)
+            VERSION="${{ github.event.workflow_run.head_branch }}"
+            echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
           else
-            echo "version=${{ github.event.release.tag_name }}" | sed 's/v//' >> $GITHUB_OUTPUT
+            # Fallback: get latest from PyPI
+            VERSION=$(pip index versions scitex 2>/dev/null | grep -oP 'scitex \(\K[^)]+' | head -1)
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
           fi
 
       - name: Wait for PyPI propagation
@@ -59,6 +68,8 @@ jobs:
   test-install-all:
     name: Test Full Install (Python ${{ matrix.python-version }})
     runs-on: ubuntu-latest
+    # Only run if Release workflow succeeded
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     strategy:
       fail-fast: false
       matrix:
@@ -75,8 +86,14 @@ jobs:
         run: |
           if [ -n "${{ github.event.inputs.version }}" ]; then
             echo "version=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
+          elif [ -n "${{ github.event.workflow_run.head_branch }}" ]; then
+            # Extract version from tag (workflow_run trigger)
+            VERSION="${{ github.event.workflow_run.head_branch }}"
+            echo "version=${VERSION#v}" >> $GITHUB_OUTPUT
           else
-            echo "version=${{ github.event.release.tag_name }}" | sed 's/v//' >> $GITHUB_OUTPUT
+            # Fallback: get latest from PyPI
+            VERSION=$(pip index versions scitex 2>/dev/null | grep -oP 'scitex \(\K[^)]+' | head -1)
+            echo "version=$VERSION" >> $GITHUB_OUTPUT
           fi
 
       - name: Wait for PyPI propagation

{scitex-2.15.4 → scitex-2.15.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scitex
-Version: 2.15.4
+Version: 2.15.5
 Summary: A comprehensive Python library for scientific computing and data analysis
 Project-URL: Homepage, https://github.com/ywatanabe1989/scitex-python
 Project-URL: Documentation, https://scitex.readthedocs.io

{scitex-2.15.4 → scitex-2.15.5}/pyproject.toml

@@ -11,7 +11,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "scitex"
-version = "2.15.4"
+version = "2.15.5"
 description = "A comprehensive Python library for scientific computing and data analysis"
 readme = "README.md"
 requires-python = ">=3.10"

{scitex-2.15.4 → scitex-2.15.5}/src/scitex/_mcp_tools/canvas.py

@@ -1,12 +1,20 @@
 #!/usr/bin/env python3
-# Timestamp: 2026-01-15
-# File: /home/ywatanabe/proj/scitex-code/src/scitex/_mcp_tools/canvas.py
-"""Canvas module tools for FastMCP unified server."""
+# Timestamp: 2026-01-29
+# File: src/scitex/_mcp_tools/canvas.py
+"""Canvas module tools for FastMCP unified server.
+
+.. deprecated:: 2.16.0
+    Canvas tools are deprecated. Use figrecipe MCP tools instead:
+    - plt_compose for multi-panel composition
+    - plt_plot for creating figures
+    - plt_reproduce for reproducing from recipes
+
+    figrecipe is mounted automatically if installed.
+"""
 
 from __future__ import annotations
 
 import json
-from typing import Optional
 
 
 def _json(data: dict) -> str:
@@ -14,8 +22,14 @@ def _json(data: dict) -> str:
 
 
 def register_canvas_tools(mcp) -> None:
-    """Register canvas tools with FastMCP server."""
+    """Register canvas tools with FastMCP server.
 
+    Note: These tools are deprecated. figrecipe is mounted for composition.
+    """
+    # Mount figrecipe MCP server if available (preferred)
+    _mount_figrecipe(mcp)
+
+    # Legacy canvas tools (deprecated, for backward compatibility)
     @mcp.tool()
     async def canvas_create_canvas(
         parent_dir: str,
@@ -23,7 +37,7 @@ def register_canvas_tools(mcp) -> None:
         width_mm: float = 180,
         height_mm: float = 120,
     ) -> str:
-        """[canvas] Create a new paper figure canvas workspace."""
+        """[canvas][DEPRECATED] Create a canvas workspace. Use plt_compose instead."""
         from scitex.canvas._mcp.handlers import create_canvas_handler
 
         result = await create_canvas_handler(
@@ -32,6 +46,7 @@ def register_canvas_tools(mcp) -> None:
             width_mm=width_mm,
             height_mm=height_mm,
         )
+        result["_deprecated"] = "Use plt_compose from figrecipe instead"
         return _json(result)
 
     @mcp.tool()
@@ -44,9 +59,9 @@ def register_canvas_tools(mcp) -> None:
         y_mm: float = 0,
         width_mm: float = 50,
         height_mm: float = 50,
-        label: Optional[str] = None,
+        label: str | None = None,
     ) -> str:
-        """[canvas] Add a panel to an existing canvas from an image or plot."""
+        """[canvas][DEPRECATED] Add a panel to canvas. Use plt_compose instead."""
         from scitex.canvas._mcp.handlers import add_panel_handler
 
         result = await add_panel_handler(
@@ -60,23 +75,25 @@ def register_canvas_tools(mcp) -> None:
             height_mm=height_mm,
             label=label,
         )
+        result["_deprecated"] = "Use plt_compose from figrecipe instead"
         return _json(result)
 
     @mcp.tool()
     async def canvas_list_panels(parent_dir: str, canvas_name: str) -> str:
-        """[canvas] List all panels in a canvas with their properties."""
+        """[canvas][DEPRECATED] List panels in a canvas."""
         from scitex.canvas._mcp.handlers import list_panels_handler
 
         result = await list_panels_handler(
             parent_dir=parent_dir, canvas_name=canvas_name
         )
+        result["_deprecated"] = "Use figrecipe instead"
         return _json(result)
 
     @mcp.tool()
     async def canvas_remove_panel(
         parent_dir: str, canvas_name: str, panel_name: str
     ) -> str:
-        """[canvas] Remove a panel from a canvas."""
+        """[canvas][DEPRECATED] Remove a panel from canvas."""
         from scitex.canvas._mcp.handlers import remove_panel_handler
 
         result = await remove_panel_handler(
@@ -84,17 +101,18 @@ def register_canvas_tools(mcp) -> None:
             canvas_name=canvas_name,
             panel_name=panel_name,
         )
+        result["_deprecated"] = "Use figrecipe instead"
         return _json(result)
 
     @mcp.tool()
     async def canvas_export_canvas(
         parent_dir: str,
         canvas_name: str,
-        output_path: Optional[str] = None,
-        format: Optional[str] = None,
+        output_path: str | None = None,
+        format: str | None = None,
         dpi: int = 300,
     ) -> str:
-        """[canvas] Export/render canvas to PNG, PDF, or SVG format."""
+        """[canvas][DEPRECATED] Export canvas to image. Use plt_compose instead."""
         from scitex.canvas._mcp.handlers import export_canvas_handler
 
         result = await export_canvas_handler(
@@ -104,25 +122,41 @@ def register_canvas_tools(mcp) -> None:
             format=format,
             dpi=dpi,
         )
+        result["_deprecated"] = "Use plt_compose from figrecipe instead"
         return _json(result)
 
     @mcp.tool()
     async def canvas_list_canvases(parent_dir: str) -> str:
-        """[canvas] List all canvases in a directory."""
+        """[canvas][DEPRECATED] List canvases in a directory."""
         from scitex.canvas._mcp.handlers import list_canvases_handler
 
         result = await list_canvases_handler(parent_dir=parent_dir)
+        result["_deprecated"] = "Use figrecipe instead"
         return _json(result)
 
     @mcp.tool()
     async def canvas_canvas_exists(parent_dir: str, canvas_name: str) -> str:
-        """[canvas] Check if a canvas exists."""
+        """[canvas][DEPRECATED] Check if a canvas exists."""
         from scitex.canvas._mcp.handlers import canvas_exists_handler
 
         result = await canvas_exists_handler(
             parent_dir=parent_dir, canvas_name=canvas_name
         )
+        result["_deprecated"] = "Use figrecipe instead"
         return _json(result)
 
 
+def _mount_figrecipe(mcp) -> None:
+    """Mount figrecipe MCP server for composition tools.
+
+    Provides: plt_plot, plt_compose, plt_reproduce, plt_info, etc.
+    """
+    try:
+        from figrecipe._mcp.server import mcp as figrecipe_mcp
+
+        mcp.mount(figrecipe_mcp, prefix="plt")
+    except ImportError:
+        pass  # figrecipe not installed
+
+
 # EOF

scitex-2.15.5/src/scitex/canvas/__init__.py

@@ -0,0 +1,222 @@
+#!/usr/bin/env python3
+# Timestamp: 2026-01-29
+# File: src/scitex/canvas/__init__.py
+"""
+SciTeX Canvas Module (DEPRECATED)
+
+.. deprecated:: 2.16.0
+    This module is deprecated. Use figrecipe instead:
+
+    - Interactive editor: ``figrecipe.edit()`` (browser GUI at port 5050)
+    - Multi-panel composition: ``figrecipe.compose()``
+    - Save/reproduce: ``figrecipe.save()`` / ``figrecipe.reproduce()``
+
+    Install: ``pip install figrecipe``
+
+    Migration examples::
+
+        # Old (scitex.canvas)
+        from scitex.canvas import edit
+        edit(fig)
+
+        # New (figrecipe)
+        import figrecipe as fr
+        fr.edit(fig)
+
+        # Old (scitex.canvas multi-panel)
+        stx.canvas.create_canvas(...)
+        stx.canvas.add_panel(...)
+
+        # New (figrecipe.compose)
+        fig, axes = fr.compose(
+            sources={
+                "panel_a.png": {"xy_mm": (10, 10), "size_mm": (80, 60)},
+                "panel_b.png": {"xy_mm": (100, 10), "size_mm": (80, 60)},
+            },
+            canvas_size_mm=(190, 80),
+            panel_labels=True,
+        )
+"""
+
+from __future__ import annotations
+
+import warnings
+
+# Issue deprecation warning on import
+warnings.warn(
+    "scitex.canvas is deprecated. Use figrecipe instead:\n"
+    "  - fr.edit() for interactive GUI editor (port 5050)\n"
+    "  - fr.compose() for multi-panel composition\n"
+    "  - pip install figrecipe",
+    DeprecationWarning,
+    stacklevel=2,
+)
+
+
+# =============================================================================
+# Delegate to figrecipe (preferred)
+# =============================================================================
+def edit(*args, **kwargs):
+    """Launch interactive GUI editor.
+
+    .. deprecated:: 2.16.0
+        Use ``figrecipe.edit()`` instead.
+    """
+    warnings.warn(
+        "scitex.canvas.edit() is deprecated. Use figrecipe.edit() instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    try:
+        import figrecipe as fr
+
+        return fr.edit(*args, **kwargs)
+    except ImportError as e:
+        raise ImportError(
+            "figrecipe is required for the editor. Install with: pip install figrecipe"
+        ) from e
+
+
+def compose(*args, **kwargs):
+    """Compose multi-panel figures.
+
+    .. deprecated:: 2.16.0
+        Use ``figrecipe.compose()`` instead.
+    """
+    warnings.warn(
+        "scitex.canvas.compose() is deprecated. Use figrecipe.compose() instead.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    try:
+        import figrecipe as fr
+
+        return fr.compose(*args, **kwargs)
+    except ImportError as e:
+        raise ImportError(
+            "figrecipe is required for composition. Install with: pip install figrecipe"
+        ) from e
+
+
+# =============================================================================
+# Legacy imports (deprecated, for backward compatibility)
+# =============================================================================
+def __getattr__(name):
+    """Lazy import legacy submodules with deprecation warnings."""
+    _legacy_submodules = {"backend", "editor", "io", "model", "utils"}
+    _legacy_functions = {
+        "Canvas",
+        "create_canvas",
+        "get_canvas_path",
+        "canvas_exists",
+        "list_canvases",
+        "delete_canvas",
+        "add_panel",
+        "update_panel",
+        "remove_panel",
+        "list_panels",
+        "export_canvas",
+        "verify_data",
+        "save_figure",
+        "load_figure",
+        "add_panel_from_image",
+        "add_panel_from_scitex",
+    }
+
+    if name in _legacy_submodules:
+        warnings.warn(
+            f"scitex.canvas.{name} is deprecated. Use figrecipe instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        if name == "backend":
+            from . import backend as mod
+        elif name == "editor":
+            from . import editor as mod
+        elif name == "io":
+            from . import io as mod
+        elif name == "model":
+            from . import model as mod
+        elif name == "utils":
+            from . import utils as mod
+        return mod
+
+    if name in _legacy_functions:
+        warnings.warn(
+            f"scitex.canvas.{name} is deprecated. Use figrecipe.compose() instead.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        # Import from legacy locations
+        if name == "Canvas":
+            from .canvas import Canvas
+
+            return Canvas
+        elif name in {
+            "create_canvas",
+            "get_canvas_path",
+            "canvas_exists",
+            "list_canvases",
+            "delete_canvas",
+            "add_panel_from_image",
+            "add_panel_from_scitex",
+            "list_panels",
+            "remove_panel",
+            "update_panel",
+            "export_canvas",
+            "verify_data",
+        }:
+            from . import io as _io
+
+            _name_map = {
+                "create_canvas": "ensure_canvas_directory",
+                "get_canvas_path": "get_canvas_directory_path",
+                "canvas_exists": "canvas_directory_exists",
+                "list_canvases": "list_canvas_directories",
+                "delete_canvas": "delete_canvas_directory",
+                "export_canvas": "export_canvas_to_file",
+                "verify_data": "verify_all_data_hashes",
+            }
+            actual_name = _name_map.get(name, name)
+            return getattr(_io, actual_name)
+        elif name == "add_panel":
+            from ._legacy import add_panel
+
+            return add_panel
+        elif name in {"save_figure", "load_figure"}:
+            from ._legacy import load_figure, save_figure
+
+            if name == "save_figure":
+                return save_figure
+            return load_figure
+
+    raise AttributeError(f"module 'scitex.canvas' has no attribute '{name}'")
+
+
+__all__ = [
+    # Recommended (delegates to figrecipe)
+    "edit",
+    "compose",
+    # Legacy (deprecated)
+    "Canvas",
+    "io",
+    "model",
+    "backend",
+    "utils",
+    "editor",
+    "create_canvas",
+    "get_canvas_path",
+    "canvas_exists",
+    "list_canvases",
+    "delete_canvas",
+    "add_panel",
+    "update_panel",
+    "remove_panel",
+    "list_panels",
+    "export_canvas",
+    "verify_data",
+    "save_figure",
+    "load_figure",
+]
+
+# EOF

scitex-2.15.5/src/scitex/canvas/_legacy.py

@@ -0,0 +1,171 @@
+#!/usr/bin/env python3
+# Timestamp: 2026-01-29
+# File: src/scitex/canvas/_legacy.py
+"""Legacy functions for backward compatibility.
+
+All functions here are deprecated. Use figrecipe instead.
+"""
+
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Any
+
+
+def add_panel(
+    parent_dir,
+    canvas_name,
+    panel_name,
+    source,
+    xy_mm=(0, 0),
+    size_mm=(50, 50),
+    label="",
+    bundle=False,
+    **kwargs,
+):
+    """Add a panel to canvas (DEPRECATED).
+
+    Use figrecipe.compose() instead.
+    """
+    from .io import add_panel_from_image, add_panel_from_scitex
+
+    source = Path(source)
+    panel_properties = {
+        "position": {"x_mm": xy_mm[0], "y_mm": xy_mm[1]},
+        "size": {"width_mm": size_mm[0], "height_mm": size_mm[1]},
+        **kwargs,
+    }
+    if label:
+        panel_properties["label"] = {"text": label, "position": "top-left"}
+
+    json_sibling = source.parent / f"{source.stem}.json"
+    if json_sibling.exists():
+        return add_panel_from_scitex(
+            project_dir=parent_dir,
+            canvas_name=canvas_name,
+            panel_name=panel_name,
+            source_png=source,
+            panel_properties=panel_properties,
+            bundle=bundle,
+        )
+    else:
+        return add_panel_from_image(
+            project_dir=parent_dir,
+            canvas_name=canvas_name,
+            panel_name=panel_name,
+            source_image=source,
+            panel_properties=panel_properties,
+            bundle=bundle,
+        )
+
+
+def save_figure(
+    panels,
+    path,
+    spec=None,
+    as_zip=None,
+):
+    """Save panels as a .figure bundle (DEPRECATED).
+
+    Use figrecipe.compose() and figrecipe.save() instead.
+    """
+    from scitex.io.bundle import BundleType, save
+
+    p = Path(path)
+    spath = str(path)
+
+    if as_zip is None:
+        as_zip = spath.endswith(".zip")
+
+    if spec is None:
+        spec = _generate_figure_spec(panels)
+
+    bundle_data = {
+        "spec": spec,
+        "plots": {},
+    }
+
+    for panel_id, plot_source in panels.items():
+        plot_path = Path(plot_source)
+        if plot_path.exists():
+            bundle_data["plots"][panel_id] = str(plot_path)
+
+    return save(bundle_data, p, bundle_type=BundleType.FIGURE, as_zip=as_zip)
+
+
+def load_figure(path):
+    """Load a .figure bundle (DEPRECATED).
+
+    Use figrecipe.load() instead.
+    """
+    from scitex.io.bundle import load
+
+    bundle = load(path)
+
+    if bundle["type"] != "figure":
+        raise ValueError(f"Not a .figure bundle: {path}")
+
+    result = {
+        "spec": bundle.get("spec", {}),
+        "panels": {},
+    }
+
+    for panel_id, plot_bundle in bundle.get("plots", {}).items():
+        result["panels"][panel_id] = {
+            "spec": plot_bundle.get("spec", {}),
+            "data": plot_bundle.get("data"),
+        }
+
+    return result
+
+
+def _generate_figure_spec(panels) -> dict[str, Any]:
+    """Generate figure.json spec from panels."""
+    spec: dict[str, Any] = {
+        "schema": {"name": "scitex.canvas.figure", "version": "1.0.0"},
+        "figure": {
+            "id": "figure",
+            "title": "",
+            "caption": "",
+            "styles": {
+                "size": {"width_mm": 180, "height_mm": 120},
+                "background": "#ffffff",
+            },
+        },
+        "panels": [],
+    }
+
+    panel_ids = sorted(panels.keys())
+    n_panels = len(panel_ids)
+
+    if n_panels == 0:
+        return spec
+
+    cols = min(n_panels, 2)
+
+    panel_w = 80
+    panel_h = 50
+    margin = 5
+
+    for i, panel_id in enumerate(panel_ids):
+        row = i // cols
+        col = i % cols
+
+        x = margin + col * (panel_w + margin)
+        y = margin + row * (panel_h + margin)
+
+        spec["panels"].append(
+            {
+                "id": panel_id,
+                "label": panel_id,
+                "caption": "",
+                "plot": f"{panel_id}.plot",
+                "position": {"x_mm": x, "y_mm": y},
+                "size": {"width_mm": panel_w, "height_mm": panel_h},
+            }
+        )
+
+    return spec
+
+
+# EOF