Skip to content

Commit 847ad78

Browse files
feat: add reserved_ip_ranges to CustomJobSpec in aiplatform v1 custom_job.proto (#1165)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 443508623 Source-Link: googleapis/googleapis@fd6935f Source-Link: googleapis/googleapis-gen@4f659e3 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGY2NTllM2I4YWNlMmU4NmMwMjdjNGZlY2E5ZGVjZDZlZTU4YzY0YyJ9 PiperOrigin-RevId: 442088600 Source-Link: googleapis/googleapis@c56ae2a Source-Link: googleapis/googleapis-gen@12d6b9d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTJkNmI5ZGZlNzBjNzY5ZGEzZTAzMDJjZmQzNWQxN2Y2MzNlM2E1OSJ9 feat: add nfs_mounts to WorkPoolSpec in aiplatform v1 custom_job.proto feat: add JOB_STATE_UPDATING to JobState in aiplatform v1 job_state.proto feat: add MfsMount in aiplatform v1 machine_resources.proto feat: add ConvexAutomatedStoppingSpec to StudySpec in aiplatform v1 study.proto PiperOrigin-RevId: 441616654 Source-Link: googleapis/googleapis@a476b9f Source-Link: googleapis/googleapis-gen@ed936e9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZWQ5MzZlOTA1MjEyZTUwZmViODYyOTEyMWRmN2JlOTQzMGRiZDhhYSJ9 feat: rename Similarity to Examples, and similarity to examples in ExplanationParameters in aiplatform v1beta1 explanation.proto feat: add reserved_ip_ranges to CustomJobSpec in aiplatform v1beta1 custom_job.proto feat: add nfs_mounts to WorkPoolSpec in aiplatform v1beta1 custom_job.proto feat: add PredictRequestResponseLoggingConfig to aiplatform v1beta1 endpoint.proto feat: add model_version_id to DeployedModel in aiplatform v1beta1 endpoint.proto feat: add JOB_STATE_UPDATING to JobState in aiplatform v1beta1 job_state.proto feat: add MfsMount in aiplatform v1beta1 machine_resources.proto feat: add version_id to Model in aiplatform v1beta1 model.proto feat: add LatestMonitoringPipelineMetadata to ModelDeploymentMonitoringJob in aiplatform v1beta1 model_deployment_monitoring_job.proto feat: add ListModelVersion, DeleteModelVersion, and MergeVersionAliases rpcs to aiplatform v1beta1 model_service.proto feat: add model_version_id to UploadModelRequest and UploadModelResponse in aiplatform v1beta1 model_service.proto feat: add model_version_id to PredictResponse in aiplatform v1beta1 prediction_service.proto feat: add ConvexAutomatedStoppingSpec to StudySpec in aiplatform v1beta1 study.proto feat: add model_id and parent_model to TrainingPipeline in aiplatform v1beta1 training_pipeline.proto PiperOrigin-RevId: 441615103 Source-Link: googleapis/googleapis@2ce1c56 Source-Link: googleapis/googleapis-gen@54ad530 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTRhZDUzMDI2ODE2OTdkNGU0NWJlNjkwNjkzMjJkOTMyOGI1ODU4MCJ9 chore: use gapic-generator-python 0.65.1 PiperOrigin-RevId: 441524537 Source-Link: googleapis/googleapis@2a27391 Source-Link: googleapis/googleapis-gen@ab6756a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWI2NzU2YTQ4Yzg5YjViY2I5ZmI3MzQ0M2NiOGU1NWQ1NzRmNDY0MyJ9 docs: fix type in docstring for map fields
1 parent 3224ae3 commit 847ad78

File tree

242 files changed

+36400
-3035
lines changed

Some content is hidden

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

242 files changed

+36400
-3035
lines changed

google/cloud/aiplatform/v1/schema/predict/instance_v1/types/__init__.py

+27-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,33 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .image_classification import ImageClassificationPredictionInstance
17-
from .image_object_detection import ImageObjectDetectionPredictionInstance
18-
from .image_segmentation import ImageSegmentationPredictionInstance
19-
from .text_classification import TextClassificationPredictionInstance
20-
from .text_extraction import TextExtractionPredictionInstance
21-
from .text_sentiment import TextSentimentPredictionInstance
22-
from .video_action_recognition import VideoActionRecognitionPredictionInstance
23-
from .video_classification import VideoClassificationPredictionInstance
24-
from .video_object_tracking import VideoObjectTrackingPredictionInstance
16+
from .image_classification import (
17+
ImageClassificationPredictionInstance,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionInstance,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionInstance,
24+
)
25+
from .text_classification import (
26+
TextClassificationPredictionInstance,
27+
)
28+
from .text_extraction import (
29+
TextExtractionPredictionInstance,
30+
)
31+
from .text_sentiment import (
32+
TextSentimentPredictionInstance,
33+
)
34+
from .video_action_recognition import (
35+
VideoActionRecognitionPredictionInstance,
36+
)
37+
from .video_classification import (
38+
VideoClassificationPredictionInstance,
39+
)
40+
from .video_object_tracking import (
41+
VideoObjectTrackingPredictionInstance,
42+
)
2543

2644
__all__ = (
2745
"ImageClassificationPredictionInstance",

google/cloud/aiplatform/v1/schema/predict/params_v1/types/__init__.py

+18-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,24 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .image_classification import ImageClassificationPredictionParams
17-
from .image_object_detection import ImageObjectDetectionPredictionParams
18-
from .image_segmentation import ImageSegmentationPredictionParams
19-
from .video_action_recognition import VideoActionRecognitionPredictionParams
20-
from .video_classification import VideoClassificationPredictionParams
21-
from .video_object_tracking import VideoObjectTrackingPredictionParams
16+
from .image_classification import (
17+
ImageClassificationPredictionParams,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionParams,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionParams,
24+
)
25+
from .video_action_recognition import (
26+
VideoActionRecognitionPredictionParams,
27+
)
28+
from .video_classification import (
29+
VideoClassificationPredictionParams,
30+
)
31+
from .video_object_tracking import (
32+
VideoObjectTrackingPredictionParams,
33+
)
2234

2335
__all__ = (
2436
"ImageClassificationPredictionParams",

google/cloud/aiplatform/v1/schema/predict/prediction_v1/types/__init__.py

+30-10
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,36 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .classification import ClassificationPredictionResult
17-
from .image_object_detection import ImageObjectDetectionPredictionResult
18-
from .image_segmentation import ImageSegmentationPredictionResult
19-
from .tabular_classification import TabularClassificationPredictionResult
20-
from .tabular_regression import TabularRegressionPredictionResult
21-
from .text_extraction import TextExtractionPredictionResult
22-
from .text_sentiment import TextSentimentPredictionResult
23-
from .video_action_recognition import VideoActionRecognitionPredictionResult
24-
from .video_classification import VideoClassificationPredictionResult
25-
from .video_object_tracking import VideoObjectTrackingPredictionResult
16+
from .classification import (
17+
ClassificationPredictionResult,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionResult,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionResult,
24+
)
25+
from .tabular_classification import (
26+
TabularClassificationPredictionResult,
27+
)
28+
from .tabular_regression import (
29+
TabularRegressionPredictionResult,
30+
)
31+
from .text_extraction import (
32+
TextExtractionPredictionResult,
33+
)
34+
from .text_sentiment import (
35+
TextSentimentPredictionResult,
36+
)
37+
from .video_action_recognition import (
38+
VideoActionRecognitionPredictionResult,
39+
)
40+
from .video_classification import (
41+
VideoClassificationPredictionResult,
42+
)
43+
from .video_object_tracking import (
44+
VideoObjectTrackingPredictionResult,
45+
)
2646

2747
__all__ = (
2848
"ClassificationPredictionResult",

google/cloud/aiplatform/v1/schema/trainingjob/definition_v1/types/__init__.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@
5757
AutoMlVideoObjectTracking,
5858
AutoMlVideoObjectTrackingInputs,
5959
)
60-
from .export_evaluated_data_items_config import ExportEvaluatedDataItemsConfig
60+
from .export_evaluated_data_items_config import (
61+
ExportEvaluatedDataItemsConfig,
62+
)
6163

6264
__all__ = (
6365
"AutoMlImageClassification",

google/cloud/aiplatform/v1beta1/schema/predict/instance_v1beta1/types/__init__.py

+27-9
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,33 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .image_classification import ImageClassificationPredictionInstance
17-
from .image_object_detection import ImageObjectDetectionPredictionInstance
18-
from .image_segmentation import ImageSegmentationPredictionInstance
19-
from .text_classification import TextClassificationPredictionInstance
20-
from .text_extraction import TextExtractionPredictionInstance
21-
from .text_sentiment import TextSentimentPredictionInstance
22-
from .video_action_recognition import VideoActionRecognitionPredictionInstance
23-
from .video_classification import VideoClassificationPredictionInstance
24-
from .video_object_tracking import VideoObjectTrackingPredictionInstance
16+
from .image_classification import (
17+
ImageClassificationPredictionInstance,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionInstance,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionInstance,
24+
)
25+
from .text_classification import (
26+
TextClassificationPredictionInstance,
27+
)
28+
from .text_extraction import (
29+
TextExtractionPredictionInstance,
30+
)
31+
from .text_sentiment import (
32+
TextSentimentPredictionInstance,
33+
)
34+
from .video_action_recognition import (
35+
VideoActionRecognitionPredictionInstance,
36+
)
37+
from .video_classification import (
38+
VideoClassificationPredictionInstance,
39+
)
40+
from .video_object_tracking import (
41+
VideoObjectTrackingPredictionInstance,
42+
)
2543

2644
__all__ = (
2745
"ImageClassificationPredictionInstance",

google/cloud/aiplatform/v1beta1/schema/predict/params_v1beta1/types/__init__.py

+18-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,24 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .image_classification import ImageClassificationPredictionParams
17-
from .image_object_detection import ImageObjectDetectionPredictionParams
18-
from .image_segmentation import ImageSegmentationPredictionParams
19-
from .video_action_recognition import VideoActionRecognitionPredictionParams
20-
from .video_classification import VideoClassificationPredictionParams
21-
from .video_object_tracking import VideoObjectTrackingPredictionParams
16+
from .image_classification import (
17+
ImageClassificationPredictionParams,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionParams,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionParams,
24+
)
25+
from .video_action_recognition import (
26+
VideoActionRecognitionPredictionParams,
27+
)
28+
from .video_classification import (
29+
VideoClassificationPredictionParams,
30+
)
31+
from .video_object_tracking import (
32+
VideoObjectTrackingPredictionParams,
33+
)
2234

2335
__all__ = (
2436
"ImageClassificationPredictionParams",

google/cloud/aiplatform/v1beta1/schema/predict/prediction_v1beta1/types/__init__.py

+33-11
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,39 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
from .classification import ClassificationPredictionResult
17-
from .image_object_detection import ImageObjectDetectionPredictionResult
18-
from .image_segmentation import ImageSegmentationPredictionResult
19-
from .tabular_classification import TabularClassificationPredictionResult
20-
from .tabular_regression import TabularRegressionPredictionResult
21-
from .text_extraction import TextExtractionPredictionResult
22-
from .text_sentiment import TextSentimentPredictionResult
23-
from .time_series_forecasting import TimeSeriesForecastingPredictionResult
24-
from .video_action_recognition import VideoActionRecognitionPredictionResult
25-
from .video_classification import VideoClassificationPredictionResult
26-
from .video_object_tracking import VideoObjectTrackingPredictionResult
16+
from .classification import (
17+
ClassificationPredictionResult,
18+
)
19+
from .image_object_detection import (
20+
ImageObjectDetectionPredictionResult,
21+
)
22+
from .image_segmentation import (
23+
ImageSegmentationPredictionResult,
24+
)
25+
from .tabular_classification import (
26+
TabularClassificationPredictionResult,
27+
)
28+
from .tabular_regression import (
29+
TabularRegressionPredictionResult,
30+
)
31+
from .text_extraction import (
32+
TextExtractionPredictionResult,
33+
)
34+
from .text_sentiment import (
35+
TextSentimentPredictionResult,
36+
)
37+
from .time_series_forecasting import (
38+
TimeSeriesForecastingPredictionResult,
39+
)
40+
from .video_action_recognition import (
41+
VideoActionRecognitionPredictionResult,
42+
)
43+
from .video_classification import (
44+
VideoClassificationPredictionResult,
45+
)
46+
from .video_object_tracking import (
47+
VideoObjectTrackingPredictionResult,
48+
)
2749

2850
__all__ = (
2951
"ClassificationPredictionResult",

google/cloud/aiplatform/v1beta1/schema/trainingjob/definition_v1beta1/types/__init__.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262
AutoMlVideoObjectTracking,
6363
AutoMlVideoObjectTrackingInputs,
6464
)
65-
from .export_evaluated_data_items_config import ExportEvaluatedDataItemsConfig
65+
from .export_evaluated_data_items_config import (
66+
ExportEvaluatedDataItemsConfig,
67+
)
6668

6769
__all__ = (
6870
"AutoMlImageClassification",

google/cloud/aiplatform_v1/__init__.py

+2
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@
258258
from .types.machine_resources import DedicatedResources
259259
from .types.machine_resources import DiskSpec
260260
from .types.machine_resources import MachineSpec
261+
from .types.machine_resources import NfsMount
261262
from .types.machine_resources import ResourcesConsumed
262263
from .types.manual_batch_tuning_parameters import ManualBatchTuningParameters
263264
from .types.metadata_schema import MetadataSchema
@@ -826,6 +827,7 @@
826827
"MutateDeployedIndexRequest",
827828
"MutateDeployedIndexResponse",
828829
"NearestNeighborSearchOperationMetadata",
830+
"NfsMount",
829831
"PauseModelDeploymentMonitoringJobRequest",
830832
"PipelineJob",
831833
"PipelineJobDetail",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
import functools
1818
import re
19-
from typing import Dict, Optional, Sequence, Tuple, Type, Union
19+
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

2222
from google.api_core.client_options import ClientOptions

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
import os
1818
import re
19-
from typing import Dict, Optional, Sequence, Tuple, Type, Union
19+
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

2222
from google.api_core import client_options as client_options_lib

google/cloud/aiplatform_v1/services/dataset_service/transports/base.py

+5
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ def __init__(
8585
always_use_jwt_access (Optional[bool]): Whether self signed JWT should
8686
be used for service account credentials.
8787
"""
88+
8889
# Save the hostname. Default to port 443 (HTTPS) if none is specified.
8990
if ":" not in host:
9091
host += ":443"
@@ -292,5 +293,9 @@ def list_annotations(
292293
]:
293294
raise NotImplementedError()
294295

296+
@property
297+
def kind(self) -> str:
298+
raise NotImplementedError()
299+
295300

296301
__all__ = ("DatasetServiceTransport",)

google/cloud/aiplatform_v1/services/dataset_service/transports/grpc.py

+4
Original file line numberDiff line numberDiff line change
@@ -520,5 +520,9 @@ def list_annotations(
520520
def close(self):
521521
self.grpc_channel.close()
522522

523+
@property
524+
def kind(self) -> str:
525+
return "grpc"
526+
523527

524528
__all__ = ("DatasetServiceGrpcTransport",)

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

+5-11
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from collections import OrderedDict
1717
import functools
1818
import re
19-
from typing import Dict, Optional, Sequence, Tuple, Type, Union
19+
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

2222
from google.api_core.client_options import ClientOptions
@@ -804,17 +804,14 @@ async def deploy_model(
804804
*,
805805
endpoint: str = None,
806806
deployed_model: gca_endpoint.DeployedModel = None,
807-
traffic_split: Sequence[
808-
endpoint_service.DeployModelRequest.TrafficSplitEntry
809-
] = None,
807+
traffic_split: Mapping[str, int] = None,
810808
retry: OptionalRetry = gapic_v1.method.DEFAULT,
811809
timeout: float = None,
812810
metadata: Sequence[Tuple[str, str]] = (),
813811
) -> operation_async.AsyncOperation:
814812
r"""Deploys a Model into this Endpoint, creating a
815813
DeployedModel within it.
816814
817-
818815
.. code-block:: python
819816
820817
from google.cloud import aiplatform_v1
@@ -866,7 +863,7 @@ def sample_deploy_model():
866863
This corresponds to the ``deployed_model`` field
867864
on the ``request`` instance; if ``request`` is provided, this
868865
should not be set.
869-
traffic_split (:class:`Sequence[google.cloud.aiplatform_v1.types.DeployModelRequest.TrafficSplitEntry]`):
866+
traffic_split (:class:`Mapping[str, int]`):
870867
A map from a DeployedModel's ID to the percentage of
871868
this Endpoint's traffic that should be forwarded to that
872869
DeployedModel.
@@ -963,9 +960,7 @@ async def undeploy_model(
963960
*,
964961
endpoint: str = None,
965962
deployed_model_id: str = None,
966-
traffic_split: Sequence[
967-
endpoint_service.UndeployModelRequest.TrafficSplitEntry
968-
] = None,
963+
traffic_split: Mapping[str, int] = None,
969964
retry: OptionalRetry = gapic_v1.method.DEFAULT,
970965
timeout: float = None,
971966
metadata: Sequence[Tuple[str, str]] = (),
@@ -974,7 +969,6 @@ async def undeploy_model(
974969
DeployedModel from it, and freeing all resources it's
975970
using.
976971
977-
978972
.. code-block:: python
979973
980974
from google.cloud import aiplatform_v1
@@ -1018,7 +1012,7 @@ def sample_undeploy_model():
10181012
This corresponds to the ``deployed_model_id`` field
10191013
on the ``request`` instance; if ``request`` is provided, this
10201014
should not be set.
1021-
traffic_split (:class:`Sequence[google.cloud.aiplatform_v1.types.UndeployModelRequest.TrafficSplitEntry]`):
1015+
traffic_split (:class:`Mapping[str, int]`):
10221016
If this field is provided, then the Endpoint's
10231017
[traffic_split][google.cloud.aiplatform.v1.Endpoint.traffic_split]
10241018
will be overwritten with it. If last DeployedModel is

0 commit comments

Comments
 (0)