remove unrelated changes

Author: karen-sy

src/srtctl/cli/interactive.py

@@ -199,25 +199,6 @@ def confirm_submission(config_path: Path, config: dict, is_sweep: bool) -> bool:
     ).ask()
 
 
-def ask_run_name_suffix(config_path: Path) -> tuple[bool, str | None]:
-    """Prompt for optional run name suffix; suggest recipe stem (e.g. _agg4_dep8_batch8_nvfp4).
-
-    Returns:
-        (cancelled, suffix): cancelled is True if user pressed Ctrl+C, suffix is the value or None for no suffix
-    """
-    suggested = f"_{config_path.stem}" if config_path.stem else ""
-    answer = questionary.text(
-        "Run name suffix for output dir (e.g. _tep8x1_tep8x3 → outputs/12345_tep8x1_tep8x3). Leave empty for none:",
-        default=suggested,
-        style=STYLE,
-    ).ask()
-    if answer is None:
-        # User pressed Ctrl+C
-        return (True, None)
-    value = (answer or "").strip()
-    return (False, value if value else None)
-
-
 def preview_sbatch(config_path: Path, config: dict) -> None:
     """Preview the generated sbatch script."""
     from srtctl.cli.submit import generate_minimal_sbatch_script
@@ -308,13 +289,6 @@ def run_interactive() -> int:
     console.print()
     display_config_summary(config, title=str(config_path))
 
-    # Ask for run name suffix before the action menu
-    console.print()
-    cancelled, run_name_suffix = ask_run_name_suffix(config_path)
-    if cancelled:
-        console.print("[yellow]Cancelled.[/]")
-        return 0
-
     # Action menu
     while True:
         console.print()
@@ -343,11 +317,6 @@ def run_interactive() -> int:
                 config = yaml.safe_load(f)
             is_sweep = "sweep" in config
             display_config_summary(config, title=str(config_path))
-            console.print()
-            cancelled, run_name_suffix = ask_run_name_suffix(config_path)
-            if cancelled:
-                console.print("[yellow]Cancelled.[/]")
-                return 0
 
         elif action == "preview":
             preview_sbatch(config_path, config)
@@ -382,9 +351,9 @@ def run_interactive() -> int:
 
             try:
                 if is_sweep:
-                    submit_sweep(config_path, dry_run=False, run_name_suffix=run_name_suffix)
+                    submit_sweep(config_path, dry_run=False)
                 else:
-                    submit_single(config_path=config_path, dry_run=False, run_name_suffix=run_name_suffix)
+                    submit_single(config_path=config_path, dry_run=False)
                 console.print("\n[bold green]✅ Submission complete![/]")
                 return 0
             except Exception as e:

src/srtctl/cli/submit.py

@@ -184,7 +184,6 @@ def generate_minimal_sbatch_script(
     setup_script: str | None = None,
     output_dir: Path | None = None,
     runtime_config_filename: str = "config.yaml",
-    run_name_suffix: str | None = None,
 ) -> str:
     """Generate minimal sbatch script that calls the Python orchestrator.
 
@@ -235,7 +234,6 @@ def generate_minimal_sbatch_script(
     container_image = os.path.expandvars(config.model.container)
 
     job_name = get_job_name(config)
-    run_suffix = run_name_suffix or get_srtslurm_setting("run_name_suffix") or ""
 
     rendered = template.render(
         job_name=job_name,
@@ -256,7 +254,6 @@ def generate_minimal_sbatch_script(
         srtctl_source=str(srtctl_source.resolve()),
         output_base=output_base,
         setup_script=setup_script,
-        run_name_suffix=run_suffix,
     )
 
     return rendered
@@ -269,7 +266,7 @@ def submit_with_orchestrator(
     tags: list[str] | None = None,
     setup_script: str | None = None,
     output_dir: Path | None = None,
-    run_name_suffix: str | None = None,
+    variant_suffix: str | None = None,
     source_config_path: Path | None = None,
     runtime_config_text: str | None = None,
 ) -> str | None:
@@ -284,8 +281,8 @@ def submit_with_orchestrator(
         tags: Optional tags for the run
         setup_script: Optional custom setup script name (overrides config)
         output_dir: Custom output directory (CLI flag, highest priority)
-        run_name_suffix: If set (e.g. "base", "lowmem"), also save config_path
-                        as config_{run_name_suffix}.yaml in the job output dir.
+        variant_suffix: If set (e.g. "base", "lowmem"), also save config_path
+                        as config_{variant_suffix}.yaml in the job output dir.
         source_config_path: If set, save the original source YAML as config.yaml
                             while the job executes a resolved variant config.
         runtime_config_text: Resolved runtime YAML written under OUTPUT_DIR when
@@ -295,8 +292,6 @@ def submit_with_orchestrator(
         job_id string on success, None for dry_run.
     """
 
-    run_suffix = run_name_suffix if run_name_suffix is not None else (get_srtslurm_setting("run_name_suffix") or "")
-
     if config is None:
         config = load_config(config_path)
 
@@ -306,15 +301,14 @@ def submit_with_orchestrator(
         if runtime_config_text is None:
             raise ValueError("runtime_config_text is required when source_config_path is set")
         resolved_runtime_config_text = runtime_config_text
-        runtime_config_filename = f"config_{run_name_suffix}.yaml" if run_name_suffix else "config_resolved.yaml"
+        runtime_config_filename = f"config_{variant_suffix}.yaml" if variant_suffix else "config_resolved.yaml"
 
     script_content = generate_minimal_sbatch_script(
         config=config,
         config_path=config_path,
         setup_script=setup_script,
         output_dir=output_dir,
         runtime_config_filename=runtime_config_filename,
-        run_name_suffix=run_suffix or None,
     )
 
     if dry_run:
@@ -357,20 +351,19 @@ def submit_with_orchestrator(
         )
 
         job_id = result.stdout.strip().split()[-1]
-        job_dir_name = f"{job_id}{run_suffix}"
 
         # Determine output directory
         # Priority: CLI -o flag > srtslurm.yaml output_dir > srtctl_root/outputs
         if output_dir:
-            job_output_dir = output_dir / job_dir_name
+            job_output_dir = output_dir / job_id
         else:
             custom_output_dir = get_srtslurm_setting("output_dir")
             if custom_output_dir:
-                job_output_dir = Path(os.path.expandvars(custom_output_dir)) / job_dir_name
+                job_output_dir = Path(os.path.expandvars(custom_output_dir)) / job_id
             else:
                 srtctl_root = get_srtslurm_setting("srtctl_root")
                 srtctl_source = Path(srtctl_root) if srtctl_root else Path(__file__).parent.parent.parent.parent
-                job_output_dir = srtctl_source / "outputs" / job_dir_name
+                job_output_dir = srtctl_source / "outputs" / job_id
         job_output_dir.mkdir(parents=True, exist_ok=True)
 
         shutil.copy(source_config_path or config_path, job_output_dir / "config.yaml")
@@ -458,7 +451,7 @@ def submit_single(
     setup_script: str | None = None,
     tags: list[str] | None = None,
     output_dir: Path | None = None,
-    run_name_suffix: str | None = None,
+    variant_suffix: str | None = None,
     source_config_path: Path | None = None,
     runtime_config_text: str | None = None,
 ) -> str | None:
@@ -473,7 +466,7 @@ def submit_single(
         setup_script: Optional custom setup script name
         tags: Optional list of tags
         output_dir: Custom output directory (CLI flag, highest priority)
-        run_name_suffix: If set, also save config as config_{suffix}.yaml in job output dir.
+        variant_suffix: If set, also save config as config_{suffix}.yaml in job output dir.
         source_config_path: If set, saved as config.yaml while execution uses the
                             resolved variant config.
         runtime_config_text: Resolved runtime YAML written under OUTPUT_DIR for
@@ -496,7 +489,7 @@ def submit_single(
         tags=tags,
         setup_script=setup_script,
         output_dir=output_dir,
-        run_name_suffix=run_name_suffix,
+        variant_suffix=variant_suffix,
         source_config_path=source_config_path,
         runtime_config_text=runtime_config_text,
     )
@@ -518,7 +511,6 @@ def submit_sweep(
     setup_script: str | None = None,
     tags: list[str] | None = None,
     output_dir: Path | None = None,
-    run_name_suffix: str | None = None,
 ):
     """Submit parameter sweep.
 
@@ -528,7 +520,6 @@ def submit_sweep(
         setup_script: Optional custom setup script name
         tags: Optional list of tags
         output_dir: Custom output directory (CLI flag, highest priority)
-        run_name_suffix: Optional suffix appended to each job's output dir name
     """
     from srtctl.core.sweep import generate_sweep_configs
 
@@ -603,7 +594,6 @@ def submit_sweep(
                 setup_script=setup_script,
                 tags=tags,
                 output_dir=output_dir,
-                run_name_suffix=run_name_suffix,
             )
         finally:
             with contextlib.suppress(OSError):
@@ -634,7 +624,6 @@ def submit_directory(
     tags: list[str] | None = None,
     force_sweep: bool = False,
     output_dir: Path | None = None,
-    run_name_suffix: str | None = None,
 ) -> None:
     """Submit all YAML configs in a directory recursively.
 
@@ -645,7 +634,6 @@ def submit_directory(
         tags: Optional list of tags
         force_sweep: If True, treat all configs as sweeps
         output_dir: Custom output directory (CLI flag, highest priority)
-        run_name_suffix: Optional suffix for output dir name
     """
     yaml_files = find_yaml_files(directory)
 
@@ -685,31 +673,12 @@ def submit_directory(
 
         try:
             if is_override_config(yaml_file):
-                submit_override(
-                    yaml_file,
-                    dry_run=dry_run,
-                    setup_script=setup_script,
-                    tags=tags,
-                    output_dir=output_dir,
-                    run_name_suffix=run_name_suffix,
-                )
+                submit_override(yaml_file, dry_run=dry_run, setup_script=setup_script, tags=tags, output_dir=output_dir)
             elif force_sweep or is_sweep_config(yaml_file):
-                submit_sweep(
-                    yaml_file,
-                    dry_run=dry_run,
-                    setup_script=setup_script,
-                    tags=tags,
-                    output_dir=output_dir,
-                    run_name_suffix=run_name_suffix,
-                )
+                submit_sweep(yaml_file, dry_run=dry_run, setup_script=setup_script, tags=tags, output_dir=output_dir)
             else:
                 submit_single(
-                    config_path=yaml_file,
-                    dry_run=dry_run,
-                    setup_script=setup_script,
-                    tags=tags,
-                    output_dir=output_dir,
-                    run_name_suffix=run_name_suffix,
+                    config_path=yaml_file, dry_run=dry_run, setup_script=setup_script, tags=tags, output_dir=output_dir
                 )
             success_count += 1
         except Exception as e:
@@ -787,7 +756,6 @@ def submit_override(
     setup_script: str | None = None,
     tags: list[str] | None = None,
     output_dir: Path | None = None,
-    run_name_suffix: str | None = None,
 ) -> None:
     """Expand an override config file and submit each variant.
 
@@ -801,7 +769,6 @@ def submit_override(
         setup_script: Optional custom setup script name
         tags: Optional list of tags
         output_dir: Custom output directory
-        run_name_suffix: Optional suffix for output dir name
     """
     with open(config_path) as f:
         raw_config = yaml.safe_load(f)
@@ -851,7 +818,6 @@ def submit_override(
                     setup_script=setup_script,
                     tags=tags,
                     output_dir=output_dir,
-                    run_name_suffix=suffix,
                 )
             finally:
                 with contextlib.suppress(OSError):
@@ -864,7 +830,7 @@ def submit_override(
                 setup_script=setup_script,
                 tags=tags,
                 output_dir=output_dir,
-                run_name_suffix=suffix,
+                variant_suffix=suffix,
                 source_config_path=config_path,
                 runtime_config_text=runtime_config_text,
             )
@@ -948,13 +914,6 @@ def add_common_args(p):
             help="YAML config file, directory, or file:selector for overrides",
         )
         p.add_argument("-o", "--output", type=Path, dest="output_dir", help="Custom output directory for job logs")
-        p.add_argument(
-            "--run-name-suffix",
-            type=str,
-            dest="run_name_suffix",
-            default=None,
-            help="Suffix for output dir name (e.g. _myrun -> outputs/12345_myrun)",
-        )
         p.add_argument("--sweep", action="store_true", help="Force sweep mode")
         p.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
 
@@ -1007,11 +966,6 @@ def add_common_args(p):
 
         setup_script = getattr(args, "setup_script", None)
         output_dir = getattr(args, "output_dir", None)
-        run_name_suffix = getattr(args, "run_name_suffix", None)
-
-        if run_name_suffix is None and not is_dry_run and not getattr(args, "yes", False):
-            raw = console.input("[bold cyan]Run name suffix[/] (leave empty to skip): ").strip()
-            run_name_suffix = raw or None
 
         # Handle directory input
         if config_path.is_dir():
@@ -1024,7 +978,6 @@ def add_common_args(p):
                 tags=tags,
                 force_sweep=args.sweep,
                 output_dir=output_dir,
-                run_name_suffix=run_name_suffix,
             )
         elif is_override_config(config_path):
             submit_override(
@@ -1034,7 +987,6 @@ def add_common_args(p):
                 setup_script=setup_script,
                 tags=tags,
                 output_dir=output_dir,
-                run_name_suffix=run_name_suffix,
             )
         else:
             if selector:
@@ -1047,7 +999,6 @@ def add_common_args(p):
                     setup_script=setup_script,
                     tags=tags,
                     output_dir=output_dir,
-                    run_name_suffix=run_name_suffix,
                 )
             else:
                 submit_single(
@@ -1056,7 +1007,6 @@ def add_common_args(p):
                     setup_script=setup_script,
                     tags=tags,
                     output_dir=output_dir,
-                    run_name_suffix=run_name_suffix,
                 )
     except Exception as e:
         console.print(f"[bold red]Error:[/] {e}")

src/srtctl/templates/job_script_minimal.j2

@@ -21,7 +21,7 @@
 {% endif %}
 #SBATCH --account={{ account }}
 #SBATCH --time={{ time_limit }}
-#SBATCH --output={{ output_base }}/%j{{ run_name_suffix }}/logs/sweep_%j.log
+#SBATCH --output={{ output_base }}/%j/logs/sweep_%j.log
 #SBATCH --partition={{ partition }}
 {% for key, value in sbatch_directives.items() %}
 {% if value %}
@@ -43,8 +43,7 @@ set -e
 # Setup directories
 SRTCTL_SOURCE="{{ srtctl_source }}"
 OUTPUT_BASE="{{ output_base }}"
-RUN_NAME_SUFFIX="{{ run_name_suffix }}"
-OUTPUT_DIR="${OUTPUT_BASE}/${SLURM_JOB_ID}${RUN_NAME_SUFFIX}"
+OUTPUT_DIR="${OUTPUT_BASE}/${SLURM_JOB_ID}"
 LOG_DIR="${OUTPUT_DIR}/logs"
 mkdir -p "${LOG_DIR}"