Merge pull request #574 from watson-developer-cloud/release-2.2.0

Release 2.2.0

Author: ehdsouza

.env.enc

@@ -34,13 +34,13 @@ deploy:
     script: docs/publish.sh
     skip_cleanup: true
     on:
-      python: '2.7'
+      python: '3.5'
       branch: master
   - provider: script
     script: npx semantic-release
     skip_cleanup: true
     on:
-      python: '2.7'
+      python: '3.5'
       branch: master
   - provider: pypi
     user: ehdsouza
@@ -49,5 +49,5 @@ deploy:
     repository: https://upload.pypi.org/legacy
     skip_cleanup: true
     on:
-      python: '2.7'
+      python: '3.5'
       branch: master

.travis.yml

@@ -19,7 +19,6 @@ Python client library to quickly get started with the various [Watson APIs][wdc]
     * [Getting credentials](#getting-credentials)
     * [IAM](#iam)
     * [Username and password](#username-and-password)
-    * [API key](#api-key)
   * [Python version](#python-version)
   * [Changes for v1.0](#changes-for-v10)
   * [Changes for v2.0](#changes-for-v20)
@@ -71,7 +70,10 @@ For more details see [#405](https://github.com/watson-developer-cloud/python-sdk
 
 ## Examples
 
-The [examples][examples] folder has basic and advanced examples. The examples within each service assume that you already have [service credentials](#getting-credentials). 
+The [examples][examples] folder has basic and advanced examples. The examples within each service assume that you already have [service credentials](#getting-credentials).
+
+Note:
+Conversation V1 is deprecated and will be removed in the next major release of the SDK. Use Assistant V1 or Assistant V2.
 
 ## Running in IBM Cloud
 
@@ -83,7 +85,6 @@ Watson services are migrating to token-based Identity and Access Management (IAM
 
 - With some service instances, you authenticate to the API by using **[IAM](#iam)**.
 - In other instances, you authenticate by providing the **[username and password](#username-and-password)** for the service instance.
-- Visual Recognition uses a form of [API key](#api-key) only with instances created before May 23, 2018. Newer instances of Visual Recognition use IAM.
 
 **Note:** Authenticating with the X-Watson-Authorization-Token header is deprecated. The token continues to work with Cloud Foundry services, but is not supported for services that use Identity and Access Management (IAM) authentication. See [here](#iam) for details.
 
@@ -146,22 +147,6 @@ discovery = DiscoveryV1(version='2018-08-01', url='<url_as_per_region>')
 discovery.set_username_and_password('<username>', '<password>')
 ```
 
-### API key
-
-**Important**: This type of authentication works only with Visual Recognition instances created before May 23, 2018. Newer instances of Visual Recognition use [IAM](#iam).
-
-```python
-from watson_developer_cloud import VisualRecognitionV3
-# In the constructor
-visual_recognition = VisualRecognitionV3(version='2018-03-19', url='<url_as_per_region>', api_key='<api_key>')
-```
-
-```python
-# After instantiation
-visual_recognition = VisualRecognitionV3(version='2018-03-19')
-visual_recognition.set_api_key('<api_key>')
-```
-
 ## Python version
 
 Tested on Python 2.7, 3.4, 3.5, and 3.6.

README.md

@@ -6,17 +6,12 @@
 test_url = 'https://www.ibm.com/ibm/ginni/images' \
            '/ginni_bio_780x981_v4_03162016.jpg'
 
-# # If service instance provides IAM API key authentication
-# service = VisualRecognitionV3(
-#     '2018-03-19',
-#     ## url is optional, and defaults to the URL below. Use the correct URL for your region.
-#     url='https://gateway.watsonplatform.net/visual-recognition/api',
-#     iam_apikey='iam_apikey')
-
-service = VisualRecognitionV3('2018-03-19',
-                              ## url is optional, and defaults to the URL below. Use the correct URL for your region.
-                              #  url='https://gateway.watsonplatform.net/visual-recognition/api',
-                              api_key='YOUR API KEY')
+# If service instance provides IAM API key authentication
+service = VisualRecognitionV3(
+    '2018-03-19',
+    ## url is optional, and defaults to the URL below. Use the correct URL for your region.
+    url='https://gateway.watsonplatform.net/visual-recognition/api',
+    iam_apikey='iam_apikey')
 
 # with open(abspath('resources/cars.zip'), 'rb') as cars, \
 #      open(abspath('resources/trucks.zip'), 'rb') as trucks:

examples/visual_recognition_v3.py

@@ -14,14 +14,14 @@ class IntegrationTestVisualRecognitionV3(TestCase):
     @classmethod
     def setup_class(cls):
         cls.visual_recognition = watson_developer_cloud.VisualRecognitionV3(
-            '2018-03-19', api_key='YOUR API KEY')
+            '2018-03-19', iam_apikey='YOUR IAM API KEY')
         cls.visual_recognition.set_default_headers({
             'X-Watson-Learning-Opt-Out':
             '1',
             'X-Watson-Test':
             '1'
         })
-        cls.classifier_id = 'doxnotxdeletexintegrationxtest_397877192'
+        cls.classifier_id = 'sdkxtestxclassifierxdoxnotxdel_1089651138'
 
     def test_classify(self):
         dog_path = abspath('resources/dog.jpg')
@@ -37,7 +37,7 @@ def test_detect_faces(self):
             url='https://www.ibm.com/ibm/ginni/images/ginni_bio_780x981_v4_03162016.jpg').get_result()
         assert output is not None
 
-    # @pytest.mark.skip(reason="Time consuming")
+    @pytest.mark.skip(reason="Time consuming")
     def test_custom_classifier(self):
         with open(abspath('resources/cars.zip'), 'rb') as cars, \
             open(abspath('resources/trucks.zip'), 'rb') as trucks:

test/integration/test_visual_recognition.py

@@ -219,7 +219,7 @@ def test_federated_query():
     discovery_url = urljoin(base_discovery_url,
                             'environments/envid/query')
 
-    responses.add(responses.GET, discovery_url,
+    responses.add(responses.POST, discovery_url,
                   body="{\"body\": \"hello\"}", status=200,
                   content_type='application/json')
     discovery = watson_developer_cloud.DiscoveryV1('2016-11-07',
@@ -234,6 +234,29 @@ def test_federated_query():
     assert called_url.path == test_url.path
     assert len(responses.calls) == 1
 
+@responses.activate
+def test_federated_query_2():
+    discovery_url = urljoin(base_discovery_url,
+                            'environments/envid/query')
+
+    responses.add(responses.POST, discovery_url,
+                  body="{\"body\": \"hello\"}", status=200,
+                  content_type='application/json')
+    discovery = watson_developer_cloud.DiscoveryV1('2016-11-07',
+                                                   username='username',
+                                                   password='password')
+    discovery.federated_query('envid', "'collid1', 'collid2'",
+                              filter='colls.sha1::9181d244*',
+                              bias='1',
+                              logging_opt_out=True)
+
+    called_url = urlparse(responses.calls[0].request.url)
+    test_url = urlparse(discovery_url)
+
+    assert called_url.netloc == test_url.netloc
+    assert called_url.path == test_url.path
+    assert len(responses.calls) == 1
+
 @responses.activate
 def test_federated_query_notices():
     discovery_url = urljoin(base_discovery_url,
@@ -259,7 +282,7 @@ def test_query():
     discovery_url = urljoin(base_discovery_url,
                             'environments/envid/collections/collid/query')
 
-    responses.add(responses.GET, discovery_url,
+    responses.add(responses.POST, discovery_url,
                   body="{\"body\": \"hello\"}", status=200,
                   content_type='application/json')
     discovery = watson_developer_cloud.DiscoveryV1('2016-11-07',
@@ -280,6 +303,34 @@ def test_query():
     assert called_url.path == test_url.path
     assert len(responses.calls) == 1
 
+@responses.activate
+def test_query_2():
+    discovery_url = urljoin(base_discovery_url,
+                            'environments/envid/collections/collid/query')
+
+    responses.add(responses.POST, discovery_url,
+                  body="{\"body\": \"hello\"}", status=200,
+                  content_type='application/json')
+    discovery = watson_developer_cloud.DiscoveryV1('2016-11-07',
+                                                   username='username',
+                                                   password='password')
+    discovery.query('envid', 'collid',
+                    filter='extracted_metadata.sha1::9181d244*',
+                    count=1,
+                    passages=True,
+                    passages_fields=['x', 'y'],
+                    logging_opt_out='True',
+                    passages_count=2,
+                    bias='1',
+                    collection_ids='1,2')
+
+    called_url = urlparse(responses.calls[0].request.url)
+    test_url = urlparse(discovery_url)
+
+    assert called_url.netloc == test_url.netloc
+    assert called_url.path == test_url.path
+    assert len(responses.calls) == 1
+
 @responses.activate
 def test_query_relations():
     discovery_url = urljoin(

test/unit/test_discovery_v1.py

@@ -6,12 +6,24 @@
 
 from unittest import TestCase
 
-base_url = "https://gateway-a.watsonplatform.net/visual-recognition/api/"
+base_url = "https://gateway.watsonplatform.net/visual-recognition/api/"
 
 class TestVisualRecognitionV3(TestCase):
+    @classmethod
+    def setUp(cls):
+        iam_url = "https://iam.bluemix.net/identity/token"
+        iam_token_response = """{
+            "access_token": "oAeisG8yqPY7sFR_x66Z15",
+            "token_type": "Bearer",
+            "expires_in": 3600,
+            "expiration": 1524167011,
+            "refresh_token": "jy4gl91BQ"
+        }"""
+        responses.add(responses.POST, url=iam_url, body=iam_token_response, status=200)
+
     @responses.activate
     def test_get_classifier(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classifiers/bogusnumber')
 
@@ -31,11 +43,11 @@ def test_get_classifier(self):
                       content_type='application/json')
         vr_service.get_classifier(classifier_id='bogusnumber')
 
-        assert len(responses.calls) == 1
+        assert len(responses.calls) == 2
 
     @responses.activate
     def test_delete_classifier(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classifiers/bogusnumber')
 
@@ -46,11 +58,11 @@ def test_delete_classifier(self):
                       content_type='application/json')
         vr_service.delete_classifier(classifier_id='bogusnumber')
 
-        assert len(responses.calls) == 1
+        assert len(responses.calls) == 2
 
     @responses.activate
     def test_list_classifiers(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classifiers')
 
@@ -74,11 +86,11 @@ def test_list_classifiers(self):
                       content_type='application/json')
         vr_service.list_classifiers()
 
-        assert len(responses.calls) == 1
+        assert len(responses.calls) == 2
 
     @responses.activate
     def test_create_classifier(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classifiers')
 
@@ -101,11 +113,11 @@ def test_create_classifier(self):
             open(os.path.join(os.path.dirname(__file__), '../../resources/trucks.zip'), 'rb') as trucks:
             vr_service.create_classifier('Cars vs Trucks', cars_positive_examples=cars, negative_examples=trucks)
 
-        assert len(responses.calls) == 1
+        assert len(responses.calls) == 2
 
     @responses.activate
     def test_update_classifier(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classifiers/bogusid')
 
@@ -129,11 +141,11 @@ def test_update_classifier(self):
                       content_type='application/json')
 
         vr_service.update_classifier(classifier_id="bogusid")
-        assert len(responses.calls) == 1
+        assert len(responses.calls) == 2
 
     @responses.activate
     def test_classify(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/classify')
 
@@ -175,11 +187,11 @@ def test_classify(self):
 
         with open(os.path.join(os.path.dirname(__file__), '../../resources/test.jpg'), 'rb') as image_file:
             vr_service.classify(images_file=image_file)
-        assert len(responses.calls) == 4
+        assert len(responses.calls) == 8
 
     @responses.activate
     def test_detect_faces(self):
-        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
 
         gc_url = "{0}{1}".format(base_url, 'v3/detect_faces')
 
@@ -232,19 +244,19 @@ def test_detect_faces(self):
         vr_service.detect_faces(parameters='{"url": "http://google.com"}')
         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
+        assert len(responses.calls) == 4
 
-@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=204,
-        content_type='application_json')
-
-    vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', api_key='bogusapikey')
-    response = vr_service.delete_user_data('id').get_result()
-    assert response is None
-    assert len(responses.calls) == 1
+    @responses.activate
+    def test_delete_user_data(self):
+        url = "{0}{1}".format(base_url, 'v3/user_data')
+        responses.add(
+            responses.DELETE,
+            url,
+            body='{"description": "success" }',
+            status=204,
+            content_type='application_json')
+
+        vr_service = watson_developer_cloud.VisualRecognitionV3('2016-10-20', iam_apikey='bogusapikey')
+        response = vr_service.delete_user_data('id').get_result()
+        assert response is None
+        assert len(responses.calls) == 2

test/unit/test_visual_recognition_v3.py

@@ -150,7 +150,7 @@ def test_when_apikey_is_username():
 
 @responses.activate
 def test_for_icp():
-    service1 = AnyServiceV1('2017-07-07', api_key='icp-xxxx', url='service_url')
+    service1 = AnyServiceV1('2017-07-07', username='apikey', password='icp-xxxx', url='service_url')
     assert service1.token_manager is None
     assert service1.iam_apikey is None
     assert service1.username is not None
@@ -166,7 +166,7 @@ def test_for_icp():
 
 @responses.activate
 def test_disable_SSL_verification():
-    service1 = AnyServiceV1('2017-07-07', api_key='icp-xxxx', url='service_url')
+    service1 = AnyServiceV1('2017-07-07', username='apikey', password='icp-xxxx', url='service_url')
     assert service1.verify is None
 
     service1.disable_SSL_verification()

test/unit/test_watson_service.py

@@ -32,3 +32,4 @@
 from .version import __version__
 from .speech_to_text_v1_adapter import SpeechToTextV1Adapter as SpeechToTextV1
 from .visual_recognition_v3_adapter import VisualRecognitionV3Adapter as VisualRecognitionV3
+from .discovery_v1_adapter import DiscoveryV1Adapter as DiscoveryV1