Skip to content

Commit

Permalink
chore(bazel): move rules_gapic up in WORKSPACE loading order (#1454)
Browse files Browse the repository at this point in the history 
* feat: add BatchImportModelEvaluationSlices API in aiplatform v1 model_service.proto

PiperOrigin-RevId: 456604066

Source-Link: googleapis/googleapis@d57f437

Source-Link: googleapis/googleapis-gen@d9f3b86
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDlmM2I4NjdjNjA2ODhlZTJlZDVkYmY1NzJhZDg4OTEzZDFmY2U0NSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* feat: add audience parameter

PiperOrigin-RevId: 456827138

Source-Link: googleapis/googleapis@23f1a15

Source-Link: googleapis/googleapis-gen@4075a85
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNDA3NWE4NTE0ZjY3NjY5MWVjMTU2Njg4YTViYmYxODNhYTk4OTNjZSJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* feat: add ListSavedQueries rpc to aiplatform v1beta1 dataset_service.proto
feat: add saved_query.proto to aiplatform v1beta1
feat: add saved_query_id to InputDataConfig in aiplatform v1beta1 training_pipeline.proto

PiperOrigin-RevId: 456872207

Source-Link: googleapis/googleapis@aeb384a

Source-Link: googleapis/googleapis-gen@c5c8894
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzVjODg5NGFiYmZjZDFmNmI5ZDM4ZDllOWZkNzBhMThmMTVjZjBjYyJ9

* feat: add ListSavedQueries rpc to aiplatform v1 dataset_service.proto
feat: add saved_query.proto to aiplatform v1
feat: add saved_query_id to InputDataConfig in aiplatform v1 training_pipeline.proto

PiperOrigin-RevId: 456872211

Source-Link: googleapis/googleapis@88f3973

Source-Link: googleapis/googleapis-gen@daf8d1c
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGFmOGQxY2IyMGZhZGFiZGQ4OTE0NTgxZGExY2VlZWYwNDhhMzRmNyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* docs: clarify descriptions of the AdvancedSettings and WebhookRequest data types

PiperOrigin-RevId: 458000126

Source-Link: googleapis/googleapis@c425ac6

Source-Link: googleapis/googleapis-gen@1b0446d
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWIwNDQ2ZGJhYmEwODZmMWJmNjRkOTc2YjE4MGQ2YWI2ZjMzOGViNiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix: Upgrade `rules_python` to 0.9.0

fix: Set bazel python interpreter to 3.9
PiperOrigin-RevId: 459075062

Source-Link: googleapis/googleapis@99fa3a5

Source-Link: googleapis/googleapis-gen@857bba1
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODU3YmJhMWVhM2VmZDliMDNiZDdkMTRiODFiOWY3OGRiMDFkNDAxZCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: use gapic-generator-python 1.1.1

PiperOrigin-RevId: 459095142

Source-Link: googleapis/googleapis@4f1be99

Source-Link: googleapis/googleapis-gen@ae686d9
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWU2ODZkOWNkZTRmYzNlMzZkMGFjMDJlZmI4NjQzYjE1ODkwYzFlZCJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix(deps): require google-api-core 2.8.0

* chore: remove unused imports

PiperOrigin-RevId: 459515628

Source-Link: googleapis/googleapis@ed9ca3b

Source-Link: googleapis/googleapis-gen@94137b9
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOTQxMzdiOWNhMDMxOTE2OTFkZTQwZmMwNWVlZjZmNjk1ZTQ5MGI3NiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix: update rules_go, grpc, gazelle and python toolchain to latest versions to fix various build issues

PiperOrigin-RevId: 459858846

Source-Link: googleapis/googleapis@21ef848

Source-Link: googleapis/googleapis-gen@26af3a3
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjZhZjNhMzg0YmU0MDc3YzVmMDEwMDUyMWEyNjNmZDliZDhmYzdlNyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore(bazel): move rules_gapic up in WORKSPACE loading order

PiperOrigin-RevId: 460327690

Source-Link: googleapis/googleapis@f86f3a2

Source-Link: googleapis/googleapis-gen@76d224d
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzZkMjI0ZDU3YWMyYzNjYjBmMjEzMDE3MDNiNGJjYjk5YzdiZDA0MyJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Yu-Han Liu <yuhanliu@google.com>
Co-authored-by: Anthonios Partheniou <partheniou@google.com>
Co-authored-by: nayaknishant <nishantnayak@google.com>
  • Loading branch information
@gcf-owl-bot @dizcology
@parthea @nayaknishant
5 people authored Jul 15, 2022
1 parent 1b16f90 commit 91ed3a6
Show file tree
Hide file tree
Showing 181 changed files with 5,872 additions and 229 deletions.
10 changes: 10 additions & 0 deletions google/cloud/aiplatform_v1/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@
from .types.dataset_service import ListDataItemsResponse
from .types.dataset_service import ListDatasetsRequest
from .types.dataset_service import ListDatasetsResponse
from .types.dataset_service import ListSavedQueriesRequest
from .types.dataset_service import ListSavedQueriesResponse
from .types.dataset_service import UpdateDatasetRequest
from .types.deployed_index_ref import DeployedIndexRef
from .types.deployed_model_ref import DeployedModelRef
Expand Down Expand Up @@ -345,6 +347,8 @@
from .types.model_monitoring import ModelMonitoringObjectiveConfig
from .types.model_monitoring import SamplingStrategy
from .types.model_monitoring import ThresholdConfig
from .types.model_service import BatchImportModelEvaluationSlicesRequest
from .types.model_service import BatchImportModelEvaluationSlicesResponse
from .types.model_service import DeleteModelRequest
from .types.model_service import DeleteModelVersionRequest
from .types.model_service import ExportModelOperationMetadata
Expand Down Expand Up @@ -393,6 +397,7 @@
from .types.prediction_service import PredictRequest
from .types.prediction_service import PredictResponse
from .types.prediction_service import RawPredictRequest
from .types.saved_query import SavedQuery
from .types.specialist_pool import SpecialistPool
from .types.specialist_pool_service import CreateSpecialistPoolOperationMetadata
from .types.specialist_pool_service import CreateSpecialistPoolRequest
Expand Down Expand Up @@ -535,6 +540,8 @@
"BatchCreateTensorboardTimeSeriesRequest",
"BatchCreateTensorboardTimeSeriesResponse",
"BatchDedicatedResources",
"BatchImportModelEvaluationSlicesRequest",
"BatchImportModelEvaluationSlicesResponse",
"BatchMigrateResourcesOperationMetadata",
"BatchMigrateResourcesRequest",
"BatchMigrateResourcesResponse",
Expand Down Expand Up @@ -796,6 +803,8 @@
"ListOptimalTrialsResponse",
"ListPipelineJobsRequest",
"ListPipelineJobsResponse",
"ListSavedQueriesRequest",
"ListSavedQueriesResponse",
"ListSpecialistPoolsRequest",
"ListSpecialistPoolsResponse",
"ListStudiesRequest",
Expand Down Expand Up @@ -886,6 +895,7 @@
"SampleConfig",
"SampledShapleyAttribution",
"SamplingStrategy",
"SavedQuery",
"Scalar",
"Scheduling",
"SearchFeaturesRequest",
Expand Down
20 changes: 20 additions & 0 deletions google/cloud/aiplatform_v1/gapic_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@
"list_datasets"
]
},
"ListSavedQueries": {
"methods": [
"list_saved_queries"
]
},
"UpdateDataset": {
"methods": [
"update_dataset"
Expand Down Expand Up @@ -110,6 +115,11 @@
"list_datasets"
]
},
"ListSavedQueries": {
"methods": [
"list_saved_queries"
]
},
"UpdateDataset": {
"methods": [
"update_dataset"
Expand Down Expand Up @@ -1266,6 +1276,11 @@
"grpc": {
"libraryClient": "ModelServiceClient",
"rpcs": {
"BatchImportModelEvaluationSlices": {
"methods": [
"batch_import_model_evaluation_slices"
]
},
"DeleteModel": {
"methods": [
"delete_model"
Expand Down Expand Up @@ -1341,6 +1356,11 @@
"grpc-async": {
"libraryClient": "ModelServiceAsyncClient",
"rpcs": {
"BatchImportModelEvaluationSlices": {
"methods": [
"batch_import_model_evaluation_slices"
]
},
"DeleteModel": {
"methods": [
"delete_model"
Expand Down
112 changes: 112 additions & 0 deletions google/cloud/aiplatform_v1/services/dataset_service/async_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
from google.cloud.aiplatform_v1.types import dataset_service
from google.cloud.aiplatform_v1.types import encryption_spec
from google.cloud.aiplatform_v1.types import operation as gca_operation
from google.cloud.aiplatform_v1.types import saved_query
from google.cloud.location import locations_pb2 # type: ignore
from google.iam.v1 import iam_policy_pb2 # type: ignore
from google.iam.v1 import policy_pb2 # type: ignore
Expand Down Expand Up @@ -75,6 +76,8 @@ class DatasetServiceAsyncClient:
parse_data_item_path = staticmethod(DatasetServiceClient.parse_data_item_path)
dataset_path = staticmethod(DatasetServiceClient.dataset_path)
parse_dataset_path = staticmethod(DatasetServiceClient.parse_dataset_path)
saved_query_path = staticmethod(DatasetServiceClient.saved_query_path)
parse_saved_query_path = staticmethod(DatasetServiceClient.parse_saved_query_path)
common_billing_account_path = staticmethod(
DatasetServiceClient.common_billing_account_path
)
Expand Down Expand Up @@ -1157,6 +1160,115 @@ async def sample_list_data_items():
# Done; return the response.
return response

async def list_saved_queries(
self,
request: Union[dataset_service.ListSavedQueriesRequest, dict] = None,
*,
parent: str = None,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListSavedQueriesAsyncPager:
r"""Lists SavedQueries in a Dataset.
.. code-block:: python
from google.cloud import aiplatform_v1
async def sample_list_saved_queries():
# Create a client
client = aiplatform_v1.DatasetServiceAsyncClient()
# Initialize request argument(s)
request = aiplatform_v1.ListSavedQueriesRequest(
parent="parent_value",
)
# Make the request
page_result = client.list_saved_queries(request=request)
# Handle the response
async for response in page_result:
print(response)
Args:
request (Union[google.cloud.aiplatform_v1.types.ListSavedQueriesRequest, dict]):
The request object. Request message for
[DatasetService.ListSavedQueries][google.cloud.aiplatform.v1.DatasetService.ListSavedQueries].
parent (:class:`str`):
Required. The resource name of the Dataset to list
SavedQueries from. Format:
``projects/{project}/locations/{location}/datasets/{dataset}``
This corresponds to the ``parent`` field
on the ``request`` instance; if ``request`` is provided, this
should not be set.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
metadata (Sequence[Tuple[str, str]]): Strings which should be
sent along with the request as metadata.
Returns:
google.cloud.aiplatform_v1.services.dataset_service.pagers.ListSavedQueriesAsyncPager:
Response message for
[DatasetService.ListSavedQueries][google.cloud.aiplatform.v1.DatasetService.ListSavedQueries].
Iterating over this object will yield results and
resolve additional pages automatically.
"""
# Create or coerce a protobuf request object.
# Quick check: If we got a request object, we should *not* have
# gotten any keyword arguments that map to the request.
has_flattened_params = any([parent])
if request is not None and has_flattened_params:
raise ValueError(
"If the `request` argument is set, then none of "
"the individual field arguments should be set."
)

request = dataset_service.ListSavedQueriesRequest(request)

# If we have keyword arguments corresponding to fields on the
# request, apply these.
if parent is not None:
request.parent = parent

# Wrap the RPC method; this adds retry and timeout information,
# and friendly error handling.
rpc = gapic_v1.method_async.wrap_method(
self._client._transport.list_saved_queries,
default_timeout=None,
client_info=DEFAULT_CLIENT_INFO,
)

# Certain fields should be provided within the metadata header;
# add these here.
metadata = tuple(metadata) + (
gapic_v1.routing_header.to_grpc_metadata((("parent", request.parent),)),
)

# Send the request.
response = await rpc(
request,
retry=retry,
timeout=timeout,
metadata=metadata,
)

# This method is paged; wrap the response in a pager, which provides
# an `__aiter__` convenience method.
response = pagers.ListSavedQueriesAsyncPager(
method=rpc,
request=request,
response=response,
metadata=metadata,
)

# Done; return the response.
return response

async def get_annotation_spec(
self,
request: Union[dataset_service.GetAnnotationSpecRequest, dict] = None,
Expand Down
135 changes: 135 additions & 0 deletions google/cloud/aiplatform_v1/services/dataset_service/client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
from google.cloud.aiplatform_v1.types import dataset_service
from google.cloud.aiplatform_v1.types import encryption_spec
from google.cloud.aiplatform_v1.types import operation as gca_operation
from google.cloud.aiplatform_v1.types import saved_query
from google.cloud.location import locations_pb2 # type: ignore
from google.iam.v1 import iam_policy_pb2 # type: ignore
from google.iam.v1 import policy_pb2 # type: ignore
Expand Down Expand Up @@ -277,6 +278,30 @@ def parse_dataset_path(path: str) -> Dict[str, str]:
)
return m.groupdict() if m else {}

@staticmethod
def saved_query_path(
project: str,
location: str,
dataset: str,
saved_query: str,
) -> str:
"""Returns a fully-qualified saved_query string."""
return "projects/{project}/locations/{location}/datasets/{dataset}/savedQueries/{saved_query}".format(
project=project,
location=location,
dataset=dataset,
saved_query=saved_query,
)

@staticmethod
def parse_saved_query_path(path: str) -> Dict[str, str]:
"""Parses a saved_query path into its component segments."""
m = re.match(
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)/savedQueries/(?P<saved_query>.+?)$",
path,
)
return m.groupdict() if m else {}

@staticmethod
def common_billing_account_path(
billing_account: str,
Expand Down Expand Up @@ -517,6 +542,7 @@ def __init__(
quota_project_id=client_options.quota_project_id,
client_info=client_info,
always_use_jwt_access=True,
api_audience=client_options.api_audience,
)

def create_dataset(
Expand Down Expand Up @@ -1447,6 +1473,115 @@ def sample_list_data_items():
# Done; return the response.
return response

def list_saved_queries(
self,
request: Union[dataset_service.ListSavedQueriesRequest, dict] = None,
*,
parent: str = None,
retry: OptionalRetry = gapic_v1.method.DEFAULT,
timeout: float = None,
metadata: Sequence[Tuple[str, str]] = (),
) -> pagers.ListSavedQueriesPager:
r"""Lists SavedQueries in a Dataset.
.. code-block:: python
from google.cloud import aiplatform_v1
def sample_list_saved_queries():
# Create a client
client = aiplatform_v1.DatasetServiceClient()
# Initialize request argument(s)
request = aiplatform_v1.ListSavedQueriesRequest(
parent="parent_value",
)
# Make the request
page_result = client.list_saved_queries(request=request)
# Handle the response
for response in page_result:
print(response)
Args:
request (Union[google.cloud.aiplatform_v1.types.ListSavedQueriesRequest, dict]):
The request object. Request message for
[DatasetService.ListSavedQueries][google.cloud.aiplatform.v1.DatasetService.ListSavedQueries].
parent (str):
Required. The resource name of the Dataset to list
SavedQueries from. Format:
``projects/{project}/locations/{location}/datasets/{dataset}``
This corresponds to the ``parent`` field
on the ``request`` instance; if ``request`` is provided, this
should not be set.
retry (google.api_core.retry.Retry): Designation of what errors, if any,
should be retried.
timeout (float): The timeout for this request.
metadata (Sequence[Tuple[str, str]]): Strings which should be
sent along with the request as metadata.
Returns:
google.cloud.aiplatform_v1.services.dataset_service.pagers.ListSavedQueriesPager:
Response message for
[DatasetService.ListSavedQueries][google.cloud.aiplatform.v1.DatasetService.ListSavedQueries].
Iterating over this object will yield results and
resolve additional pages automatically.
"""
# Create or coerce a protobuf request object.
# Quick check: If we got a request object, we should *not* have
# gotten any keyword arguments that map to the request.
has_flattened_params = any([parent])
if request is not None and has_flattened_params:
raise ValueError(
"If the `request` argument is set, then none of "
"the individual field arguments should be set."
)

# Minor optimization to avoid making a copy if the user passes
# in a dataset_service.ListSavedQueriesRequest.
# There's no risk of modifying the input as we've already verified
# there are no flattened fields.
if not isinstance(request, dataset_service.ListSavedQueriesRequest):
request = dataset_service.ListSavedQueriesRequest(request)
# If we have keyword arguments corresponding to fields on the
# request, apply these.
if parent is not None:
request.parent = parent

# Wrap the RPC method; this adds retry and timeout information,
# and friendly error handling.
rpc = self._transport._wrapped_methods[self._transport.list_saved_queries]

# Certain fields should be provided within the metadata header;
# add these here.
metadata = tuple(metadata) + (
gapic_v1.routing_header.to_grpc_metadata((("parent", request.parent),)),
)

# Send the request.
response = rpc(
request,
retry=retry,
timeout=timeout,
metadata=metadata,
)

# This method is paged; wrap the response in a pager, which provides
# an `__iter__` convenience method.
response = pagers.ListSavedQueriesPager(
method=rpc,
request=request,
response=response,
metadata=metadata,
)

# Done; return the response.
return response

def get_annotation_spec(
self,
request: Union[dataset_service.GetAnnotationSpecRequest, dict] = None,
Expand Down
Loading

0 comments on commit 91ed3a6

Please sign in to comment.