scitex 2.1.2__py3-none-any.whl → 2.4.2__py3-none-any.whl

scitex/__init__.py

@@ -25,6 +25,14 @@ warnings.filterwarnings("ignore", category=DeprecationWarning)
 # Version
 from .__version__ import __version__
 
+# Sentinel object for decorator-injected parameters
+class _InjectedSentinel:
+    """Sentinel value indicating a parameter will be injected by a decorator"""
+    def __repr__(self):
+        return "<INJECTED>"
+
+INJECTED = _InjectedSentinel()
+
 # Lazy loading for all modules
 class _LazyModule:
     def __init__(self, name):
@@ -41,6 +49,74 @@ class _LazyModule:
         return getattr(self._module, attr)
 
 
+class _CallableModuleWrapper:
+    """Callable module wrapper that acts as both a decorator and a module.
+
+    This allows:
+    - @scitex.session (new clean API)
+    - @scitex.session.session (old API for backwards compatibility)
+    - scitex.session.start() and other module functions
+
+    Example:
+        import scitex
+
+        @scitex.session  # Clean! Calls __call__()
+        def main(): pass
+
+        @scitex.session.session  # Backwards compatible
+        def main(): pass
+
+        scitex.session.start(...)  # Access other functions
+    """
+
+    def __init__(self, module_name, main_decorator_name='session'):
+        self._module_name = module_name
+        self._main_decorator_name = main_decorator_name
+        self._module = None
+        self._parent_name = None
+        self._attr_name = None
+
+    def _setup_persistence(self, parent_name, attr_name):
+        """Set up persistence information to prevent replacement."""
+        self._parent_name = parent_name
+        self._attr_name = attr_name
+
+    def _load_module(self):
+        """Lazy load the actual module."""
+        if self._module is None:
+            import importlib
+            import sys
+
+            # Import the module
+            self._module = importlib.import_module(
+                f".{self._module_name}", package="scitex"
+            )
+
+            # Restore ourselves in the parent module's __dict__ to prevent replacement
+            if self._parent_name and self._attr_name:
+                parent_module = sys.modules.get(self._parent_name)
+                if parent_module is not None:
+                    setattr(parent_module, self._attr_name, self)
+
+        return self._module
+
+    def __call__(self, *args, **kwargs):
+        """When used as @scitex.session"""
+        module = self._load_module()
+        main_decorator = getattr(module, self._main_decorator_name)
+        return main_decorator(*args, **kwargs)
+
+    def __getattr__(self, name):
+        """When accessed as scitex.session.session or scitex.session.start"""
+        if name == self._main_decorator_name:
+            # Return self so @scitex.session.session works
+            return self
+
+        # Otherwise, delegate to the actual module
+        module = self._load_module()
+        return getattr(module, name)
+
+
 # Create lazy modules
 io = _LazyModule("io")
 gen = _LazyModule("gen")
@@ -63,6 +139,7 @@ reproduce = _LazyModule("reproduce")
 rng = _LazyModule("rng")
 scholar = _LazyModule("scholar")
 writer = _LazyModule("writer")
+vis = _LazyModule("vis")
 resource = _LazyModule("resource")
 tex = _LazyModule("tex")
 linalg = _LazyModule("linalg")
@@ -77,17 +154,19 @@ gists = _LazyModule("gists")
 errors = _LazyModule("errors")
 units = _LazyModule("units")
 logging = _LazyModule("logging")
-session = _LazyModule("session")
+session = _CallableModuleWrapper("session", main_decorator_name="session")
+session._setup_persistence("scitex", "session")
 capture = _LazyModule("capture")
 template = _LazyModule("template")
+cloud = _LazyModule("cloud")
 
-# Import sh functions directly as they're commonly used
-try:
-    from .sh import sh, sh_run, quote
-except ImportError:
-    sh = None
-    sh_run = None
-    quote = None
+# Auto-load cloud hooks if in cloud environment
+import os as _os
+if _os.environ.get('SCITEX_CLOUD_CODE_WORKSPACE') == 'true':
+    try:
+        from .cloud import _matplotlib_hook
+    except Exception:
+        pass  # Silently fail if matplotlib not available
 
 __all__ = [
     "io",
@@ -103,8 +182,6 @@ __all__ = [
     "decorators",
     "__version__",
     "sh",
-    "sh_run",
-    "quote",
     "errors",
     "units",
     "logging",
@@ -121,6 +198,7 @@ __all__ = [
     "reproduce",
     "scholar",
     "writer",
+    "vis",
     "resource",
     "tex",
     "linalg",
@@ -132,6 +210,8 @@ __all__ = [
     "context",
     "dev",
     "gists",
+    "cloud",
+    "INJECTED",
 ]
 
 # EOF

scitex/__main__.py

@@ -23,113 +23,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-
-# Original content preserved below:
-# #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-# Time-stamp: "2024-10-13 18:56:15 (ywatanabe)"
-# /home/yusukew/proj/scitex_repo/src/scitex/__main__.py
-
-"""
-1. Functionality:
-   - Serves as the entry point for the scitex package
-   - Handles command-line arguments and directs to appropriate submodules
-2. Input:
-   - Command-line arguments
-3. Output:
-   - Execution of specified submodule or usage instructions
-4. Prerequisites:
-   - scitex package and its submodules
-"""
-
-import warnings
-
-warnings.filterwarnings("ignore")
-
-import sys
-from .gen._print_config import print_config_main
-from .template.create_research import main as create_research_main
-from .template.create_pip_project import main as create_pip_project_main
-from .template.create_singularity import main as create_singularity_main
-
-
-def main():
-    """Main entry point for SciTeX command-line interface.
-
-    Provides command-line access to various SciTeX utilities.
-
-    Commands
-    --------
-    print_config : Print configuration values
-        Usage: python -m scitex print_config [key]
-
-    create_research_project : Create a new research project from template
-        Usage: python -m scitex create_research_project <project-name> [target-dir]
-
-    create_pip_project : Create a new pip project from template
-        Usage: python -m scitex create_pip_project <project-name> [target-dir]
-
-    create_singularity_project : Create a new singularity project from template
-        Usage: python -m scitex create_singularity_project <project-name> [target-dir]
-
-    Examples
-    --------
-    >>> # Print all configuration
-    >>> python -m scitex print_config
-
-    >>> # Print specific configuration key
-    >>> python -m scitex print_config DATABASE_URL
-
-    >>> # Create a new research project
-    >>> python -m scitex create_research_project my_research_project
-
-    >>> # Create a new pip project
-    >>> python -m scitex create_pip_project my_pip_project
-
-    >>> # Create a new singularity project
-    >>> python -m scitex create_singularity_project my_singularity_project
-
-    >>> # Create in a specific directory
-    >>> python -m scitex create_research_project my_project ~/projects
-
-    Raises
-    ------
-    SystemExit
-        If no command provided or unknown command specified.
-    """
-    if len(sys.argv) < 2:
-        print("Usage: python -m scitex <command> [args]")
-        print("")
-        print("Available commands:")
-        print("  print_config          Print configuration values")
-        print("  create_research_project       Create a new research project")
-        print("  create_pip_project    Create a new pip project")
-        print("  create_singularity_project    Create a new singularity project")
-        print("")
-        print("Use 'python -m scitex <command> --help' for more information on a command.")
-        sys.exit(1)
-
-    command = sys.argv[1]
-    args = sys.argv[2:]
-
-    if command == "print_config":
-        print_config_main(args)
-    elif command == "create_research_project":
-        create_research_main(args)
-    elif command == "create_pip_project":
-        create_pip_project_main(args)
-    elif command == "create_singularity_project":
-        create_singularity_main(args)
-    else:
-        print(f"Unknown command: {command}")
-        print("")
-        print("Available commands:")
-        print("  print_config          Print configuration values")
-        print("  create_research_project       Create a new research project")
-        print("  create_pip_project    Create a new pip project")
-        print("  create_singularity_project    Create a new singularity project")
-        sys.exit(1)
-
-
-if __name__ == "__main__":
-    main()

scitex/__version__.py

@@ -9,6 +9,6 @@ __FILE__ = "./src/scitex/__version__.py"
 __DIR__ = os.path.dirname(__FILE__)
 # ----------------------------------------
 
-__version__ = "2.1.2"
+__version__ = "2.4.2"
 
 # EOF

scitex/ai/_gen_ai/_BaseGenAI.py

@@ -17,7 +17,7 @@ from typing import Any, Dict, Generator, List, Optional, Union
 import matplotlib.pyplot as plt
 import numpy as np
 
-from ...io._load import load
+from scitex.io._load import load
 from ._calc_cost import calc_cost
 from ._format_output_func import format_output_func
 from ._PARAMS import MODELS

scitex/ai/classification/reporters/_ClassificationReporter.py

@@ -746,7 +746,7 @@ def run_main():
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/reporters/reporter_utils/_Plotter.py

@@ -44,7 +44,7 @@ try:
 
     # Import scitex plotting functions
     import scitex as stx
-    from scitex.ai.plt.plot_conf_mat import plot_conf_mat as conf_mat
+    from scitex.ai.plt.stx_conf_mat import stx_conf_mat as conf_mat
     from scitex.ai.plt.plot_roc_curve import plot_roc_curve as roc_auc
     from scitex.ai.plt.plot_pre_rec_curve import plot_pre_rec_curve as pre_rec_auc
 

scitex/ai/classification/timeseries/_TimeSeriesBlockingSplit.py

@@ -95,7 +95,7 @@ class TimeSeriesBlockingSplit(BaseCrossValidator):
         self.test_ratio = test_ratio
         self.val_ratio = val_ratio
         self.random_state = random_state
-        self.rng = np.random.default_rng(random_state)
+        self.rng_manager = np.random.default_rng(random_state)
     
     def split(
         self,
@@ -541,7 +541,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/timeseries/_TimeSeriesCalendarSplit.py

@@ -110,7 +110,7 @@ class TimeSeriesCalendarSplit(BaseCrossValidator):
         self.gap_intervals = gap_intervals
         self.step_intervals = step_intervals
         self.random_state = random_state
-        self.rng = np.random.default_rng(random_state)
+        self.rng_manager = np.random.default_rng(random_state)
     
     def split(
         self,
@@ -661,7 +661,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/timeseries/_TimeSeriesSlidingWindowSplit.py

@@ -152,7 +152,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
         self.gap = gap
         self.val_ratio = val_ratio
         self.random_state = random_state
-        self.rng = np.random.default_rng(random_state)
+        self.rng_manager = np.random.default_rng(random_state)
         self.overlapping_tests = overlapping_tests
         self.expanding_window = expanding_window
         self.undersample = undersample
@@ -781,8 +781,8 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                         train_end - train_start + 1,
                         0.6,
                         linewidth=1,
-                        edgecolor=COLORS["RGBA_NORM"]["light_blue"],
-                        facecolor=COLORS["RGBA_NORM"]["light_blue"],
+                        edgecolor=COLORS["RGBA_NORM"]["lightblue"],
+                        facecolor=COLORS["RGBA_NORM"]["lightblue"],
                         alpha=0.7,
                         label="Train" if fold == 0 else "",
                     )
@@ -927,7 +927,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                     # Color by class if y is provided
                     if y is not None:
                         train_colors = [
-                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["light_blue"]
+                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["lightblue"]
                             for idx in train_idx
                         ]
                         ax.plot_scatter(
@@ -1050,7 +1050,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                     # Color by class if y is provided
                     if y is not None:
                         train_colors = [
-                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["light_blue"]
+                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["lightblue"]
                             for idx in train_idx
                         ]
                         ax.plot_scatter(
@@ -1689,7 +1689,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/timeseries/_TimeSeriesSlidingWindowSplit_v01-not-using-n_splits.py

@@ -122,7 +122,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
         self.gap = gap
         self.val_ratio = val_ratio
         self.random_state = random_state
-        self.rng = np.random.default_rng(random_state)
+        self.rng_manager = np.random.default_rng(random_state)
         self.overlapping_tests = overlapping_tests
         self.expanding_window = expanding_window
         self.undersample = undersample
@@ -750,8 +750,8 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                         train_end - train_start + 1,
                         0.6,
                         linewidth=1,
-                        edgecolor=COLORS["RGBA_NORM"]["light_blue"],
-                        facecolor=COLORS["RGBA_NORM"]["light_blue"],
+                        edgecolor=COLORS["RGBA_NORM"]["lightblue"],
+                        facecolor=COLORS["RGBA_NORM"]["lightblue"],
                         alpha=0.7,
                         label="Train" if fold == 0 else "",
                     )
@@ -896,7 +896,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                     # Color by class if y is provided
                     if y is not None:
                         train_colors = [
-                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["light_blue"]
+                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["lightblue"]
                             for idx in train_idx
                         ]
                         ax.plot_scatter(
@@ -1019,7 +1019,7 @@ class TimeSeriesSlidingWindowSplit(BaseCrossValidator):
                     # Color by class if y is provided
                     if y is not None:
                         train_colors = [
-                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["light_blue"]
+                            stx.plt.color.PARAMS["RGBA_NORM"]["blue"] if y[idx] == 0 else stx.plt.color.PARAMS["RGBA_NORM"]["lightblue"]
                             for idx in train_idx
                         ]
                         ax.plot_scatter(
@@ -1658,7 +1658,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/timeseries/_TimeSeriesStratifiedSplit.py

@@ -97,7 +97,7 @@ class TimeSeriesStratifiedSplit(BaseCrossValidator):
         self.gap = gap
         self.stratify = stratify
         self.random_state = random_state
-        self.rng = np.random.default_rng(random_state)
+        self.rng_manager = np.random.default_rng(random_state)
     
     def split(
         self,
@@ -583,7 +583,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/classification/timeseries/_normalize_timestamp.py

@@ -409,7 +409,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/feature_extraction/vit.py

@@ -25,7 +25,7 @@ import numpy as np
 from pytorch_pretrained_vit import ViT
 from torchvision import transforms as _transforms
 
-# from ...decorators import batch_torch_fn
+# from scitex.decorators import batch_torch_fn
 
 
 def _setup_device(device: Union[str, None]) -> str:

scitex/ai/loss/multi_task_loss.py

@@ -7,7 +7,7 @@ import numpy as np
 import torch
 import torch.nn as nn
 
-from ...repro import fix_seeds
+from scitex.repro import fix_seeds
 
 
 class MultiTaskLoss(nn.Module):

scitex/ai/metrics/_calc_seizure_prediction_metrics.py

@@ -463,7 +463,7 @@ def run_main():
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/__init__.py

@@ -6,7 +6,7 @@ but re-exported here for backward compatibility. New code should import directly
 from scitex.ai.metrics instead.
 """
 
-from ._plot_conf_mat import calc_bACC_from_conf_mat, calc_bacc_from_conf_mat, plot_conf_mat, conf_mat
+from ._stx_conf_mat import calc_bACC_from_conf_mat, calc_bacc_from_conf_mat, stx_conf_mat, conf_mat
 from ._plot_learning_curve import (
     plot_learning_curve,
     _prepare_metrics_df,
@@ -37,7 +37,7 @@ vline_at_epochs = _add_epoch_vlines
 
 __all__ = [
     # Plotting functions
-    "plot_conf_mat",
+    "stx_conf_mat",
     "conf_mat",  # backward compat
     "plot_learning_curve",
     "learning_curve",  # backward compat

scitex/ai/plt/_plot_feature_importance.py

@@ -296,7 +296,7 @@ def run_main():
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/_plot_learning_curve.py

@@ -318,7 +318,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/_plot_optuna_study.py

@@ -194,7 +194,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/_plot_pre_rec_curve.py

@@ -263,7 +263,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/_plot_roc_curve.py

@@ -224,7 +224,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/plt/{_plot_conf_mat.py → _stx_conf_mat.py}

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # Timestamp: "2025-10-02 07:15:10 (ywatanabe)"
-# File: /ssh:sp:/home/ywatanabe/proj/scitex_repo/src/scitex/ml/plt/plot_conf_mat.py
+# File: /ssh:sp:/home/ywatanabe/proj/scitex_repo/src/scitex/ml/plt/stx_conf_mat.py
 # ----------------------------------------
 from __future__ import annotations
 import os
@@ -28,7 +28,7 @@ from scitex.ai.metrics import calc_bacc_from_conf_mat
 calc_bACC_from_conf_mat = calc_bacc_from_conf_mat
 
 
-def plot_conf_mat(
+def stx_conf_mat(
     cm=None,
     y_true=None,
     y_pred=None,
@@ -270,7 +270,7 @@ def plot_conf_mat(
 
 
 # Backward compatibility alias
-conf_mat = plot_conf_mat
+conf_mat = stx_conf_mat
 
 
 # Metric calculation functions have been moved to scitex.ai.metrics
@@ -335,7 +335,7 @@ def run_main() -> None:
 
     args = parse_args()
 
-    CONFIG, sys.stdout, sys.stderr, plt, CC, rng = stx.session.start(
+    CONFIG, sys.stdout, sys.stderr, plt, CC, rng_manager = stx.session.start(
         sys,
         plt,
         args=args,

scitex/ai/sampling/undersample.py

@@ -6,7 +6,7 @@
 THIS_FILE = "/home/ywatanabe/proj/scitex_repo/src/scitex/ai/sampling/undersample.py"
 
 from typing import Tuple
-from ...types import ArrayLike
+from scitex.types import ArrayLike
 
 try:
     from imblearn.under_sampling import RandomUnderSampler