scitex 2.10.3__py3-none-any.whl → 2.13.0__py3-none-any.whl

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

@@ -6,11 +6,11 @@
 """Main edit function for launching visual editor."""
 
 from pathlib import Path
-from typing import Union, Literal
+from typing import Literal, Union
 
-from .backend_detector import print_available_backends, detect_best_backend
+from .backend_detector import detect_best_backend, print_available_backends
+from .bundle_resolver import resolve_figure_bundle, resolve_plot_bundle
 from .path_resolver import resolve_figure_paths
-from .bundle_resolver import resolve_pltz_bundle, resolve_figz_bundle
 
 __all__ = ["edit"]
 
@@ -28,9 +28,9 @@ def edit(
     ----------
     path : str or Path
         Path to figure file. Can be:
-        - .pltz.d directory bundle (recommended for hitmap selection)
-        - .pltz ZIP bundle
-        - .figz or .figz.d multi-panel bundle
+        - .plot directory bundle (recommended for hitmap selection)
+        - .plot ZIP bundle
+        - .figure multi-panel bundle
         - JSON file (figure.json or figure.manual.json)
         - CSV file (figure.csv) - for data-only start
         - PNG file (figure.png)
@@ -60,8 +60,8 @@ def edit(
     panel_info = None
 
     # Resolve paths based on input type
-    json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = _resolve_paths(
-        path, spath, parent_str
+    json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = (
+        _resolve_paths(path, spath, parent_str)
     )
 
     if not json_path.exists():
@@ -111,17 +111,31 @@ def _resolve_paths(path: Path, spath: str, parent_str: str) -> tuple:
     hitmap_path = None
     bundle_spec = None
 
-    # Check if this is a .figz bundle (multi-panel figure)
-    if spath.endswith('.figz.d') or spath.endswith('.figz'):
-        json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = resolve_figz_bundle(path)
-    # Check if this is a .pltz bundle
-    elif spath.endswith('.pltz.d') or spath.endswith('.pltz') or parent_str.endswith('.pltz.d'):
-        bundle_path = path.parent if parent_str.endswith('.pltz.d') else path
-        json_path, csv_path, png_path, hitmap_path, bundle_spec = resolve_pltz_bundle(bundle_path)
-    # Check if file is inside a .figz.d
-    elif parent_str.endswith('.figz.d') or (path.parent.parent and str(path.parent.parent).endswith('.figz.d')):
-        figz_path = path.parent if parent_str.endswith('.figz.d') else path.parent.parent
-        json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = resolve_figz_bundle(figz_path)
+    # Check if this is a .figure bundle (multi-panel figure)
+    if spath.endswith(".figure") or spath.endswith(".figure"):
+        json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = (
+            resolve_figure_bundle(path)
+        )
+    # Check if this is a .plot bundle
+    elif (
+        spath.endswith(".plot")
+        or spath.endswith(".plot")
+        or parent_str.endswith(".plot")
+    ):
+        bundle_path = path.parent if parent_str.endswith(".plot") else path
+        json_path, csv_path, png_path, hitmap_path, bundle_spec = resolve_plot_bundle(
+            bundle_path
+        )
+    # Check if file is inside a .figure
+    elif parent_str.endswith(".figure") or (
+        path.parent.parent and str(path.parent.parent).endswith(".figure")
+    ):
+        figure_path = (
+            path.parent if parent_str.endswith(".figure") else path.parent.parent
+        )
+        json_path, csv_path, png_path, hitmap_path, bundle_spec, panel_info = (
+            resolve_figure_bundle(figure_path)
+        )
     else:
         # Standard file paths
         json_path, csv_path, png_path = resolve_figure_paths(path)
@@ -143,11 +157,28 @@ def _launch_backend(
 ) -> None:
     """Launch the specified editor backend."""
     if backend == "flask":
-        _launch_flask(json_path, metadata, csv_data, png_path, hitmap_path, manual_overrides, port, panel_info)
+        _launch_flask(
+            json_path,
+            metadata,
+            csv_data,
+            png_path,
+            hitmap_path,
+            manual_overrides,
+            port,
+            panel_info,
+        )
     elif backend == "dearpygui":
         _launch_dearpygui(json_path, metadata, csv_data, png_path, manual_overrides)
     elif backend == "qt":
-        _launch_qt(json_path, metadata, csv_data, png_path, manual_overrides, hitmap_path, bundle_spec)
+        _launch_qt(
+            json_path,
+            metadata,
+            csv_data,
+            png_path,
+            manual_overrides,
+            hitmap_path,
+            bundle_spec,
+        )
     elif backend == "tkinter":
         _launch_tkinter(json_path, metadata, csv_data, manual_overrides)
     elif backend == "mpl":
@@ -159,10 +190,20 @@ def _launch_backend(
         )
 
 
-def _launch_flask(json_path, metadata, csv_data, png_path, hitmap_path, manual_overrides, port, panel_info):
+def _launch_flask(
+    json_path,
+    metadata,
+    csv_data,
+    png_path,
+    hitmap_path,
+    manual_overrides,
+    port,
+    panel_info,
+):
     """Launch Flask web editor."""
     try:
         from .._flask_editor import WebEditor
+
         editor = WebEditor(
             json_path=json_path,
             metadata=metadata,
@@ -175,13 +216,16 @@ def _launch_flask(json_path, metadata, csv_data, png_path, hitmap_path, manual_o
         )
         editor.run()
     except ImportError as e:
-        raise ImportError("Flask backend requires Flask. Install with: pip install flask") from e
+        raise ImportError(
+            "Flask backend requires Flask. Install with: pip install flask"
+        ) from e
 
 
 def _launch_dearpygui(json_path, metadata, csv_data, png_path, manual_overrides):
     """Launch DearPyGui editor."""
     try:
         from .._dearpygui_editor import DearPyGuiEditor
+
         editor = DearPyGuiEditor(
             json_path=json_path,
             metadata=metadata,
@@ -191,13 +235,18 @@ def _launch_dearpygui(json_path, metadata, csv_data, png_path, manual_overrides)
         )
         editor.run()
     except ImportError as e:
-        raise ImportError("DearPyGui backend requires dearpygui. Install with: pip install dearpygui") from e
+        raise ImportError(
+            "DearPyGui backend requires dearpygui. Install with: pip install dearpygui"
+        ) from e
 
 
-def _launch_qt(json_path, metadata, csv_data, png_path, manual_overrides, hitmap_path, bundle_spec):
+def _launch_qt(
+    json_path, metadata, csv_data, png_path, manual_overrides, hitmap_path, bundle_spec
+):
     """Launch Qt editor."""
     try:
         from .._qt_editor import QtEditor
+
         editor = QtEditor(
             json_path=json_path,
             metadata=metadata,
@@ -209,12 +258,15 @@ def _launch_qt(json_path, metadata, csv_data, png_path, manual_overrides, hitmap
         )
         editor.run()
     except ImportError as e:
-        raise ImportError("Qt backend requires PyQt5/PyQt6 or PySide2/PySide6. Install with: pip install PyQt6") from e
+        raise ImportError(
+            "Qt backend requires PyQt5/PyQt6 or PySide2/PySide6. Install with: pip install PyQt6"
+        ) from e
 
 
 def _launch_tkinter(json_path, metadata, csv_data, manual_overrides):
     """Launch Tkinter editor."""
     from .._tkinter_editor import TkinterEditor
+
     editor = TkinterEditor(
         json_path=json_path,
         metadata=metadata,
@@ -227,6 +279,7 @@ def _launch_tkinter(json_path, metadata, csv_data, manual_overrides):
 def _launch_mpl(json_path, metadata, csv_data, manual_overrides):
     """Launch matplotlib editor."""
     from .._mpl_editor import MplEditor
+
     editor = MplEditor(
         json_path=json_path,
         metadata=metadata,

scitex/{fts/_fig/_editor/_cui/_panel_loader.py → canvas/editor/edit/panel_loader.py}

@@ -16,14 +16,14 @@ def load_panel_data(
     panel_path: Union[Path, str], is_zip: bool = None
 ) -> Optional[Dict[str, Any]]:
     """
-    Load panel data from either a .pltz.d directory or a .pltz zip file.
+    Load panel data from either a .plot directory or a .plot.zip file.
 
     Handles both formats transparently using in-memory reading for zips.
 
     Parameters
     ----------
     panel_path : Path or str
-        Path to .pltz.d directory or .pltz zip file
+        Path to .plot directory or .plot.zip file
     is_zip : bool, optional
         If True, treat as zip file. If False, treat as directory.
         If None, auto-detect based on path suffix and existence.
@@ -41,7 +41,7 @@ def load_panel_data(
     # Auto-detect if not specified
     if is_zip is None:
         spath = str(panel_path)
-        if spath.endswith(".pltz") and not spath.endswith(".pltz.d"):
+        if spath.endswith(".plot.zip"):
             is_zip = panel_path.is_file()
         else:
             is_zip = False
@@ -53,10 +53,10 @@ def load_panel_data(
 
 
 def _load_from_zip(panel_path: Path) -> Optional[Dict[str, Any]]:
-    """Load panel data from a .pltz zip file."""
+    """Load panel data from a .plot.zip file."""
     from PIL import Image
 
-    from scitex.fts import FTS as ZipBundle
+    from scitex.io.bundle import ZipBundle
 
     if not panel_path.exists():
         return None
@@ -134,7 +134,7 @@ def _load_from_zip(panel_path: Path) -> Optional[Dict[str, Any]]:
 
 
 def _load_from_directory(panel_path: Path) -> Optional[Dict[str, Any]]:
-    """Load panel data from a .pltz.d directory."""
+    """Load panel data from a .plot directory."""
 
     panel_dir = panel_path
     if not panel_dir.exists():
@@ -151,9 +151,9 @@ def _load_from_directory(panel_path: Path) -> Optional[Dict[str, Any]]:
 def _load_layered_directory(panel_dir: Path) -> Dict[str, Any]:
     """Load panel data from layered format directory."""
     import scitex as stx
-    from scitex.plt.io import load_layered_pltz_bundle
+    from scitex.plt.io import load_layered_plot_bundle
 
-    bundle_data = load_layered_pltz_bundle(panel_dir)
+    bundle_data = load_layered_plot_bundle(panel_dir)
     metadata = bundle_data.get("merged", {})
 
     # Find CSV

scitex/{fts/_fig/_editor/_gui/_flask_editor → canvas/editor/flask_editor}/_bbox.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+# -*- coding: utf-8 -*-
 # File: ./src/scitex/vis/editor/flask_editor/bbox.py
 """Bounding box extraction for figure elements.
 
@@ -1002,7 +1003,7 @@ def extract_bboxes_from_metadata(
                 "ax_id": ax_id,
             }
 
-    # Extract from traces array (pltz spec format)
+    # Extract from traces array (plot spec format)
     traces = metadata.get("traces", [])
     if isinstance(traces, list):
         for i, trace in enumerate(traces):