Skip to content

Commit 43eee8d

Browse files
gcf-owl-bot[bot]copybara-github
authored andcommitted
Copybara import of the project:
-- c32529d by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: feat: add API for Managed OSS Fine Tuning docs: A comment for field `model` in message `.google.cloud.aiplatform.v1beta1.TunedModel` is changed docs: A comment for field `learning_rate_multiplier` in message `.google.cloud.aiplatform.v1beta1.SupervisedHyperParameters` is changed docs: A comment for field `training_dataset_uri` in message `.google.cloud.aiplatform.v1beta1.SupervisedTuningSpec` is changed docs: A comment for field `validation_dataset_uri` in message `.google.cloud.aiplatform.v1beta1.SupervisedTuningSpec` is changed PiperOrigin-RevId: 782121247 Source-Link: googleapis/googleapis@5680805 Source-Link: googleapis/googleapis-gen@6876265 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjg3NjI2NTYwZjUwYTkwYjA0YjVjYTM4MmVlNzExYjBkMDAzMjNmMiJ9 feat: Vertex AI Model Garden custom model deploy Public Preview PiperOrigin-RevId: 782029721 Source-Link: googleapis/googleapis@e21caa3 Source-Link: googleapis/googleapis-gen@2bc7a49 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmJjN2E0OTFiYThhOWM5NDZiNTgzYzlkNTAwZThiOGE0MmIxODgxMiJ9 feat: Add Aggregation Output in EvaluateDataset Get Operation Response docs: Add constraints for AggregationMetric enum and default value for flip_enabled field in AutoraterConfig PiperOrigin-RevId: 781252306 Source-Link: googleapis/googleapis@0cdaee6 Source-Link: googleapis/googleapis-gen@8e46ada Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGU0NmFkYTI0YmViZGM2N2QyMzRiMmIzOWNiZjFmOGQyNGE4OWRjOSJ9 feat: add flexstart option to v1beta1 feat: some comments changes in machine_resources.proto to v1beta1 docs: A comment for message `DedicatedResources` is changed docs: A comment for field `machine_spec` in message `.google.cloud.aiplatform.v1beta1.DedicatedResources` is changed docs: A comment for field `min_replica_count` in message `.google.cloud.aiplatform.v1beta1.DedicatedResources` is changed docs: A comment for field `max_replica_count` in message `.google.cloud.aiplatform.v1beta1.DedicatedResources` is changed docs: A comment for field `required_replica_count` in message `.google.cloud.aiplatform.v1beta1.DedicatedResources` is changed docs: A comment for field `min_replica_count` in message `.google.cloud.aiplatform.v1beta1.AutomaticResources` is changed docs: A comment for field `max_replica_count` in message `.google.cloud.aiplatform.v1beta1.AutomaticResources` is changed docs: A comment for field `boot_disk_type` in message `.google.cloud.aiplatform.v1beta1.DiskSpec` is changed PiperOrigin-RevId: 781151401 Source-Link: googleapis/googleapis@f74e4fa Source-Link: googleapis/googleapis-gen@e851822 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTg1MTgyMjU3NGFjYzcwZDFjN2ZlY2VjYjFlYTk0M2Y2OGViOGExNCJ9 feat: Expose task_unique_name in pipeline task details for pipeline rerun PiperOrigin-RevId: 780661695 Source-Link: googleapis/googleapis@b6084d2 Source-Link: googleapis/googleapis-gen@adf70b4 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWRmNzBiNGZjN2I5MzlhZmI0Nzc1ZjM4NDdhYTc1NTk2Y2JkNWU4MCJ9 -- fb5daae 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=#5517 from googleapis:owl-bot-copy 29ea1c4 PiperOrigin-RevId: 782966012
1 parent cee8d8b commit 43eee8d

18 files changed

Lines changed: 449 additions & 120 deletions

google/cloud/aiplatform_v1/types/pipeline_job.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,15 @@ class PipelineTaskDetail(proto.Message):
450450
outputs (MutableMapping[str, google.cloud.aiplatform_v1.types.PipelineTaskDetail.ArtifactList]):
451451
Output only. The runtime output artifacts of
452452
the task.
453+
task_unique_name (str):
454+
Output only. The unique name of a task. This field is used
455+
by rerun pipeline job. Console UI and Vertex AI SDK will
456+
support triggering pipeline job reruns. The name is
457+
constructed by concatenating all the parent tasks name with
458+
the task name. For example, if a task named "child_task" has
459+
a parent task named "parent_task_1" and parent task 1 has a
460+
parent task named "parent_task_2", the task unique name will
461+
be "parent_task_2.parent_task_1.child_task".
453462
"""
454463

455464
class State(proto.Enum):
@@ -603,6 +612,10 @@ class ArtifactList(proto.Message):
603612
number=11,
604613
message=ArtifactList,
605614
)
615+
task_unique_name: str = proto.Field(
616+
proto.STRING,
617+
number=14,
618+
)
606619

607620

608621
class PipelineTaskExecutorDetail(proto.Message):

google/cloud/aiplatform_v1beta1/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,8 @@
260260
from .types.evaluated_annotation import ErrorAnalysisAnnotation
261261
from .types.evaluated_annotation import EvaluatedAnnotation
262262
from .types.evaluated_annotation import EvaluatedAnnotationExplanation
263+
from .types.evaluation_service import AggregationOutput
264+
from .types.evaluation_service import AggregationResult
263265
from .types.evaluation_service import AutoraterConfig
264266
from .types.evaluation_service import BleuInput
265267
from .types.evaluation_service import BleuInstance
@@ -731,6 +733,7 @@
731733
from .types.machine_resources import BatchDedicatedResources
732734
from .types.machine_resources import DedicatedResources
733735
from .types.machine_resources import DiskSpec
736+
from .types.machine_resources import FlexStart
734737
from .types.machine_resources import MachineSpec
735738
from .types.machine_resources import NfsMount
736739
from .types.machine_resources import PersistentDiskSpec
@@ -1334,6 +1337,8 @@
13341337
"AddExecutionEventsRequest",
13351338
"AddExecutionEventsResponse",
13361339
"AddTrialMeasurementRequest",
1340+
"AggregationOutput",
1341+
"AggregationResult",
13371342
"Annotation",
13381343
"AnnotationSpec",
13391344
"ApiAuth",
@@ -1725,6 +1730,7 @@
17251730
"FilterSplit",
17261731
"FindNeighborsRequest",
17271732
"FindNeighborsResponse",
1733+
"FlexStart",
17281734
"FluencyInput",
17291735
"FluencyInstance",
17301736
"FluencyResult",

google/cloud/aiplatform_v1beta1/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,
269268
dataset: str,
270269
) -> str:
271270
"""Returns a fully-qualified dataset string."""
272-
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
271+
return "projects/{project}/datasets/{dataset}".format(
273272
project=project,
274-
location=location,
275273
dataset=dataset,
276274
)
277275

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

287282
@staticmethod
288283
def dataset_path(
289284
project: str,
285+
location: str,
290286
dataset: str,
291287
) -> str:
292288
"""Returns a fully-qualified dataset string."""
293-
return "projects/{project}/datasets/{dataset}".format(
289+
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
294290
project=project,
291+
location=location,
295292
dataset=dataset,
296293
)
297294

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

304304
@staticmethod

google/cloud/aiplatform_v1beta1/types/__init__.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@
211211
EvaluatedAnnotationExplanation,
212212
)
213213
from .evaluation_service import (
214+
AggregationOutput,
215+
AggregationResult,
214216
AutoraterConfig,
215217
BleuInput,
216218
BleuInstance,
@@ -756,6 +758,7 @@
756758
BatchDedicatedResources,
757759
DedicatedResources,
758760
DiskSpec,
761+
FlexStart,
759762
MachineSpec,
760763
NfsMount,
761764
PersistentDiskSpec,
@@ -1593,6 +1596,8 @@
15931596
"ErrorAnalysisAnnotation",
15941597
"EvaluatedAnnotation",
15951598
"EvaluatedAnnotationExplanation",
1599+
"AggregationOutput",
1600+
"AggregationResult",
15961601
"AutoraterConfig",
15971602
"BleuInput",
15981603
"BleuInstance",
@@ -2060,6 +2065,7 @@
20602065
"BatchDedicatedResources",
20612066
"DedicatedResources",
20622067
"DiskSpec",
2068+
"FlexStart",
20632069
"MachineSpec",
20642070
"NfsMount",
20652071
"PersistentDiskSpec",

google/cloud/aiplatform_v1beta1/types/evaluation_service.py

Lines changed: 128 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
"EvaluateDatasetOperationMetadata",
3232
"EvaluateDatasetResponse",
3333
"OutputInfo",
34+
"AggregationOutput",
35+
"AggregationResult",
3436
"EvaluateDatasetRequest",
3537
"OutputConfig",
3638
"Metric",
@@ -228,11 +230,20 @@ class EvaluateDatasetResponse(proto.Message):
228230
r"""Response in LRO for EvaluationService.EvaluateDataset.
229231
230232
Attributes:
233+
aggregation_output (google.cloud.aiplatform_v1beta1.types.AggregationOutput):
234+
Output only. Aggregation statistics derived
235+
from results of
236+
EvaluationService.EvaluateDataset.
231237
output_info (google.cloud.aiplatform_v1beta1.types.OutputInfo):
232238
Output only. Output info for
233239
EvaluationService.EvaluateDataset.
234240
"""
235241

242+
aggregation_output: "AggregationOutput" = proto.Field(
243+
proto.MESSAGE,
244+
number=1,
245+
message="AggregationOutput",
246+
)
236247
output_info: "OutputInfo" = proto.Field(
237248
proto.MESSAGE,
238249
number=3,
@@ -264,6 +275,102 @@ class OutputInfo(proto.Message):
264275
)
265276

266277

278+
class AggregationOutput(proto.Message):
279+
r"""The aggregation result for the entire dataset and all
280+
metrics.
281+
282+
Attributes:
283+
dataset (google.cloud.aiplatform_v1beta1.types.EvaluationDataset):
284+
The dataset used for evaluation &
285+
aggregation.
286+
aggregation_results (MutableSequence[google.cloud.aiplatform_v1beta1.types.AggregationResult]):
287+
One AggregationResult per metric.
288+
"""
289+
290+
dataset: "EvaluationDataset" = proto.Field(
291+
proto.MESSAGE,
292+
number=1,
293+
message="EvaluationDataset",
294+
)
295+
aggregation_results: MutableSequence["AggregationResult"] = proto.RepeatedField(
296+
proto.MESSAGE,
297+
number=2,
298+
message="AggregationResult",
299+
)
300+
301+
302+
class AggregationResult(proto.Message):
303+
r"""The aggregation result for a single metric.
304+
305+
This message has `oneof`_ fields (mutually exclusive fields).
306+
For each oneof, at most one member field can be set at the same time.
307+
Setting any member of the oneof automatically clears all other
308+
members.
309+
310+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
311+
312+
Attributes:
313+
pointwise_metric_result (google.cloud.aiplatform_v1beta1.types.PointwiseMetricResult):
314+
Result for pointwise metric.
315+
316+
This field is a member of `oneof`_ ``aggregation_result``.
317+
pairwise_metric_result (google.cloud.aiplatform_v1beta1.types.PairwiseMetricResult):
318+
Result for pairwise metric.
319+
320+
This field is a member of `oneof`_ ``aggregation_result``.
321+
exact_match_metric_value (google.cloud.aiplatform_v1beta1.types.ExactMatchMetricValue):
322+
Results for exact match metric.
323+
324+
This field is a member of `oneof`_ ``aggregation_result``.
325+
bleu_metric_value (google.cloud.aiplatform_v1beta1.types.BleuMetricValue):
326+
Results for bleu metric.
327+
328+
This field is a member of `oneof`_ ``aggregation_result``.
329+
rouge_metric_value (google.cloud.aiplatform_v1beta1.types.RougeMetricValue):
330+
Results for rouge metric.
331+
332+
This field is a member of `oneof`_ ``aggregation_result``.
333+
aggregation_metric (google.cloud.aiplatform_v1beta1.types.Metric.AggregationMetric):
334+
Aggregation metric.
335+
"""
336+
337+
pointwise_metric_result: "PointwiseMetricResult" = proto.Field(
338+
proto.MESSAGE,
339+
number=5,
340+
oneof="aggregation_result",
341+
message="PointwiseMetricResult",
342+
)
343+
pairwise_metric_result: "PairwiseMetricResult" = proto.Field(
344+
proto.MESSAGE,
345+
number=6,
346+
oneof="aggregation_result",
347+
message="PairwiseMetricResult",
348+
)
349+
exact_match_metric_value: "ExactMatchMetricValue" = proto.Field(
350+
proto.MESSAGE,
351+
number=7,
352+
oneof="aggregation_result",
353+
message="ExactMatchMetricValue",
354+
)
355+
bleu_metric_value: "BleuMetricValue" = proto.Field(
356+
proto.MESSAGE,
357+
number=8,
358+
oneof="aggregation_result",
359+
message="BleuMetricValue",
360+
)
361+
rouge_metric_value: "RougeMetricValue" = proto.Field(
362+
proto.MESSAGE,
363+
number=9,
364+
oneof="aggregation_result",
365+
message="RougeMetricValue",
366+
)
367+
aggregation_metric: "Metric.AggregationMetric" = proto.Field(
368+
proto.ENUM,
369+
number=4,
370+
enum="Metric.AggregationMetric",
371+
)
372+
373+
267374
class EvaluateDatasetRequest(proto.Message):
268375
r"""Request message for EvaluationService.EvaluateDataset.
269376
@@ -373,25 +480,34 @@ class AggregationMetric(proto.Enum):
373480
AGGREGATION_METRIC_UNSPECIFIED (0):
374481
Unspecified aggregation metric.
375482
AVERAGE (1):
376-
Average aggregation metric.
483+
Average aggregation metric. Not supported for
484+
Pairwise metric.
377485
MODE (2):
378486
Mode aggregation metric.
379487
STANDARD_DEVIATION (3):
380-
Standard deviation aggregation metric.
488+
Standard deviation aggregation metric. Not
489+
supported for pairwise metric.
381490
VARIANCE (4):
382-
Variance aggregation metric.
491+
Variance aggregation metric. Not supported
492+
for pairwise metric.
383493
MINIMUM (5):
384-
Minimum aggregation metric.
494+
Minimum aggregation metric. Not supported for
495+
pairwise metric.
385496
MAXIMUM (6):
386-
Maximum aggregation metric.
497+
Maximum aggregation metric. Not supported for
498+
pairwise metric.
387499
MEDIAN (7):
388-
Median aggregation metric.
500+
Median aggregation metric. Not supported for
501+
pairwise metric.
389502
PERCENTILE_P90 (8):
390-
90th percentile aggregation metric.
503+
90th percentile aggregation metric. Not
504+
supported for pairwise metric.
391505
PERCENTILE_P95 (9):
392-
95th percentile aggregation metric.
506+
95th percentile aggregation metric. Not
507+
supported for pairwise metric.
393508
PERCENTILE_P99 (10):
394-
99th percentile aggregation metric.
509+
99th percentile aggregation metric. Not
510+
supported for pairwise metric.
395511
"""
396512
AGGREGATION_METRIC_UNSPECIFIED = 0
397513
AVERAGE = 1
@@ -494,9 +610,9 @@ class AutoraterConfig(proto.Message):
494610
495611
This field is a member of `oneof`_ ``_sampling_count``.
496612
flip_enabled (bool):
497-
Optional. Whether to flip the candidate and baseline
498-
responses. This is only applicable to the pairwise metric.
499-
If enabled, also provide
613+
Optional. Default is true. Whether to flip the candidate and
614+
baseline responses. This is only applicable to the pairwise
615+
metric. If enabled, also provide
500616
PairwiseMetricSpec.candidate_response_field_name and
501617
PairwiseMetricSpec.baseline_response_field_name. When
502618
rendering PairwiseMetricSpec.metric_prompt_template, the

0 commit comments

Comments
 (0)