Merge branch 'main' of https://github.com/googleapis/google-cloud-python into add-build-command

Author: parthea

.generator/Dockerfile

@@ -22,6 +22,8 @@ RUN apt-get update && \
     # For downloading secure files
     wget \
     ca-certificates \
+    # For running bazelisk commands
+    openjdk-17-jdk \
     # --- Critical libraries for a complete Python build ---
     libssl-dev \
     zlib1g-dev \
@@ -34,6 +36,7 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Set up environment variables for tool versions to make updates easier.
+ENV BAZELISK_VERSION=v1.26.0
 
 
 RUN for PYTHON_VERSION in 3.9.23 3.10.18 3.11.13 3.12.11 3.13.5; do \
@@ -78,7 +81,9 @@ RUN python3.13 -m pip
 
 # TODO(https://github.com/googleapis/librarian/issues/904): Install protoc for gencode.
 
-# TODO(https://github.com/googleapis/librarian/issues/903): Install Bazelisk for building a client library.
+# Install Bazelisk
+RUN wget https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-amd64 -O /usr/local/bin/bazelisk && \
+    chmod +x /usr/local/bin/bazelisk
 
 # TODO(https://github.com/googleapis/librarian/issues/902): Create a dedicate non-root user and 
 # switch to the non-root user to run subsequent commands.

.generator/cli.py

@@ -17,11 +17,13 @@
 import logging
 import subprocess
 import sys
+import subprocess
 
 logger = logging.getLogger()
 
 LIBRARIAN_DIR = "librarian"
 GENERATE_REQUEST_FILE = "generate-request.json"
+SOURCE_DIR = "source"
 
 
 def _read_json_file(path):
@@ -47,6 +49,39 @@ def handle_configure():
     logger.info("'configure' command executed.")
 
 
+def _determine_bazel_rule(api_path):
+    """Executes a `bazelisk query` to find a Bazel rule.
+
+    Args:
+        api_path (str): The API path to query for.
+
+    Returns:
+        str: The discovered Bazel rule.
+
+    Raises:
+        Exception: If the subprocess call fails or returns an empty result.
+    """
+    logger.info(f"Determining Bazel rule for api_path: '{api_path}'")
+    try:
+        query = f'filter("-py$", kind("rule", //{api_path}/...:*))'
+        command = ["bazelisk", "query", query]
+        result = subprocess.run(
+            command,
+            cwd=f"{SOURCE_DIR}/googleapis",
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        bazel_rule = result.stdout.strip()
+        if not bazel_rule:
+            raise ValueError(f"Bazelisk query `{query}` returned an empty bazel rule.")
+
+        logger.info(f"Found Bazel rule: {bazel_rule}")
+        return bazel_rule
+    except Exception as e:
+        raise ValueError(f"Bazelisk query `{query}` failed") from e
+
+
 def handle_generate():
     """The main coordinator for the code generation process.
 
@@ -61,12 +96,18 @@ def handle_generate():
     # Read a generate-request.json file
     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
+        library_id = request_data.get("id")
+        if not library_id:
+            raise ValueError("Request file is missing required 'id' field.")
+
+        for api in request_data.get("apis", []):
+            api_path = api.get("path")
+            if api_path:
+                bazel_rule = _determine_bazel_rule(api_path)
 
-    logger.info(json.dumps(request_data, indent=2))
+            logger.info(json.dumps(request_data, indent=2))
+    except Exception as e:
+        raise ValueError("Generation failed.") from e
 
     # TODO(https://github.com/googleapis/librarian/issues/448): Implement generate command and update docstring.
     logger.info("'generate' command executed.")

.generator/test_cli.py

@@ -16,11 +16,13 @@
 import pytest
 import json
 import logging
+import subprocess
 
-from unittest.mock import mock_open
+from unittest.mock import mock_open, MagicMock
 
 from cli import (
     _read_json_file,
+    _determine_bazel_rule,
     handle_generate,
     handle_build,
     handle_configure,
@@ -60,16 +62,51 @@ def test_handle_configure_success(caplog, mock_generate_request_file):
     assert "'configure' command executed." in caplog.text
 
 
-def test_handle_generate_success(caplog, mock_generate_request_file):
+def test_determine_bazel_rule_success(mocker, caplog):
+    """
+    Tests the happy path of _determine_bazel_rule.
+    """
+    caplog.set_level(logging.INFO)
+    mock_result = MagicMock(
+        stdout="//google/cloud/language/v1:google-cloud-language-v1-py\n"
+    )
+    mocker.patch("cli.subprocess.run", return_value=mock_result)
+
+    rule = _determine_bazel_rule("google/cloud/language/v1")
+
+    assert rule == "//google/cloud/language/v1:google-cloud-language-v1-py"
+    assert "Found Bazel rule" in caplog.text
+
+
+def test_determine_bazel_rule_command_fails(mocker, caplog):
+    """
+    Tests that an exception is raised if the subprocess command fails.
+    """
+    caplog.set_level(logging.INFO)
+    mocker.patch(
+        "cli.subprocess.run",
+        side_effect=subprocess.CalledProcessError(1, "cmd", stderr="Bazel error"),
+    )
+
+    with pytest.raises(ValueError):
+        _determine_bazel_rule("google/cloud/language/v1")
+
+    assert "Found Bazel rule" not in caplog.text
+
+
+def test_handle_generate_success(caplog, mock_generate_request_file, mocker):
     """
     Tests the successful execution path of handle_generate.
     """
     caplog.set_level(logging.INFO)
 
+    mock_determine_rule = mocker.patch(
+        "cli._determine_bazel_rule", return_value="mock-rule"
+    )
+
     handle_generate()
 
-    assert "google-cloud-language" in caplog.text
-    assert "'generate' command executed." in caplog.text
+    mock_determine_rule.assert_called_once_with("google/cloud/language/v1")
 
 
 def test_handle_generate_fail(caplog):

.release-please-manifest.json

@@ -114,6 +114,7 @@
     "packages/google-cloud-maintenance-api": "0.1.0",
     "packages/google-cloud-managed-identities": "1.12.2",
     "packages/google-cloud-managedkafka": "0.1.12",
+    "packages/google-cloud-managedkafka-schemaregistry": "0.0.0",
     "packages/google-cloud-media-translation": "0.11.17",
     "packages/google-cloud-memcache": "1.12.2",
     "packages/google-cloud-memorystore": "0.1.3",

CHANGELOG.md

@@ -58,13 +58,13 @@ Changelogs
 - [google-cloud-cloudcontrolspartner==0.2.7](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-cloudcontrolspartner/CHANGELOG.md)
 - [google-cloud-commerce-consumer-procurement==0.2.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-commerce-consumer-procurement/CHANGELOG.md)
 - [google-cloud-common==1.5.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-common/CHANGELOG.md)
-- [google-cloud-compute-v1beta==0.1.3](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute-v1beta/CHANGELOG.md)
-- [google-cloud-compute==1.32.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute/CHANGELOG.md)
+- [google-cloud-compute-v1beta==0.1.4](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute-v1beta/CHANGELOG.md)
+- [google-cloud-compute==1.33.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-compute/CHANGELOG.md)
 - [google-cloud-confidentialcomputing==0.4.18](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-confidentialcomputing/CHANGELOG.md)
 - [google-cloud-config==0.1.19](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-config/CHANGELOG.md)
 - [google-cloud-configdelivery==0.1.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-configdelivery/CHANGELOG.md)
 - [google-cloud-contact-center-insights==1.23.3](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-contact-center-insights/CHANGELOG.md)
-- [google-cloud-container==2.57.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container/CHANGELOG.md)
+- [google-cloud-container==2.58.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-container/CHANGELOG.md)
 - [google-cloud-containeranalysis==2.18.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-containeranalysis/CHANGELOG.md)
 - [google-cloud-contentwarehouse==0.7.16](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-contentwarehouse/CHANGELOG.md)
 - [google-cloud-data-fusion==1.13.3](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-data-fusion/CHANGELOG.md)
@@ -98,7 +98,7 @@ Changelogs
 - [google-cloud-financialservices==0.1.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-financialservices/CHANGELOG.md)
 - [google-cloud-functions==1.20.4](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-functions/CHANGELOG.md)
 - [google-cloud-gdchardwaremanagement==0.1.12](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gdchardwaremanagement/CHANGELOG.md)
-- [google-cloud-geminidataanalytics==0.1.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-geminidataanalytics/CHANGELOG.md)
+- [google-cloud-geminidataanalytics==0.2.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-geminidataanalytics/CHANGELOG.md)
 - [google-cloud-gke-backup==0.5.19](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-backup/CHANGELOG.md)
 - [google-cloud-gke-connect-gateway==0.10.4](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-connect-gateway/CHANGELOG.md)
 - [google-cloud-gke-hub==1.17.3](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-gke-hub/CHANGELOG.md)
@@ -111,9 +111,9 @@ Changelogs
 - [google-cloud-kms-inventory==0.2.15](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms-inventory/CHANGELOG.md)
 - [google-cloud-kms==3.5.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-kms/CHANGELOG.md)
 - [google-cloud-language==2.17.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-language/CHANGELOG.md)
-- [google-cloud-licensemanager==null](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-licensemanager/CHANGELOG.md)
+- [google-cloud-licensemanager==0.1.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-licensemanager/CHANGELOG.md)
 - [google-cloud-life-sciences==0.9.18](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-life-sciences/CHANGELOG.md)
-- [google-cloud-lustre==0.1.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-lustre/CHANGELOG.md)
+- [google-cloud-lustre==0.1.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-lustre/CHANGELOG.md)
 - [google-cloud-maintenance-api==0.1.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-maintenance-api/CHANGELOG.md)
 - [google-cloud-managed-identities==1.12.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-managed-identities/CHANGELOG.md)
 - [google-cloud-managedkafka==0.1.12](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-managedkafka/CHANGELOG.md)
@@ -156,7 +156,7 @@ Changelogs
 - [google-cloud-redis==2.18.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-redis/CHANGELOG.md)
 - [google-cloud-resource-manager==1.14.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-resource-manager/CHANGELOG.md)
 - [google-cloud-retail==2.3.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-retail/CHANGELOG.md)
-- [google-cloud-run==0.10.18](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-run/CHANGELOG.md)
+- [google-cloud-run==0.10.19](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-run/CHANGELOG.md)
 - [google-cloud-scheduler==2.16.1](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-scheduler/CHANGELOG.md)
 - [google-cloud-secret-manager==2.24.0](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-secret-manager/CHANGELOG.md)
 - [google-cloud-securesourcemanager==0.1.15](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-securesourcemanager/CHANGELOG.md)
@@ -196,7 +196,7 @@ Changelogs
 - [google-cloud-workflows==1.18.2](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workflows/CHANGELOG.md)
 - [google-cloud-workstations==0.5.15](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-workstations/CHANGELOG.md)
 - [google-geo-type==0.3.13](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-geo-type/CHANGELOG.md)
-- [google-maps-addressvalidation==0.3.19](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-addressvalidation/CHANGELOG.md)
+- [google-maps-addressvalidation==0.3.20](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-addressvalidation/CHANGELOG.md)
 - [google-maps-areainsights==0.1.8](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-areainsights/CHANGELOG.md)
 - [google-maps-fleetengine-delivery==0.2.13](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-fleetengine-delivery/CHANGELOG.md)
 - [google-maps-fleetengine==0.2.11](https://github.com/googleapis/google-cloud-python/tree/main/packages/google-maps-fleetengine/CHANGELOG.md)

packages/google-apps-chat/google/apps/chat/__init__.py

@@ -26,9 +26,11 @@
 from google.apps.chat_v1.types.annotation import (
     Annotation,
     AnnotationType,
+    CalendarEventLinkData,
     ChatSpaceLinkData,
     CustomEmojiMetadata,
     DriveLinkData,
+    MeetSpaceLinkData,
     RichLinkMetadata,
     SlashCommandMetadata,
     UserMentionMetadata,
@@ -151,9 +153,11 @@
     "ChatServiceAsyncClient",
     "ActionStatus",
     "Annotation",
+    "CalendarEventLinkData",
     "ChatSpaceLinkData",
     "CustomEmojiMetadata",
     "DriveLinkData",
+    "MeetSpaceLinkData",
     "RichLinkMetadata",
     "SlashCommandMetadata",
     "UserMentionMetadata",

packages/google-apps-chat/google/apps/chat/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.2.6"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}

packages/google-apps-chat/google/apps/chat_v1/__init__.py

@@ -23,9 +23,11 @@
 from .types.annotation import (
     Annotation,
     AnnotationType,
+    CalendarEventLinkData,
     ChatSpaceLinkData,
     CustomEmojiMetadata,
     DriveLinkData,
+    MeetSpaceLinkData,
     RichLinkMetadata,
     SlashCommandMetadata,
     UserMentionMetadata,
@@ -150,6 +152,7 @@
     "AttachedGif",
     "Attachment",
     "AttachmentDataRef",
+    "CalendarEventLinkData",
     "CardWithId",
     "ChatServiceClient",
     "ChatSpaceLinkData",
@@ -200,6 +203,7 @@
     "ListSpacesRequest",
     "ListSpacesResponse",
     "MatchedUrl",
+    "MeetSpaceLinkData",
     "Membership",
     "MembershipBatchCreatedEventData",
     "MembershipBatchDeletedEventData",

packages/google-apps-chat/google/apps/chat_v1/gapic_version.py

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-__version__ = "0.2.6"  # {x-release-please-version}
+__version__ = "0.0.0"  # {x-release-please-version}

packages/google-apps-chat/google/apps/chat_v1/types/__init__.py

@@ -17,9 +17,11 @@
 from .annotation import (
     Annotation,
     AnnotationType,
+    CalendarEventLinkData,
     ChatSpaceLinkData,
     CustomEmojiMetadata,
     DriveLinkData,
+    MeetSpaceLinkData,
     RichLinkMetadata,
     SlashCommandMetadata,
     UserMentionMetadata,
@@ -137,9 +139,11 @@
 __all__ = (
     "ActionStatus",
     "Annotation",
+    "CalendarEventLinkData",
     "ChatSpaceLinkData",
     "CustomEmojiMetadata",
     "DriveLinkData",
+    "MeetSpaceLinkData",
     "RichLinkMetadata",
     "SlashCommandMetadata",
     "UserMentionMetadata",