Merge develop in master (#481)

* 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)

* :docs(IAM): Update readme with IAM examples (#478)

* :docs(IAM): Update readme with IAM examples

* Adding <code> around the method

* chore(readme): Update readme with IAM examples

* Generated changes for python 1.3.5 (#480)

* new(generator): Direct generator + formatting

* new(codegen): generated sdk changes + formatting

* new(codegen): generator + formatting

* fix(manual): Handedits for all services

* doc(readme): support set_iam_api_key

* fix(readme): remove VR auth from readme

Author: ehdsouza

README.md

@@ -59,15 +59,80 @@ To create an instance of the service:
    1. Type a unique name for the service instance in the **Service name** field. For example, type `my-service-name`. Leave the default values for the other options.
    1. Click **Create**.
 
+## Authentication
 To get your service credentials:
 
 Copy your credentials from the **Manage** page. To find the Service details page for an existing service, navigate to your [IBM Cloud][ibm_cloud] dashboard and click the service name.
 
 1. On the **Manage** page, you will see a **Credentials** pane
 1. Depending on the service you will see use either:
-* 2.a: `username`, `password`, and `url`(optional).
+* 2.a: `username`, `password`, and `url`(optional) or `apikey`(for Visual Recognition).
 * 2.b: `apikey` which is the value for parameter `iam_api_key` when initializing the constructor.
 
+### Username and Password
+```python
+from watson_developer_cloud import DiscoveryV1
+# In the constructor
+discovery = DiscoveryV1(version='2017-10-16', username='<username>', password='<password>')
+```
+
+```python
+# After instantiation
+discovery = DiscoveryV1(version='2017-10-16')
+discovery.set_username_and_password('<username>', '<password>')
+```
+
+### API Key
+*Important: Instantiation with API key works only with Visual Recognition service instances created before May 23, 2018. Visual Recognition instances created after May 22 use IAM.*
+
+```python
+from watson_developer_cloud import VisualRecognitionV3
+# In the constructor
+visual_recognition = VisualRecognitionV3(version='2018-05-22', api_key='<api_key>')
+```
+
+```python
+# After instantiation
+visual_recognition = VisualRecognitionV3(version='2018-05-22')
+visual_recognition.set_api_key('<api_key>')
+```
+
+### Using IAM
+
+When authenticating with IAM, you have the option of passing in:
+
+* the IAM API key and, optionally, the IAM service URL
+* an IAM access token
+
+**Be aware that passing in an access token means that you're assuming responsibility for maintaining that token's lifecycle.** If you instead pass in an IAM API key, the SDK will manage it for you.
+
+```python
+# In the constructor, letting the SDK manage the IAM token
+discovery = DiscoveryV1(version='2017-10-16',
+                        iam_api_key='<iam_api_key>',
+                        iam_url='<iam_url>') # optional - the default value is https://iam.ng.bluemix.net/identity/token
+```
+
+```python
+# after instantiation, letting the SDK manage the IAM token
+discovery = DiscoveryV1(version='2017-10-16')
+discovery.set_iam_api_key('<iam_api_key>')
+```
+
+```python
+# in the constructor, assuming control of managing IAM token
+discovery = DiscoveryV1(version='2017-10-16',
+                        iam_access_token='<iam_access_token>')
+```
+
+```python
+# after instantiation, assuming control of managing IAM token
+discovery = DiscoveryV1(version='2017-10-16')
+discovery.set_iam_access_token('<access_token>')
+```
+
+If at any time you would like to let the SDK take over managing your IAM token, simply override your stored IAM credentials with an IAM API key by calling the `set_token_manager()` method again.
+
 ## Python Version
 
 Tested on Python 2.7, 3.4, 3.5, and 3.6.

test/unit/test_speech_to_text_v1.py

@@ -493,3 +493,18 @@ def test_custom_audio_resources():
 
     speech_to_text.list_audio('custid')
     assert responses.calls[3].response.json() == {"get response all": "done"}
+
+@responses.activate
+def test_delete_user_data():
+    url = 'https://stream.watsonplatform.net/speech-to-text/api/v1/user_data'
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    speech_to_text = watson_developer_cloud.SpeechToTextV1(username="username", password="password")
+    response = speech_to_text.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

test/unit/test_text_to_speech_v1.py

@@ -227,3 +227,19 @@ def test_custom_words():
     text_to_speech.delete_word(customization_id="custid", word="word")
 
     assert len(responses.calls) == 5
+
+@responses.activate
+
+def test_delete_user_data():
+    url = 'https://stream.watsonplatform.net/text-to-speech/api/v1/user_data'
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    text_to_speech = watson_developer_cloud.TextToSpeechV1(username="username", password="password")
+    response = text_to_speech.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

test/unit/test_visual_recognition_v3.py

@@ -233,3 +233,18 @@ def test_detect_faces(self):
         with open(os.path.join(os.path.dirname(__file__), '../../resources/test.jpg'), 'rb') as image_file:
             vr_service.detect_faces(images_file=image_file)
         assert len(responses.calls) == 2
+
+@responses.activate
+def test_delete_user_data():
+    url = "{0}{1}".format(base_url, 'v3/user_data')
+    responses.add(
+        responses.DELETE,
+        url,
+        body='{"description": "success" }',
+        status=200,
+        content_type='application_json')
+
+    vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+    response = vr_service.delete_user_data('id')
+    assert response is None
+    assert len(responses.calls) == 1

test/unit/test_watson_service.py

@@ -14,13 +14,15 @@ class AnyServiceV1(WatsonService):
     default_url = 'https://gateway.watsonplatform.net/test/api'
 
     def __init__(self, version, url=default_url, username=None, password=None,
+                 api_key=None,
                  iam_api_key=None,
                  iam_access_token=None,
                  iam_url=None):
         WatsonService.__init__(
             self,
             vcap_services_name='test',
             url=url,
+            api_key=api_key,
             username=username,
             password=password,
             use_vcap_services=True,
@@ -102,6 +104,12 @@ def test_iam():
     service = AnyServiceV1('2017-07-07', iam_api_key="iam_api_key")
     assert service.token_manager is not None
 
+    iam_url = "https://iam.bluemix.net/identity/token"
+    service = AnyServiceV1('2017-07-07', username='xxx', password='yyy')
+    assert service.token_manager is None
+    service.set_iam_api_key('yyy')
+    assert service.token_manager is not None
+
     service.token_manager.token_info = {
         "access_token": "dummy",
         "token_type": "Bearer",