scitex 2.10.2__py3-none-any.whl → 2.11.0__py3-none-any.whl

scitex/__init__.py

@@ -164,10 +164,7 @@ cloud = _LazyModule("cloud")
 config = _LazyModule("config")
 audio = _LazyModule("audio")
 msword = _LazyModule("msword")
-fts = _LazyModule(
-    "fts"
-)  # Figure-Table-Statistics - single source of truth for bundle schemas
-fsb = fts  # Legacy alias (FSB -> FTS)
+fts = _LazyModule("fts")  # Bundle schemas module
 
 # Centralized path configuration - eager loaded for convenience
 # Usage: scitex.PATHS.logs, scitex.PATHS.cache, etc.

scitex/__version__.py

@@ -8,6 +8,6 @@ __FILE__ = "./src/scitex/__version__.py"
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
-__version__ = "2.10.2"
+__version__ = "2.11.0"
 
 # EOF

scitex/_install_guide.py

@@ -16,33 +16,45 @@ from ._optional_deps import PACKAGE_TO_EXTRA, check_optional_deps
 F = TypeVar("F", bound=Callable[..., Any])
 
 # Module name -> (required_packages, extra_name, description)
+# Synced with pyproject.toml [project.optional-dependencies]
 MODULE_REQUIREMENTS: Dict[str, Tuple[List[str], str, str]] = {
     "ai": (["openai", "anthropic"], "ai", "LLM APIs"),
     "audio": (["pyttsx3", "gtts"], "audio", "Text-to-Speech"),
     "benchmark": (["psutil"], "benchmark", "Performance Monitoring"),
+    "bridge": (["matplotlib", "scipy"], "bridge", "External System Integration"),
     "browser": (["playwright"], "browser", "Web Automation"),
     "capture": (["mss", "PIL"], "capture", "Screenshot Capture"),
     "cli": (["click"], "cli", "Command Line Interface"),
+    "cloud": (["matplotlib"], "cloud", "Cloud Service Integration"),
+    "config": (["pyyaml"], "config", "Configuration Management"),
     "db": (["sqlalchemy"], "db", "Database"),
     "decorators": (["joblib"], "decorators", "Caching Utilities"),
+    "devtools": (["joblib", "ruamel.yaml"], "devtools", "Development Tools"),
+    "diagram": (["pyyaml"], "diagram", "Diagram Generation"),
     "dsp": (["scipy", "sounddevice"], "dsp", "Signal Processing"),
-    "fts": (["matplotlib", "PIL", "flask"], "fts", "Figures/Tables/Stats"),
+    "dt": (["matplotlib"], "dt", "Date/Time Utilities"),
     "gen": (["IPython", "h5py"], "gen", "General Utilities"),
     "git": (["git"], "git", "Git Operations"),
     "io": (["h5py", "openpyxl"], "io", "File I/O"),
     "linalg": (["scipy", "sympy"], "linalg", "Linear Algebra"),
+    "logging": (["matplotlib"], "logging", "Enhanced Logging"),
     "msword": (["docx"], "msword", "MS Word"),
-    "neuro": (["mne"], "neuro", "Neuroscience"),
     "nn": (["torch"], "nn", "Neural Networks"),
+    "parallel": (["tqdm"], "parallel", "Parallel Processing"),
     "path": (["git"], "path", "Path Utilities"),
+    "pd": (["xarray"], "pd", "Pandas Utilities"),
     "plt": (["matplotlib", "seaborn"], "plt", "Plotting"),
     "repro": (["torch"], "repro", "Reproducibility"),
     "resource": (["psutil"], "resource", "Resource Monitoring"),
     "scholar": (["selenium", "bs4", "playwright"], "scholar", "Paper Management"),
+    "session": (["matplotlib", "pyyaml"], "session", "Session Management"),
+    "sh": (["matplotlib"], "sh", "Shell Utilities"),
     "stats": (["scipy", "statsmodels"], "stats", "Statistical Analysis"),
     "str": (["natsort"], "str", "String Utilities"),
+    "tex": (["matplotlib"], "tex", "LaTeX Utilities"),
     "torch": (["torch"], "torch", "PyTorch Support"),
     "types": (["xarray"], "types", "Type Utilities"),
+    "utils": (["h5py", "natsort"], "utils", "General Utilities"),
     "web": (["aiohttp", "bs4"], "web", "Web Utilities"),
     "writer": (["yq"], "writer", "Academic Writing"),
 }

scitex/bridge/_figrecipe.py

@@ -63,7 +63,7 @@ def save_with_recipe(
     dict
         Paths to saved files: {'image': Path, 'csv': Path, 'recipe': Path}
     """
-    from scitex.fts._bundle._storage import get_storage
+    from scitex.io.bundle._bundle._storage import get_storage
 
     path = Path(path)
     result = {}

scitex/bridge/_helpers.py

@@ -118,7 +118,7 @@ def _detect_backend(target) -> Literal["plt", "vis"]:
     """
     # Check for vis FigureModel
     try:
-        from scitex.fig.model import FigureModel
+        from scitex.canvas.model import FigureModel
         if isinstance(target, FigureModel):
             return "vis"
     except ImportError:

scitex/bridge/_plt_vis.py

@@ -16,7 +16,7 @@ import warnings
 
 # Legacy model imports - may not be available (deleted module)
 try:
-    from scitex.fig.model import (
+    from scitex.canvas.model import (
         FigureModel,
         AxesModel,
         PlotModel,

scitex/bridge/_stats_plt.py

@@ -29,7 +29,7 @@ from typing import Optional, Dict, Any, Union, List
 import warnings
 
 # Import GUI classes from FTS (single source of truth)
-from scitex.fts._stats import Position
+from scitex.io.bundle._stats import Position
 
 # StatResult is now a dict - the GUI-specific StatResult is deprecated
 StatResult = dict

scitex/bridge/_stats_vis.py

@@ -27,11 +27,11 @@ When bridging between plt and vis, coordinate transformation may be needed.
 from typing import Optional, Dict, Any, List, Tuple
 
 # Import GUI classes from FTS (single source of truth)
-from scitex.fts._stats import Position, StatPositioning
+from scitex.io.bundle._stats import Position, StatPositioning
 
 # Legacy model imports - may not be available
 try:
-    from scitex.fig.model import AnnotationModel, FigureModel, AxesModel, TextStyle
+    from scitex.canvas.model import AnnotationModel, FigureModel, AxesModel, TextStyle
     VIS_MODEL_AVAILABLE = True
 except ImportError:
     AnnotationModel = None

scitex/{fig → canvas}/__init__.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Timestamp: 2025-12-08
 # File: ./src/scitex/vis/__init__.py
 """
-SciTeX Visualization Module (scitex.fig)
+SciTeX Visualization Module (scitex.canvas)
 
 Canvas-based composition of publication-quality figures.
 
@@ -19,7 +18,7 @@ Quick Start:
 >>> # Create canvas and add panels
 >>> stx.vis.create_canvas("/output", "fig1")
 >>> stx.vis.add_panel("/output", "fig1", "panel_a", source="plot.png",
-...                   position=(10, 10), size=(80, 60), label="A")
+...                   xy_mm=(10, 10), size_mm=(80, 60), label="A")
 >>>
 >>> # Save with stx.io (auto-exports PNG/PDF/SVG)
 >>> canvas = stx.io.load("/output/fig1.canvas")
@@ -34,46 +33,31 @@ Directory Structure:
 """
 
 # Submodules for advanced use
-from . import io
-from . import model
-from . import backend
-from . import utils
-from . import editor
+from . import backend, editor, io, model, utils
 
 # Canvas class
 from .canvas import Canvas
 
+# Editor
+from .editor import edit
+
+# Data integrity
+# Export (usually handled by stx.io.save, but available for explicit use)
 # =============================================================================
 # Primary API (minimal, reusable, flexible)
 # =============================================================================
-
 # Canvas operations
-from .io import (
-    ensure_canvas_directory as create_canvas,
-    get_canvas_directory_path as get_canvas_path,
-    canvas_directory_exists as canvas_exists,
-    list_canvas_directories as list_canvases,
-    delete_canvas_directory as delete_canvas,
-)
-
 # Panel operations
-from .io import (
-    add_panel_from_scitex,
-    add_panel_from_image,
-    update_panel,
-    remove_panel,
-    list_panels,
-)
-
-# Export (usually handled by stx.io.save, but available for explicit use)
+from .io import add_panel_from_image, add_panel_from_scitex
+from .io import canvas_directory_exists as canvas_exists
+from .io import delete_canvas_directory as delete_canvas
+from .io import ensure_canvas_directory as create_canvas
 from .io import export_canvas_to_file as export_canvas
-
-# Data integrity
+from .io import get_canvas_directory_path as get_canvas_path
+from .io import list_canvas_directories as list_canvases
+from .io import list_panels, remove_panel, update_panel
 from .io import verify_all_data_hashes as verify_data
 
-# Editor
-from .editor import edit
-
 
 # =============================================================================
 # Convenience wrapper for add_panel
@@ -83,8 +67,8 @@ def add_panel(
     canvas_name,
     panel_name,
     source,
-    position=(0, 0),
-    size=(50, 50),
+    xy_mm=(0, 0),
+    size_mm=(50, 50),
     label="",
     bundle=False,
     **kwargs,
@@ -102,10 +86,10 @@ def add_panel(
         Name for the panel
     source : str or Path
         Source file (PNG, JPG, SVG)
-    position : tuple
-        (x_mm, y_mm) position on canvas
-    size : tuple
-        (width_mm, height_mm) panel size
+    xy_mm : tuple
+        (x_mm, y_mm) position on canvas in millimeters
+    size_mm : tuple
+        (width_mm, height_mm) panel size in millimeters
     label : str
         Panel label (A, B, C...)
     bundle : bool
@@ -117,8 +101,8 @@ def add_panel(
 
     source = Path(source)
     panel_properties = {
-        "position": {"x_mm": position[0], "y_mm": position[1]},
-        "size": {"width_mm": size[0], "height_mm": size[1]},
+        "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:
@@ -147,32 +131,33 @@ def add_panel(
 
 
 # =============================================================================
-# .figz Bundle Support
+# .figure Bundle Support
 # =============================================================================
 
-def save_figz(
+
+def save_figure(
     panels,
     path,
     spec=None,
     as_zip=None,
 ):
     """
-    Save panels as a .figz publication figure bundle.
+    Save panels as a .figure publication figure bundle.
 
     Parameters
     ----------
     panels : dict
-        Dictionary mapping panel IDs to .pltz bundle paths or data.
-        Example: {"A": "timecourse.pltz.d", "B": "barplot.pltz.d"}
+        Dictionary mapping panel IDs to .plot bundle paths or data.
+        Example: {"A": "timecourse.plot", "B": "barplot.plot"}
     path : str or Path
-        Output path (e.g., "Figure1.figz" or "Figure1.figz.d").
-        - Path ending with ".figz" creates ZIP archive (default behavior)
-        - Path ending with ".figz.d" creates directory bundle
+        Output path (e.g., "Figure1.figure.zip" or "Figure1.figure").
+        - Path ending with ".zip" creates ZIP archive
+        - Path ending with ".figure" creates directory bundle
     spec : dict, optional
         Figure specification. Auto-generated if None.
     as_zip : bool, optional
         If True, save as ZIP archive. If False, save as directory.
-        Default: auto-detect from path (ZIP for .figz, directory for .figz.d).
+        Default: auto-detect from path.
 
     Returns
     -------
@@ -181,24 +166,25 @@ def save_figz(
 
     Examples
     --------
-    >>> import scitex.fig as sfig
+    >>> import scitex.canvas as sfig
     >>> panels = {
-    ...     "A": "timecourse.pltz.d",
-    ...     "B": "barplot.pltz.d"
+    ...     "A": "timecourse.plot",
+    ...     "B": "barplot.plot"
     ... }
-    >>> sfig.save_figz(panels, "Figure1.figz")    # Creates ZIP
-    >>> sfig.save_figz(panels, "Figure1.figz.d")  # Creates directory
+    >>> sfig.save_figure(panels, "Figure1.figure.zip")  # Creates ZIP
+    >>> sfig.save_figure(panels, "Figure1.figure")      # Creates directory
     """
-    from pathlib import Path
     import shutil
-    from scitex.io.bundle import save, BundleType
+    from pathlib import Path
+
+    from scitex.io.bundle import BundleType, save
 
     p = Path(path)
     spath = str(path)
 
     # Auto-detect as_zip from path suffix if not specified
     if as_zip is None:
-        as_zip = not spath.endswith(".d")
+        as_zip = spath.endswith(".zip")
 
     # Auto-generate spec if not provided
     if spec is None:
@@ -206,28 +192,28 @@ def save_figz(
 
     # Build bundle data - pass source paths directly for file copying
     bundle_data = {
-        'spec': spec,
-        'plots': {},
+        "spec": spec,
+        "plots": {},
     }
 
     # Pass source paths directly (not loaded data) to preserve all files
-    for panel_id, pltz_source in panels.items():
-        pltz_path = Path(pltz_source)
-        if pltz_path.exists():
+    for panel_id, plot_source in panels.items():
+        plot_path = Path(plot_source)
+        if plot_path.exists():
             # Store source path for direct copying
-            bundle_data['plots'][panel_id] = str(pltz_path)
+            bundle_data["plots"][panel_id] = str(plot_path)
 
-    return save(bundle_data, p, bundle_type=BundleType.FIGZ, as_zip=as_zip)
+    return save(bundle_data, p, bundle_type=BundleType.FIGURE, as_zip=as_zip)
 
 
-def load_figz(path):
+def load_figure(path):
     """
-    Load a .figz bundle.
+    Load a .figure bundle.
 
     Parameters
     ----------
     path : str or Path
-        Path to .figz bundle (directory or ZIP).
+        Path to .figure bundle (directory or ZIP).
 
     Returns
     -------
@@ -238,7 +224,7 @@ def load_figz(path):
 
     Examples
     --------
-    >>> figure = scitex.fig.load_figz("Figure1.figz.d")
+    >>> figure = scitex.canvas.load_figure("Figure1.figure")
     >>> print(figure['spec']['figure']['title'])
     >>> panel_a = figure['panels']['A']
     >>> print(panel_a['spec'], panel_a['data'])
@@ -247,19 +233,19 @@ def load_figz(path):
 
     bundle = load(path)
 
-    if bundle['type'] != 'figz':
-        raise ValueError(f"Not a .figz bundle: {path}")
+    if bundle["type"] != "figure":
+        raise ValueError(f"Not a .figure bundle: {path}")
 
     result = {
-        'spec': bundle.get('spec', {}),
-        'panels': {},
+        "spec": bundle.get("spec", {}),
+        "panels": {},
     }
 
     # Return spec and data for each panel (reconstruction is optional)
-    for panel_id, plot_bundle in bundle.get('plots', {}).items():
-        result['panels'][panel_id] = {
-            'spec': plot_bundle.get('spec', {}),
-            'data': plot_bundle.get('data'),
+    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
@@ -270,17 +256,17 @@ def _generate_figure_spec(panels):
     from pathlib import Path
 
     spec = {
-        'schema': {'name': 'scitex.fig.figure', 'version': '1.0.0'},
-        'figure': {
-            'id': 'figure',
-            'title': '',
-            'caption': '',
-            'styles': {
-                'size': {'width_mm': 180, 'height_mm': 120},
-                'background': '#ffffff',
+        "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': [],
+        "panels": [],
     }
 
     # Auto-layout panels
@@ -305,15 +291,17 @@ def _generate_figure_spec(panels):
         x = margin + col * (panel_w + margin)
         y = margin + row * (panel_h + margin)
 
-        # Note: save_bundle uses panel_id for the directory name (e.g., A.pltz.d)
-        spec['panels'].append({
-            'id': panel_id,
-            'label': panel_id,
-            'caption': '',
-            'plot': f"{panel_id}.pltz.d",
-            'position': {'x_mm': x, 'y_mm': y},
-            'size': {'width_mm': panel_w, 'height_mm': panel_h},
-        })
+        # Note: save_bundle uses panel_id for the directory name (e.g., A.plot)
+        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
 
@@ -344,9 +332,9 @@ __all__ = [
     "verify_data",
     # Editor
     "edit",
-    # .figz bundle
-    "save_figz",
-    "load_figz",
+    # .figure bundle
+    "save_figure",
+    "load_figure",
 ]
 
 # EOF

scitex/{fig → canvas}/backend/_parser.py

@@ -161,7 +161,7 @@ def validate_figure_json(fig_json: Dict[str, Any]) -> bool:
 
     Examples
     --------
-    >>> from scitex.fig.backend import validate_figure_json
+    >>> from scitex.canvas.backend import validate_figure_json
     >>> fig_json = {"width_mm": 180, "height_mm": 120, "axes": []}
     >>> validate_figure_json(fig_json)
     True

scitex/{fig → canvas}/canvas.py

@@ -1,16 +1,15 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Timestamp: 2025-12-08
 # File: ./src/scitex/vis/canvas.py
 """
-Canvas class for scitex.fig.
+Canvas class for scitex.canvas.
 
 Provides object-oriented interface to canvas operations.
 """
 
-from pathlib import Path
-from typing import Dict, Any, Union, List, Optional
 from datetime import datetime
+from pathlib import Path
+from typing import Any, Dict, List, Union
 
 
 class Canvas:
@@ -35,8 +34,8 @@ class Canvas:
     >>> # Create canvas
     >>> canvas = stx.vis.Canvas("fig1", width_mm=180, height_mm=120)
     >>> # Add panels
-    >>> canvas.add_panel("panel_a", "plot.png", position=(10, 10), size=(80, 50), label="A")
-    >>> canvas.add_panel("panel_b", "chart.png", position=(100, 10), size=(80, 50), label="B")
+    >>> canvas.add_panel("panel_a", "plot.png", xy_mm=(10, 10), size_mm=(80, 50), label="A")
+    >>> canvas.add_panel("panel_b", "chart.png", xy_mm=(100, 10), size_mm=(80, 50), label="B")
     >>> # Save (auto-exports PNG/PDF/SVG)
     >>> stx.io.save(canvas, "/output/fig1.canvas")
     """
@@ -82,8 +81,8 @@ class Canvas:
         self,
         panel_name: str,
         source: Union[str, Path],
-        position: tuple = (0, 0),
-        size: tuple = (50, 50),
+        xy_mm: tuple = (0, 0),
+        size_mm: tuple = (50, 50),
         label: str = "",
         **kwargs,
     ) -> "Canvas":
@@ -96,10 +95,10 @@ class Canvas:
             Name for the panel
         source : str or Path
             Path to source file (PNG, JPG, SVG)
-        position : tuple
-            (x_mm, y_mm) position on canvas
-        size : tuple
-            (width_mm, height_mm) panel size
+        xy_mm : tuple
+            (x_mm, y_mm) position on canvas in millimeters
+        size_mm : tuple
+            (width_mm, height_mm) panel size in millimeters
         label : str
             Panel label (A, B, C...)
         **kwargs
@@ -120,8 +119,8 @@ class Canvas:
         panel_entry = {
             "name": panel_name,
             "type": panel_type,
-            "position": {"x_mm": position[0], "y_mm": position[1]},
-            "size": {"width_mm": size[0], "height_mm": size[1]},
+            "position": {"x_mm": xy_mm[0], "y_mm": xy_mm[1]},
+            "size": {"width_mm": size_mm[0], "height_mm": size_mm[1]},
             "z_index": len(self._panels),
             "rotation_deg": kwargs.get("rotation_deg", 0),
             "opacity": kwargs.get("opacity", 1.0),

scitex/{fts/_fig/_editor → canvas/editor}/_defaults.py

@@ -197,7 +197,7 @@ def extract_defaults_from_metadata(metadata):
     # Extract traces information - check multiple possible locations
     traces = metadata.get("traces", [])
 
-    # Also check axes[].lines (pltz bundle format)
+    # Also check axes[].lines (plot bundle format)
     if not traces and isinstance(axes, list) and len(axes) > 0:
         ax = axes[0]
         lines = ax.get("lines", [])
@@ -225,7 +225,7 @@ def extract_defaults_from_metadata(metadata):
     # Extract legend information from multiple possible locations
     legend = metadata.get("legend", {})
 
-    # Also check selectable_regions.axes[0].legend (pltz bundle format)
+    # Also check selectable_regions.axes[0].legend (plot bundle format)
     if not legend:
         selectable = metadata.get("selectable_regions", {})
         sel_axes = selectable.get("axes", [])

scitex/{fig → canvas}/editor/edit/__init__.py

@@ -8,24 +8,21 @@
 This module provides the main edit() function and supporting utilities for:
 - Backend detection and selection (flask, dearpygui, qt, tkinter, mpl)
 - Path resolution for figure files (.json, .csv, .png)
-- Bundle resolution for .pltz and .figz formats
+- Bundle resolution for .plot and .figure formats
 - Panel data loading for multi-panel figures
 - Manual override handling (.manual.json)
 """
 
-from .editor_launcher import edit
-from .backend_detector import (
-    detect_best_backend,
-    print_available_backends,
-)
-from .path_resolver import resolve_figure_paths
+from .backend_detector import detect_best_backend, print_available_backends
 from .bundle_resolver import (
-    resolve_pltz_bundle,
-    resolve_figz_bundle,
-    resolve_layered_pltz_bundle,
+    resolve_figure_bundle,
+    resolve_layered_plot_bundle,
+    resolve_plot_bundle,
 )
-from .panel_loader import load_panel_data
+from .editor_launcher import edit
 from .manual_handler import compute_file_hash, save_manual_overrides
+from .panel_loader import load_panel_data
+from .path_resolver import resolve_figure_paths
 
 __all__ = [
     # Main entry point
@@ -36,9 +33,9 @@ __all__ = [
     # Path resolution
     "resolve_figure_paths",
     # Bundle resolution
-    "resolve_pltz_bundle",
-    "resolve_figz_bundle",
-    "resolve_layered_pltz_bundle",
+    "resolve_plot_bundle",
+    "resolve_figure_bundle",
+    "resolve_layered_plot_bundle",
     # Panel loading
     "load_panel_data",
     # Manual overrides