Skip to content

Commit dd52140

Browse files
yoshi-automationbusunkim96
yoshi-automation
authored and
busunkim96
committed
[BREAKING] Remove audio type, add general_data type, blocking_resources (via synth). (googleapis#8459)
* [BREAKING] Remove audio type * Add general_data type * Add text entity classification * Add evaluations. * Add user_email_address to import_data_request and export_data_request. * Add blocking resources * [BREAKING] Remove instruction_message
1 parent 3d32438 commit dd52140

32 files changed

Lines changed: 7989 additions & 1973 deletions

‎datalabeling/google/cloud/datalabeling_v1beta1/gapic/data_labeling_service_client.py‎

Lines changed: 873 additions & 107 deletions
Large diffs are not rendered by default.

‎datalabeling/google/cloud/datalabeling_v1beta1/gapic/data_labeling_service_client_config.py‎

Lines changed: 72 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,121 +18,166 @@
1818
},
1919
"methods": {
2020
"CreateDataset": {
21-
"timeout_millis": 60000,
21+
"timeout_millis": 30000,
2222
"retry_codes_name": "non_idempotent",
2323
"retry_params_name": "default",
2424
},
2525
"GetDataset": {
26-
"timeout_millis": 60000,
26+
"timeout_millis": 30000,
2727
"retry_codes_name": "idempotent",
2828
"retry_params_name": "default",
2929
},
3030
"ListDatasets": {
31-
"timeout_millis": 60000,
31+
"timeout_millis": 30000,
3232
"retry_codes_name": "idempotent",
3333
"retry_params_name": "default",
3434
},
3535
"DeleteDataset": {
36-
"timeout_millis": 60000,
36+
"timeout_millis": 30000,
3737
"retry_codes_name": "idempotent",
3838
"retry_params_name": "default",
3939
},
4040
"ImportData": {
41-
"timeout_millis": 60000,
41+
"timeout_millis": 30000,
4242
"retry_codes_name": "non_idempotent",
4343
"retry_params_name": "default",
4444
},
4545
"ExportData": {
46-
"timeout_millis": 60000,
46+
"timeout_millis": 30000,
4747
"retry_codes_name": "idempotent",
4848
"retry_params_name": "default",
4949
},
5050
"GetDataItem": {
51-
"timeout_millis": 60000,
51+
"timeout_millis": 30000,
5252
"retry_codes_name": "idempotent",
5353
"retry_params_name": "default",
5454
},
5555
"ListDataItems": {
56-
"timeout_millis": 60000,
56+
"timeout_millis": 30000,
5757
"retry_codes_name": "idempotent",
5858
"retry_params_name": "default",
5959
},
6060
"GetAnnotatedDataset": {
61-
"timeout_millis": 60000,
61+
"timeout_millis": 30000,
6262
"retry_codes_name": "idempotent",
6363
"retry_params_name": "default",
6464
},
6565
"ListAnnotatedDatasets": {
66-
"timeout_millis": 60000,
66+
"timeout_millis": 30000,
6767
"retry_codes_name": "idempotent",
6868
"retry_params_name": "default",
6969
},
7070
"LabelImage": {
71-
"timeout_millis": 60000,
71+
"timeout_millis": 30000,
7272
"retry_codes_name": "non_idempotent",
7373
"retry_params_name": "default",
7474
},
7575
"LabelVideo": {
76-
"timeout_millis": 60000,
76+
"timeout_millis": 30000,
7777
"retry_codes_name": "non_idempotent",
7878
"retry_params_name": "default",
7979
},
8080
"LabelText": {
81-
"timeout_millis": 60000,
82-
"retry_codes_name": "non_idempotent",
83-
"retry_params_name": "default",
84-
},
85-
"LabelAudio": {
86-
"timeout_millis": 60000,
81+
"timeout_millis": 30000,
8782
"retry_codes_name": "non_idempotent",
8883
"retry_params_name": "default",
8984
},
9085
"GetExample": {
91-
"timeout_millis": 60000,
86+
"timeout_millis": 30000,
9287
"retry_codes_name": "idempotent",
9388
"retry_params_name": "default",
9489
},
9590
"ListExamples": {
96-
"timeout_millis": 60000,
91+
"timeout_millis": 30000,
9792
"retry_codes_name": "idempotent",
9893
"retry_params_name": "default",
9994
},
10095
"CreateAnnotationSpecSet": {
101-
"timeout_millis": 60000,
96+
"timeout_millis": 30000,
10297
"retry_codes_name": "non_idempotent",
10398
"retry_params_name": "default",
10499
},
105100
"GetAnnotationSpecSet": {
106-
"timeout_millis": 60000,
101+
"timeout_millis": 30000,
107102
"retry_codes_name": "idempotent",
108103
"retry_params_name": "default",
109104
},
110105
"ListAnnotationSpecSets": {
111-
"timeout_millis": 60000,
106+
"timeout_millis": 30000,
112107
"retry_codes_name": "idempotent",
113108
"retry_params_name": "default",
114109
},
115110
"DeleteAnnotationSpecSet": {
116-
"timeout_millis": 60000,
111+
"timeout_millis": 30000,
117112
"retry_codes_name": "idempotent",
118113
"retry_params_name": "default",
119114
},
120115
"CreateInstruction": {
121-
"timeout_millis": 60000,
116+
"timeout_millis": 30000,
122117
"retry_codes_name": "non_idempotent",
123118
"retry_params_name": "default",
124119
},
125120
"GetInstruction": {
126-
"timeout_millis": 60000,
121+
"timeout_millis": 30000,
127122
"retry_codes_name": "idempotent",
128123
"retry_params_name": "default",
129124
},
130125
"ListInstructions": {
131-
"timeout_millis": 60000,
126+
"timeout_millis": 30000,
132127
"retry_codes_name": "idempotent",
133128
"retry_params_name": "default",
134129
},
135130
"DeleteInstruction": {
131+
"timeout_millis": 30000,
132+
"retry_codes_name": "idempotent",
133+
"retry_params_name": "default",
134+
},
135+
"GetEvaluation": {
136+
"timeout_millis": 60000,
137+
"retry_codes_name": "idempotent",
138+
"retry_params_name": "default",
139+
},
140+
"SearchEvaluations": {
141+
"timeout_millis": 60000,
142+
"retry_codes_name": "idempotent",
143+
"retry_params_name": "default",
144+
},
145+
"SearchExampleComparisons": {
146+
"timeout_millis": 60000,
147+
"retry_codes_name": "non_idempotent",
148+
"retry_params_name": "default",
149+
},
150+
"CreateEvaluationJob": {
151+
"timeout_millis": 60000,
152+
"retry_codes_name": "non_idempotent",
153+
"retry_params_name": "default",
154+
},
155+
"UpdateEvaluationJob": {
156+
"timeout_millis": 60000,
157+
"retry_codes_name": "non_idempotent",
158+
"retry_params_name": "default",
159+
},
160+
"GetEvaluationJob": {
161+
"timeout_millis": 60000,
162+
"retry_codes_name": "idempotent",
163+
"retry_params_name": "default",
164+
},
165+
"PauseEvaluationJob": {
166+
"timeout_millis": 60000,
167+
"retry_codes_name": "non_idempotent",
168+
"retry_params_name": "default",
169+
},
170+
"ResumeEvaluationJob": {
171+
"timeout_millis": 60000,
172+
"retry_codes_name": "non_idempotent",
173+
"retry_params_name": "default",
174+
},
175+
"DeleteEvaluationJob": {
176+
"timeout_millis": 60000,
177+
"retry_codes_name": "idempotent",
178+
"retry_params_name": "default",
179+
},
180+
"ListEvaluationJobs": {
136181
"timeout_millis": 60000,
137182
"retry_codes_name": "idempotent",
138183
"retry_params_name": "default",

‎datalabeling/google/cloud/datalabeling_v1beta1/gapic/enums.py‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ class AnnotationType(enum.IntEnum):
6060
VIDEO_OBJECT_TRACKING_ANNOTATION (int): Video object tracking annotation.
6161
VIDEO_OBJECT_DETECTION_ANNOTATION (int): Video object detection annotation.
6262
VIDEO_EVENT_ANNOTATION (int): Video event annotation.
63-
AUDIO_TRANSCRIPTION_ANNOTATION (int): Speech to text annotation.
6463
TEXT_CLASSIFICATION_ANNOTATION (int): Classification for text.
6564
TEXT_ENTITY_EXTRACTION_ANNOTATION (int): Entity extraction for text.
65+
GENERAL_CLASSIFICATION_ANNOTATION (int): General classification.
6666
"""
6767

6868
ANNOTATION_TYPE_UNSPECIFIED = 0
@@ -76,9 +76,9 @@ class AnnotationType(enum.IntEnum):
7676
VIDEO_OBJECT_TRACKING_ANNOTATION = 4
7777
VIDEO_OBJECT_DETECTION_ANNOTATION = 5
7878
VIDEO_EVENT_ANNOTATION = 6
79-
AUDIO_TRANSCRIPTION_ANNOTATION = 7
8079
TEXT_CLASSIFICATION_ANNOTATION = 8
8180
TEXT_ENTITY_EXTRACTION_ANNOTATION = 9
81+
GENERAL_CLASSIFICATION_ANNOTATION = 14
8282

8383

8484
class DataType(enum.IntEnum):
@@ -88,14 +88,14 @@ class DataType(enum.IntEnum):
8888
IMAGE (int)
8989
VIDEO (int)
9090
TEXT (int)
91-
AUDIO (int)
91+
GENERAL_DATA (int)
9292
"""
9393

9494
DATA_TYPE_UNSPECIFIED = 0
9595
IMAGE = 1
9696
VIDEO = 2
9797
TEXT = 4
98-
AUDIO = 5
98+
GENERAL_DATA = 6
9999

100100

101101
class StringAggregationType(enum.IntEnum):
@@ -113,18 +113,24 @@ class StringAggregationType(enum.IntEnum):
113113
NO_AGGREGATION = 3
114114

115115

116-
class LabelAudioRequest(object):
117-
class Feature(enum.IntEnum):
116+
class EvaluationJob(object):
117+
class State(enum.IntEnum):
118118
"""
119-
Audio labeling task feature.
119+
State of the job.
120120
121121
Attributes:
122-
FEATURE_UNSPECIFIED (int)
123-
AUDIO_TRANSCRIPTION (int): Transcribe the audios into text.
122+
STATE_UNSPECIFIED (int)
123+
SCHEDULED (int)
124+
RUNNING (int)
125+
PAUSED (int)
126+
STOPPED (int)
124127
"""
125128

126-
FEATURE_UNSPECIFIED = 0
127-
AUDIO_TRANSCRIPTION = 1
129+
STATE_UNSPECIFIED = 0
130+
SCHEDULED = 1
131+
RUNNING = 2
132+
PAUSED = 3
133+
STOPPED = 4
128134

129135

130136
class LabelImageRequest(object):

0 commit comments

Comments
 (0)