Skip to content

Commit 163668e

Browse files
author
Mike Kistler
committed
Generated service changes for encoding path variables
1 parent 42b8e6e commit 163668e

8 files changed

Lines changed: 286 additions & 445 deletions

‎watson_developer_cloud/conversation_v1.py‎

Lines changed: 121 additions & 211 deletions
Large diffs are not rendered by default.

‎watson_developer_cloud/discovery_v1.py‎

Lines changed: 109 additions & 175 deletions
Large diffs are not rendered by default.

‎watson_developer_cloud/language_translator_v2.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ def translate(self, text, model_id=None, source=None, target=None):
8888
'source': source,
8989
'target': target
9090
}
91+
url = '/v2/translate'
9192
response = self.request(
92-
method='POST', url='/v2/translate', json=data, accept_json=True)
93+
method='POST', url=url, json=data, accept_json=True)
9394
return response
9495

9596
#########################
@@ -108,9 +109,10 @@ def identify(self, text):
108109
raise ValueError('text must be provided')
109110
data = text
110111
headers = {'content-type': 'text/plain'}
112+
url = '/v2/identify'
111113
response = self.request(
112114
method='POST',
113-
url='/v2/identify',
115+
url=url,
114116
headers=headers,
115117
data=data,
116118
accept_json=True)
@@ -126,8 +128,8 @@ def list_identifiable_languages(self):
126128
:return: A `dict` containing the `IdentifiableLanguages` response.
127129
:rtype: dict
128130
"""
129-
response = self.request(
130-
method='GET', url='/v2/identifiable_languages', accept_json=True)
131+
url = '/v2/identifiable_languages'
132+
response = self.request(method='GET', url=url, accept_json=True)
131133
return response
132134

133135
#########################
@@ -184,9 +186,10 @@ def create_model(self,
184186
mime_type = 'text/plain'
185187
monolingual_corpus_tuple = (monolingual_corpus_filename,
186188
monolingual_corpus, mime_type)
189+
url = '/v2/models'
187190
response = self.request(
188191
method='POST',
189-
url='/v2/models',
192+
url=url,
190193
params=params,
191194
files={
192195
'forced_glossary': forced_glossary_tuple,
@@ -206,10 +209,8 @@ def delete_model(self, model_id):
206209
"""
207210
if model_id is None:
208211
raise ValueError('model_id must be provided')
209-
response = self.request(
210-
method='DELETE',
211-
url='/v2/models/{0}'.format(model_id),
212-
accept_json=True)
212+
url = '/v2/models/{0}'.format(*self._encode_path_vars(model_id))
213+
response = self.request(method='DELETE', url=url, accept_json=True)
213214
return response
214215

215216
def get_model(self, model_id):
@@ -222,10 +223,8 @@ def get_model(self, model_id):
222223
"""
223224
if model_id is None:
224225
raise ValueError('model_id must be provided')
225-
response = self.request(
226-
method='GET',
227-
url='/v2/models/{0}'.format(model_id),
228-
accept_json=True)
226+
url = '/v2/models/{0}'.format(*self._encode_path_vars(model_id))
227+
response = self.request(method='GET', url=url, accept_json=True)
229228
return response
230229

231230
def list_models(self, source=None, target=None, default_models=None):
@@ -239,8 +238,9 @@ def list_models(self, source=None, target=None, default_models=None):
239238
:rtype: dict
240239
"""
241240
params = {'source': source, 'target': target, 'default': default_models}
241+
url = '/v2/models'
242242
response = self.request(
243-
method='GET', url='/v2/models', params=params, accept_json=True)
243+
method='GET', url=url, params=params, accept_json=True)
244244
return response
245245

246246

‎watson_developer_cloud/natural_language_classifier_v1.py‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ def classify(self, classifier_id, text):
8787
if text is None:
8888
raise ValueError('text must be provided')
8989
data = {'text': text}
90+
url = '/v1/classifiers/{0}/classify'.format(
91+
*self._encode_path_vars(classifier_id))
9092
response = self.request(
91-
method='POST',
92-
url='/v1/classifiers/{0}/classify'.format(classifier_id),
93-
json=data,
94-
accept_json=True)
93+
method='POST', url=url, json=data, accept_json=True)
9594
return response
9695

9796
def create_classifier(self,
@@ -124,9 +123,10 @@ def create_classifier(self,
124123
training_data_filename = training_data.name
125124
mime_type = 'text/csv'
126125
training_data_tuple = (training_data_filename, training_data, mime_type)
126+
url = '/v1/classifiers'
127127
response = self.request(
128128
method='POST',
129-
url='/v1/classifiers',
129+
url=url,
130130
files={
131131
'metadata': metadata_tuple,
132132
'training_data': training_data_tuple
@@ -143,10 +143,9 @@ def delete_classifier(self, classifier_id):
143143
"""
144144
if classifier_id is None:
145145
raise ValueError('classifier_id must be provided')
146-
self.request(
147-
method='DELETE',
148-
url='/v1/classifiers/{0}'.format(classifier_id),
149-
accept_json=True)
146+
url = '/v1/classifiers/{0}'.format(
147+
*self._encode_path_vars(classifier_id))
148+
self.request(method='DELETE', url=url, accept_json=True)
150149
return None
151150

152151
def get_classifier(self, classifier_id):
@@ -161,10 +160,9 @@ def get_classifier(self, classifier_id):
161160
"""
162161
if classifier_id is None:
163162
raise ValueError('classifier_id must be provided')
164-
response = self.request(
165-
method='GET',
166-
url='/v1/classifiers/{0}'.format(classifier_id),
167-
accept_json=True)
163+
url = '/v1/classifiers/{0}'.format(
164+
*self._encode_path_vars(classifier_id))
165+
response = self.request(method='GET', url=url, accept_json=True)
168166
return response
169167

170168
def list_classifiers(self):
@@ -176,8 +174,8 @@ def list_classifiers(self):
176174
:return: A `dict` containing the `ClassifierList` response.
177175
:rtype: dict
178176
"""
179-
response = self.request(
180-
method='GET', url='/v1/classifiers', accept_json=True)
177+
url = '/v1/classifiers'
178+
response = self.request(method='GET', url=url, accept_json=True)
181179
return response
182180

183181

‎watson_developer_cloud/natural_language_understanding_v1.py‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,9 @@ def analyze(self,
169169
'language': language,
170170
'limit_text_characters': limit_text_characters
171171
}
172+
url = '/v1/analyze'
172173
response = self.request(
173-
method='POST',
174-
url='/v1/analyze',
175-
params=params,
176-
json=data,
177-
accept_json=True)
174+
method='POST', url=url, params=params, json=data, accept_json=True)
178175
return response
179176

180177
#########################
@@ -194,11 +191,9 @@ def delete_model(self, model_id):
194191
if model_id is None:
195192
raise ValueError('model_id must be provided')
196193
params = {'version': self.version}
194+
url = '/v1/models/{0}'.format(*self._encode_path_vars(model_id))
197195
response = self.request(
198-
method='DELETE',
199-
url='/v1/models/{0}'.format(model_id),
200-
params=params,
201-
accept_json=True)
196+
method='DELETE', url=url, params=params, accept_json=True)
202197
return response
203198

204199
def list_models(self):
@@ -213,8 +208,9 @@ def list_models(self):
213208
:rtype: dict
214209
"""
215210
params = {'version': self.version}
211+
url = '/v1/models'
216212
response = self.request(
217-
method='GET', url='/v1/models', params=params, accept_json=True)
213+
method='GET', url=url, params=params, accept_json=True)
218214
return response
219215

220216

‎watson_developer_cloud/personality_insights_v3.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,10 @@ def profile(self,
166166
data = json.dumps(content)
167167
else:
168168
data = content
169+
url = '/v3/profile'
169170
response = self.request(
170171
method='POST',
171-
url='/v3/profile',
172+
url=url,
172173
headers=headers,
173174
params=params,
174175
data=data,

‎watson_developer_cloud/tone_analyzer_v3.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,10 @@ def tone(self,
166166
data = json.dumps(tone_input)
167167
else:
168168
data = tone_input
169+
url = '/v3/tone'
169170
response = self.request(
170171
method='POST',
171-
url='/v3/tone',
172+
url=url,
172173
headers=headers,
173174
params=params,
174175
data=data,
@@ -201,9 +202,10 @@ def tone_chat(self, utterances, accept_language=None):
201202
headers = {'Accept-Language': accept_language}
202203
params = {'version': self.version}
203204
data = {'utterances': utterances}
205+
url = '/v3/tone_chat'
204206
response = self.request(
205207
method='POST',
206-
url='/v3/tone_chat',
208+
url=url,
207209
headers=headers,
208210
params=params,
209211
json=data,

‎watson_developer_cloud/visual_recognition_v3.py‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ def classify(self,
106106
parameters_tuple = None
107107
if parameters:
108108
parameters_tuple = (None, parameters, 'text/plain')
109+
url = '/v3/classify'
109110
response = self.request(
110111
method='POST',
111-
url='/v3/classify',
112+
url=url,
112113
headers=headers,
113114
params=params,
114115
files={
@@ -143,9 +144,10 @@ def detect_faces(self,
143144
parameters_tuple = None
144145
if parameters:
145146
parameters_tuple = (None, parameters, 'text/plain')
147+
url = '/v3/detect_faces'
146148
response = self.request(
147149
method='POST',
148-
url='/v3/detect_faces',
150+
url=url,
149151
params=params,
150152
files={
151153
'images_file': images_file_tuple,
@@ -174,9 +176,10 @@ def create_classifier(self,
174176
raise ValueError('name must be provided')
175177
params = {'version': self.version}
176178
data = {'name': name}
179+
url = '/v3/classifiers'
177180
response = self.request(
178181
method='POST',
179-
url='/v3/classifiers',
182+
url=url,
180183
params=params,
181184
data=data,
182185
files=kwargs,
@@ -193,11 +196,9 @@ def delete_classifier(self, classifier_id):
193196
if classifier_id is None:
194197
raise ValueError('classifier_id must be provided')
195198
params = {'version': self.version}
196-
self.request(
197-
method='DELETE',
198-
url='/v3/classifiers/{0}'.format(classifier_id),
199-
params=params,
200-
accept_json=True)
199+
url = '/v3/classifiers/{0}'.format(
200+
*self._encode_path_vars(classifier_id))
201+
self.request(method='DELETE', url=url, params=params, accept_json=True)
201202
return None
202203

203204
def get_classifier(self, classifier_id):
@@ -211,11 +212,10 @@ def get_classifier(self, classifier_id):
211212
if classifier_id is None:
212213
raise ValueError('classifier_id must be provided')
213214
params = {'version': self.version}
215+
url = '/v3/classifiers/{0}'.format(
216+
*self._encode_path_vars(classifier_id))
214217
response = self.request(
215-
method='GET',
216-
url='/v3/classifiers/{0}'.format(classifier_id),
217-
params=params,
218-
accept_json=True)
218+
method='GET', url=url, params=params, accept_json=True)
219219
return response
220220

221221
def list_classifiers(self, verbose=None):
@@ -227,11 +227,9 @@ def list_classifiers(self, verbose=None):
227227
:rtype: dict
228228
"""
229229
params = {'version': self.version, 'verbose': verbose}
230+
url = '/v3/classifiers'
230231
response = self.request(
231-
method='GET',
232-
url='/v3/classifiers',
233-
params=params,
234-
accept_json=True)
232+
method='GET', url=url, params=params, accept_json=True)
235233
return response
236234

237235
def update_classifier(self,
@@ -249,9 +247,11 @@ def update_classifier(self,
249247
if classifier_id is None:
250248
raise ValueError('classifier_id must be provided')
251249
params = {'version': self.version}
250+
url = '/v3/classifiers/{0}'.format(
251+
*self._encode_path_vars(classifier_id))
252252
response = self.request(
253253
method='POST',
254-
url='/v3/classifiers/{0}'.format(classifier_id),
254+
url=url,
255255
params=params,
256256
files=kwargs,
257257
accept_json=True)

0 commit comments

Comments
 (0)