scitex 2.8.1__py3-none-any.whl → 2.10.0__py3-none-any.whl

scitex/resource/_utils/_get_env_info.py

@@ -82,9 +82,7 @@ def get_conda_packages(run_lambda):
     if get_platform() == "win32":
         system_root = os.environ.get("SYSTEMROOT", "C:\\Windows")
         findstr_cmd = os.path.join(system_root, "System32", "findstr")
-        grep_cmd = r'{} /R "torch numpy cudatoolkit soumith mkl magma"'.format(
-            findstr_cmd
-        )
+        grep_cmd = rf'{findstr_cmd} /R "torch numpy cudatoolkit soumith mkl magma"'
     else:
         grep_cmd = r'grep "torch\|numpy\|cudatoolkit\|soumith\|mkl\|magma"'
     conda = os.environ.get("CONDA_EXE", "conda")
@@ -148,7 +146,7 @@ def get_cudnn_version(run_lambda):
         system_root = os.environ.get("SYSTEMROOT", "C:\\Windows")
         cuda_path = os.environ.get("CUDA_PATH", "%CUDA_PATH%")
         where_cmd = os.path.join(system_root, "System32", "where")
-        cudnn_cmd = '{} /R "{}\\bin" cudnn*.dll'.format(where_cmd, cuda_path)
+        cudnn_cmd = f'{where_cmd} /R "{cuda_path}\\bin" cudnn*.dll'
     elif get_platform() == "darwin":
         # CUDA libraries and drivers can be found in /usr/local/cuda/. See
         # https://docs.nvidia.com/cuda/cuda-installation-guide-mac-os-x/index.html#install
@@ -172,11 +170,11 @@ def get_cudnn_version(run_lambda):
     if not files_set:
         return None
     # Alphabetize the result because the order is non-deterministic otherwise
-    files = list(sorted(files_set))
+    files = sorted(files_set)
     if len(files) == 1:
         return files[0]
     result = "\n".join(files)
-    return "Probably one of the following:\n{}".format(result)
+    return f"Probably one of the following:\n{result}"
 
 
 def get_nvidia_smi():
@@ -220,7 +218,7 @@ def get_windows_version(run_lambda):
     findstr_cmd = os.path.join(system_root, "System32", "findstr")
     return run_and_read_all(
         run_lambda,
-        "{} os get Caption | {} /v Caption".format(wmic_cmd, findstr_cmd),
+        f"{wmic_cmd} os get Caption | {findstr_cmd} /v Caption",
     )
 
 
@@ -248,20 +246,20 @@ def get_os(run_lambda):
         version = get_mac_version(run_lambda)
         if version is None:
             return None
-        return "macOS {} ({})".format(version, machine())
+        return f"macOS {version} ({machine()})"
 
     if platform == "linux":
         # Ubuntu/Debian based
         desc = get_lsb_version(run_lambda)
         if desc is not None:
-            return "{} ({})".format(desc, machine())
+            return f"{desc} ({machine()})"
 
         # Try reading /etc/*-release
         desc = check_release_file(run_lambda)
         if desc is not None:
-            return "{} ({})".format(desc, machine())
+            return f"{desc} ({machine()})"
 
-        return "{} ({})".format(platform, machine())
+        return f"{platform} ({machine()})"
 
     # Unknown platform
     return platform
@@ -276,7 +274,7 @@ def get_pip_packages(run_lambda):
         if get_platform() == "win32":
             system_root = os.environ.get("SYSTEMROOT", "C:\\Windows")
             findstr_cmd = os.path.join(system_root, "System32", "findstr")
-            grep_cmd = r'{} /R "numpy torch"'.format(findstr_cmd)
+            grep_cmd = rf'{findstr_cmd} /R "numpy torch"'
         else:
             grep_cmd = r'grep "torch\|numpy"'
         return run_and_read_all(run_lambda, pip + " list --format=freeze | " + grep_cmd)
@@ -329,11 +327,7 @@ def get_env_info():
     return SystemEnv(
         torch_version=version_str,
         is_debug_build=debug_mode_str,
-        python_version="{}.{} ({}-bit runtime)".format(
-            sys.version_info[0],
-            sys.version_info[1],
-            sys.maxsize.bit_length() + 1,
-        ),
+        python_version=f"{sys.version_info[0]}.{sys.version_info[1]} ({sys.maxsize.bit_length() + 1}-bit runtime)",
         is_cuda_available=cuda_available_str,
         cuda_compiled_version=cuda_version_str,
         cuda_runtime_version=get_running_cuda_version(run_lambda),
@@ -408,7 +402,7 @@ def pretty_str(envinfo):
     def maybe_start_on_next_line(string):
         # If `string` is multiline, prepend a \n to it.
         if string is not None and len(string.split("\n")) > 1:
-            return "\n{}\n".format(string)
+            return f"\n{string}\n"
         return string
 
     mutable_dict = envinfo._asdict()
@@ -452,7 +446,7 @@ def pretty_str(envinfo):
     # If they were previously None, they'll show up as ie '[conda] Could not collect'
     if mutable_dict["pip_packages"]:
         mutable_dict["pip_packages"] = prepend(
-            mutable_dict["pip_packages"], "[{}] ".format(envinfo.pip_version)
+            mutable_dict["pip_packages"], f"[{envinfo.pip_version}] "
         )
     if mutable_dict["conda_packages"]:
         mutable_dict["conda_packages"] = prepend(
@@ -473,9 +467,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-
-
-def main():
-    print("Collecting environment information...")
-    env_info = get_env_info()
-    print(env_info)

scitex/schema/__init__.py

@@ -1,237 +1,226 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 # File: ./src/scitex/schema/__init__.py
-# Timestamp: "2025-12-13 (ywatanabe)"
+# Timestamp: "2025-12-20 (ywatanabe)"
 """
-SciTeX Schema Module - Central source of truth for cross-module data structures.
-
-This module provides standardized schemas for data that crosses module boundaries:
-- Plot specifications (plt ↔ fig ↔ cloud) - NEW layered architecture
-- Figure specifications (fig ↔ writer ↔ cloud)
-- Statistical results (stats ↔ plt ↔ fig)
-- Canvas metadata (fig ↔ io ↔ cloud)
-
-Design Principles:
-- Anything serialized to JSON/disk → defined here
-- Anything shared across modules → defined here
-- Internal module implementations → stay per-module
-- Canonical units: ratio (0-1) for axes bbox, mm for panel size
-- px data is ALWAYS derived/cached, never source of truth
-
-Usage:
-    # New layered plot schema (recommended)
-    from scitex.schema import PltzSpec, PltzStyle, PltzGeometry
-
-    # Legacy figure model
-    from scitex.schema import FigureSpec, StatResult, CanvasSpec
-    from scitex.schema import validate_figure, validate_stat_result
+SciTeX Schema Module - DEPRECATED
+
+This module is scheduled for removal. All schemas are being consolidated
+in scitex.fts as the single source of truth.
+
+For new code, import from scitex.fts:
+    from scitex.fts import FTS, Node, Encoding, Theme, Stats
+
+This module exists temporarily for backward compatibility.
 """
 
-# Schema version for all cross-module specs
-SCHEMA_VERSION = "0.2.0"
+import warnings
 
-# =============================================================================
-# Plot Schemas - NEW Layered Architecture (SOURCE OF TRUTH for .pltz files)
-# =============================================================================
-from scitex.schema._plot import (
-    # Version constants
-    PLOT_SPEC_VERSION,
-    PLOT_STYLE_VERSION,
-    PLOT_GEOMETRY_VERSION,
-    # DPI fallback for legacy data
-    DPI_FALLBACK,
-    # Type aliases
-    TraceType,
-    CoordinateSpace,
-    LegendLocation,
-    # Bbox classes
-    BboxRatio,
-    BboxPx,
-    # Spec classes (canonical) - prefixed with Pltz to avoid collision
-    TraceSpec as PltzTraceSpec,
-    AxesLimits as PltzAxesLimits,
-    AxesLabels as PltzAxesLabels,
-    AxesSpecItem as PltzAxesItem,
-    DataSourceSpec as PltzDataSource,
-    PlotSpec as PltzSpec,
-    # Style classes
-    TraceStyleSpec as PltzTraceStyle,
-    ThemeSpec as PltzTheme,
-    FontSpec as PltzFont,
-    SizeSpec as PltzSize,
-    LegendSpec as PltzLegendSpec,
-    PlotStyle as PltzStyle,
-    # Geometry classes (cache)
-    RenderedArtist as PltzRenderedArtist,
-    RenderedAxes as PltzRenderedAxes,
-    HitRegionEntry as PltzHitRegion,
-    SelectableRegion as PltzSelectableRegion,
-    PlotGeometry as PltzGeometry,
-    # Manifest
-    RenderManifest as PltzRenderManifest,
+warnings.warn(
+    "scitex.schema is deprecated. Import from scitex.fts instead. "
+    "This module will be removed in a future version.",
+    DeprecationWarning,
+    stacklevel=2
 )
 
+# Schema version
+SCHEMA_VERSION = "0.2.0"
+
 # =============================================================================
-# Figure Schemas (re-exported from fig.model for central access)
-# These are for figure COMPOSITION (multi-panel), not individual plots
+# Re-export from scitex.fts (new single source of truth)
 # =============================================================================
-from scitex.fig.model import (
-    # Core models
-    FigureModel as FigureSpec,
-    AxesModel as FigAxesSpec,
-    PlotModel as FigPlotSpec,
-    AnnotationModel as AnnotationSpec,
-    GuideModel as GuideSpec,
-    # Style models
-    PlotStyle as FigPlotStyle,
-    AxesStyle as FigAxesStyle,
-    GuideStyle,
-    TextStyle,
-    # Style utilities
-    copy_plot_style,
-    copy_axes_style,
-    copy_guide_style,
-    copy_text_style,
-    apply_style_to_plots,
-)
+try:
+    from scitex.fts import (
+        # Core bundle classes
+        FTS,
+        Node,
+        BBox,
+        SizeMM,
+        DataInfo,
+        # Encoding and Theme
+        Encoding,
+        Theme,
+        # Stats
+        Stats,
+    )
+except ImportError:
+    # FTS not fully configured yet
+    FTS = None
+    Node = None
+    Encoding = None
+    Theme = None
+    Stats = None
 
 # =============================================================================
-# Statistical Result Schemas (SOURCE OF TRUTH)
+# Independent schemas (still defined here temporarily)
+# These will be migrated to scitex.fts in subsequent phases
 # =============================================================================
+
+# Stats schema (GUI-focused version - to be merged with FTS Stats)
 from scitex.schema._stats import (
-    # Type aliases
+    Position,
     PositionMode,
-    UnitType,
-    SymbolStyle,
-    # Classes
-    StatResult,
     StatPositioning,
+    StatResult,
     StatStyling,
-    Position,
-    # Convenience function
+    SymbolStyle,
+    UnitType,
     create_stat_result,
 )
 
-# =============================================================================
-# Canvas Schemas
-# =============================================================================
-from scitex.schema._canvas import (
-    CanvasSpec,
-    PanelSpec,
-    CanvasAnnotationSpec,
-    CanvasTitleSpec,
-    CanvasCaptionSpec,
-    CanvasMetadataSpec,
-    DataFileSpec,
+# Encoding schema
+from scitex.schema._encoding import (
+    ENCODING_VERSION,
+    ChannelBinding,
+    PlotEncoding,
+    TraceEncoding,
 )
 
-# =============================================================================
-# Validation Functions
-# =============================================================================
+# Figure elements
+from scitex.schema._figure_elements import (
+    FIGURE_ELEMENTS_VERSION,
+    Caption,
+    FigureTitle,
+    PanelInfo,
+    PanelLabels,
+    generate_caption,
+    generate_caption_latex,
+    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,
+    BboxPx,
+    BboxRatio,
+    CoordinateSpace,
+    LegendLocation,
+    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
+
+# Validation (temporarily keep here)
 from scitex.schema._validation import (
-    validate_figure,
+    ValidationError,
     validate_axes,
+    validate_color,
+    validate_figure,
     validate_plot,
     validate_stat_result,
-    validate_canvas,
-    validate_color,
-    ValidationError,
 )
 
 # =============================================================================
-# Public API
+# Public API (maintaining backward compatibility)
 # =============================================================================
 __all__ = [
     # Version
     "SCHEMA_VERSION",
-    # ==========================================================================
-    # NEW: Plot Schemas (layered architecture for .pltz files)
-    # ==========================================================================
-    # Version constants
+    # FTS re-exports
+    "FTS",
+    "Node",
+    "BBox",
+    "SizeMM",
+    "DataInfo",
+    "Encoding",
+    "Theme",
+    "Stats",
+    # Plot specs
     "PLOT_SPEC_VERSION",
     "PLOT_STYLE_VERSION",
     "PLOT_GEOMETRY_VERSION",
-    # Type aliases
     "TraceType",
     "CoordinateSpace",
     "LegendLocation",
-    # Bbox classes
     "BboxRatio",
     "BboxPx",
-    # Spec classes (canonical)
     "PltzTraceSpec",
     "PltzAxesLimits",
     "PltzAxesLabels",
     "PltzAxesItem",
     "PltzDataSource",
     "PltzSpec",
-    # Style classes
     "PltzTraceStyle",
     "PltzTheme",
     "PltzFont",
     "PltzSize",
     "PltzLegendSpec",
     "PltzStyle",
-    # Geometry classes (cache)
     "PltzRenderedArtist",
     "PltzRenderedAxes",
     "PltzHitRegion",
     "PltzSelectableRegion",
     "PltzGeometry",
-    # Manifest
     "PltzRenderManifest",
-    # ==========================================================================
-    # Figure specs (for multi-panel composition)
-    # ==========================================================================
-    "FigureSpec",
-    "FigAxesSpec",
-    "FigPlotSpec",
-    "AnnotationSpec",
-    "GuideSpec",
-    # Style specs
-    "FigPlotStyle",
-    "FigAxesStyle",
-    "GuideStyle",
-    "TextStyle",
-    # Style utilities
-    "copy_plot_style",
-    "copy_axes_style",
-    "copy_guide_style",
-    "copy_text_style",
-    "apply_style_to_plots",
-    # ==========================================================================
-    # Stats type aliases
-    # ==========================================================================
+    # Encoding
+    "ENCODING_VERSION",
+    "ChannelBinding",
+    "TraceEncoding",
+    "PlotEncoding",
+    # Theme
+    "THEME_VERSION",
+    "ColorScheme",
+    "Typography",
+    "LineDefaults",
+    "MarkerDefaults",
+    "ThemeTraceStyle",
+    "LegendStyle",
+    "PlotTheme",
+    # Figure elements
+    "FIGURE_ELEMENTS_VERSION",
+    "FigureTitle",
+    "Caption",
+    "PanelLabels",
+    "PanelInfo",
+    "generate_caption",
+    "generate_caption_latex",
+    "generate_caption_markdown",
+    # Stats
     "PositionMode",
     "UnitType",
     "SymbolStyle",
-    # Stats specs
     "StatResult",
     "StatPositioning",
     "StatStyling",
     "Position",
     "create_stat_result",
-    # ==========================================================================
-    # Canvas specs
-    # ==========================================================================
-    "CanvasSpec",
-    "PanelSpec",
-    "CanvasAnnotationSpec",
-    "CanvasTitleSpec",
-    "CanvasCaptionSpec",
-    "CanvasMetadataSpec",
-    "DataFileSpec",
-    # ==========================================================================
     # Validation
-    # ==========================================================================
     "validate_figure",
     "validate_axes",
     "validate_plot",
     "validate_stat_result",
-    "validate_canvas",
     "validate_color",
     "ValidationError",
 ]
 
-
 # EOF