rushti 2.3.0__tar.gz → 2.3.2__tar.gz

{rushti-2.3.0/src/rushti.egg-info → rushti-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rushti
-Version: 2.3.0
+Version: 2.3.2
 Summary: RushTI - Parallel TM1 TurboIntegrator Process Execution
 Author-email: nicolasbisurgi <nbisurgi@cubewise.com>, Marius Wirtz <mwirtz@cubewise.com>
 Maintainer: Cubewise CODE
@@ -109,6 +109,11 @@ user = admin
 password = apple
 ```
 
+RushTI looks for `config.ini` under `config/` (or `RUSHTI_DIR`). To point a
+single run at a different file — e.g. a `config.ini` shared with other tm1py
+utilities — pass `--config PATH` to any TM1-connecting command (`run`, `build`,
+`tasks`, `resume`).
+
 **2. Create a task file**
 
 ```json

{rushti-2.3.0 → rushti-2.3.2}/README.md

@@ -65,6 +65,11 @@ user = admin
 password = apple
 ```
 
+RushTI looks for `config.ini` under `config/` (or `RUSHTI_DIR`). To point a
+single run at a different file — e.g. a `config.ini` shared with other tm1py
+utilities — pass `--config PATH` to any TM1-connecting command (`run`, `build`,
+`tasks`, `resume`).
+
 **2. Create a task file**
 
 ```json

{rushti-2.3.0 → rushti-2.3.2}/pyproject.toml

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

{rushti-2.3.0 → rushti-2.3.2}/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.3.0"
+__version__ = "2.3.2"
 __app_name__ = "RushTI"
 
 # Core exports for programmatic use

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/app_paths.py

@@ -6,6 +6,7 @@ and tracks which legacy paths have been used so a deprecation warning
 can be emitted once logging is initialized.
 """
 
+import argparse
 import logging
 import os
 
@@ -15,6 +16,7 @@ __all__ = [
     "CURRENT_DIRECTORY",
     "resolve_config_path",
     "log_legacy_path_warnings",
+    "add_config_arg",
 ]
 
 
@@ -73,6 +75,26 @@ def resolve_config_path(filename: str, warn_on_legacy: bool = True, cli_path: st
     return new_path
 
 
+def add_config_arg(parser: argparse.ArgumentParser) -> None:
+    """Add the ``--config`` argument to a parser.
+
+    Long-form only (``-c`` is taken by ``resume --checkpoint``). Relocates
+    only ``config.ini`` (TM1 connection parameters); ``settings.ini`` and
+    ``logging_config.ini`` keep their own resolution. The resolved value is
+    fed to :func:`resolve_config_path` as ``cli_path``.
+    """
+    parser.add_argument(
+        "--config",
+        dest="config",
+        default=None,
+        metavar="FILE",
+        help=(
+            "Path to a config.ini file (TM1 connection parameters). "
+            "Overrides RUSHTI_DIR/default location."
+        ),
+    )
+
+
 def log_legacy_path_warnings(logger: logging.Logger) -> None:
     """Log deprecation warnings for any legacy paths that were used.
 

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/cli.py

@@ -19,6 +19,7 @@ from pathlib import Path
 from TM1py.Utils import integerize_version
 
 from rushti.app_paths import (
+    add_config_arg,
     log_legacy_path_warnings,
     resolve_config_path,
 )
@@ -273,6 +274,9 @@ Configuration:
     # Add taskfile source arguments
     add_taskfile_source_args(parser, required=False, include_settings=True)
 
+    # Add --config (relocates config.ini only)
+    add_config_arg(parser)
+
     parser.add_argument(
         "--max-workers",
         "-w",
@@ -426,6 +430,7 @@ def parse_named_arguments(argv: list):
         "workflow": workflow,
         "log_level": args.log_level,
         "detailed_results": args.detailed_results,
+        "config": args.config,
     }
 
     return tasks_file_path, cli_args
@@ -471,6 +476,7 @@ def parse_arguments(argv: list):
             "exclusive": None,
             "no_checkpoint": False,
             "log_level": None,  # Not supported in positional style
+            "config": None,  # Legacy positional style does not support --config
         }
         return tasks_file, cli_args
 
@@ -626,6 +632,14 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
     if resume_context:
         cli_args.update(resume_context)
 
+    # Resolve config.ini location, threading the resolved path explicitly into
+    # the TM1 connection layer (CLI --config > RUSHTI_DIR > legacy CWD > config/).
+    # Fail fast with a clean message (no traceback) on an explicit bad path.
+    try:
+        config_path = resolve_config_path("config.ini", cli_path=cli_args.get("config"))
+    except FileNotFoundError:
+        sys.exit(f"RushTI: --config file not found: {cli_args.get('config')}")
+
     # Apply log level override if specified
     apply_log_level(cli_args.get("log_level"))
 
@@ -645,7 +659,7 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
         try:
             from rushti.tm1_integration import read_taskfile_from_tm1, connect_to_tm1_instance
 
-            tm1_source = connect_to_tm1_instance(tm1_instance, CONFIG)
+            tm1_source = connect_to_tm1_instance(tm1_instance, config_path)
             try:
                 # Resolve execution mode for TM1 read (affects predecessor parsing)
                 tm1_mode = "opt" if cli_args.get("execution_mode") == ExecutionMode.OPT else "norm"
@@ -752,6 +766,7 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
         tasks_file_path=tasks_file_path_for_services if not tm1_taskfile else None,
         workflow=workflow,
         exclusive=exclusive_mode,
+        config_path=config_path,
         tm1_instances=tm1_instances_needed,
     )
 
@@ -1106,7 +1121,7 @@ Use '{APP_NAME} <command> --help' for command-specific options and examples.
                         )
                         tm1_upload = connect_to_tm1_instance(
                             upload_instance,
-                            CONFIG,
+                            config_path,
                         )
                         try:
                             results_df = build_results_dataframe(

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/commands/build.py

@@ -10,6 +10,7 @@ import sys
 
 from TM1py import TM1Service
 
+from rushti.app_paths import add_config_arg, resolve_config_path
 from rushti.logging_setup import add_log_level_arg, apply_log_level
 from rushti.settings import load_settings
 from rushti.tm1_build import build_logging_objects, get_build_status
@@ -25,8 +26,6 @@ def run_build_command(argv: list) -> None:
 
     :param argv: Command line arguments
     """
-    from rushti.cli import CONFIG
-
     parser = argparse.ArgumentParser(
         prog=f"{APP_NAME} build",
         description="Create TM1 dimensions and cube for RushTI execution logging.",
@@ -60,6 +59,7 @@ Examples:
         metavar="FILE",
         help="Path to settings.ini file",
     )
+    add_config_arg(parser)
     add_log_level_arg(parser)
 
     args = parser.parse_args(argv[2:])  # Skip "rushti" and "build"
@@ -68,16 +68,22 @@ Examples:
     # Load settings
     settings = load_settings(args.settings_file)
 
+    # Resolve config.ini location (CLI --config > RUSHTI_DIR > legacy CWD > config/)
+    try:
+        config_path = resolve_config_path("config.ini", cli_path=args.config)
+    except FileNotFoundError:
+        sys.exit(f"RushTI: --config file not found: {args.config}")
+
     # Load config to get TM1 connection details
-    if not os.path.isfile(CONFIG):
-        print(f"Error: {CONFIG} does not exist")
+    if not os.path.isfile(config_path):
+        print(f"Error: {config_path} does not exist")
         sys.exit(1)
 
     config = configparser.ConfigParser()
-    config.read(CONFIG, encoding="utf-8")
+    config.read(config_path, encoding="utf-8")
 
     if args.tm1_instance not in config.sections():
-        print(f"Error: Instance '{args.tm1_instance}' not found in {CONFIG}")
+        print(f"Error: Instance '{args.tm1_instance}' not found in {config_path}")
         print(f"Available instances: {', '.join(config.sections())}")
         sys.exit(1)
 

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/commands/resume.py

@@ -10,6 +10,7 @@ import sys
 from pathlib import Path
 from typing import Optional
 
+from rushti.app_paths import add_config_arg
 from rushti.checkpoint import find_checkpoint_for_taskfile, load_checkpoint
 from rushti.logging_setup import add_log_level_arg, apply_log_level
 from rushti.settings import load_settings
@@ -86,6 +87,7 @@ Examples:
         default=False,
         help="Force resume even if checkpoint doesn't match taskfile",
     )
+    add_config_arg(parser)
     add_log_level_arg(parser)
 
     args = parser.parse_args(argv[2:])
@@ -200,6 +202,9 @@ Examples:
     if args.settings_file:
         resume_argv.extend(["--settings", args.settings_file])
 
+    if args.config:
+        resume_argv.extend(["--config", args.config])
+
     if args.force:
         resume_argv.append("--force")
 

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/commands/tasks/__init__.py

@@ -9,8 +9,9 @@ Subcommands:
 """
 
 import argparse
+import sys
 
-from rushti.app_paths import resolve_config_path
+from rushti.app_paths import add_config_arg, resolve_config_path
 from rushti.commands.tasks.expand import handle_tasks_expand
 from rushti.commands.tasks.export import handle_tasks_export
 from rushti.commands.tasks.push import handle_tasks_push
@@ -98,6 +99,7 @@ Examples:
         help="[TM1 sources only] 'norm' for wait-based sequencing, 'opt' for explicit predecessors. "
         "Ignored for file sources (auto-detected). Default: opt",
     )
+    add_config_arg(export_parser)
     add_log_level_arg(export_parser)
 
     # --- push subcommand ---
@@ -122,6 +124,7 @@ Examples:
         help="[TM1 sources only] 'norm' for wait-based sequencing, 'opt' for explicit predecessors. "
         "Ignored for file sources (auto-detected). Default: opt",
     )
+    add_config_arg(push_parser)
     add_log_level_arg(push_parser)
 
     # --- expand subcommand ---
@@ -155,6 +158,7 @@ Examples:
         help="[TM1 sources only] 'norm' for wait-based sequencing, 'opt' for explicit predecessors. "
         "Ignored for file sources (auto-detected). Default: opt",
     )
+    add_config_arg(expand_parser)
     add_log_level_arg(expand_parser)
 
     # --- visualize subcommand ---
@@ -188,6 +192,7 @@ Examples:
         help="[TM1 sources only] 'norm' for wait-based sequencing, 'opt' for explicit predecessors. "
         "Ignored for file sources (auto-detected). Default: opt",
     )
+    add_config_arg(visualize_parser)
     add_log_level_arg(visualize_parser)
 
     # --- validate subcommand ---
@@ -219,14 +224,18 @@ Examples:
         help="[TM1 sources only] 'norm' for wait-based sequencing, 'opt' for explicit predecessors. "
         "Ignored for file sources (auto-detected). Default: opt",
     )
+    add_config_arg(validate_parser)
     add_log_level_arg(validate_parser)
 
     # Parse arguments (skip script name and 'tasks' command)
     args = parser.parse_args(argv[2:])
     apply_log_level(args.log_level)
 
-    # Resolve config path
-    config_path = resolve_config_path("config.ini", cli_path=None)
+    # Resolve config.ini location (CLI --config > RUSHTI_DIR > legacy CWD > config/)
+    try:
+        config_path = resolve_config_path("config.ini", cli_path=args.config)
+    except FileNotFoundError:
+        sys.exit(f"RushTI: --config file not found: {args.config}")
 
     # Dispatch to appropriate handler based on subcommand
     if args.subcommand == "export":

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/execution.py

@@ -148,14 +148,12 @@ def setup_tm1_services(
     :param tasks_file_path: Path to the tasks file (can be None if tm1_instances provided)
     :param workflow: Workflow identifier for session context
     :param exclusive: Whether running in exclusive mode
-    :param config_path: Optional path to config.ini file (defaults to resolved CONFIG)
+    :param config_path: Path to config.ini file (resolved by the caller; required)
     :param tm1_instances: Optional set of TM1 instance names (used when reading from TM1)
     :return: Dictionary server_names and TM1py.TM1Service instances pairs
     """
     if config_path is None:
-        from rushti.cli import CONFIG
-
-        config_path = CONFIG
+        raise ValueError("config_path is required")
 
     config_file = config_path
     if not os.path.isfile(config_file):

{rushti-2.3.0 → rushti-2.3.2}/src/rushti/tm1_objects.py

@@ -150,6 +150,8 @@ nProcessReturnCode  = 0;
 nErrors             = 0;
 nMetadataRecordCount= 0;
 nDataRecordCount    = 0;
+nHeaderChecked      = 0;
+nDataHeaderChecked  = 0;
 
 ### Process Specific Constants
 cFileSrc            = pSourceFile;
@@ -220,7 +222,9 @@ CubeSetLogChanges( cCubeTgt, 0 );
 If( nErrors = 0 );
     DatasourceType          = 'CHARACTERDELIMITED';
     DatasourceNameForServer = cFileSrc;
-    DatasourceASCIIHeaderRecords = 1;
+    # 0 (not 1): the header row is consumed as the first record so the
+    # metadata tab can validate it against the expected columns (issue #169).
+    DatasourceASCIIHeaderRecords = 0;
     DatasourceASCIIDelimiter=',';
     DatasourceASCIIDecimalSeparator='.';
     DatasourceASCIIThousandSeparator='';
@@ -290,6 +294,8 @@ nProcessReturnCode  = 0;
 nErrors             = 0;
 nMetadataRecordCount= 0;
 nDataRecordCount    = 0;
+nHeaderChecked      = 0;
+nDataHeaderChecked  = 0;
 
 ### Process Specific Constants
 cFileSrc            = pSourceFile;
@@ -356,7 +362,9 @@ EndIf;
 If( nErrors = 0 );
     DatasourceType          = 'CHARACTERDELIMITED';
     DatasourceNameForServer = cFileSrc;
-    DatasourceASCIIHeaderRecords = 1;
+    # 0 (not 1): the header row is consumed as the first record so the
+    # metadata tab can validate it against the expected columns (issue #169).
+    DatasourceASCIIHeaderRecords = 0;
     DatasourceASCIIDelimiter=',';
     DatasourceASCIIDecimalSeparator='.';
     DatasourceASCIIThousandSeparator='';
@@ -366,10 +374,17 @@ EndIf;
 #################################################################################################
 """
 
-PROCESS_METADATA = r"""#****Begin: Generated Statements***
+# Marker pair TM1 Architect uses to inject auto-generated variable/parameter
+# code at the top of a tab. Kept as the first lines of every generated
+# procedure so the process round-trips cleanly if later opened in Architect.
+_GENERATED_STATEMENTS_MARKER = """#****Begin: Generated Statements***
 #****End: Generated Statements****
+"""
 
-If( pLogOutput >= 1 );
+# Body of the metadata tab. The header-validation preamble is generated from
+# PROCESS_VARIABLES and prepended in ``build_metadata_procedure`` so it stays
+# in lockstep with the CSV column contract (see issue #169).
+_PROCESS_METADATA_BODY = r"""If( pLogOutput >= 1 );
    nMetadataRecordCount = nMetadataRecordCount + 1;
 EndIf;
 
@@ -388,10 +403,9 @@ if (DimensionElementExists(pRunId_Dim, vrun_id) = 0);
   DimensionElementInsertDirect(pRunId_Dim, '', vrun_id, 'N');
 endif;"""
 
-PROCESS_DATA = r"""#****Begin: Generated Statements***
-#****End: Generated Statements****
-
-If( pLogOutput >= 1 );
+# Body of the data tab. The header-skip preamble is prepended in
+# ``build_data_procedure`` so the CSV header row is not written to the cube.
+_PROCESS_DATA_BODY = r"""If( pLogOutput >= 1 );
    nDataRecordCount = nDataRecordCount + 1;
 EndIf;
 
@@ -544,8 +558,9 @@ PROCESS_PARAMETERS = [
 # declaration list. Must match the column order produced by
 # ``rushti.tm1_integration.upload_results_to_tm1`` (which inserts
 # ``workflow`` and ``run_id`` ahead of the columns built by
-# ``build_results_dataframe``). Mismatched ordering silently scrambles
-# the loaded payload.
+# ``build_results_dataframe``). Mismatched ordering scrambles the loaded
+# payload; the metadata-tab header check generated from this list turns a
+# stale-process mismatch into a hard error instead (see issue #169).
 PROCESS_VARIABLES = [
     "vworkflow",
     "vrun_id",
@@ -571,12 +586,73 @@ PROCESS_VARIABLES = [
     "vsucceed_on_minor_errors",
 ]
 
+
+def build_metadata_procedure() -> str:
+    """Assemble the ``}rushti.load.results`` metadata tab.
+
+    Prepends a header-validation preamble generated from ``PROCESS_VARIABLES``
+    so it stays in lockstep with the CSV column contract. The loader maps CSV
+    columns to variables positionally; with ``asciiHeaderRecords=0`` the CSV
+    header row is the first source record, so validating each column name
+    against the variable it feeds makes a process left stale by an in-place
+    rushti upgrade fail loudly instead of silently writing values to the wrong
+    measures (issue #169). Re-run ``rushti build`` to refresh a stale process.
+    """
+    checks = "\n".join(
+        f"    If( {var} @<> '{var[1:]}' );\n"
+        f"        sHeaderError = sHeaderError | ' {var[1:]}';\n"
+        f"    EndIf;"
+        for var in PROCESS_VARIABLES
+    )
+    preamble = f"""### Validate the CSV header against the columns this process expects.
+### The loader maps columns to variables positionally, so a process built by
+### an older rushti scrambles measures (issue #169). Fail loudly on mismatch
+### and skip the header so it is not loaded as data.
+If( nHeaderChecked = 0 );
+    nHeaderChecked = 1;
+    sHeaderError = '';
+{checks}
+    If( Trim( sHeaderError ) @<> '' );
+        nErrors = nErrors + 1;
+        sMessage = Expand( 'Results CSV header does not match the columns }}rushti.load.results expects (mismatched:%sHeaderError% ). This process is out of date with the rushti version that produced the file - re-run: rushti build --tm1-instance <instance>.' );
+        LogOutput( cMsgErrorLevel, Expand( cMsgErrorContent ) );
+        ProcessQuit;
+    EndIf;
+    ItemSkip;
+EndIf;
+
+"""
+    return _GENERATED_STATEMENTS_MARKER + "\n" + preamble + _PROCESS_METADATA_BODY
+
+
+def build_data_procedure() -> str:
+    """Assemble the ``}rushti.load.results`` data tab.
+
+    Skips the CSV header row (validated in the metadata tab) so it is not
+    written to the cube, then delegates to the static body. See issue #169.
+    """
+    preamble = """### Skip the CSV header row (asciiHeaderRecords=0; validated in the
+### metadata tab). See issue #169.
+If( nDataHeaderChecked = 0 );
+    nDataHeaderChecked = 1;
+    ItemSkip;
+EndIf;
+
+"""
+    return _GENERATED_STATEMENTS_MARKER + "\n" + preamble + _PROCESS_DATA_BODY
+
+
+PROCESS_METADATA = build_metadata_procedure()
+PROCESS_DATA = build_data_procedure()
+
 PROCESS_DATASOURCE = {
     "Type": "ASCII",
     "asciiDecimalSeparator": ".",
     "asciiDelimiterChar": ",",
     "asciiDelimiterType": "Character",
-    "asciiHeaderRecords": 1,
+    # 0: the header row is validated (not skipped) by the metadata tab; see
+    # the DatasourceASCIIHeaderRecords note in the prolog and issue #169.
+    "asciiHeaderRecords": 0,
     "asciiQuoteCharacter": '"',
     "asciiThousandSeparator": ",",
     "dataSourceNameForClient": "",

{rushti-2.3.0 → rushti-2.3.2/src/rushti.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rushti
-Version: 2.3.0
+Version: 2.3.2
 Summary: RushTI - Parallel TM1 TurboIntegrator Process Execution
 Author-email: nicolasbisurgi <nbisurgi@cubewise.com>, Marius Wirtz <mwirtz@cubewise.com>
 Maintainer: Cubewise CODE
@@ -109,6 +109,11 @@ user = admin
 password = apple
 ```
 
+RushTI looks for `config.ini` under `config/` (or `RUSHTI_DIR`). To point a
+single run at a different file — e.g. a `config.ini` shared with other tm1py
+utilities — pass `--config PATH` to any TM1-connecting command (`run`, `build`,
+`tasks`, `resume`).
+
 **2. Create a task file**
 
 ```json