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

scitex/schema/__init__.py

@@ -5,10 +5,10 @@
 SciTeX Schema Module - DEPRECATED
 
 This module is scheduled for removal. All schemas are being consolidated
-in scitex.fts as the single source of truth.
+in scitex.io.bundle as the single source of truth.
 
-For new code, import from scitex.fts:
-    from scitex.fts import FTS, Node, Encoding, Theme, Stats
+For new code, import from scitex.io.bundle:
+    from scitex.io.bundle import FTS, Node, Encoding, Theme, Stats
 
 This module exists temporarily for backward compatibility.
 """
@@ -16,31 +16,28 @@ This module exists temporarily for backward compatibility.
 import warnings
 
 warnings.warn(
-    "scitex.schema is deprecated. Import from scitex.fts instead. "
+    "scitex.schema is deprecated. Import from scitex.io.bundle instead. "
     "This module will be removed in a future version.",
     DeprecationWarning,
-    stacklevel=2
+    stacklevel=2,
 )
 
 # Schema version
 SCHEMA_VERSION = "0.2.0"
 
 # =============================================================================
-# Re-export from scitex.fts (new single source of truth)
+# Re-export from scitex.io.bundle (new single source of truth)
 # =============================================================================
 try:
-    from scitex.fts import (
-        # Core bundle classes
+    from scitex.io.bundle import (  # Core bundle classes; Encoding and Theme; Stats
         FTS,
-        Node,
         BBox,
-        SizeMM,
         DataInfo,
-        # Encoding and Theme
         Encoding,
-        Theme,
-        # Stats
+        Node,
+        SizeMM,
         Stats,
+        Theme,
     )
 except ImportError:
     # FTS not fully configured yet
@@ -52,21 +49,10 @@ except ImportError:
 
 # =============================================================================
 # Independent schemas (still defined here temporarily)
-# These will be migrated to scitex.fts in subsequent phases
+# These will be migrated to scitex.io.bundle in subsequent phases
 # =============================================================================
 
 # Stats schema (GUI-focused version - to be merged with FTS Stats)
-from scitex.schema._stats import (
-    Position,
-    PositionMode,
-    StatPositioning,
-    StatResult,
-    StatStyling,
-    SymbolStyle,
-    UnitType,
-    create_stat_result,
-)
-
 # Encoding schema
 from scitex.schema._encoding import (
     ENCODING_VERSION,
@@ -87,48 +73,58 @@ from scitex.schema._figure_elements import (
     generate_caption_markdown,
 )
 
-# Theme schema
-from scitex.schema._theme import (
-    THEME_VERSION,
-    ColorScheme,
-    LegendStyle,
-    LineDefaults,
-    MarkerDefaults,
-    PlotTheme,
-    Typography,
-)
-from scitex.schema._theme import TraceStyle as ThemeTraceStyle
-
 # Plot schema
 from scitex.schema._plot import (
     DPI_FALLBACK,
     PLOT_GEOMETRY_VERSION,
     PLOT_SPEC_VERSION,
     PLOT_STYLE_VERSION,
+    AxesLabels,
+    AxesLimits,
+    AxesSpecItem,
     BboxPx,
     BboxRatio,
     CoordinateSpace,
+    DataSourceSpec,
+    FontSpec,
+    HitRegionEntry,
     LegendLocation,
+    LegendSpec,
+    PlotGeometry,
+    PlotSpec,
+    PlotStyle,
+    RenderedArtist,
+    RenderedAxes,
+    RenderManifest,
+    SelectableRegion,
+    SizeSpec,
+    ThemeSpec,
+    TraceSpec,
+    TraceStyleSpec,
     TraceType,
 )
-from scitex.schema._plot import AxesLabels as PltzAxesLabels
-from scitex.schema._plot import AxesLimits as PltzAxesLimits
-from scitex.schema._plot import AxesSpecItem as PltzAxesItem
-from scitex.schema._plot import DataSourceSpec as PltzDataSource
-from scitex.schema._plot import FontSpec as PltzFont
-from scitex.schema._plot import HitRegionEntry as PltzHitRegion
-from scitex.schema._plot import LegendSpec as PltzLegendSpec
-from scitex.schema._plot import PlotGeometry as PltzGeometry
-from scitex.schema._plot import PlotSpec as PltzSpec
-from scitex.schema._plot import PlotStyle as PltzStyle
-from scitex.schema._plot import RenderedArtist as PltzRenderedArtist
-from scitex.schema._plot import RenderedAxes as PltzRenderedAxes
-from scitex.schema._plot import RenderManifest as PltzRenderManifest
-from scitex.schema._plot import SelectableRegion as PltzSelectableRegion
-from scitex.schema._plot import SizeSpec as PltzSize
-from scitex.schema._plot import ThemeSpec as PltzTheme
-from scitex.schema._plot import TraceSpec as PltzTraceSpec
-from scitex.schema._plot import TraceStyleSpec as PltzTraceStyle
+from scitex.schema._stats import (
+    Position,
+    PositionMode,
+    StatPositioning,
+    StatResult,
+    StatStyling,
+    SymbolStyle,
+    UnitType,
+    create_stat_result,
+)
+
+# Theme schema
+from scitex.schema._theme import (
+    THEME_VERSION,
+    ColorScheme,
+    LegendStyle,
+    LineDefaults,
+    MarkerDefaults,
+    PlotTheme,
+)
+from scitex.schema._theme import TraceStyle as ThemeTraceStyle
+from scitex.schema._theme import Typography
 
 # Validation (temporarily keep here)
 from scitex.schema._validation import (
@@ -164,24 +160,24 @@ __all__ = [
     "LegendLocation",
     "BboxRatio",
     "BboxPx",
-    "PltzTraceSpec",
-    "PltzAxesLimits",
-    "PltzAxesLabels",
-    "PltzAxesItem",
-    "PltzDataSource",
-    "PltzSpec",
-    "PltzTraceStyle",
-    "PltzTheme",
-    "PltzFont",
-    "PltzSize",
-    "PltzLegendSpec",
-    "PltzStyle",
-    "PltzRenderedArtist",
-    "PltzRenderedAxes",
-    "PltzHitRegion",
-    "PltzSelectableRegion",
-    "PltzGeometry",
-    "PltzRenderManifest",
+    "TraceSpec",
+    "AxesLimits",
+    "AxesLabels",
+    "AxesSpecItem",
+    "DataSourceSpec",
+    "PlotSpec",
+    "TraceStyleSpec",
+    "ThemeSpec",
+    "FontSpec",
+    "SizeSpec",
+    "LegendSpec",
+    "PlotStyle",
+    "RenderedArtist",
+    "RenderedAxes",
+    "HitRegionEntry",
+    "SelectableRegion",
+    "PlotGeometry",
+    "RenderManifest",
     # Encoding
     "ENCODING_VERSION",
     "ChannelBinding",

scitex/schema/_canvas.py

@@ -327,7 +327,7 @@ class CanvasSpec:
     Complete specification for a SciTeX canvas.
 
     This is the wire format for canvas.json files.
-    The Canvas class in scitex.fig provides the OO interface.
+    The Canvas class in scitex.canvas provides the OO interface.
 
     Examples
     --------

scitex/schema/_stats.py

@@ -10,7 +10,7 @@ Statistical Result Schema - Central Source of Truth.
 This module defines the canonical schema for statistical test results
 that integrates with:
 - scitex.plt (TrackingMixin, metadata embedding)
-- scitex.fig (JSON serialization, FigureModel)
+- scitex.canvas (JSON serialization, FigureModel)
 - scitex-cloud GUI (Fabric.js canvas, properties panel, positioning)
 - scitex.bridge (cross-module adapters)
 
@@ -272,7 +272,7 @@ class StatResult:
 
     This is the central schema for statistical results that integrates with:
     - scitex.plt: Automatic annotation via TrackingMixin
-    - scitex.fig: JSON serialization for FigureModel
+    - scitex.canvas: JSON serialization for FigureModel
     - scitex-cloud GUI: Fabric.js canvas positioning and properties panel
     - scitex.bridge: Cross-module adapters
 

scitex/stats/__init__.py

@@ -57,21 +57,21 @@ from .auto import (
 )
 
 # =============================================================================
-# Stats Schema - Use scitex.fts.Stats as single source of truth
+# Stats Schema - Use scitex.io.bundle.Stats as single source of truth
 # =============================================================================
 
-# For backward compatibility, re-export from fts
+# Re-export Stats from bundle module
 try:
-    from scitex.fts import Stats
+    from scitex.io.bundle import Stats
 
-    FTS_AVAILABLE = True
+    BUNDLE_AVAILABLE = True
 except ImportError:
     Stats = None
-    FTS_AVAILABLE = False
+    BUNDLE_AVAILABLE = False
 
 
 def test_result_to_stats(result: dict) -> "Stats":
-    """Convert test result dict to FTS Stats schema.
+    """Convert test result dict to Stats schema.
 
     Parameters
     ----------
@@ -92,26 +92,24 @@ def test_result_to_stats(result: dict) -> "Stats":
     Returns
     -------
     Stats
-        FTS Stats object suitable for bundle storage
+        Stats object suitable for bundle storage
 
     Example
     -------
     >>> result = stats.t_test(x, y)
-    >>> fts_stats = stats.test_result_to_stats(result)
-    >>> bundle.stats = fts_stats
+    >>> stat_obj = stats.test_result_to_stats(result)
+    >>> bundle.stats = stat_obj
     """
-    if not FTS_AVAILABLE:
-        raise ImportError("scitex.fts is required for Stats conversion")
+    if not BUNDLE_AVAILABLE:
+        raise ImportError("scitex.io.bundle is required for Stats conversion")
 
     import uuid
 
-    from scitex.fts._stats._dataclasses._Stats import (
+    from scitex.io.bundle._stats._dataclasses._Stats import (
         Analysis,
         EffectSize,
         StatMethod,
-    )
-    from scitex.fts._stats._dataclasses._Stats import (
-        StatResult as FTSStatResult,
+        StatResult,
     )
 
     # Handle legacy flat format vs new nested format
@@ -134,7 +132,7 @@ def test_result_to_stats(result: dict) -> "Stats":
                 ci_lower=ci[0] if len(ci) > 0 else None,
                 ci_upper=ci[1] if len(ci) > 1 else None,
             )
-        stat_result = FTSStatResult(
+        stat_result = StatResult(
             statistic=result.get("statistic", 0.0),
             statistic_name=result.get("statistic_name", ""),
             p_value=result.get("p_value", 1.0),
@@ -164,7 +162,7 @@ def test_result_to_stats(result: dict) -> "Stats":
                 ci_upper=es.get("ci_upper"),
             )
 
-        stat_result = FTSStatResult(
+        stat_result = StatResult(
             statistic=results_data.get("statistic", 0.0),
             statistic_name=results_data.get("statistic_name", ""),
             p_value=results_data.get("p_value", 1.0),
@@ -189,25 +187,25 @@ def test_result_to_stats(result: dict) -> "Stats":
 
 
 # =============================================================================
-# .statsz Bundle Support - Using FTS
+# .stats Bundle Support
 # =============================================================================
 
 
-def save_statsz(
+def save_stats(
     comparisons,
     path,
     metadata=None,
     as_zip=False,
 ):
     """
-    Save statistical results as an FTS bundle.
+    Save statistical results as a SciTeX bundle.
 
     Parameters
     ----------
     comparisons : list of dict
         List of comparison results.
     path : str or Path
-        Output path (e.g., "results.zip").
+        Output path (e.g., "results.stats" or "results.stats.zip").
     metadata : dict, optional
         Additional metadata.
     as_zip : bool, optional
@@ -220,14 +218,14 @@ def save_statsz(
     """
     from pathlib import Path
 
-    from scitex.fts import FTS
+    from scitex.io.bundle import Bundle
 
     p = Path(path)
     if as_zip and not p.suffix == ".zip":
         p = p.with_suffix(".zip")
 
-    # Create FTS bundle
-    bundle = FTS(p, create=True, node_type="stats")
+    # Create bundle
+    bundle = Bundle(p, create=True, bundle_type="stats")
 
     # Convert comparisons to Stats
     if comparisons:
@@ -246,14 +244,14 @@ def save_statsz(
     return p
 
 
-def load_statsz(path):
+def load_stats(path):
     """
-    Load a stats bundle using FTS.
+    Load a stats bundle.
 
     Parameters
     ----------
     path : str or Path
-        Path to bundle.
+        Path to bundle (.stats or .stats.zip).
 
     Returns
     -------
@@ -262,9 +260,9 @@ def load_statsz(path):
         Each comparison is a flat dict with:
         - name, method, p_value, effect_size, ci95, formatted
     """
-    from scitex.fts import FTS
+    from scitex.io.bundle import Bundle
 
-    bundle = FTS(path)
+    bundle = Bundle(path)
 
     comparisons = []
     if bundle.stats and bundle.stats.analyses:
@@ -317,9 +315,8 @@ __all__ = [
     "describe",
     # Torch availability flag (for GPU acceleration)
     "TORCH_AVAILABLE",
-    # Stats schema (from FTS)
+    # Stats schema
     "Stats",
-    "FTS_AVAILABLE",
     # Auto module convenience exports
     "StatContext",
     "TestRule",
@@ -334,8 +331,8 @@ __all__ = [
     # Conversion utilities
     "test_result_to_stats",
     # Bundle functions
-    "save_statsz",
-    "load_statsz",
+    "save_stats",
+    "load_stats",
 ]
 
 __version__ = "2.2.0"

scitex/stats/_schema.py

@@ -7,7 +7,7 @@ Statistical Result Schema - DEPRECATED
 This module is deprecated. Import from scitex.schema._stats instead:
     from scitex.schema._stats import Position, StatStyling, StatPositioning, StatResult
 
-For the new simplified API, use scitex.fts._stats.
+For the new simplified API, use scitex.io.bundle._stats.
 """
 
 import warnings

scitex/stats/io/__init__.py

@@ -1,29 +1,28 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Timestamp: "2025-12-13 (ywatanabe)"
 # File: /home/ywatanabe/proj/scitex-code/src/scitex/stats/io/__init__.py
 
 """
-I/O operations for scitex.stats - Statistical results bundles (.statsz).
+I/O operations for scitex.stats - Statistical results bundles (.stats).
 
 This module handles:
-    - .statsz bundle load/save operations
+    - .stats bundle load/save operations
     - Statistical comparison metadata
     - P-value and effect size validation
 """
 
 from ._bundle import (
-    validate_statsz_spec,
-    load_statsz_bundle,
-    save_statsz_bundle,
-    STATSZ_SCHEMA_SPEC,
+    STATS_SCHEMA_SPEC,
+    load_stats_bundle,
+    save_stats_bundle,
+    validate_stats_spec,
 )
 
 __all__ = [
-    "validate_statsz_spec",
-    "load_statsz_bundle",
-    "save_statsz_bundle",
-    "STATSZ_SCHEMA_SPEC",
+    "validate_stats_spec",
+    "load_stats_bundle",
+    "save_stats_bundle",
+    "STATS_SCHEMA_SPEC",
 ]
 
 # EOF

scitex/stats/io/_bundle.py

@@ -1,10 +1,9 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # Timestamp: "2025-12-13 (ywatanabe)"
 # File: /home/ywatanabe/proj/scitex-code/src/scitex/stats/io/_bundle.py
 
 """
-SciTeX .statsz Bundle I/O - Statistics-specific bundle operations.
+SciTeX .stats Bundle I/O - Statistics-specific bundle operations.
 
 Handles:
     - Statistical results specification validation
@@ -17,14 +16,14 @@ from pathlib import Path
 from typing import Any, Dict, List
 
 __all__ = [
-    "validate_statsz_spec",
-    "load_statsz_bundle",
-    "save_statsz_bundle",
-    "STATSZ_SCHEMA_SPEC",
+    "validate_stats_spec",
+    "load_stats_bundle",
+    "save_stats_bundle",
+    "STATS_SCHEMA_SPEC",
 ]
 
-# Schema specification for .statsz bundles
-STATSZ_SCHEMA_SPEC = {
+# Schema specification for .stats bundles
+STATS_SCHEMA_SPEC = {
     "name": "scitex.stats.stats",
     "version": "1.0.0",
     "required_fields": ["schema"],
@@ -32,8 +31,8 @@ STATSZ_SCHEMA_SPEC = {
 }
 
 
-def validate_statsz_spec(spec: Dict[str, Any]) -> List[str]:
-    """Validate .statsz-specific fields.
+def validate_stats_spec(spec: Dict[str, Any]) -> List[str]:
+    """Validate .stats-specific fields.
 
     Args:
         spec: The specification dictionary to validate.
@@ -91,8 +90,8 @@ def validate_statsz_spec(spec: Dict[str, Any]) -> List[str]:
     return errors
 
 
-def load_statsz_bundle(bundle_dir: Path) -> Dict[str, Any]:
-    """Load .statsz bundle contents from directory.
+def load_stats_bundle(bundle_dir: Path) -> Dict[str, Any]:
+    """Load .stats bundle contents from directory.
 
     Args:
         bundle_dir: Path to the bundle directory.
@@ -105,7 +104,7 @@ def load_statsz_bundle(bundle_dir: Path) -> Dict[str, Any]:
     # Load specification
     spec_file = bundle_dir / "stats.json"
     if spec_file.exists():
-        with open(spec_file, "r") as f:
+        with open(spec_file) as f:
             result["spec"] = json.load(f)
     else:
         result["spec"] = None
@@ -115,16 +114,17 @@ def load_statsz_bundle(bundle_dir: Path) -> Dict[str, Any]:
     if data_file.exists():
         try:
             import pandas as pd
+
             result["data"] = pd.read_csv(data_file)
         except ImportError:
-            with open(data_file, "r") as f:
+            with open(data_file) as f:
                 result["data"] = f.read()
 
     return result
 
 
-def save_statsz_bundle(data: Dict[str, Any], dir_path: Path) -> None:
-    """Save .statsz bundle contents to directory.
+def save_stats_bundle(data: Dict[str, Any], dir_path: Path) -> None:
+    """Save .stats bundle contents to directory.
 
     Args:
         data: Bundle data dictionary.