Merge branch 'develop' into codegen/vr

Author: germanattanasio

examples/tone_analyzer_v3.py

@@ -43,3 +43,13 @@
     tone = tone_analyzer.tone(json.load(tone_html)['text'],
                               content_type='text/html')
 print(json.dumps(tone, indent=2))
+
+print("\ntone() example 6 with GDPR support:\n")
+tone_analyzer.set_detailed_response(True)
+with open(join(dirname(__file__),
+               '../resources/tone-example-html.json')) as tone_html:
+    tone = tone_analyzer.tone(json.load(tone_html)['text'],
+                              content_type='text/html',
+                              headers={'Custom-Header': 'custom_value'})
+
+print(tone)

test/integration/test_discovery_v1.py

@@ -8,18 +8,28 @@
 @pytest.mark.skipif(
     os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class Discoveryv1(TestCase):
-    def setUp(self):
-        self.discovery = watson_developer_cloud.DiscoveryV1(
+    discovery = None
+    environment_id = 'e15f6424-f887-4f50-b4ea-68267c36fc9c'  # This environment is created for integration testing
+    collection_id = None
+
+    @classmethod
+    def setup_class(cls):
+        cls.discovery = watson_developer_cloud.DiscoveryV1(
             version='2017-10-16',
             username="YOUR SERVICE USERNAME",
             password="YOUR SERVICE PASSWORD")
-        self.discovery.set_default_headers({
+        cls.discovery.set_default_headers({
             'X-Watson-Learning-Opt-Out': '1',
             'X-Watson-Test': '1'
         })
-        self.environment_id = 'e15f6424-f887-4f50-b4ea-68267c36fc9c'  # This environment is created for integration testing
-        self.collection_id = self.discovery.list_collections(
-            self.environment_id)['collections'][0]['collection_id']
+        cls.collection_id = cls.discovery.list_collections(cls.environment_id)['collections'][0]['collection_id']
+
+    @classmethod
+    def teardown_class(cls):
+        collections = cls.discovery.list_collections(cls.environment_id)['collections']
+        for collection in collections:
+            if collection['name'] != 'DO-NOT-DELETE':
+                cls.discovery.delete_collection(cls.environment_id, collection['collection_id'])
 
     def test_environments(self):
         envs = self.discovery.list_environments()
@@ -86,10 +96,7 @@ def test_documents(self):
             self.environment_id, self.collection_id, add_doc['document_id'])
         assert doc_status is not None
 
-        with open(
-                os.path.join(
-                    os.path.dirname(__file__), '../../resources/simple.html'),
-                'r') as fileinfo:
+        with open(os.path.join(os.path.dirname(__file__), '../../resources/simple.html'), 'r') as fileinfo:
             update_doc = self.discovery.update_document(
                 self.environment_id,
                 self.collection_id,

test/integration/test_speech_to_text_v1.py

@@ -8,25 +8,32 @@
 @pytest.mark.skipif(
     os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class TestSpeechToTextV1(TestCase):
-    def setUp(self):
-        self.speech_to_text = watson_developer_cloud.SpeechToTextV1(
+    text_to_speech = None
+    custom_models = None
+    create_custom_model = None
+    customization_id = None
+
+    @classmethod
+    def setup_class(cls):
+        cls.speech_to_text = watson_developer_cloud.SpeechToTextV1(
             username=os.getenv('YOUR SERVICE USERNAME'),
             password=os.getenv('YOUR SERVICE PASSWORD'))
-        self.speech_to_text.set_default_headers({
+        cls.speech_to_text.set_default_headers({
             'X-Watson-Learning-Opt-Out':
             '1',
             'X-Watson-Test':
             '1'
         })
-        self.custom_models = self.speech_to_text.list_language_models()
-        self.create_custom_model = self.speech_to_text.create_language_model(
+        cls.custom_models = cls.speech_to_text.list_language_models()
+        cls.create_custom_model = cls.speech_to_text.create_language_model(
             name="integration_test_model",
             base_model_name="en-US_BroadbandModel")
-        self.customization_id = self.create_custom_model['customization_id']
+        cls.customization_id = cls.create_custom_model['customization_id']
 
-    def tearDown(self):
-        self.speech_to_text.delete_language_model(
-            customization_id=self.create_custom_model['customization_id'])
+    @classmethod
+    def teardown_class(cls):
+        cls.speech_to_text.delete_language_model(
+            customization_id=cls.create_custom_model['customization_id'])
 
     def test_models(self):
         output = self.speech_to_text.list_models()

test/integration/test_text_to_speech_v1.py

@@ -7,23 +7,29 @@
 @pytest.mark.skipif(
     os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class TestIntegrationTextToSpeechV1(unittest.TestCase):
-    def setUp(self):
-        self.text_to_speech = watson_developer_cloud.TextToSpeechV1(
+    text_to_speech = None
+    original_customizations = None
+    created_customization = None
+
+    @classmethod
+    def setup_class(cls):
+        cls.text_to_speech = watson_developer_cloud.TextToSpeechV1(
             username="YOUR SERVICE USERNAME", password="YOUR SERVICE PASSWORD")
-        self.text_to_speech.set_default_headers({
+        cls.text_to_speech.set_default_headers({
             'X-Watson-Learning-Opt-Out':
             '1',
             'X-Watson-Test':
             '1'
         })
-        self.original_customizations = self.text_to_speech.list_voice_models()
-        self.created_customization = self.text_to_speech.create_voice_model(
+        cls.original_customizations = cls.text_to_speech.list_voice_models()
+        cls.created_customization = cls.text_to_speech.create_voice_model(
             name="test_integration_customization",
             description="customization for tests")
 
-    def tearDown(self):
-        custid = self.created_customization['customization_id']
-        self.text_to_speech.delete_voice_model(customization_id=custid)
+    @classmethod
+    def teardown_class(cls):
+        custid = cls.created_customization['customization_id']
+        cls.text_to_speech.delete_voice_model(customization_id=custid)
 
     def test_voices(self):
         output = self.text_to_speech.list_voices()