Skip to content

Commit 89a26c1

Browse files
gcf-owl-bot[bot]copybara-github
gcf-owl-bot[bot]
authored and
copybara-github
committed
Copybara import of the project:
-- e339795 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat:Auto-generated CL for //google/cloud/aiplatform:aiplatform_v1beta1_public_proto_gen PiperOrigin-RevId: 813083326 Source-Link: googleapis/googleapis@3ecf1f0 Source-Link: googleapis/googleapis-gen@00da0dd Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMDBkYTBkZDIyZDAwZmNkMTExMGE0MGI5MzJiNzI0M2Q4ZmRlZmIzYyJ9 -- efdd99a 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 -- b9fd9fa by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: Auto-generated CL for //google/cloud/aiplatform:aiplatform_v1_public_proto_gen PiperOrigin-RevId: 813096234 Source-Link: googleapis/googleapis@e78280f Source-Link: googleapis/googleapis-gen@d83eeb4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDgzZWViNGIwNTU5YWQwYjMyNDMxNTJlYzhiOGMyMzEwYzIzYWVjNyJ9 -- e01fdae 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 -- 5f2b229 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add DeploymentTier enum to DeployedIndex PiperOrigin-RevId: 813384393 Source-Link: googleapis/googleapis@063f9e1 Source-Link: googleapis/googleapis-gen@1119646 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTExOTY0NmY5ZTUxOTIyZmJjYThjM2E3YWU3NDNhNmM3OTEzMWMxZSJ9 -- b9d3464 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 -- fabb82d by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: Add labels field for Predict API for Imagen use case (v1beta) PiperOrigin-RevId: 815803050 Source-Link: googleapis/googleapis@7f0c1e5 Source-Link: googleapis/googleapis-gen@a452a5d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTQ1MmE1ZGRhOGU3MmMzMmQ2MGIwMWU3NTFiZDBjYmRmNmIzYTI2ZSJ9 -- 8cf83c2 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=#5863 from googleapis:owl-bot-copy a962595 PiperOrigin-RevId: 815901905
1 parent 7757886 commit 89a26c1

File tree

15 files changed

+256
-62
lines changed

15 files changed

+256
-62
lines changed

‎google/cloud/aiplatform_v1/services/migration_service/client.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -265,40 +265,40 @@ def parse_dataset_path(path: str) -> Dict[str, str]:
265265
@staticmethod
266266
def dataset_path(
267267
project: str,
268+
location: str,
268269
dataset: str,
269270
) -> str:
270271
"""Returns a fully-qualified dataset string."""
271-
return "projects/{project}/datasets/{dataset}".format(
272+
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
272273
project=project,
274+
location=location,
273275
dataset=dataset,
274276
)
275277

276278
@staticmethod
277279
def parse_dataset_path(path: str) -> Dict[str, str]:
278280
"""Parses a dataset path into its component segments."""
279-
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
281+
m = re.match(
282+
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
283+
path,
284+
)
280285
return m.groupdict() if m else {}
281286

282287
@staticmethod
283288
def dataset_path(
284289
project: str,
285-
location: str,
286290
dataset: str,
287291
) -> str:
288292
"""Returns a fully-qualified dataset string."""
289-
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
293+
return "projects/{project}/datasets/{dataset}".format(
290294
project=project,
291-
location=location,
292295
dataset=dataset,
293296
)
294297

295298
@staticmethod
296299
def parse_dataset_path(path: str) -> Dict[str, str]:
297300
"""Parses a dataset path into its component segments."""
298-
m = re.match(
299-
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
300-
path,
301-
)
301+
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
302302
return m.groupdict() if m else {}
303303

304304
@staticmethod

‎google/cloud/aiplatform_v1/types/accelerator_type.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ class AcceleratorType(proto.Enum):
6363
Nvidia B200 GPU.
6464
NVIDIA_GB200 (17):
6565
Nvidia GB200 GPU.
66+
NVIDIA_RTX_PRO_6000 (18):
67+
Nvidia RTX Pro 6000 GPU.
6668
TPU_V2 (6):
6769
TPU v2.
6870
TPU_V3 (7):
@@ -87,6 +89,7 @@ class AcceleratorType(proto.Enum):
8789
NVIDIA_H200_141GB = 15
8890
NVIDIA_B200 = 16
8991
NVIDIA_GB200 = 17
92+
NVIDIA_RTX_PRO_6000 = 18
9093
TPU_V2 = 6
9194
TPU_V3 = 7
9295
TPU_V4_POD = 10

‎google/cloud/aiplatform_v1/types/index_endpoint.py‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,13 +342,31 @@ class DeployedIndex(proto.Message):
342342
343343
Note: we only support up to 5 deployment groups(not
344344
including 'default').
345+
deployment_tier (google.cloud.aiplatform_v1.types.DeployedIndex.DeploymentTier):
346+
Optional. The deployment tier that the index is deployed to.
347+
DEPLOYMENT_TIER_UNSPECIFIED will use a system-chosen default
348+
tier.
345349
psc_automation_configs (MutableSequence[google.cloud.aiplatform_v1.types.PSCAutomationConfig]):
346350
Optional. If set for PSC deployed index, PSC connection will
347351
be automatically created after deployment is done and the
348352
endpoint information is populated in
349353
private_endpoints.psc_automated_endpoints.
350354
"""
351355

356+
class DeploymentTier(proto.Enum):
357+
r"""Tiers encapsulate serving time attributes like latency and
358+
throughput.
359+
360+
Values:
361+
DEPLOYMENT_TIER_UNSPECIFIED (0):
362+
Default deployment tier.
363+
STORAGE (2):
364+
Optimized for costs.
365+
"""
366+
367+
DEPLOYMENT_TIER_UNSPECIFIED = 0
368+
STORAGE = 2
369+
352370
id: str = proto.Field(
353371
proto.STRING,
354372
number=1,
@@ -407,6 +425,11 @@ class DeployedIndex(proto.Message):
407425
proto.STRING,
408426
number=11,
409427
)
428+
deployment_tier: DeploymentTier = proto.Field(
429+
proto.ENUM,
430+
number=18,
431+
enum=DeploymentTier,
432+
)
410433
psc_automation_configs: MutableSequence[service_networking.PSCAutomationConfig] = (
411434
proto.RepeatedField(
412435
proto.MESSAGE,

‎google/cloud/aiplatform_v1/types/tool.py‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,73 @@ class Tool(proto.Message):
106106
specific Function Declarations.
107107
"""
108108

109+
class PhishBlockThreshold(proto.Enum):
110+
r"""These are available confidence level user can set to block
111+
malicious urls with chosen confidence and above. For
112+
understanding different confidence of webrisk, please refer to
113+
https://cloud.google.com/web-risk/docs/reference/rpc/google.cloud.webrisk.v1eap1#confidencelevel
114+
115+
Values:
116+
PHISH_BLOCK_THRESHOLD_UNSPECIFIED (0):
117+
Defaults to unspecified.
118+
BLOCK_LOW_AND_ABOVE (30):
119+
Blocks Low and above confidence URL that is
120+
risky.
121+
BLOCK_MEDIUM_AND_ABOVE (40):
122+
Blocks Medium and above confidence URL that
123+
is risky.
124+
BLOCK_HIGH_AND_ABOVE (50):
125+
Blocks High and above confidence URL that is
126+
risky.
127+
BLOCK_HIGHER_AND_ABOVE (55):
128+
Blocks Higher and above confidence URL that
129+
is risky.
130+
BLOCK_VERY_HIGH_AND_ABOVE (60):
131+
Blocks Very high and above confidence URL
132+
that is risky.
133+
BLOCK_ONLY_EXTREMELY_HIGH (100):
134+
Blocks Extremely high confidence URL that is
135+
risky.
136+
"""
137+
138+
PHISH_BLOCK_THRESHOLD_UNSPECIFIED = 0
139+
BLOCK_LOW_AND_ABOVE = 30
140+
BLOCK_MEDIUM_AND_ABOVE = 40
141+
BLOCK_HIGH_AND_ABOVE = 50
142+
BLOCK_HIGHER_AND_ABOVE = 55
143+
BLOCK_VERY_HIGH_AND_ABOVE = 60
144+
BLOCK_ONLY_EXTREMELY_HIGH = 100
145+
109146
class GoogleSearch(proto.Message):
110147
r"""GoogleSearch tool type.
111148
Tool to support Google Search in Model. Powered by Google.
112149
150+
151+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
152+
113153
Attributes:
114154
exclude_domains (MutableSequence[str]):
115155
Optional. List of domains to be excluded from the search
116156
results. The default limit is 2000 domains. Example:
117157
["amazon.com", "facebook.com"].
158+
blocking_confidence (google.cloud.aiplatform_v1.types.Tool.PhishBlockThreshold):
159+
Optional. Sites with confidence level chosen
160+
& above this value will be blocked from the
161+
search results.
162+
163+
This field is a member of `oneof`_ ``_blocking_confidence``.
118164
"""
119165

120166
exclude_domains: MutableSequence[str] = proto.RepeatedField(
121167
proto.STRING,
122168
number=3,
123169
)
170+
blocking_confidence: "Tool.PhishBlockThreshold" = proto.Field(
171+
proto.ENUM,
172+
number=4,
173+
optional=True,
174+
enum="Tool.PhishBlockThreshold",
175+
)
124176

125177
class CodeExecution(proto.Message):
126178
r"""Tool that executes code generated by the model, and automatically
@@ -692,17 +744,32 @@ class EnterpriseWebSearch(proto.Message):
692744
r"""Tool to search public web data, powered by Vertex AI Search
693745
and Sec4 compliance.
694746
747+
748+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
749+
695750
Attributes:
696751
exclude_domains (MutableSequence[str]):
697752
Optional. List of domains to be excluded from
698753
the search results. The default limit is 2000
699754
domains.
755+
blocking_confidence (google.cloud.aiplatform_v1.types.Tool.PhishBlockThreshold):
756+
Optional. Sites with confidence level chosen
757+
& above this value will be blocked from the
758+
search results.
759+
760+
This field is a member of `oneof`_ ``_blocking_confidence``.
700761
"""
701762

702763
exclude_domains: MutableSequence[str] = proto.RepeatedField(
703764
proto.STRING,
704765
number=1,
705766
)
767+
blocking_confidence: "Tool.PhishBlockThreshold" = proto.Field(
768+
proto.ENUM,
769+
number=2,
770+
optional=True,
771+
enum="Tool.PhishBlockThreshold",
772+
)
706773

707774

708775
class DynamicRetrievalConfig(proto.Message):

‎google/cloud/aiplatform_v1beta1/services/migration_service/client.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -243,40 +243,40 @@ def parse_annotated_dataset_path(path: str) -> Dict[str, str]:
243243
@staticmethod
244244
def dataset_path(
245245
project: str,
246+
location: str,
246247
dataset: str,
247248
) -> str:
248249
"""Returns a fully-qualified dataset string."""
249-
return "projects/{project}/datasets/{dataset}".format(
250+
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
250251
project=project,
252+
location=location,
251253
dataset=dataset,
252254
)
253255

254256
@staticmethod
255257
def parse_dataset_path(path: str) -> Dict[str, str]:
256258
"""Parses a dataset path into its component segments."""
257-
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
259+
m = re.match(
260+
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
261+
path,
262+
)
258263
return m.groupdict() if m else {}
259264

260265
@staticmethod
261266
def dataset_path(
262267
project: str,
263-
location: str,
264268
dataset: str,
265269
) -> str:
266270
"""Returns a fully-qualified dataset string."""
267-
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
271+
return "projects/{project}/datasets/{dataset}".format(
268272
project=project,
269-
location=location,
270273
dataset=dataset,
271274
)
272275

273276
@staticmethod
274277
def parse_dataset_path(path: str) -> Dict[str, str]:
275278
"""Parses a dataset path into its component segments."""
276-
m = re.match(
277-
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
278-
path,
279-
)
279+
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
280280
return m.groupdict() if m else {}
281281

282282
@staticmethod

‎google/cloud/aiplatform_v1beta1/types/accelerator_type.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ class AcceleratorType(proto.Enum):
6363
Nvidia B200 GPU.
6464
NVIDIA_GB200 (17):
6565
Nvidia GB200 GPU.
66+
NVIDIA_RTX_PRO_6000 (18):
67+
Nvidia RTX Pro 6000 GPU.
6668
TPU_V2 (6):
6769
TPU v2.
6870
TPU_V3 (7):
@@ -87,6 +89,7 @@ class AcceleratorType(proto.Enum):
8789
NVIDIA_H200_141GB = 15
8890
NVIDIA_B200 = 16
8991
NVIDIA_GB200 = 17
92+
NVIDIA_RTX_PRO_6000 = 18
9093
TPU_V2 = 6
9194
TPU_V3 = 7
9295
TPU_V4_POD = 10

‎google/cloud/aiplatform_v1beta1/types/prediction_service.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ class PredictRequest(proto.Message):
8989
][google.cloud.aiplatform.v1beta1.DeployedModel.model]
9090
[PredictSchemata's][google.cloud.aiplatform.v1beta1.Model.predict_schemata]
9191
[parameters_schema_uri][google.cloud.aiplatform.v1beta1.PredictSchemata.parameters_schema_uri].
92+
labels (MutableMapping[str, str]):
93+
Optional. The user labels for Imagen billing
94+
usage only. Only Imagen supports labels. For
95+
other use cases, it will be ignored.
9296
"""
9397

9498
endpoint: str = proto.Field(
@@ -105,6 +109,11 @@ class PredictRequest(proto.Message):
105109
number=3,
106110
message=struct_pb2.Value,
107111
)
112+
labels: MutableMapping[str, str] = proto.MapField(
113+
proto.STRING,
114+
proto.STRING,
115+
number=4,
116+
)
108117

109118

110119
class PredictResponse(proto.Message):

0 commit comments

Comments
 (0)