address PR feedback

Author: ohmayr

.generator/cli.py

@@ -24,35 +24,56 @@
 GENERATE_REQUEST_FILE = "generate-request.json"
 
 
-# Helper function that reads a json file path and returns the loaded json content.
 def _read_json_file(path):
+    """Helper function that reads a json file path and returns the loaded json content.
+
+    Args:
+        path (str): The file path to read.
+
+    Returns:
+        dict: The parsed JSON content.
+
+    Raises:
+        FileNotFoundError: If the file is not found at the specified path.
+        json.JSONDecodeError: If the file does not contain valid JSON.
+        IOError: If there is an issue reading the file.
+    """
     with open(path, "r") as f:
         return json.load(f)
 
 
-def handle_configure(dry_run=False):
-    # TODO(https://github.com/googleapis/librarian/issues/466): Implement configure command.
+def handle_configure():
+    # TODO(https://github.com/googleapis/librarian/issues/466): Implement configure command and update docstring.
     logger.info("'configure' command executed.")
 
 
-def handle_generate(dry_run=False):
+def handle_generate():
+    """The main coordinator for the code generation process.
+
+    This function orchestrates the generation of a client library by reading a
+    `librarian/generate-request.json` file, determining the necessary Bazel rule for each API, and
+    (in future steps) executing the build.
+
+    Raises:
+        ValueError: If the `generate-request.json` file is not found or read.
+    """
 
     # Read a generate-request.json file
-    if not dry_run:
-        try:
-            request_data = _read_json_file(f"{LIBRARIAN_DIR}/{GENERATE_REQUEST_FILE}")
-        except Exception as e:
-            logger.error(f"failed to read {LIBRARIAN_DIR}/{GENERATE_REQUEST_FILE}: {e}")
-            sys.exit(1)
+    try:
+        request_data = _read_json_file(f"{LIBRARIAN_DIR}/{GENERATE_REQUEST_FILE}")
+    except Exception as e:
+        raise ValueError(
+            f"failed to read {LIBRARIAN_DIR}/{GENERATE_REQUEST_FILE}"
+        ) from e
 
-        logger.info(json.dumps(request_data, indent=2))
+    logger.info(json.dumps(request_data, indent=2))
 
-    # TODO(https://github.com/googleapis/librarian/issues/448): Implement generate command.
+    # TODO(https://github.com/googleapis/librarian/issues/448): Implement generate command and update docstring.
     logger.info("'generate' command executed.")
 
 
-def handle_build(dry_run=False):
-    # TODO(https://github.com/googleapis/librarian/issues/450): Implement build command.
+def handle_build():
+    # TODO(https://github.com/googleapis/librarian/issues/450): Implement build command and update docstring.
     logger.info("'build' command executed.")
 
 
@@ -62,11 +83,6 @@ def handle_build(dry_run=False):
         dest="command", required=True, help="Available commands"
     )
 
-    # This flag is needed for testing.
-    parser.add_argument(
-        "--dry-run", action="store_true", help="Perform a dry run for testing purposes."
-    )
-
     # Define commands
     handler_map = {
         "configure": handle_configure,
@@ -87,4 +103,4 @@ def handle_build(dry_run=False):
         sys.exit(1)
 
     args = parser.parse_args()
-    args.func(dry_run=args.dry_run)
+    args.func()

.generator/test_cli.py

@@ -49,14 +49,15 @@ def mock_generate_request_file(tmp_path, monkeypatch):
     return request_file
 
 
-def test_handle_configure_dry_run():
-    # This is a simple test to ensure that the dry run command succeeds.
-    handle_configure(dry_run=True)
+def test_handle_configure_success(caplog, mock_generate_request_file):
+    """
+    Tests the successful execution path of handle_configure.
+    """
+    caplog.set_level(logging.INFO)
 
+    handle_configure()
 
-def test_handle_generate_dry_run():
-    # This is a simple test to ensure that the dry run command succeeds.
-    handle_generate(dry_run=True)
+    assert "'configure' command executed." in caplog.text
 
 
 def test_handle_generate_success(caplog, mock_generate_request_file):
@@ -65,15 +66,29 @@ def test_handle_generate_success(caplog, mock_generate_request_file):
     """
     caplog.set_level(logging.INFO)
 
-    handle_generate(dry_run=False)
+    handle_generate()
 
     assert "google-cloud-language" in caplog.text
     assert "'generate' command executed." in caplog.text
 
 
-def test_handle_build_dry_run():
-    # This is a simple test to ensure that the dry run command succeeds.
-    handle_build(dry_run=True)
+def test_handle_generate_fail(caplog):
+    """
+    Tests the failed to read `librarian/generate-request.json` file in handle_generates.
+    """
+    with pytest.raises(ValueError):
+        handle_generate()
+
+
+def test_handle_build_success(caplog, mock_generate_request_file):
+    """
+    Tests the successful execution path of handle_build.
+    """
+    caplog.set_level(logging.INFO)
+
+    handle_build()
+
+    assert "'build' command executed." in caplog.text
 
 
 def test_read_valid_json(mocker):