Merge pull request #592 from watson-developer-cloud/codegen/all

Regeneration of python SDK

Author: ehdsouza

test/integration/test_discovery_v1.py

@@ -21,10 +21,14 @@ def setUp(self):
         collections = self.discovery.list_collections(self.environment_id).get_result()['collections']
         self.collection_id = collections[0]['collection_id']
 
+        for collection in collections:
+            if collection['name'] == 'DO-NOT-DELETE-JAPANESE-COLLECTION':
+                self.collection_id_JP = collection['collection_id']
+
     def tearDown(self):
         collections = self.discovery.list_collections(self.environment_id).get_result()['collections']
         for collection in collections:
-            if collection['name'] != 'DO-NOT-DELETE':
+            if not collection['name'].startswith('DO-NOT-DELETE'):
                 self.discovery.delete_collection(self.environment_id, collection['collection_id'])
 
     def test_environments(self):
@@ -209,3 +213,11 @@ def test_feedback(self):
 
         response = self.discovery.query_log(count=2).get_result()
         assert response is not None
+
+
+    def test_tokenization_dictionary(self):
+        result = self.discovery.get_tokenization_dictionary_status(
+            self.environment_id,
+            self.collection_id_JP
+        ).get_result()
+        assert result['status'] is not None

test/unit/test_discovery_v1.py

@@ -1173,3 +1173,45 @@ def test_events_and_feedback():
     assert responses.calls[13].response.json() == log_query_response
 
     assert len(responses.calls) == 14
+
+@responses.activate
+def test_tokenization_dictionary():
+    url = 'https://gateway.watsonplatform.net/discovery/api/v1/environments/envid/collections/colid/word_lists/tokenization_dictionary?version=2017-11-07'
+    responses.add(
+        responses.POST,
+        url,
+        body='{"status": "pending"}',
+        status=200,
+        content_type='application_json')
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"status": "pending"}',
+        status=200)
+    responses.add(
+        responses.GET,
+        url,
+        body='{"status": "pending", "type":"tokenization_dictionary"}',
+        status=200,
+        content_type='application_json')
+
+    discovery = watson_developer_cloud.DiscoveryV1('2017-11-07', username="username", password="password")
+
+    tokenization_rules = [
+        {
+            'text': 'token',
+            'tokens': ['token 1', 'token 2'],
+            'readings': ['reading 1', 'reading 2'],
+            'part_of_speech': 'noun',
+        }
+    ]
+    discovery.create_tokenization_dictionary('envid', 'colid', tokenization_rules)
+    assert responses.calls[0].response.json() == {"status": "pending"}
+
+    discovery.get_tokenization_dictionary_status('envid', 'colid')
+    assert responses.calls[1].response.json() == {"status": "pending", "type":"tokenization_dictionary"}
+
+    discovery.delete_tokenization_dictionary('envid', 'colid')
+    assert responses.calls[2].response.status_code is 200
+
+    assert len(responses.calls) == 3

test/unit/test_speech_to_text_v1.py

@@ -46,7 +46,12 @@ def test_success():
     assert request_url == recognize_url
     assert responses.calls[1].response.text == recognize_response
 
-    assert len(responses.calls) == 2
+    with open(os.path.join(os.path.dirname(__file__), '../../resources/speech.wav'), 'rb') as audio_file:
+        speech_to_text.recognize(
+            audio=audio_file, customization_id='x', content_type='audio/l16; rate=44100')
+    expected_url = "{0}?customization_id=x".format(recognize_url)
+    assert expected_url == responses.calls[2].request.url
+    assert len(responses.calls) == 3
 
 
 @responses.activate