added --before-job-id argument.

Author: kohankhaki

README.md

@@ -102,7 +102,7 @@ Note that there are other parameters that can also be added to the config but no
 * `metrics`: Streams performance metrics to the console.
 * `shutdown`: Shutdown a model by providing its Slurm job ID.
 * `list`: List all available model names, or view the default/cached configuration of a specific model, `--json-mode` supported.
-* `cleanup`: Remove old log directories. You can filter by `--model-family`, `--model-name`, and/or `--job-id`. Use `--dry-run` to preview what would be deleted.
+* `cleanup`: Remove old log directories. You can filter by `--model-family`, `--model-name`, `--job-id`, and/or `--before-job-id`. Use `--dry-run` to preview what would be deleted.
 
 For more details on the usage of these commands, refer to the [User Guide](https://vectorinstitute.github.io/vector-inference/user_guide/)
 

vec_inf/README.md

@@ -5,6 +5,6 @@
 * `metrics`: Streams performance metrics to the console.
 * `shutdown`: Shutdown a model by providing its Slurm job ID.
 * `list`: List all available model names, or view the default/cached configuration of a specific model, `--json-mode` supported.
-* `cleanup`: Remove old log directories. You can filter by `--model-family`, `--model-name`, and/or `--job-id`. Use `--dry-run` to preview what would be deleted.
+* `cleanup`: Remove old log directories. You can filter by `--model-family`, `--model-name`, `--job-id`, and/or `--before-job-id`. Use `--dry-run` to preview what would be deleted.
 
 Use `--help` to see all available options

vec_inf/cli/_cli.py

@@ -343,12 +343,18 @@ def metrics(slurm_job_id: int, log_dir: Optional[str] = None) -> None:
 @click.option(
     "--job-id", type=int, help="Only remove logs with this exact SLURM job ID"
 )
+@click.option(
+    "--before-job-id",
+    type=int,
+    help="Remove logs with job ID less than this value",
+)
 @click.option("--dry-run", is_flag=True, help="List matching logs without deleting")
 def cleanup_logs_cli(
     log_dir: Optional[str],
     model_family: Optional[str],
     model_name: Optional[str],
     job_id: Optional[int],
+    before_job_id: Optional[int],
     dry_run: bool,
 ) -> None:
     """Clean up log files based on optional filters.
@@ -363,6 +369,8 @@ def cleanup_logs_cli(
         Only delete logs for this model name.
     job_id : int, optional
         If provided, only match directories with this exact SLURM job ID.
+    before_job_id : int, optional
+        If provided, only delete logs with job ID less than this value.
     dry_run : bool
         If True, return matching files without deleting them.
     """
@@ -373,6 +381,7 @@ def cleanup_logs_cli(
             model_family=model_family,
             model_name=model_name,
             job_id=job_id,
+            before_job_id=before_job_id,
             dry_run=dry_run,
         )
 

vec_inf/client/_utils.py

@@ -292,6 +292,7 @@ def find_matching_dirs(
     model_family: Optional[str] = None,
     model_name: Optional[str] = None,
     job_id: Optional[int] = None,
+    before_job_id: Optional[int] = None,
 ) -> list[Path]:
     """
     Find log directories based on filtering criteria.
@@ -306,6 +307,8 @@ def find_matching_dirs(
         Filter to only match model names.
     job_id : int, optional
         Filter to only match this exact SLURM job ID.
+    before_job_id : int, optional
+        Filter to only include job IDs less than this value.
 
     Returns
     -------
@@ -317,17 +320,16 @@ def find_matching_dirs(
     if not log_dir.exists() or not log_dir.is_dir():
         raise FileNotFoundError(f"Log directory does not exist: {log_dir}")
 
-    if not model_family and not model_name and not job_id:
+    if not model_family and not model_name and not job_id and not before_job_id:
         return [log_dir]
 
-    # Iterate over model families
     for family_dir in log_dir.iterdir():
         if not family_dir.is_dir():
             continue
         if model_family and family_dir.name != model_family:
             continue
 
-        if model_family and not model_name and not job_id:
+        if model_family and not model_name and not job_id and not before_job_id:
             return [family_dir]
 
         for job_dir in family_dir.iterdir():
@@ -344,6 +346,9 @@ def find_matching_dirs(
                 continue
             if job_id is not None and parsed_id != job_id:
                 continue
+            if before_job_id is not None and parsed_id >= before_job_id:
+                continue
 
             matched.append(job_dir)
+
     return matched

vec_inf/client/api.py

@@ -312,6 +312,7 @@ def cleanup_logs(
         model_family: Optional[str] = None,
         model_name: Optional[str] = None,
         job_id: Optional[int] = None,
+        before_job_id: Optional[int] = None,
         dry_run: bool = False,
     ) -> list[Path]:
         """Remove logs from the log directory.
@@ -326,6 +327,8 @@ def cleanup_logs(
             Only delete logs for this model name.
         job_id : int, optional
             If provided, only match directories with this exact SLURM job ID.
+        before_job_id : int, optional
+            If provided, only delete logs with job ID less than this value.
         dry_run : bool
             If True, return matching files without deleting them.
 
@@ -340,6 +343,7 @@ def cleanup_logs(
             model_family=model_family,
             model_name=model_name,
             job_id=job_id,
+            before_job_id=before_job_id,
         )
 
         if dry_run: