refactor code

Author: ohmayr

.generator/cli.py

@@ -114,6 +114,31 @@ def _write_json_file(path: str, updated_content: Dict):
     with open(path, "w") as f:
         json.dump(updated_content, f, indent=2)
         f.write("\n")
+ 
+def _get_new_library_config(request_data: Dict) -> Dict:
+    """Returns the configuration for a new library.
+
+    Args:
+        request_data(Dict): The request data from which to extract the new
+        library config.
+
+    Returns:
+        Dict: The configuration of a new library.
+    """
+    new_library_config = {}
+    for library_config in request_data.get("libraries", []):
+        all_apis = library_config.get("apis", [])
+        for api in all_apis:
+            if api.get("status") == "new":
+                new_library_config = library_config
+                break
+    
+    # remove status key from new library config.
+    all_apis = new_library_config.get("apis", [])
+    for api in all_apis:
+        del api["status"]
+    
+    return new_library_config
 
 
 def handle_configure(
@@ -148,22 +173,10 @@ def handle_configure(
     try:
         # configure-request.json contains the library definitions.
         request_data = _read_json_file(f"{librarian}/{CONFIGURE_REQUEST_FILE}")
-        for library_config in request_data.get("libraries", []):
-            is_new_library_or_api = False
-            if "apis" in library_config:
-                for api in library_config["apis"]:
-                    if api.get("status") == "new":
-                        is_new_library_or_api = True
-                        # Delete the status field since we don't need to include it in `configure-response.json`.
-                        del api["status"]
-
-            if is_new_library_or_api:
-                library_id = _get_library_id(library_config)
-                # TODO: Add missing information for the configured library.
-                request_data[library_id] = library_config
+        new_library_config = _get_new_library_config(request_data)
 
         # Write the new library configuration to configure-response.json.
-        _write_json_file(f"{librarian}/configure-response.json", request_data[library_id])
+        _write_json_file(f"{librarian}/configure-response.json", new_library_config)
 
     except Exception as e:
         raise ValueError("Configuring a new library failed.") from e

.generator/test_cli.py

@@ -44,6 +44,7 @@
     _get_library_dist_name,
     _get_library_id,
     _get_libraries_to_prepare_for_release,
+    _get_new_library_config,
     _get_previous_version,
     _process_changelog,
     _process_version_file,
@@ -162,23 +163,28 @@ def mock_build_request_file(tmp_path, monkeypatch):
 
 
 @pytest.fixture
-def mock_configure_request_file(tmp_path, monkeypatch):
-    """Creates the mock request file at the correct path inside a temp dir."""
-    # Create the path as expected by the script: .librarian/configure-request.json
-    request_path = f"{LIBRARIAN_DIR}/{CONFIGURE_REQUEST_FILE}"
-    request_dir = tmp_path / os.path.dirname(request_path)
-    request_dir.mkdir(parents=True, exist_ok=True)
-    request_file = request_dir / os.path.basename(request_path)
-
-    request_content = {
+def mock_configure_request_data():
+    """Returns mock data for configure-request.json."""
+    return {
         "libraries": [
             {
                 "id": "google-cloud-language",
                 "apis": [{"path": "google/cloud/language/v1", "status": "new"}],
             }
         ]
     }
-    request_file.write_text(json.dumps(request_content))
+
+
+@pytest.fixture
+def mock_configure_request_file(tmp_path, monkeypatch, mock_configure_request_data):
+    """Creates the mock request file at the correct path inside a temp dir."""
+    # Create the path as expected by the script: .librarian/configure-request.json
+    request_path = f"{LIBRARIAN_DIR}/{CONFIGURE_REQUEST_FILE}"
+    request_dir = tmp_path / os.path.dirname(request_path)
+    request_dir.mkdir(parents=True, exist_ok=True)
+    request_file = request_dir / os.path.basename(request_path)
+
+    request_file.write_text(json.dumps(mock_configure_request_data))
 
     # Change the current working directory to the temp path for the test.
     monkeypatch.chdir(tmp_path)
@@ -261,6 +267,52 @@ def mock_state_file(tmp_path, monkeypatch):
     return request_file
 
 
+def test_handle_configure(mock_configure_request_file, mocker):
+    """Tests the successful execution path of handle_configure."""
+    mock_write_json = mocker.patch("cli._write_json_file")
+
+    handle_configure()
+
+    # Verify that the correct configuration is written to the response file.
+    expected_config = {
+        "id": "google-cloud-language",
+        "apis": [{"path": "google/cloud/language/v1"}],
+    }
+    mock_write_json.assert_called_once_with(
+        f"{LIBRARIAN_DIR}/configure-response.json", expected_config
+    )
+
+
+def test_handle_configure_failure(mocker):
+    """Tests that handle_configure raises ValueError on failure."""
+    with pytest.raises(ValueError, match="Configuring a new library failed."):
+        handle_configure()
+
+
+def test_get_new_library_config_new_library_found(mock_configure_request_data):
+    """Tests that the new library configuration is returned when found."""
+    config = _get_new_library_config(mock_configure_request_data)
+    assert config["id"] == "google-cloud-language"
+    assert "status" not in config["apis"][0]
+
+
+def test_get_new_library_config_no_new_library():
+    """Tests that an empty dictionary is returned when no new library is found."""
+    request_data = {
+        "libraries": [
+            {"id": "existing-library", "apis": [{"path": "path/v1", "status": "existing"}]},
+        ]
+    }
+    config = _get_new_library_config(request_data)
+    assert config == {}
+
+
+def test_get_new_library_config_empty_input():
+    """Tests that an empty dictionary is returned for empty input."""
+    config = _get_new_library_config({})
+    assert config == {}
+
+
 def test_get_library_id_success():
     """Tests that _get_library_id returns the correct ID when present."""
     request_data = {"id": "test-library", "name": "Test Library"}