Skip to content

Commit 62848a3

Browse files
jsstylosjsstylos
authored
Merge pull request #262 from rebecca-makar/master
In discovery_v1 I added support for languages in createCollection
2 parents d69e95d + 25f54ab commit 62848a3

2 files changed

Lines changed: 17 additions & 18 deletions

File tree

‎test/test_discovery_v1.py‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
environment_id = 'envid'
1919
collection_id = 'collid'
2020

21+
2122
@responses.activate
2223
def test_environments():
2324
discovery_url = urljoin(base_discovery_url, 'environments')
@@ -218,10 +219,12 @@ def test_collection():
218219
discovery.create_collection(environment_id='envid',
219220
name="name",
220221
description="",
222+
language="",
221223
configuration_id='confid')
222224

223225
discovery.create_collection(environment_id='envid',
224226
name="name",
227+
language="es",
225228
description="")
226229

227230
discovery.get_collection('envid', 'collid')
@@ -326,8 +329,8 @@ def test_document():
326329
content_type='application/json')
327330
responses.add(responses.GET, config_url,
328331
body=json.dumps({"configurations":
329-
[{"name": "Default Configuration",
330-
"configuration_id": "confid"}]}),
332+
[{"name": "Default Configuration",
333+
"configuration_id": "confid"}]}),
331334
status=200,
332335
content_type='application/json')
333336

@@ -532,7 +535,8 @@ def test_add_training_data_query():
532535
def test_delete_training_data_query():
533536
training_endpoint = '/v1/environments/{0}/collections/{1}/training_data/{2}'
534537
query_id = 'queryid'
535-
endpoint = training_endpoint.format(environment_id, collection_id, query_id)
538+
endpoint = training_endpoint.format(
539+
environment_id, collection_id, query_id)
536540
url = '{0}{1}'.format(base_url, endpoint)
537541
responses.add(responses.DELETE, url, status=204)
538542

@@ -550,7 +554,8 @@ def test_delete_training_data_query():
550554
def test_get_training_data_query():
551555
training_endpoint = '/v1/environments/{0}/collections/{1}/training_data/{2}'
552556
query_id = 'queryid'
553-
endpoint = training_endpoint.format(environment_id, collection_id, query_id)
557+
endpoint = training_endpoint.format(
558+
environment_id, collection_id, query_id)
554559
url = '{0}{1}'.format(base_url, endpoint)
555560
mock_response = {
556561
"query_id": "string",
@@ -585,7 +590,8 @@ def test_list_training_data_query_examples():
585590
examples_endpoint = '/v1/environments/{0}/collections/{1}/training_data' + \
586591
'/{2}/examples'
587592
query_id = 'queryid'
588-
endpoint = examples_endpoint.format(environment_id, collection_id, query_id)
593+
endpoint = examples_endpoint.format(
594+
environment_id, collection_id, query_id)
589595
url = '{0}{1}'.format(base_url, endpoint)
590596
mock_response = [
591597
{
@@ -616,7 +622,8 @@ def test_add_training_data_query_example():
616622
examples_endpoint = '/v1/environments/{0}/collections/{1}/training_data' + \
617623
'/{2}/examples'
618624
query_id = 'queryid'
619-
endpoint = examples_endpoint.format(environment_id, collection_id, query_id)
625+
endpoint = examples_endpoint.format(
626+
environment_id, collection_id, query_id)
620627
url = '{0}{1}'.format(base_url, endpoint)
621628
document_id = "string"
622629
relevance = 0

‎watson_developer_cloud/discovery_v1.py‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,12 @@ def create_collection(self,
196196
environment_id,
197197
name,
198198
description="",
199-
configuration_id=None):
199+
configuration_id=None,
200+
language="en"):
200201
data_dict = {'configuration_id': configuration_id,
201202
'name': name,
202-
'description': description}
203+
'description': description,
204+
'language': language}
203205
url_string = '/v1/environments/{0}/collections'.format(
204206
environment_id)
205207
return self.request(method='POST',
@@ -380,7 +382,6 @@ def query(self, environment_id, collection_id, query_options):
380382
environment_id, collection_id),
381383
params=query_options, accept_json=True)
382384

383-
384385
def delete_training_data(self, environment_id, collection_id):
385386
"""
386387
Clears all training data for this collection.
@@ -396,7 +397,6 @@ def delete_training_data(self, environment_id, collection_id):
396397
url=url_string,
397398
params=params)
398399

399-
400400
def list_training_data(self, environment_id, collection_id):
401401
"""
402402
Lists the training data for this collection
@@ -413,7 +413,6 @@ def list_training_data(self, environment_id, collection_id):
413413
params=params,
414414
accept_json=True)
415415

416-
417416
def add_training_data_query(self,
418417
environment_id,
419418
collection_id,
@@ -445,7 +444,6 @@ def add_training_data_query(self,
445444
json=data,
446445
accept_json=True)
447446

448-
449447
def delete_training_data_query(self,
450448
environment_id,
451449
collection_id,
@@ -469,7 +467,6 @@ def delete_training_data_query(self,
469467
url=url_string,
470468
params=params)
471469

472-
473470
def get_training_data_query(self,
474471
environment_id,
475472
collection_id,
@@ -492,7 +489,6 @@ def get_training_data_query(self,
492489
params=params,
493490
accept_json=True)
494491

495-
496492
def list_training_data_query_examples(self,
497493
environment_id,
498494
collection_id,
@@ -515,7 +511,6 @@ def list_training_data_query_examples(self,
515511
params=params,
516512
accept_json=True)
517513

518-
519514
def add_training_data_query_example(self,
520515
environment_id,
521516
collection_id,
@@ -549,7 +544,6 @@ def add_training_data_query_example(self,
549544
json=data,
550545
accept_json=True)
551546

552-
553547
def delete_training_data_query_example(self,
554548
environment_id,
555549
collection_id,
@@ -576,7 +570,6 @@ def delete_training_data_query_example(self,
576570
url=url_string,
577571
params=params)
578572

579-
580573
def get_training_data_query_example(self,
581574
environment_id,
582575
collection_id,
@@ -603,7 +596,6 @@ def get_training_data_query_example(self,
603596
params=params,
604597
accept_json=True)
605598

606-
607599
def update_training_data_query_example(self,
608600
environment_id,
609601
collection_id,

0 commit comments

Comments
 (0)