rimport can now take BOTH --file and --filelist.

Author: samsrabin

rimport

@@ -52,16 +52,15 @@ def build_parser() -> argparse.ArgumentParser:
         add_help=False,  # Disable automatic help to add custom -help flag
     )
 
-    # Mutually exclusive: -file or -list (one required)
-    group = parser.add_mutually_exclusive_group(required=True)
-    group.add_argument(
+    parser.add_argument(
         "--file",
         "-file",
         dest="file",
         metavar="filename",
         help="Provide a file to import. Must be in the CESM inputdata directory.",
     )
-    group.add_argument(
+
+    parser.add_argument(
         "--list",
         "-list",
         dest="filelist",
@@ -309,12 +308,11 @@ def print_can_file_be_downloaded(file_can_be_downloaded: bool):
 def get_files_to_process(file: str, filelist: str):
     """Get list of files to process.
 
-    Uses either --file or --filelist. "Prefers" --file, but they're actually mutually exclusive, so
-    don't rely on that.
+    Uses --file and/or --filelist arguments.
 
     Args:
         file (str): Single file to process.
-        filelist (str): File containing list of files to process
+        filelist (str): File containing list of files to process.
 
     Returns:
         list: List of files to process
@@ -323,14 +321,22 @@ def get_files_to_process(file: str, filelist: str):
     if file is not None:
         files_to_process = [file]
     else:
+        files_to_process = []
+
+    if filelist is not None:
         list_path = Path(filelist).expanduser().resolve()
         if not list_path.exists():
             logger.error("rimport: list file not found: %s", list_path)
             return None, 2
-        files_to_process = read_filelist(list_path)
-        if not files_to_process:
+        files_in_list = read_filelist(list_path)
+        if not files_in_list:
             logger.error("rimport: no filenames found in list: %s", list_path)
             return None, 2
+        files_to_process.extend(files_in_list)
+
+    if not files_to_process:
+        logger.error("rimport: At least one of --file or --filelist is required")
+        return None, 2
 
     return files_to_process, 0
 

tests/rimport/test_build_parser.py

@@ -60,27 +60,14 @@ def test_inputdata_arguments_accepted(self, temp_dirs, inputdata_flag):
         )
         assert args.inputdata_root == inputdata_root
 
-    def test_file_and_list_mutually_exclusive(self, capsys):
-        """Test that -file and -list cannot be used together."""
-        parser = rimport.build_parser()
-        with pytest.raises(SystemExit):
-            parser.parse_args(["-file", "test.txt", "-list", "files.txt"])
-
-        # Check that the error message explains the problem
-        captured = capsys.readouterr()
-        stderr_lines = captured.err.strip().split("\n")
-        assert "not allowed with argument" in stderr_lines[-1]
-
-    def test_file_or_list_required(self, capsys):
-        """Test that either -file or -list is required."""
-        parser = rimport.build_parser()
-        with pytest.raises(SystemExit):
-            parser.parse_args([])
-
-        # Check that the error message explains the problem
-        captured = capsys.readouterr()
-        stderr_lines = captured.err.strip().split("\n")
-        assert "error: one of the arguments" in stderr_lines[-1]
+    def test_file_and_list_not_mutually_exclusive(self, capsys):
+        """Test that -file and -list can be used together."""
+        parser = rimport.build_parser()
+        file = "test.txt"
+        filelist = "files.txt"
+        args = parser.parse_args(["-file", file, "-list", filelist])
+        assert args.file == file
+        assert args.filelist == filelist
 
     def test_inputdata_default(self):
         """Test that -inputdata has correct default value."""

tests/rimport/test_get_relnames_to_process.py

@@ -8,9 +8,6 @@
 import os
 import importlib.util
 from importlib.machinery import SourceFileLoader
-from pathlib import Path
-from unittest.mock import patch, call
-import pytest
 
 # pylint: disable=too-many-arguments,too-many-positional-arguments
 
@@ -198,3 +195,44 @@ def test_filelist_empty(self, tmp_path):
         )
         assert result == 2
         assert files_to_process is None
+
+    def test_single_file_and_list(self, tmp_path):
+        """Test giving it a single file by its relative path"""
+        # Setup
+        inputdata_root = tmp_path / "inputdata"
+        inputdata_root.mkdir()
+        staging_root = tmp_path / "staging"
+        staging_root.mkdir()
+
+        filename = "test.nc"
+        test_file = inputdata_root / filename
+        test_file.write_text("abc123")
+
+        filenames = []
+        for i in range(2):
+            f = f"test{i}.txt"
+            filenames.append(f)
+            (inputdata_root / f).write_text("def567")
+
+        filelist = tmp_path / "file_list.txt"
+        filelist.write_text("\n".join(filenames), encoding="utf8")
+
+        # Run
+        files_to_process, result = rimport.get_files_to_process(
+            file=filename, filelist=filelist
+        )
+
+        # Verify
+        assert result == 0
+        assert files_to_process == [filename] + filenames
+
+    def test_single_or_list_required(self):
+        """Test that either file or filelist is required"""
+        # Run
+        files_to_process, result = rimport.get_files_to_process(
+            file=None, filelist=None
+        )
+
+        # Verify
+        assert result == 2
+        assert files_to_process is None

tests/rimport/test_main.py

@@ -203,6 +203,22 @@ def test_empty_filelist(
         captured = capsys.readouterr()
         assert "no filenames found in list" in captured.err
 
+    @patch.object(rimport, "ensure_running_as")
+    def test_requires_file_or_filelist(
+        self, _mock_ensure_running_as, tmp_path, capsys
+    ):
+        """Test that main() returns error code 2 if neither file nor filelist provided."""
+        inputdata_root = tmp_path / "inputdata"
+        inputdata_root.mkdir()
+
+        result = rimport.main(
+            ["-inputdata", str(inputdata_root)]
+        )
+
+        assert result == 2
+        captured = capsys.readouterr()
+        assert "At least one of --file or --filelist is required" in captured.err
+
     @patch.object(rimport, "stage_data")
     @patch.object(rimport, "get_staging_root")
     @patch.object(rimport, "normalize_paths")