Merge develop to master (#477)

* doc(IAM): Document changes for IAM support

* Add support for IAM (#456)

* Feat(IAM): Adding IAM feature

* Update constructors for IAM support (#459)

* :feat(iam): Generate service constructors to support IAM

* fix(vr): Fix vr tests (#463)

* fix(vr): Fix vr tests

* chore(discovery): Update test for discovery

* Regenerate discovery (#464)

* new(discovery): Generate discovery

* chore(discovery): Hand edits to discovery

* test(discovery): Add test for delete_user_data

* Regenerate language translator (#465)

* new(language-translator): Generate language translator

* Chore(lt): Hand edits to language translator and formatting

* Regenerate Tone Analyzer (#468)

* new(ta): Generate tone analyzer

* chore(ta): Hand edits and formatting for tone analyzer

* Regenerate conversation (#469)

* new(convresation): Generate conversation

* chore(conversation): Hand edits for conversation

* test(conversation): Add test for delete_user_data

* Regenerate Assistant (#470)

* new(assistant): Generate assistant

* chore(assistant): Hand edits and formatting

* test(assistant): Add test for delete_user_data

* chore(assistant): Add newline

* Regenerate Text to Speech (#471)

* new(tts): Generate tts

* chore(tts): Hand edits and pylint complaints for tts

* Regenerate natural language understanding (#466)

* new(nlu): Generate natural language understanding

* chore(nlu): hand edits for nlu

* Regenerate Visual recognition (#473)

* new(vr): Genetate visual recognition

* chore(cr): Hand edits for visual recognition

* Regenerate Persoanlity Insights (#467)

* new(personality insights): Generate personality insights

* chore(pi): hand edits for personality insights

* chore(pi): Hand edits remove profile_as_csv

* Regenerate Speech to text (#472)

* new(stt): Generate stt

* chore(stt): Hand edits for speech to text

* chore(stt): Pylint

* chore(deprecated): Use proper deprecation message

* test(discovery): Update the discovery test (#474)

* chore(pylint): Handle pylint issues (#476)

Author: ehdsouza

test/integration/test_discovery_v1.py

@@ -40,30 +40,35 @@ def test_environments(self):
     def test_configurations(self):
         configs = self.discovery.list_configurations(self.environment_id)
         assert configs is not None
+
+        name = 'test' + random.choice('ABCDEFGHIJKLMNOPQ')
         new_configuration_id = self.discovery.create_configuration(
-            self.environment_id, 'test',
+            self.environment_id, name,
             'creating new config for python sdk')['configuration_id']
         assert new_configuration_id is not None
         self.discovery.get_configuration(self.environment_id,
                                          new_configuration_id)
+
         updated_config = self.discovery.update_configuration(
             self.environment_id, new_configuration_id, 'lala')
         assert updated_config['name'] == 'lala'
+
         deleted_config = self.discovery.delete_configuration(
             self.environment_id, new_configuration_id)
         assert deleted_config['status'] == 'deleted'
 
     def test_collections_and_expansions(self):
+        name = 'Example collection for python' + random.choice('ABCDEFGHIJKLMNOPQ')
         new_collection_id = self.discovery.create_collection(
             self.environment_id,
-            name='Example collection for python' +
-            random.choice('ABCDEFGHIJKLMNOPQ'),
+            name,
             description="Integration test for python sdk")['collection_id']
         assert new_collection_id is not None
+
         self.discovery.get_collection(self.environment_id, new_collection_id)
         updated_collection = self.discovery.update_collection(
-            self.environment_id, new_collection_id, name='lala')
-        assert updated_collection['name'] == 'lala'
+            self.environment_id, new_collection_id, name, description='Updating description')
+        assert updated_collection['description'] == 'Updating description'
 
         self.discovery.create_expansions(self.environment_id,
                                          new_collection_id, [{

test/integration/test_visual_recognition.py

@@ -6,7 +6,6 @@
 from unittest import TestCase
 import json
 
-
 @pytest.mark.skipif(
     os.getenv('VCAP_SERVICES') is None, reason='requires VCAP_SERVICES')
 class IntegrationTestVisualRecognitionV3(TestCase):
@@ -23,25 +22,16 @@ def setup_class(cls):
             'X-Watson-Test':
             '1'
         })
-        cls.classifier_id = 'doxnotxdeletexdogxvsxcat_1697519201'
-
-    @classmethod
-    def teardown_class(cls):
-        classifiers = cls.visual_recognition.list_classifiers()['classifiers']
-
-        if classifiers:
-            for classifier in classifiers:
-                if 'CarsVsTrucks' in classifier['name']:
-                    cls.visual_recognition.delete_classifier(classifier['classifier_id'])
+        cls.classifier_id = 'doxnotxdeletexintegrationxtest_397877192'
 
     def test_classify(self):
-        car_path = join(dirname(__file__), '../../resources/dog.jpg')
-        with open(car_path, 'rb') as images_file:
-            car_results = self.visual_recognition.classify(
-                images_file=images_file,
+        dog_path = join(dirname(__file__), '../../resources/dog.jpg')
+        with open(dog_path, 'rb') as image_file:
+            dog_results = self.visual_recognition.classify(
+                images_file=image_file,
                 threshold='0.1',
                 classifier_ids=['default'])
-        assert car_results is not None
+        assert dog_results is not None
 
     def test_detect_faces(self):
         output = self.visual_recognition.detect_faces(
@@ -51,6 +41,7 @@ def test_detect_faces(self):
             }))
         assert output is not None
 
+    @pytest.mark.skip(reason="Time consuming")
     def test_custom_classifier(self):
         with open(os.path.join(os.path.dirname(__file__), '../../resources/cars.zip'), 'rb') as cars, \
             open(os.path.join(os.path.dirname(__file__), '../../resources/trucks.zip'), 'rb') as trucks:

test/unit/test_assistant_v1.py

@@ -1480,3 +1480,19 @@ def test_dialog_nodes():
     assert responses.calls[3].response.json() == {"application/json": {"dialog_node": "location-atm"}}
 
     assert len(responses.calls) == 4
+
+@responses.activate
+def test_delete_user_data():
+    url = 'https://gateway.watsonplatform.net/assistant/api/v1/user_data'
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    assistant = watson_developer_cloud.AssistantV1('2017-05-26', username="username", password="password")
+
+    response = assistant.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

test/unit/test_conversation_v1.py

@@ -1480,3 +1480,19 @@ def test_dialog_nodes():
     assert responses.calls[3].response.json() == {"application/json": {"dialog_node": "location-atm"}}
 
     assert len(responses.calls) == 4
+
+@responses.activate
+def test_delete_user_data():
+    url = 'https://gateway.watsonplatform.net/conversation/api/v1/user_data'
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    conversation = watson_developer_cloud.ConversationV1('2017-05-26', username="username", password="password")
+
+    response = conversation.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

test/unit/test_discovery_v1.py

@@ -799,3 +799,19 @@ def test_expansions():
     assert responses.calls[2].response.json() == {"description": "success"}
 
     assert len(responses.calls) == 3
+
+@responses.activate
+def test_delete_user_data():
+    url = 'https://gateway.watsonplatform.net/discovery/api/v1/user_data'
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    discovery = watson_developer_cloud.DiscoveryV1('2017-11-07', username="username", password="password")
+
+    response = discovery.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

watson_developer_cloud/assistant_v1.py

@@ -134,9 +134,7 @@ def message(self,
         if context is not None:
             context = self._convert_model(context, Context)
         if entities is not None:
-            entities = [
-                self._convert_model(x, RuntimeEntity) for x in entities
-            ]
+            entities = [self._convert_model(x, RuntimeEntity) for x in entities]
         if intents is not None:
             intents = [self._convert_model(x, RuntimeIntent) for x in intents]
         if output is not None:
@@ -296,8 +294,7 @@ def get_workspace(self,
             'export': export,
             'include_audit': include_audit
         }
-        url = '/v1/workspaces/{0}'.format(
-            *self._encode_path_vars(workspace_id))
+        url = '/v1/workspaces/{0}'.format(*self._encode_path_vars(workspace_id))
         response = self.request(
             method='GET',
             url=url,
@@ -314,6 +311,8 @@ def list_workspaces(self,
                         include_audit=None,
                         **kwargs):
         """
+        List workspaces.
+
         List the workspaces associated with a Watson Assistant service instance.    This
         operation is limited to 500 requests per 30 minutes. For more information, see
         **Rate limiting**.
@@ -412,8 +411,7 @@ def update_workspace(self,
             'metadata': metadata,
             'learning_opt_out': learning_opt_out
         }
-        url = '/v1/workspaces/{0}'.format(
-            *self._encode_path_vars(workspace_id))
+        url = '/v1/workspaces/{0}'.format(*self._encode_path_vars(workspace_id))
         response = self.request(
             method='POST',
             url=url,
@@ -452,9 +450,7 @@ def create_intent(self,
         if intent is None:
             raise ValueError('intent must be provided')
         if examples is not None:
-            examples = [
-                self._convert_model(x, CreateExample) for x in examples
-            ]
+            examples = [self._convert_model(x, CreateExample) for x in examples]
         headers = {}
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
@@ -495,8 +491,8 @@ def delete_intent(self, workspace_id, intent, **kwargs):
         if 'headers' in kwargs:
             headers.update(kwargs.get('headers'))
         params = {'version': self.version}
-        url = '/v1/workspaces/{0}/intents/{1}'.format(*self._encode_path_vars(
-            workspace_id, intent))
+        url = '/v1/workspaces/{0}/intents/{1}'.format(
+            *self._encode_path_vars(workspace_id, intent))
         self.request(
             method='DELETE',
             url=url,
@@ -539,8 +535,8 @@ def get_intent(self,
             'export': export,
             'include_audit': include_audit
         }
-        url = '/v1/workspaces/{0}/intents/{1}'.format(*self._encode_path_vars(
-            workspace_id, intent))
+        url = '/v1/workspaces/{0}/intents/{1}'.format(
+            *self._encode_path_vars(workspace_id, intent))
         response = self.request(
             method='GET',
             url=url,
@@ -640,8 +636,8 @@ def update_intent(self,
             'description': new_description,
             'examples': new_examples
         }
-        url = '/v1/workspaces/{0}/intents/{1}'.format(*self._encode_path_vars(
-            workspace_id, intent))
+        url = '/v1/workspaces/{0}/intents/{1}'.format(
+            *self._encode_path_vars(workspace_id, intent))
         response = self.request(
             method='POST',
             url=url,
@@ -2157,6 +2153,39 @@ def list_logs(self,
             accept_json=True)
         return response
 
+    #########################
+    # User data
+    #########################
+
+    def delete_user_data(self, customer_id, **kwargs):
+        """
+        Delete labeled data.
+
+        Deletes all data associated with a specified customer ID. The method has no effect
+        if no data is associated with the customer ID.   You associate a customer ID with
+        data by passing the `X-Watson-Metadata` header with a request that passes data.
+        For more information about personal data and customer IDs, see [Information
+        security](https://console.bluemix.net/docs/services/conversation/information-security.html).
+
+        :param str customer_id: The customer ID for which all data is to be deleted.
+        :param dict headers: A `dict` containing the request headers
+        :rtype: None
+        """
+        if customer_id is None:
+            raise ValueError('customer_id must be provided')
+        headers = {}
+        if 'headers' in kwargs:
+            headers.update(kwargs.get('headers'))
+        params = {'version': self.version, 'customer_id': customer_id}
+        url = '/v1/user_data'
+        self.request(
+            method='DELETE',
+            url=url,
+            headers=headers,
+            params=params,
+            accept_json=True)
+        return None
+
 
 ##############################################################################
 # Models