Skip to content

Commit 26d4d26

Browse files
yinghsienwuyinghsienwu
authored
Revert "feat: add RaySepc to ResourceRuntimeSpec, and add ResourceRuntime to PersistentResource (#2387)" (#2401)
This reverts commit 6987f69.
1 parent 6987f69 commit 26d4d26

70 files changed

Lines changed: 65 additions & 15434 deletions

File tree

Some content is hidden

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

‎docs/aiplatform_v1/schedule_service.rst‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎docs/aiplatform_v1/services.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Services for Google Cloud Aiplatform v1 API
1717
model_service
1818
pipeline_service
1919
prediction_service
20-
schedule_service
2120
specialist_pool_service
2221
tensorboard_service
2322
vizier_service

‎google/cloud/aiplatform/v1/schema/trainingjob/definition_v1/types/automl_tables.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ class AutoMlTablesInputs(proto.Message):
110110
the prediction type. If the field is not set, a
111111
default objective function is used.
112112
classification (binary):
113-
114113
"maximize-au-roc" (default) - Maximize the
115114
area under the receiver
116115
operating characteristic (ROC) curve.
@@ -123,11 +122,9 @@ class AutoMlTablesInputs(proto.Message):
123122
Maximize recall for a specified
124123
precision value.
125124
classification (multi-class):
126-
127125
"minimize-log-loss" (default) - Minimize log
128126
loss.
129127
regression:
130-
131128
"minimize-rmse" (default) - Minimize
132129
root-mean-squared error (RMSE). "minimize-mae"
133130
- Minimize mean-absolute error (MAE).

‎google/cloud/aiplatform/v1beta1/schema/trainingjob/definition_v1beta1/types/automl_tables.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ class AutoMlTablesInputs(proto.Message):
110110
the prediction type. If the field is not set, a
111111
default objective function is used.
112112
classification (binary):
113-
114113
"maximize-au-roc" (default) - Maximize the
115114
area under the receiver
116115
operating characteristic (ROC) curve.
@@ -123,11 +122,9 @@ class AutoMlTablesInputs(proto.Message):
123122
Maximize recall for a specified
124123
precision value.
125124
classification (multi-class):
126-
127125
"minimize-log-loss" (default) - Minimize log
128126
loss.
129127
regression:
130-
131128
"minimize-rmse" (default) - Minimize
132129
root-mean-squared error (RMSE). "minimize-mae"
133130
- Minimize mean-absolute error (MAE).

‎google/cloud/aiplatform_v1/__init__.py‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@
5050
from .services.pipeline_service import PipelineServiceAsyncClient
5151
from .services.prediction_service import PredictionServiceClient
5252
from .services.prediction_service import PredictionServiceAsyncClient
53-
from .services.schedule_service import ScheduleServiceClient
54-
from .services.schedule_service import ScheduleServiceAsyncClient
5553
from .services.specialist_pool_service import SpecialistPoolServiceClient
5654
from .services.specialist_pool_service import SpecialistPoolServiceAsyncClient
5755
from .services.tensorboard_service import TensorboardServiceClient
@@ -465,19 +463,8 @@
465463
from .types.prediction_service import PredictRequest
466464
from .types.prediction_service import PredictResponse
467465
from .types.prediction_service import RawPredictRequest
468-
from .types.prediction_service import StreamingPredictRequest
469-
from .types.prediction_service import StreamingPredictResponse
470466
from .types.publisher_model import PublisherModel
471467
from .types.saved_query import SavedQuery
472-
from .types.schedule import Schedule
473-
from .types.schedule_service import CreateScheduleRequest
474-
from .types.schedule_service import DeleteScheduleRequest
475-
from .types.schedule_service import GetScheduleRequest
476-
from .types.schedule_service import ListSchedulesRequest
477-
from .types.schedule_service import ListSchedulesResponse
478-
from .types.schedule_service import PauseScheduleRequest
479-
from .types.schedule_service import ResumeScheduleRequest
480-
from .types.schedule_service import UpdateScheduleRequest
481468
from .types.service_networking import PrivateServiceConnectConfig
482469
from .types.specialist_pool import SpecialistPool
483470
from .types.specialist_pool_service import CreateSpecialistPoolOperationMetadata
@@ -557,7 +544,6 @@
557544
from .types.types import DoubleArray
558545
from .types.types import Int64Array
559546
from .types.types import StringArray
560-
from .types.types import Tensor
561547
from .types.unmanaged_container_model import UnmanagedContainerModel
562548
from .types.user_action_reference import UserActionReference
563549
from .types.value import Value
@@ -599,7 +585,6 @@
599585
"ModelServiceAsyncClient",
600586
"PipelineServiceAsyncClient",
601587
"PredictionServiceAsyncClient",
602-
"ScheduleServiceAsyncClient",
603588
"SpecialistPoolServiceAsyncClient",
604589
"TensorboardServiceAsyncClient",
605590
"VizierServiceAsyncClient",
@@ -689,7 +674,6 @@
689674
"CreateModelDeploymentMonitoringJobRequest",
690675
"CreateNasJobRequest",
691676
"CreatePipelineJobRequest",
692-
"CreateScheduleRequest",
693677
"CreateSpecialistPoolOperationMetadata",
694678
"CreateSpecialistPoolRequest",
695679
"CreateStudyRequest",
@@ -736,7 +720,6 @@
736720
"DeleteOperationMetadata",
737721
"DeletePipelineJobRequest",
738722
"DeleteSavedQueryRequest",
739-
"DeleteScheduleRequest",
740723
"DeleteSpecialistPoolRequest",
741724
"DeleteStudyRequest",
742725
"DeleteTensorboardExperimentRequest",
@@ -837,7 +820,6 @@
837820
"GetNasTrialDetailRequest",
838821
"GetPipelineJobRequest",
839822
"GetPublisherModelRequest",
840-
"GetScheduleRequest",
841823
"GetSpecialistPoolRequest",
842824
"GetStudyRequest",
843825
"GetTensorboardExperimentRequest",
@@ -926,8 +908,6 @@
926908
"ListPipelineJobsResponse",
927909
"ListSavedQueriesRequest",
928910
"ListSavedQueriesResponse",
929-
"ListSchedulesRequest",
930-
"ListSchedulesResponse",
931911
"ListSpecialistPoolsRequest",
932912
"ListSpecialistPoolsResponse",
933913
"ListStudiesRequest",
@@ -988,7 +968,6 @@
988968
"Neighbor",
989969
"NfsMount",
990970
"PauseModelDeploymentMonitoringJobRequest",
991-
"PauseScheduleRequest",
992971
"PipelineFailurePolicy",
993972
"PipelineJob",
994973
"PipelineJobDetail",
@@ -1039,14 +1018,11 @@
10391018
"RemoveDatapointsResponse",
10401019
"ResourcesConsumed",
10411020
"ResumeModelDeploymentMonitoringJobRequest",
1042-
"ResumeScheduleRequest",
10431021
"SampleConfig",
10441022
"SampledShapleyAttribution",
10451023
"SamplingStrategy",
10461024
"SavedQuery",
10471025
"Scalar",
1048-
"Schedule",
1049-
"ScheduleServiceClient",
10501026
"Scheduling",
10511027
"SearchDataItemsRequest",
10521028
"SearchDataItemsResponse",
@@ -1061,8 +1037,6 @@
10611037
"SpecialistPoolServiceClient",
10621038
"StopTrialRequest",
10631039
"StratifiedSplit",
1064-
"StreamingPredictRequest",
1065-
"StreamingPredictResponse",
10661040
"StreamingReadFeatureValuesRequest",
10671041
"StringArray",
10681042
"Study",
@@ -1071,7 +1045,6 @@
10711045
"SuggestTrialsRequest",
10721046
"SuggestTrialsResponse",
10731047
"TFRecordDestination",
1074-
"Tensor",
10751048
"Tensorboard",
10761049
"TensorboardBlob",
10771050
"TensorboardBlobSequence",
@@ -1112,7 +1085,6 @@
11121085
"UpdateModelDeploymentMonitoringJobOperationMetadata",
11131086
"UpdateModelDeploymentMonitoringJobRequest",
11141087
"UpdateModelRequest",
1115-
"UpdateScheduleRequest",
11161088
"UpdateSpecialistPoolOperationMetadata",
11171089
"UpdateSpecialistPoolRequest",
11181090
"UpdateTensorboardExperimentRequest",

‎google/cloud/aiplatform_v1/gapic_metadata.json‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,11 +1806,6 @@
18061806
"methods": [
18071807
"raw_predict"
18081808
]
1809-
},
1810-
"ServerStreamingPredict": {
1811-
"methods": [
1812-
"server_streaming_predict"
1813-
]
18141809
}
18151810
}
18161811
},
@@ -1831,95 +1826,6 @@
18311826
"methods": [
18321827
"raw_predict"
18331828
]
1834-
},
1835-
"ServerStreamingPredict": {
1836-
"methods": [
1837-
"server_streaming_predict"
1838-
]
1839-
}
1840-
}
1841-
}
1842-
}
1843-
},
1844-
"ScheduleService": {
1845-
"clients": {
1846-
"grpc": {
1847-
"libraryClient": "ScheduleServiceClient",
1848-
"rpcs": {
1849-
"CreateSchedule": {
1850-
"methods": [
1851-
"create_schedule"
1852-
]
1853-
},
1854-
"DeleteSchedule": {
1855-
"methods": [
1856-
"delete_schedule"
1857-
]
1858-
},
1859-
"GetSchedule": {
1860-
"methods": [
1861-
"get_schedule"
1862-
]
1863-
},
1864-
"ListSchedules": {
1865-
"methods": [
1866-
"list_schedules"
1867-
]
1868-
},
1869-
"PauseSchedule": {
1870-
"methods": [
1871-
"pause_schedule"
1872-
]
1873-
},
1874-
"ResumeSchedule": {
1875-
"methods": [
1876-
"resume_schedule"
1877-
]
1878-
},
1879-
"UpdateSchedule": {
1880-
"methods": [
1881-
"update_schedule"
1882-
]
1883-
}
1884-
}
1885-
},
1886-
"grpc-async": {
1887-
"libraryClient": "ScheduleServiceAsyncClient",
1888-
"rpcs": {
1889-
"CreateSchedule": {
1890-
"methods": [
1891-
"create_schedule"
1892-
]
1893-
},
1894-
"DeleteSchedule": {
1895-
"methods": [
1896-
"delete_schedule"
1897-
]
1898-
},
1899-
"GetSchedule": {
1900-
"methods": [
1901-
"get_schedule"
1902-
]
1903-
},
1904-
"ListSchedules": {
1905-
"methods": [
1906-
"list_schedules"
1907-
]
1908-
},
1909-
"PauseSchedule": {
1910-
"methods": [
1911-
"pause_schedule"
1912-
]
1913-
},
1914-
"ResumeSchedule": {
1915-
"methods": [
1916-
"resume_schedule"
1917-
]
1918-
},
1919-
"UpdateSchedule": {
1920-
"methods": [
1921-
"update_schedule"
1922-
]
19231829
}
19241830
}
19251831
}

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -230,40 +230,40 @@ def parse_dataset_path(path: str) -> Dict[str, str]:
230230
@staticmethod
231231
def dataset_path(
232232
project: str,
233-
location: str,
234233
dataset: str,
235234
) -> str:
236235
"""Returns a fully-qualified dataset string."""
237-
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
236+
return "projects/{project}/datasets/{dataset}".format(
238237
project=project,
239-
location=location,
240238
dataset=dataset,
241239
)
242240

243241
@staticmethod
244242
def parse_dataset_path(path: str) -> Dict[str, str]:
245243
"""Parses a dataset path into its component segments."""
246-
m = re.match(
247-
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
248-
path,
249-
)
244+
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
250245
return m.groupdict() if m else {}
251246

252247
@staticmethod
253248
def dataset_path(
254249
project: str,
250+
location: str,
255251
dataset: str,
256252
) -> str:
257253
"""Returns a fully-qualified dataset string."""
258-
return "projects/{project}/datasets/{dataset}".format(
254+
return "projects/{project}/locations/{location}/datasets/{dataset}".format(
259255
project=project,
256+
location=location,
260257
dataset=dataset,
261258
)
262259

263260
@staticmethod
264261
def parse_dataset_path(path: str) -> Dict[str, str]:
265262
"""Parses a dataset path into its component segments."""
266-
m = re.match(r"^projects/(?P<project>.+?)/datasets/(?P<dataset>.+?)$", path)
263+
m = re.match(
264+
r"^projects/(?P<project>.+?)/locations/(?P<location>.+?)/datasets/(?P<dataset>.+?)$",
265+
path,
266+
)
267267
return m.groupdict() if m else {}
268268

269269
@staticmethod

0 commit comments

Comments
 (0)