address PR feedback

Author: ohmayr

.generator/cli.py

@@ -13,64 +13,67 @@
 # limitations under the License.
 
 import argparse
-import sys
 import json
-import os
 import logging
+import os
+import sys
 
 logger = logging.getLogger()
 
 LIBRARIAN = "/librarian"
 
+
 # Helper function that reads a json file path and returns the loaded json content.
-# Remove me.
 def _read_json_file(path):
-    if not os.path.exists(path):
-        raise FileNotFoundError(f"Request file not found at '{path}'")
-    try:
-        with open(path, 'r') as f:
-            return json.load(f)
-    except json.JSONDecodeError:
-        raise ValueError(f"Invalid JSON in request file '{path}'")
-    except IOError as e:
-        raise IOError(f"Invalid JSON in request file '{path}': {e}")
+    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.
     print("'configure' command executed.")
 
+
 def handle_generate(dry_run=False):
-    # TODO(https://github.com/googleapis/librarian/issues/448): Implement generate command.
 
     # Read a generate-request.json file
-    request_path = f"{LIBRARIAN}/generate-request.json"
-    try:
-        request_data = _read_json_file(request_path)
-    except Exception as e:
-        logger.error(e)
-        sys.exit(1)
+    if not dry_run:
+        request_path = f"{LIBRARIAN}/generate-request.json"
+        try:
+            request_data = _read_json_file(request_path)
+        except Exception as e:
+            logger.error(e)
+            sys.exit(1)
+
+        # Print the data:
+        print(json.dumps(request_data, indent=2))
 
-    # Print the data:
-    print(json.dumps(request_data, indent=2))
+    # TODO(https://github.com/googleapis/librarian/issues/448): Implement generate command.
     print("'generate' command executed.")
 
+
 def handle_build(dry_run=False):
     # TODO(https://github.com/googleapis/librarian/issues/450): Implement build command.
     print("'build' command executed.")
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="A simple CLI tool.")
-    subparsers = parser.add_subparsers(dest="command", required=True, help="Available commands")
+    subparsers = parser.add_subparsers(
+        dest="command", required=True, help="Available commands"
+    )
 
     # Define commands
     for command_name, help_text in [
         ("configure", "Onboard a new library or an api path to Librarian workflow."),
         ("generate", "generate a python client for an API."),
-        ("build", "Run unit tests via nox for the generated library.")
+        ("build", "Run unit tests via nox for the generated library."),
     ]:
-        handler_map = {"configure": handle_configure, "generate": handle_generate, "build": handle_build}
+        handler_map = {
+            "configure": handle_configure,
+            "generate": handle_generate,
+            "build": handle_build,
+        }
         parser_cmd = subparsers.add_parser(command_name, help=help_text)
         parser_cmd.set_defaults(func=handler_map[command_name])
 

.generator/test_cli.py

@@ -22,14 +22,17 @@ 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_generate_dry_run():
     # This is a simple test to ensure that the dry run command succeeds.
     handle_generate(dry_run=True)
 
+
 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_read_valid_json(mocker):
     """Tests reading a valid JSON file."""
     mock_content = '{"key": "value"}'
@@ -38,28 +41,31 @@ def test_read_valid_json(mocker):
     result = _read_json_file("fake/path.json")
     assert result == {"key": "value"}
 
+
 def test_file_not_found(mocker):
     """Tests behavior when the file does not exist."""
     mocker.patch("os.path.exists", return_value=False)
 
     with pytest.raises(FileNotFoundError):
         _read_json_file("non/existent/path.json")
 
+
 def test_invalid_json(mocker):
     """Tests reading a file with malformed JSON."""
     mock_content = '{"key": "value",}'
     mocker.patch("os.path.exists", return_value=True)
     mocker.patch("builtins.open", mocker.mock_open(read_data=mock_content))
 
-    with pytest.raises(ValueError, match="Invalid JSON"):
+    with pytest.raises(json.JSONDecodeError):
         _read_json_file("fake/path.json")
 
+
 def test_io_error_on_read(mocker):
     """Tests for a generic IOError."""
     mocker.patch("os.path.exists", return_value=True)
     mocked_open = mocker.mock_open()
-    mocked_open.side_effect = IOError("Permission denied")
+    mocked_open.side_effect = IOError("permission denied")
     mocker.patch("builtins.open", mocked_open)
 
-    with pytest.raises(IOError, match="Permission denied"):
+    with pytest.raises(IOError):
         _read_json_file("fake/path.json")