rushti 2.2.0__tar.gz → 2.2.1__tar.gz

{rushti-2.2.0/src/rushti.egg-info → rushti-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rushti
-Version: 2.2.0
+Version: 2.2.1
 Summary: RushTI - Parallel TM1 TurboIntegrator Process Execution
 Author-email: nicolasbisurgi <nbisurgi@cubewise.com>, Marius Wirtz <mwirtz@cubewise.com>
 Maintainer: Cubewise CODE

{rushti-2.2.0 → rushti-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rushti"
-version = "2.2.0"
+version = "2.2.1"
 description = "RushTI - Parallel TM1 TurboIntegrator Process Execution"
 readme = "README.md"
 license = "MIT"

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/__init__.py

@@ -5,7 +5,7 @@ This package provides tools for executing TM1 TI processes in parallel
 with dependency management, checkpoint/resume support, and execution logging.
 """
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"
 __app_name__ = "RushTI"
 
 # Core exports for programmatic use

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/cli.py

@@ -29,7 +29,7 @@ from rushti.logging_setup import (
 )
 from rushti.results_writer import create_results_file
 from rushti.task import ExecutionMode
-from rushti.settings import load_settings, get_effective_settings
+from rushti.settings import get_effective_settings, load_settings, resolve_tm1_instance
 from rushti.taskfile import (
     detect_file_type,
     parse_json_taskfile,
@@ -629,42 +629,6 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
     # Load settings from settings.ini
     settings = load_settings(cli_args.get("settings_file"))
 
-    # Apply CLI overrides to settings
-    settings = get_effective_settings(settings, cli_args=cli_args)
-
-    if settings.tm1_integration.detailed_results:
-        logging.info(
-            "Detailed results enabled: one cube row per executed TI. "
-            "If you upgraded RushTI from an earlier release, run "
-            "'rushti build --tm1-instance <instance>' once to add the "
-            "'original_task_id' measure to the rushti_measure dimension. "
-            "The build is non-destructive — existing cube data is preserved."
-        )
-
-    # Extract final values (CLI overrides settings.ini)
-    max_workers = (
-        cli_args["max_workers"]
-        if cli_args.get("max_workers") is not None
-        else settings.defaults.max_workers
-    )
-    process_execution_retries = (
-        cli_args["retries"] if cli_args.get("retries") is not None else settings.defaults.retries
-    )
-    result_file = (
-        cli_args["output_file"]
-        if cli_args.get("output_file") is not None
-        else settings.defaults.result_file
-    )
-    # Resolve result file path relative to application directory (skip if empty/None)
-    if result_file:
-        from rushti.utils import resolve_app_path
-
-        result_file = resolve_app_path(result_file)
-
-    logger.debug(
-        f"Effective settings: max_workers={max_workers}, retries={process_execution_retries}, result_file={result_file}"
-    )
-
     # Handle TM1 source if specified
     tm1_instance = cli_args.get("tm1_instance")
     workflow = cli_args.get("workflow")
@@ -701,6 +665,7 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
 
     # Determine workflow and exclusive mode from task file
     # Parse task file early to get metadata for session context
+    taskfile_preview = None
     if tm1_taskfile:
         # Using TM1 source
         file_type = "json"  # TM1 taskfiles are treated as JSON format
@@ -727,6 +692,36 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
             logger.error(str(e))
             sys.exit(1)
 
+    # Merge taskfile JSON settings (tier 2) into the effective settings
+    # before any setting is read. CLI args overlay JSON, which overlays
+    # settings.ini, which overlays built-in defaults.
+    effective_taskfile = tm1_taskfile or taskfile_preview
+    json_settings_dict = effective_taskfile.settings.to_dict() if effective_taskfile else {}
+    settings = get_effective_settings(settings, json_settings=json_settings_dict, cli_args=cli_args)
+
+    if settings.tm1_integration.detailed_results:
+        logging.info(
+            "Detailed results enabled: one cube row per executed TI. "
+            "If you upgraded RushTI from an earlier release, run "
+            "'rushti build --tm1-instance <instance>' once to add the "
+            "'original_task_id' measure to the rushti_measure dimension. "
+            "The build is non-destructive — existing cube data is preserved."
+        )
+
+    # Extract effective execution params (CLI > taskfile JSON > settings.ini > defaults)
+    max_workers = settings.defaults.max_workers
+    process_execution_retries = settings.defaults.retries
+    result_file = settings.defaults.result_file
+    if result_file:
+        from rushti.utils import resolve_app_path
+
+        result_file = resolve_app_path(result_file)
+
+    logger.debug(
+        f"Effective settings: max_workers={max_workers}, "
+        f"retries={process_execution_retries}, result_file={result_file}"
+    )
+
     # Apply exclusive from settings.ini if not set via CLI or JSON
     if exclusive_mode is None:
         exclusive_mode = settings.exclusive_mode.enabled
@@ -824,16 +819,6 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
             )
             dag.validate()
             taskfile = tm1_taskfile
-            # Apply settings from TM1 taskfile (CLI still overrides)
-            if taskfile.settings.max_workers and cli_args.get("max_workers") is None:
-                max_workers = taskfile.settings.max_workers
-            if taskfile.settings.retries is not None and cli_args.get("retries") is None:
-                process_execution_retries = taskfile.settings.retries
-            if taskfile.settings.result_file and cli_args.get("output_file") is None:
-                result_file = resolve_app_path(taskfile.settings.result_file)
-            logger.debug(
-                f"Applied TM1 taskfile settings: max_workers={max_workers}, retries={process_execution_retries}"
-            )
         else:
             # Build DAG from file with dependency validation
             dag_result = build_dag(
@@ -846,16 +831,6 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
             taskfile = None
             if isinstance(dag_result, tuple):
                 dag, taskfile = dag_result
-                # Apply JSON settings (CLI still overrides)
-                if taskfile.settings.max_workers and cli_args.get("max_workers") is None:
-                    max_workers = taskfile.settings.max_workers
-                if taskfile.settings.retries is not None and cli_args.get("retries") is None:
-                    process_execution_retries = taskfile.settings.retries
-                if taskfile.settings.result_file and cli_args.get("output_file") is None:
-                    result_file = resolve_app_path(taskfile.settings.result_file)
-                logger.debug(
-                    f"Applied JSON settings: max_workers={max_workers}, retries={process_execution_retries}"
-                )
             else:
                 dag = dag_result
                 # TXT source: convert to Taskfile for archiving
@@ -1117,12 +1092,15 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
                         assign_unique_task_ids,
                     )
 
-                    # CLI --tm1-instance wins over default_tm1_instance for every
-                    # TM1 operation in this run (taskfile read, results push,
-                    # auto_load_results). Silent precedence — no extra warning
-                    # when CLI overrides default.
-                    upload_instance = tm1_instance or settings.tm1_integration.default_tm1_instance
+                    upload_instance, source_tier = resolve_tm1_instance(
+                        tm1_instance, settings, json_settings_dict
+                    )
                     if upload_instance:
+                        logger.info(
+                            "Result upload target: %s (source: %s)",
+                            upload_instance,
+                            source_tier,
+                        )
                         tm1_upload = connect_to_tm1_instance(
                             upload_instance,
                             CONFIG,
@@ -1173,7 +1151,9 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
                             tm1_upload.logout()
                     else:
                         logger.warning(
-                            "push_results enabled but default_tm1_instance not configured"
+                            "push_results enabled but no TM1 instance configured "
+                            "(CLI --tm1-instance, taskfile settings.tm1_instance, "
+                            "or settings.ini tm1_instance)."
                         )
                 except Exception as e:
                     logger.warning(f"Failed to upload results to TM1 (non-blocking): {e}")

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/commands/tasks/__init__.py

@@ -108,10 +108,10 @@ Examples:
     add_taskfile_source_args(push_parser, required=False, include_settings=True)
     push_parser.add_argument(
         "--target-tm1-instance",
-        dest="target_tm1_instance",
-        default=None,
+        dest="tm1_instance",
+        default=argparse.SUPPRESS,
         metavar="INSTANCE",
-        help="Target TM1 instance for push (defaults to --tm1-instance if loading from TM1)",
+        help="[DEPRECATED] Alias for --tm1-instance. Will be removed in a future major version.",
     )
     push_parser.add_argument(
         "--mode",

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/commands/tasks/push.py

@@ -1,9 +1,12 @@
 """rushti tasks push — upload JSON taskfile to TM1 as a file."""
 
+import logging
 import os
 import sys
 from pathlib import Path
 
+logger = logging.getLogger(__name__)
+
 
 def handle_tasks_push(args, config_path: str) -> None:
     """Handle tasks push action.
@@ -11,6 +14,13 @@ def handle_tasks_push(args, config_path: str) -> None:
     :param args: Parsed arguments
     :param config_path: Path to config.ini
     """
+    if "--target-tm1-instance" in sys.argv[1:]:
+        logger.warning(
+            "DEPRECATION: --target-tm1-instance is deprecated. "
+            "Use --tm1-instance instead. The deprecated flag will continue "
+            "to work but may be removed in a future major version."
+        )
+
     if not args.taskfile_path:
         print("Error: --tasks is required for --push (must be a local JSON file)")
         sys.exit(1)
@@ -19,9 +29,9 @@ def handle_tasks_push(args, config_path: str) -> None:
         print(f"Error: Input file not found: {args.taskfile_path}")
         sys.exit(1)
 
-    target_instance = args.target_tm1_instance or args.tm1_instance
+    target_instance = args.tm1_instance
     if not target_instance:
-        print("Error: --tm1-instance or --target-tm1-instance is required for --push")
+        print("Error: --tm1-instance is required for --push")
         sys.exit(1)
 
     try:

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/settings.py

@@ -69,6 +69,7 @@ class TM1IntegrationSettings:
     push_results: bool = False
     auto_load_results: bool = False
     detailed_results: bool = False
+    tm1_instance: Optional[str] = None
     default_tm1_instance: Optional[str] = None
     default_rushti_cube: str = "rushti"
     default_workflow_dim: str = "rushti_workflow"
@@ -155,6 +156,7 @@ SETTINGS_SCHEMA = {
         "push_results": bool,
         "auto_load_results": bool,
         "detailed_results": bool,
+        "tm1_instance": str,
         "default_tm1_instance": str,
         "default_rushti_cube": str,
         "default_workflow_dim": str,
@@ -365,9 +367,67 @@ def load_settings(settings_path: Optional[str] = None) -> Settings:
     # Resolve paths relative to application directory
     settings.resume.checkpoint_dir = resolve_app_path(settings.resume.checkpoint_dir)
 
+    if not settings.tm1_integration.tm1_instance and settings.tm1_integration.default_tm1_instance:
+        logger.warning(
+            "DEPRECATION: [tm1_integration].default_tm1_instance is deprecated. "
+            "Rename to tm1_instance. The deprecated key will continue to work "
+            "but may be removed in a future major version."
+        )
+
     return settings
 
 
+def resolve_tm1_instance(
+    tm1_instance: Optional[str],
+    settings: Settings,
+    json_settings: Optional[Dict[str, Any]] = None,
+) -> tuple[Optional[str], str]:
+    """Resolve the effective TM1 instance for results-push, with source tier.
+
+    Walks the 4-tier precedence chain (highest to lowest), returning the
+    first non-empty value alongside a label identifying the tier:
+
+    1. CLI argument (``tm1_instance``) → label ``"cli"``
+    2. Taskfile JSON ``settings.tm1_instance`` → label ``"taskfile"``
+    3. ``settings.ini [tm1_integration].tm1_instance`` → label
+       ``"settings.tm1_instance"``
+    4. ``settings.ini [tm1_integration].default_tm1_instance`` (deprecated)
+       → label ``"settings.default_tm1_instance"``
+
+    Empty strings at any tier are treated as unset (fall through).
+
+    ``json_settings`` is the taskfile JSON ``settings`` dict (as returned by
+    ``TaskfileSettings.to_dict``). It is consulted separately so the
+    resolver can distinguish tier 2 from tier 3 — by the time
+    ``get_effective_settings`` has been applied, the JSON-sourced
+    ``tm1_instance`` has already overwritten the settings.ini value in the
+    merged ``Settings`` object, and the provenance is otherwise lost.
+
+    :param tm1_instance: Value from the CLI (e.g. ``run --tm1-instance``).
+    :param settings: Settings object (post-merge).
+    :param json_settings: Taskfile JSON settings dict; tier 2 lookup.
+    :return: ``(value, source_label)``; ``(None, "none")`` when all tiers
+        are empty.
+    """
+    if tm1_instance:
+        return tm1_instance, "cli"
+
+    if json_settings:
+        taskfile_value = json_settings.get("tm1_instance")
+        if taskfile_value:
+            return taskfile_value, "taskfile"
+
+    settings_value = settings.tm1_integration.tm1_instance
+    if settings_value:
+        return settings_value, "settings.tm1_instance"
+
+    deprecated_value = settings.tm1_integration.default_tm1_instance
+    if deprecated_value:
+        return deprecated_value, "settings.default_tm1_instance"
+
+    return None, "none"
+
+
 def get_effective_settings(
     settings: Settings,
     cli_args: Optional[Dict[str, Any]] = None,
@@ -419,14 +479,20 @@ def _apply_json_settings(settings: Settings, json_settings: Dict[str, Any]) -> N
         "push_results": ("tm1_integration", "push_results"),
         "auto_load_results": ("tm1_integration", "auto_load_results"),
         "detailed_results": ("tm1_integration", "detailed_results"),
+        "tm1_instance": ("tm1_integration", "tm1_instance"),
     }
 
     for json_key, (section, attr) in json_to_settings.items():
-        if json_key in json_settings and json_settings[json_key] is not None:
-            section_obj = getattr(settings, section)
-            value = json_settings[json_key]
-            setattr(section_obj, attr, value)
-            logger.debug(f"JSON override: {section}.{attr} = {value}")
+        if json_key not in json_settings:
+            continue
+        value = json_settings[json_key]
+        if value is None:
+            continue
+        if isinstance(value, str) and value == "":
+            continue
+        section_obj = getattr(settings, section)
+        setattr(section_obj, attr, value)
+        logger.debug(f"JSON override: {section}.{attr} = {value}")
 
 
 def _apply_cli_args(settings: Settings, cli_args: Dict[str, Any]) -> None:

{rushti-2.2.0 → rushti-2.2.1}/src/rushti/taskfile.py

@@ -83,6 +83,7 @@ class TaskfileSettings:
     optimization_algorithm: Optional[str] = None
     push_results: Optional[bool] = None
     auto_load_results: Optional[bool] = None
+    tm1_instance: Optional[str] = None
     stage_order: Optional[List[str]] = None
     stage_workers: Optional[Dict[str, int]] = None
 
@@ -103,6 +104,7 @@ class TaskfileSettings:
             optimization_algorithm=data.get("optimization_algorithm"),
             push_results=data.get("push_results"),
             auto_load_results=data.get("auto_load_results"),
+            tm1_instance=data.get("tm1_instance"),
             stage_order=data.get("stage_order"),
             stage_workers=data.get("stage_workers"),
         )

{rushti-2.2.0 → rushti-2.2.1/src/rushti.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rushti
-Version: 2.2.0
+Version: 2.2.1
 Summary: RushTI - Parallel TM1 TurboIntegrator Process Execution
 Author-email: nicolasbisurgi <nbisurgi@cubewise.com>, Marius Wirtz <mwirtz@cubewise.com>
 Maintainer: Cubewise CODE