Skip to content

Commit b753565

Browse files
gcf-owl-bot[bot]copybara-github
authored andcommitted
Copybara import of the project:
-- 3e757d2 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add `gpu_partition_size` to `MachineSpec` PiperOrigin-RevId: 794199275 Source-Link: googleapis/googleapis@2282643 Source-Link: googleapis/googleapis-gen@590ada3 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTkwYWRhMzNhZmFhYjllNWJhY2JlOTQ2YzIzNjZmOWI3ZDk0NzExNiJ9 feat: Add API for Gen AI Evaluation in Tuning PiperOrigin-RevId: 794142993 Source-Link: googleapis/googleapis@a6ec087 Source-Link: googleapis/googleapis-gen@e99c46f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTk5YzQ2ZmY1YTA4MmVjNWYzNmMxNDZhOTg0ZDEwYzhmZDk3MDFkYiJ9 feat: expose RecommendSpecs api to vertex python SDK for Custom Weights Model deployment PiperOrigin-RevId: 793835739 Source-Link: googleapis/googleapis@79a8512 Source-Link: googleapis/googleapis-gen@77e2347 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzdlMjM0NzhkYTQ5YTllNjdmNzcxZDFlMzU4OGRiYTkyMWU1N2ViYiJ9 feat: add option EndpointUserId and ModelUserId fields feat: migrate dedicated endpoint to be enabled by default docs: A comment for field `dedicated_endpoint_enabled` in message `.google.cloud.aiplatform.v1.DeployRequest` is changed PiperOrigin-RevId: 793795027 Source-Link: googleapis/googleapis@54236ee Source-Link: googleapis/googleapis-gen@51de9fe Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTFkZTlmZWU0M2U1ZjIwZmJjNDFiMTIxMWE2MjU3OTJjYWE1ZjUwMyJ9 feat: Added document_name for vertex ai search as part of retrieved context from grounding chunk PiperOrigin-RevId: 793753394 Source-Link: googleapis/googleapis@6d24fdd Source-Link: googleapis/googleapis-gen@e8c2681 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZThjMjY4MWRmNTdiMDAzOWQzNzc0MzdiNzgyNzhmMDc4ZTFiYmUyYiJ9 feat: Add support for CMEK, runtime controls, and PSC-I to Reasoning Engine protos docs: Add psc_interface_config, min/max_instances, resource_limits, container_concurrency to ReasoningEngineSpec docs: Add encryption_spec to ReasoningEngine PiperOrigin-RevId: 792745180 Source-Link: googleapis/googleapis@85f7aec Source-Link: googleapis/googleapis-gen@d68782f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDY4NzgyZjY5YmQ0Mjg5MzdmOWJkYzM4Y2ZjMzI3ZTE0NTdhODViZiJ9 feat: add expiration for TTL for Memory and Sessions feat: add direct_memories_source docs: Update comment for allowed values for config models PiperOrigin-RevId: 792354273 Source-Link: googleapis/googleapis@c5334a8 Source-Link: googleapis/googleapis-gen@15cb757 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTVjYjc1Nzg3NTQ3MjhiZmQ3MjY0ZDE5NGNkMDMzYTBhZWYyYTk2OCJ9 feat: add Grounding with Google Maps tool PiperOrigin-RevId: 792213276 Source-Link: googleapis/googleapis@e58f813 Source-Link: googleapis/googleapis-gen@70b047f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzBiMDQ3ZmIyNWNjZTY1MDc3YmE0MmIxZjgxOTQyMDEzYzg1NzM2MSJ9 docs: A comment for field `monitored_resource_labels` in message `.google.cloud.aiplatform.v1beta1.AutoscalingMetricSpec` is changed PiperOrigin-RevId: 791923596 Source-Link: googleapis/googleapis@b031657 Source-Link: googleapis/googleapis-gen@ec8abe6 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWM4YWJlNjQ0OTljM2U1OWY3OTVjNzk2OTI0ZjA0ZjYzNmM3MTQxMCJ9 feat: add force_delete field to DeleteRagFile 'preview' API request for Vertex RAG PiperOrigin-RevId: 791872264 Source-Link: googleapis/googleapis@f26e82a Source-Link: googleapis/googleapis-gen@51342dc Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTEzNDJkYzhiMzk4NTEyYjIwODM3YmZlZTAwZThlY2YyMTNhODA0NiJ9 -- 143b417 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md COPYBARA_INTEGRATE_REVIEW=#5685 from googleapis:owl-bot-copy b8d9246 PiperOrigin-RevId: 794683232
1 parent 0870512 commit b753565

File tree

59 files changed

+3353
-176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3353
-176
lines changed

google/cloud/aiplatform_v1/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -952,6 +952,7 @@
952952
from .types.tool import FunctionCallingConfig
953953
from .types.tool import FunctionDeclaration
954954
from .types.tool import FunctionResponse
955+
from .types.tool import GoogleMaps
955956
from .types.tool import GoogleSearchRetrieval
956957
from .types.tool import RagRetrievalConfig
957958
from .types.tool import Retrieval
@@ -1485,6 +1486,7 @@
14851486
"GetTrialRequest",
14861487
"GetTuningJobRequest",
14871488
"GoogleDriveSource",
1489+
"GoogleMaps",
14881490
"GoogleSearchRetrieval",
14891491
"GroundednessInput",
14901492
"GroundednessInstance",

google/cloud/aiplatform_v1/services/reasoning_engine_service/async_client.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
from google.api_core import operation as gac_operation # type: ignore
4949
from google.api_core import operation_async # type: ignore
5050
from google.cloud.aiplatform_v1.services.reasoning_engine_service import pagers
51+
from google.cloud.aiplatform_v1.types import encryption_spec
5152
from google.cloud.aiplatform_v1.types import operation as gca_operation
5253
from google.cloud.aiplatform_v1.types import reasoning_engine
5354
from google.cloud.aiplatform_v1.types import reasoning_engine as gca_reasoning_engine
@@ -85,6 +86,12 @@ class ReasoningEngineServiceAsyncClient:
8586
_DEFAULT_ENDPOINT_TEMPLATE = ReasoningEngineServiceClient._DEFAULT_ENDPOINT_TEMPLATE
8687
_DEFAULT_UNIVERSE = ReasoningEngineServiceClient._DEFAULT_UNIVERSE
8788

89+
network_attachment_path = staticmethod(
90+
ReasoningEngineServiceClient.network_attachment_path
91+
)
92+
parse_network_attachment_path = staticmethod(
93+
ReasoningEngineServiceClient.parse_network_attachment_path
94+
)
8895
reasoning_engine_path = staticmethod(
8996
ReasoningEngineServiceClient.reasoning_engine_path
9097
)

google/cloud/aiplatform_v1/services/reasoning_engine_service/client.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
from google.api_core import operation as gac_operation # type: ignore
6565
from google.api_core import operation_async # type: ignore
6666
from google.cloud.aiplatform_v1.services.reasoning_engine_service import pagers
67+
from google.cloud.aiplatform_v1.types import encryption_spec
6768
from google.cloud.aiplatform_v1.types import operation as gca_operation
6869
from google.cloud.aiplatform_v1.types import reasoning_engine
6970
from google.cloud.aiplatform_v1.types import reasoning_engine as gca_reasoning_engine
@@ -221,6 +222,28 @@ def transport(self) -> ReasoningEngineServiceTransport:
221222
"""
222223
return self._transport
223224

225+
@staticmethod
226+
def network_attachment_path(
227+
project: str,
228+
region: str,
229+
networkattachment: str,
230+
) -> str:
231+
"""Returns a fully-qualified network_attachment string."""
232+
return "projects/{project}/regions/{region}/networkAttachments/{networkattachment}".format(
233+
project=project,
234+
region=region,
235+
networkattachment=networkattachment,
236+
)
237+
238+
@staticmethod
239+
def parse_network_attachment_path(path: str) -> Dict[str, str]:
240+
"""Parses a network_attachment path into its component segments."""
241+
m = re.match(
242+
r"^projects/(?P<project>.+?)/regions/(?P<region>.+?)/networkAttachments/(?P<networkattachment>.+?)$",
243+
path,
244+
)
245+
return m.groupdict() if m else {}
246+
224247
@staticmethod
225248
def reasoning_engine_path(
226249
project: str,

google/cloud/aiplatform_v1/types/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,6 +1069,7 @@
10691069
FunctionCallingConfig,
10701070
FunctionDeclaration,
10711071
FunctionResponse,
1072+
GoogleMaps,
10721073
GoogleSearchRetrieval,
10731074
RagRetrievalConfig,
10741075
Retrieval,
@@ -2029,6 +2030,7 @@
20292030
"FunctionCallingConfig",
20302031
"FunctionDeclaration",
20312032
"FunctionResponse",
2033+
"GoogleMaps",
20322034
"GoogleSearchRetrieval",
20332035
"RagRetrievalConfig",
20342036
"Retrieval",

google/cloud/aiplatform_v1/types/content.py

Lines changed: 79 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,9 @@ class Part(proto.Message):
199199
thought (bool):
200200
Indicates if the part is thought from the
201201
model.
202-
203-
This field is a member of `oneof`_ ``data``.
204202
thought_signature (bytes):
205203
An opaque signature for the thought so it can
206204
be reused in subsequent requests.
207-
208-
This field is a member of `oneof`_ ``data``.
209205
video_metadata (google.cloud.aiplatform_v1.types.VideoMetadata):
210206
Optional. Video metadata. The metadata should only be
211207
specified while the video data is presented in inline_data
@@ -258,12 +254,10 @@ class Part(proto.Message):
258254
thought: bool = proto.Field(
259255
proto.BOOL,
260256
number=10,
261-
oneof="data",
262257
)
263258
thought_signature: bytes = proto.Field(
264259
proto.BYTES,
265260
number=11,
266-
oneof="data",
267261
)
268262
video_metadata: "VideoMetadata" = proto.Field(
269263
proto.MESSAGE,
@@ -1237,6 +1231,10 @@ class GroundingChunk(proto.Message):
12371231
Grounding chunk from context retrieved by the
12381232
retrieval tools.
12391233
1234+
This field is a member of `oneof`_ ``chunk_type``.
1235+
maps (google.cloud.aiplatform_v1.types.GroundingChunk.Maps):
1236+
Grounding chunk from Google Maps.
1237+
12401238
This field is a member of `oneof`_ ``chunk_type``.
12411239
"""
12421240

@@ -1291,6 +1289,11 @@ class RetrievedContext(proto.Message):
12911289
Text of the attribution.
12921290
12931291
This field is a member of `oneof`_ ``_text``.
1292+
document_name (str):
1293+
Output only. The full document name for the
1294+
referenced Vertex AI Search document.
1295+
1296+
This field is a member of `oneof`_ ``_document_name``.
12941297
"""
12951298

12961299
rag_chunk: vertex_rag_data.RagChunk = proto.Field(
@@ -1314,6 +1317,57 @@ class RetrievedContext(proto.Message):
13141317
number=3,
13151318
optional=True,
13161319
)
1320+
document_name: str = proto.Field(
1321+
proto.STRING,
1322+
number=6,
1323+
optional=True,
1324+
)
1325+
1326+
class Maps(proto.Message):
1327+
r"""Chunk from Google Maps.
1328+
1329+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
1330+
1331+
Attributes:
1332+
uri (str):
1333+
URI reference of the chunk.
1334+
1335+
This field is a member of `oneof`_ ``_uri``.
1336+
title (str):
1337+
Title of the chunk.
1338+
1339+
This field is a member of `oneof`_ ``_title``.
1340+
text (str):
1341+
Text of the chunk.
1342+
1343+
This field is a member of `oneof`_ ``_text``.
1344+
place_id (str):
1345+
This Place's resource name, in ``places/{place_id}`` format.
1346+
Can be used to look up the Place.
1347+
1348+
This field is a member of `oneof`_ ``_place_id``.
1349+
"""
1350+
1351+
uri: str = proto.Field(
1352+
proto.STRING,
1353+
number=1,
1354+
optional=True,
1355+
)
1356+
title: str = proto.Field(
1357+
proto.STRING,
1358+
number=2,
1359+
optional=True,
1360+
)
1361+
text: str = proto.Field(
1362+
proto.STRING,
1363+
number=3,
1364+
optional=True,
1365+
)
1366+
place_id: str = proto.Field(
1367+
proto.STRING,
1368+
number=4,
1369+
optional=True,
1370+
)
13171371

13181372
web: Web = proto.Field(
13191373
proto.MESSAGE,
@@ -1327,6 +1381,12 @@ class RetrievedContext(proto.Message):
13271381
oneof="chunk_type",
13281382
message=RetrievedContext,
13291383
)
1384+
maps: Maps = proto.Field(
1385+
proto.MESSAGE,
1386+
number=3,
1387+
oneof="chunk_type",
1388+
message=Maps,
1389+
)
13301390

13311391

13321392
class GroundingSupport(proto.Message):
@@ -1391,6 +1451,14 @@ class GroundingMetadata(proto.Message):
13911451
Optional. Output only. Retrieval metadata.
13921452
13931453
This field is a member of `oneof`_ ``_retrieval_metadata``.
1454+
google_maps_widget_context_token (str):
1455+
Optional. Output only. Resource name of the
1456+
Google Maps widget context token to be used with
1457+
the PlacesContextElement widget to render
1458+
contextual data. This is populated only for
1459+
Google Maps grounding.
1460+
1461+
This field is a member of `oneof`_ ``_google_maps_widget_context_token``.
13941462
"""
13951463

13961464
web_search_queries: MutableSequence[str] = proto.RepeatedField(
@@ -1419,6 +1487,11 @@ class GroundingMetadata(proto.Message):
14191487
optional=True,
14201488
message="RetrievalMetadata",
14211489
)
1490+
google_maps_widget_context_token: str = proto.Field(
1491+
proto.STRING,
1492+
number=8,
1493+
optional=True,
1494+
)
14221495

14231496

14241497
class SearchEntryPoint(proto.Message):

google/cloud/aiplatform_v1/types/model_garden_service.py

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,16 @@ class ModelConfig(proto.Message):
171171
Optional. The specification of the container
172172
that is to be used when deploying. If not set,
173173
the default container spec will be used.
174+
model_user_id (str):
175+
Optional. The ID to use for the uploaded Model, which will
176+
become the final component of the model resource name. When
177+
not provided, Vertex AI will generate a value for this ID.
178+
When Model Registry model is provided, this field will be
179+
ignored.
180+
181+
This value may be up to 63 characters, and valid characters
182+
are ``[a-z0-9_-]``. The first character cannot be a number
183+
or hyphen.
174184
"""
175185

176186
accept_eula: bool = proto.Field(
@@ -194,6 +204,10 @@ class ModelConfig(proto.Message):
194204
number=5,
195205
message=gca_model.ModelContainerSpec,
196206
)
207+
model_user_id: str = proto.Field(
208+
proto.STRING,
209+
number=6,
210+
)
197211

198212
class EndpointConfig(proto.Message):
199213
r"""The endpoint config to use for the deployment.
@@ -204,14 +218,46 @@ class EndpointConfig(proto.Message):
204218
the endpoint. If not set, a default name will be
205219
used.
206220
dedicated_endpoint_enabled (bool):
207-
Optional. If true, the endpoint will be exposed through a
221+
Optional. Deprecated. Use dedicated_endpoint_disabled
222+
instead. If true, the endpoint will be exposed through a
208223
dedicated DNS [Endpoint.dedicated_endpoint_dns]. Your
209224
request to the dedicated DNS will be isolated from other
210225
users' traffic and will have better performance and
211226
reliability. Note: Once you enabled dedicated endpoint, you
212227
won't be able to send request to the shared DNS
213228
{region}-aiplatform.googleapis.com. The limitations will be
214229
removed soon.
230+
dedicated_endpoint_disabled (bool):
231+
Optional. By default, if dedicated endpoint is enabled, the
232+
endpoint will be exposed through a dedicated DNS
233+
[Endpoint.dedicated_endpoint_dns]. Your request to the
234+
dedicated DNS will be isolated from other users' traffic and
235+
will have better performance and reliability. Note: Once you
236+
enabled dedicated endpoint, you won't be able to send
237+
request to the shared DNS
238+
{region}-aiplatform.googleapis.com. The limitations will be
239+
removed soon.
240+
241+
If this field is set to true, the dedicated endpoint will be
242+
disabled and the deployed model will be exposed through the
243+
shared DNS {region}-aiplatform.googleapis.com.
244+
endpoint_user_id (str):
245+
Optional. Immutable. The ID to use for endpoint, which will
246+
become the final component of the endpoint resource name. If
247+
not provided, Vertex AI will generate a value for this ID.
248+
249+
If the first character is a letter, this value may be up to
250+
63 characters, and valid characters are ``[a-z0-9-]``. The
251+
last character must be a letter or number.
252+
253+
If the first character is a number, this value may be up to
254+
9 characters, and valid characters are ``[0-9]`` with no
255+
leading zeros.
256+
257+
When using HTTP/JSON, this field is populated based on a
258+
query string argument, such as ``?endpoint_id=12345``. This
259+
is the fallback for fields that are not included in either
260+
the URI or the body.
215261
"""
216262

217263
endpoint_display_name: str = proto.Field(
@@ -222,6 +268,14 @@ class EndpointConfig(proto.Message):
222268
proto.BOOL,
223269
number=2,
224270
)
271+
dedicated_endpoint_disabled: bool = proto.Field(
272+
proto.BOOL,
273+
number=4,
274+
)
275+
endpoint_user_id: str = proto.Field(
276+
proto.STRING,
277+
number=3,
278+
)
225279

226280
class DeployConfig(proto.Message):
227281
r"""The deploy config to use for the deployment.

0 commit comments

Comments
 (0)