feat: wip

Author: ohmayr

.generator/cli.py

@@ -350,14 +350,6 @@ def _copy_files_needed_for_post_processing(output: str, input: str, library_id:
             f"{output}/{path_to_library}/.repo-metadata.json",
         )
 
-    source_readme_path = Path(output) / path_to_library / "README.rst"
-    if source_readme_path.exists():
-        destination_docs_dir = Path(output) / path_to_library / "docs"
-        destination_readme_path = destination_docs_dir / "README.rst"
-
-        os.makedirs(destination_docs_dir, exist_ok=True)
-        shutil.copy(source_readme_path, destination_readme_path)
-
     # copy post-procesing files
     for post_processing_file in glob.glob(
         f"{input}/client-post-processing/*.yaml"
@@ -509,6 +501,24 @@ def _generate_repo_metadata_file(
     _write_json_file(output_repo_metadata, metadata_content)
 
 
+def _copy_readme_to_docs(output: str, library_id: str):
+    """Copies the generated README.rst to the docs directory.
+
+    Args:
+        output(str): Path to the directory in the container where code
+            should be generated.
+        library_id(str): The library id.
+    """
+    path_to_library = f"packages/{library_id}"
+    source_readme_path = Path(output) / path_to_library / "README.rst"
+    if source_readme_path.exists():
+        destination_docs_dir = Path(output) / path_to_library / "docs"
+        destination_readme_path = destination_docs_dir / "README.rst"
+
+        os.makedirs(destination_docs_dir, exist_ok=True)
+        shutil.copy(source_readme_path, destination_readme_path)
+
+
 def handle_generate(
     librarian: str = LIBRARIAN_DIR,
     source: str = SOURCE_DIR,
@@ -550,6 +560,7 @@ def handle_generate(
         _copy_files_needed_for_post_processing(output, input, library_id)
         _generate_repo_metadata_file(output, library_id, source, apis_to_generate)
         _run_post_processor(output, library_id)
+        _copy_readme_to_docs(output, library_id)
         _clean_up_files_after_post_processing(output, library_id)
     except Exception as e:
         raise ValueError("Generation failed.") from e

.generator/test_cli.py

@@ -640,12 +640,15 @@ def test_handle_generate_success(
     )
     mocker.patch("cli._generate_repo_metadata_file")
 
+    mock_copy_readme_to_docs = mocker.patch("cli._copy_readme_to_docs")
+
     handle_generate()
 
     mock_run_post_processor.assert_called_once_with("output", "google-cloud-language")
     mock_copy_files_needed_for_post_processing.assert_called_once_with(
         "output", "input", "google-cloud-language"
     )
+    mock_copy_readme_to_docs.assert_called_once_with("output", "google-cloud-language")
     mock_clean_up_files_after_post_processing.assert_called_once_with(
         "output", "google-cloud-language"
     )
@@ -814,28 +817,6 @@ def test_copy_files_needed_for_post_processing_copies_metadata_if_exists(mocker)
     mock_makedirs.assert_called()
 
 
-def test_copy_files_needed_for_post_processing_copies_readme(mocker):
-    """Tests that README.rst is copied to the docs directory if it exists."""
-    mock_makedirs = mocker.patch("os.makedirs")
-    mock_shutil_copy = mocker.patch("shutil.copy")
-    mock_path_exists = mocker.patch("pathlib.Path.exists", return_value=True)
-    mocker.patch("os.path.exists", return_value=False)  # for .repo-metadata.json
-
-    _copy_files_needed_for_post_processing("output", "input", "google-cloud-language")
-
-    mock_makedirs.assert_called_with(
-        Path("output") / "packages" / "google-cloud-language" / "docs", exist_ok=True
-    )
-    mock_shutil_copy.assert_called_with(
-        Path("output") / "packages" / "google-cloud-language" / "README.rst",
-        Path("output")
-        / "packages"
-        / "google-cloud-language"
-        / "docs"
-        / "README.rst",
-    )
-
-
 def test_copy_files_needed_for_post_processing_skips_metadata_if_not_exists(mocker):
     """Tests that .repo-metadata.json is not copied if it does not exist."""
     mock_makedirs = mocker.patch("os.makedirs")

.librarian/state.yaml

@@ -1,4 +1,4 @@
-image: us-central1-docker.pkg.dev/cloud-sdk-librarian-prod/images-prod/python-librarian-generator:latest
+image: python-librarian-generator:latest
 libraries:
   - id: google-ads-admanager
     version: 0.4.0