chore: Add protobuf 7.x support

google/cloud/aiplatform/_streaming_prediction.py

@@ -38,12 +38,12 @@ def value_to_tensor(value: Any) -> aiplatform_types.Tensor:
     """
     if value is None:
         return aiplatform_types.Tensor()
+    elif isinstance(value, bool):
+        return aiplatform_types.Tensor(bool_val=[value])
     elif isinstance(value, int):
         return aiplatform_types.Tensor(int_val=[value])
     elif isinstance(value, float):
         return aiplatform_types.Tensor(float_val=[value])
-    elif isinstance(value, bool):
-        return aiplatform_types.Tensor(bool_val=[value])
     elif isinstance(value, str):
         return aiplatform_types.Tensor(string_val=[value])
     elif isinstance(value, bytes):

setup.py

@@ -322,7 +322,7 @@
         "google-auth >= 2.47.0, <3.0.0",
         "certifi >= 2023.7.22",
         "proto-plus >= 1.22.3, <2.0.0",
-        "protobuf>=3.20.2,<7.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
+        "protobuf>=3.20.2,<8.0.0,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
         "packaging >= 14.3",
         "google-cloud-storage >= 1.32.0, < 4.0.0; python_version<'3.13'",
         "google-cloud-storage >= 3.10.0, < 4.0.0; python_version>='3.13'",

testing/constraints-3.14.txt

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # This constraints file is required for unit tests.
 # List all library dependencies and extras in this file.
-google-api-core==2.27.0
 google-auth==2.49.0
 proto-plus
 mock==4.0.2
@@ -13,4 +12,5 @@ ipython==8.22.2 # Pinned to unbreak TypeAliasType import error
 google-adk==0.0.2
 google-genai>=1.10.0
 google-vizier==0.1.21
-pyarrow>=22.0.0
+pyarrow>=22.0.0
+protobuf>=7

testing/constraints-adk.txt

@@ -0,0 +1 @@
+protobuf<5.0.0

tests/unit/aiplatform/test_initializer.py

@@ -385,12 +385,9 @@ def test_create_client_user_agent(self):
             client_class=utils.ModelClientWithOverride
         )
 
-        for wrapped_method in client._transport._wrapped_methods.values():
-            # wrapped_method._metadata looks like:
-            # [('x-goog-api-client', 'model-builder/0.3.1 gl-python/3.7.6 grpc/1.30.0 gax/1.22.2 gapic/0.3.1')]
-            user_agent = wrapped_method._metadata[0][1]
-            assert "model-builder/" in user_agent
-            assert "google.cloud.aiplatform" in user_agent
+        user_agent = client._client_info.to_user_agent()
+        assert "model-builder/" in user_agent
+        assert "google.cloud.aiplatform" in user_agent
 
     def test_create_client_user_agent_top_level_method(self):
         initializer.global_config.init(project=_TEST_PROJECT, location=_TEST_LOCATION)
@@ -404,14 +401,11 @@ def __init__(self):
                     client_class=utils.ModelClientWithOverride
                 )
 
-        for wrapped_method in SomeClass()._client._transport._wrapped_methods.values():
-            # wrapped_method._metadata looks like:
-            # [('x-goog-api-client', 'model-builder/0.3.1 gl-python/3.7.6 grpc/1.30.0 gax/1.22.2 gapic/0.3.1')]
-            user_agent = wrapped_method._metadata[0][1]
-            assert (
-                f"+{initializer._TOP_GOOGLE_CONSTRUCTOR_METHOD_TAG}+vertexai.SomeClass.__init__"
-                in user_agent
-            )
+        user_agent = SomeClass()._client._client_info.to_user_agent()
+        assert (
+            f"+{initializer._TOP_GOOGLE_CONSTRUCTOR_METHOD_TAG}+vertexai.SomeClass.__init__"
+            in user_agent
+        )
 
     def test_create_client_appended_user_agent(self):
         appended_user_agent = ["fake_user_agent", "another_fake_user_agent"]
@@ -421,12 +415,9 @@ def test_create_client_appended_user_agent(self):
             appended_user_agent=appended_user_agent,
         )
 
-        for wrapped_method in client._transport._wrapped_methods.values():
-            # wrapped_method._metadata looks like:
-            # [('x-goog-api-client', 'model-builder/0.3.1 gl-python/3.7.6 grpc/1.30.0 gax/1.22.2 gapic/0.3.1')]
-            user_agent = wrapped_method._metadata[0][1]
-            assert " " + appended_user_agent[0] in user_agent
-            assert " " + appended_user_agent[1] in user_agent
+        user_agent = client._client_info.to_user_agent()
+        assert " " + appended_user_agent[0] in user_agent
+        assert " " + appended_user_agent[1] in user_agent
 
     def test_set_api_endpoint(self):
         initializer.global_config.init(