Merge branch 'master' into patch-2

Author: ehdsouza

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 3.0.1
+current_version = 3.0.3
 commit = True
 
 [bumpversion:file:ibm_watson/version.py]

README.md

@@ -98,9 +98,6 @@ To find out which authentication to use, view the service credentials. You find
 
 On this page, you should be able to see your credentials for accessing your service instance.
 
-![alt text](https://user-images.githubusercontent.com/13935994/55351058-6ac51900-548b-11e9-886e-945c6d4f31df.png)
-
-
 ### Supplying credentials
 
 There are two ways to supply the credentials you found above to the SDK for authentication.
@@ -137,12 +134,20 @@ If you'd prefer to set authentication values manually in your code, the SDK supp
 
 ### IAM
 
-IBM Cloud is migrating to token-based Identity and Access Management (IAM) authentication. IAM authentication uses a service API key to get an access token that is passed with the call. Access tokens are valid for approximately one hour and must be regenerated.
+IBM Cloud has migrated to token-based Identity and Access Management (IAM) authentication. IAM authentication uses a service API key to get an access token that is passed with the call. Access tokens are valid for approximately one hour and must be regenerated.
 
 You supply either an IAM service **API key** or an **access token**:
 
 - Use the API key to have the SDK manage the lifecycle of the access token. The SDK requests an access token, ensures that the access token is valid, and refreshes it if necessary.
 - Use the access token if you want to manage the lifecycle yourself. For details, see [Authenticating with IAM tokens](https://console.bluemix.net/docs/services/watson/getting-started-iam.html).
+- Use a server-side to generate access tokens using your IAM API key for untrusted environments like client-side scripts. The generated access tokens will be valid for one hour and can be refreshed.
+
+### Generating access tokens using IAM API key
+```python
+# In your API endpoint use this to generate new access tokens
+iam_token_manager = IAMTokenManager(iam_apikey='<apikey>')
+token = iam_token_manager.get_token()
+```
 
 #### Supplying the IAM API key
 

examples/visual_recognition_v3.py

@@ -16,7 +16,7 @@
 # with open(abspath('resources/cars.zip'), 'rb') as cars, \
 #      open(abspath('resources/trucks.zip'), 'rb') as trucks:
 #     classifier = service.create_classifier('Cars vs Trucks',
-#                                            positive_examples={'cars_positive_examples': cars},
+#                                            positive_examples={'cars': cars},
 #                                            negative_examples=trucks).get_result()
 # print(json.dumps(classifier, indent=2))
 

ibm_watson/version.py

@@ -1 +1 @@
-__version__ = '3.0.1'
+__version__ = '3.0.3'

setup.py

@@ -19,7 +19,7 @@
 import os
 import sys
 
-__version__ = '3.0.1'
+__version__ = '3.0.3'
 
 if sys.argv[-1] == 'publish':
     # test server

test/integration/test_visual_recognition.py

@@ -42,7 +42,7 @@ def test_custom_classifier(self):
             open(abspath('resources/trucks.zip'), 'rb') as trucks:
             classifier = self.visual_recognition.create_classifier(
                 'CarsVsTrucks',
-                positive_examples={'cars_positive_examples': cars},
+                positive_examples={'cars': cars},
                 negative_examples=trucks,
                 ).get_result()
 

test/unit/test_visual_recognition_v3.py

@@ -111,7 +111,7 @@ def test_create_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:
-            vr_service.create_classifier('Cars vs Trucks', positive_examples={'cars_positive_examples': cars}, negative_examples=trucks)
+            vr_service.create_classifier('Cars vs Trucks', positive_examples={'cars': cars}, negative_examples=trucks)
 
         assert len(responses.calls) == 2