Resolve merge conflict

Author: yinghsienwu

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "1.119.0"
+    ".": "1.120.0"
 }

CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## [1.120.0](https://github.com/googleapis/python-aiplatform/compare/v1.119.0...v1.120.0) (2025-10-08)
+
+
+### Features
+
+* Add ability to use existing sessions for streaming_agent_run_with_events calls. ([0a369ea](https://github.com/googleapis/python-aiplatform/commit/0a369eacaa4e21e8055ef7c2e0f4c6da3a9298f8))
+* Add DeploymentTier enum to DeployedIndex ([89a26c1](https://github.com/googleapis/python-aiplatform/commit/89a26c15b8a15c8698192dc283e5839729ad3e66))
+* Add labels field for Predict API for Imagen use case (v1beta) ([89a26c1](https://github.com/googleapis/python-aiplatform/commit/89a26c15b8a15c8698192dc283e5839729ad3e66))
+* Auto-generated CL for //google/cloud/aiplatform:aiplatform_v1_public_proto_gen ([89a26c1](https://github.com/googleapis/python-aiplatform/commit/89a26c15b8a15c8698192dc283e5839729ad3e66))
+* Expose PSC for CustomModel ([d02099c](https://github.com/googleapis/python-aiplatform/commit/d02099cf200f7e372ad0c38f98a5b8c92bcc581c))
+* GenAI Client(evals) - Add `get_evaluation_set` and `get_evaluation_item` methods to Vertex AI GenAI SDK evals ([7757886](https://github.com/googleapis/python-aiplatform/commit/77578867ff7c4e8a9c4618481821cded32b4b135))
+* GenAI Client(evals) - Add `show` method for EvaluationRun class in Vertex AI GenAI SDK evals ([0c932b9](https://github.com/googleapis/python-aiplatform/commit/0c932b99bafde099734cf136828583de23fbaeb6))
+* Migrate vertex ai session service to use agent engine sdk ([b72df1c](https://github.com/googleapis/python-aiplatform/commit/b72df1c3e418c4b87ecb92e1506e7f3fe8da3994))
+* Migrate vertex_ai_session_service to use Agent Engine SDK ([55b54a2](https://github.com/googleapis/python-aiplatform/commit/55b54a21005587338abdd66c7605f534294b0c94))
+* Migrate vertex_ai_session_service to use Agent Engine SDK ([03772e2](https://github.com/googleapis/python-aiplatform/commit/03772e2a87f2fc6c66a69220e004522cc6ba1f94))
+
+
+### Bug Fixes
+
+* GenAI Client(evals) - Parse user defined rubrics correctly to LLM metric ([64b0665](https://github.com/googleapis/python-aiplatform/commit/64b0665169b045ccfd16e537af2e45a4dd7977e0))
+
+
+### Documentation
+
+* Fix Sessions SDK docstrings ([0077bde](https://github.com/googleapis/python-aiplatform/commit/0077bdebe62d0363c1faacd5f6e5562086dff080))
+
 ## [1.119.0](https://github.com/googleapis/python-aiplatform/compare/v1.118.0...v1.119.0) (2025-10-03)
 
 

google/cloud/aiplatform/gapic_version.py

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

google/cloud/aiplatform/matching_engine/matching_engine_index.py

@@ -588,6 +588,7 @@ def create_tree_ah_index(
                     SHARD_SIZE_SMALL
                     SHARD_SIZE_MEDIUM
                     SHARD_SIZE_LARGE
+                    SHARD_SIZE_SO_DYNAMIC
 
 
         Returns:
@@ -740,6 +741,7 @@ def create_brute_force_index(
                     SHARD_SIZE_SMALL
                     SHARD_SIZE_MEDIUM
                     SHARD_SIZE_LARGE
+                    SHARD_SIZE_SO_DYNAMIC
 
         Returns:
             MatchingEngineIndex - Index resource object

google/cloud/aiplatform/matching_engine/matching_engine_index_endpoint.py

@@ -944,6 +944,7 @@ def _build_deployed_index(
         auth_config_audiences: Optional[Sequence[str]] = None,
         auth_config_allowed_issuers: Optional[Sequence[str]] = None,
         psc_automation_configs: Optional[Sequence[Tuple[str, str]]] = None,
+        deployment_tier: Optional[str] = None,
     ) -> gca_matching_engine_index_endpoint.DeployedIndex:
         """Builds a DeployedIndex.
 
@@ -1046,6 +1047,8 @@ def _build_deployed_index(
                 projects/{project}/global/networks/{network}, where
                 {project} is a project number, as in '12345', and {network}
                 is network name.
+            deployment_tier (str):
+                Optional. The deployment tier that the index is deployed to.
 
         """
 
@@ -1056,6 +1059,7 @@ def _build_deployed_index(
             enable_access_logging=enable_access_logging,
             reserved_ip_ranges=reserved_ip_ranges,
             deployment_group=deployment_group,
+            deployment_tier=deployment_tier,
         )
 
         if auth_config_audiences and auth_config_allowed_issuers:
@@ -1115,6 +1119,7 @@ def deploy_index(
         sync: bool = True,
         deploy_request_timeout: Optional[float] = None,
         psc_automation_configs: Optional[Sequence[Tuple[str, str]]] = None,
+        deployment_tier: Optional[str] = None,
     ) -> "MatchingEngineIndexEndpoint":
         """Deploys an existing index resource to this endpoint resource.
 
@@ -1231,6 +1236,8 @@ def deploy_index(
                 [(project_id_1, network_1), (project_id_1, network_2))] will enable
                 PSC automation for the index to be deployed to project_id_1's network_1
                 and network_2 and can be queried within these networks.
+            deployment_tier (str):
+                Optional. The deployment tier that the index is deployed to.
         Returns:
             MatchingEngineIndexEndpoint - IndexEndpoint resource object
         """
@@ -1250,6 +1257,7 @@ def deploy_index(
             sync=sync,
             deploy_request_timeout=deploy_request_timeout,
             psc_automation_configs=psc_automation_configs,
+            deployment_tier=deployment_tier,
         )
 
     @base.optional_sync(return_input_arg="self")
@@ -1270,6 +1278,7 @@ def _deploy_index(
         sync: bool = True,
         deploy_request_timeout: Optional[float] = None,
         psc_automation_configs: Optional[Sequence[Tuple[str, str]]] = None,
+        deployment_tier: Optional[str] = None,
     ) -> "MatchingEngineIndexEndpoint":
         """Helper method to deploy an existing index resource to this endpoint resource.
 
@@ -1386,6 +1395,8 @@ def _deploy_index(
                 [(project_id_1, network_1), (project_id_1, network_2))] will enable
                 PSC automation for the index to be deployed to project_id_1's network_1
                 and network_2 and can be queried within these networks.
+            deployment_tier (str):
+                Optional. The deployment tier that the index is deployed to.
         Returns:
             MatchingEngineIndexEndpoint - IndexEndpoint resource object
         """
@@ -1411,6 +1422,7 @@ def _deploy_index(
             auth_config_audiences=auth_config_audiences,
             auth_config_allowed_issuers=auth_config_allowed_issuers,
             psc_automation_configs=psc_automation_configs,
+            deployment_tier=deployment_tier,
         )
 
         deploy_lro = self.api_client.deploy_index(

google/cloud/aiplatform/v1/schema/predict/instance/gapic_version.py

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

google/cloud/aiplatform/v1/schema/predict/instance_v1/gapic_version.py

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

google/cloud/aiplatform/v1/schema/predict/params/gapic_version.py

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

google/cloud/aiplatform/v1/schema/predict/params_v1/gapic_version.py

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

google/cloud/aiplatform/v1/schema/predict/prediction/gapic_version.py

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