updating error message, VCAP_SERVICES parsing for Visual Recognition v3

Author: jsstylos

examples/visual_recognition_v3.py

@@ -3,25 +3,28 @@
 from os import environ
 from watson_developer_cloud import VisualRecognitionV3
 
-test_url = 'http://ia.media-imdb.com/images/M/MV5BMTMxMDIzMDEzNF5BMl5BanBnXkFtZTcwODcxMjE2Mg@@._V1_UY317_CR2,0,214,317_AL_.jpg'
+test_url = 'https://www.ibm.com/ibm/ginni/images/ginni_bio_780x981_v4_03162016.jpg'
 
-visual_recognition = VisualRecognitionV3('2016-05-20',api_key=environ['API_KEY'])
+visual_recognition = VisualRecognitionV3('2016-05-20', api_key='YOUR API KEY')
 
-#with open(join(dirname(__file__), '../resources/cars.zip'), 'rb') as cars, \
+# with open(join(dirname(__file__), '../resources/cars.zip'), 'rb') as cars, \
 #        open(join(dirname(__file__), '../resources/trucks.zip'), 'rb') as trucks:
-#    print(json.dumps(visual_recognition.create_classifier('Cars vs Trucks', cars_positive_examples=cars,
-#                                                          negative_examples=trucks), indent=2))
+#     print(json.dumps(visual_recognition.create_classifier('Cars vs Trucks', cars_positive_examples=cars,
+#                                                           negative_examples=trucks), indent=2))
 
-#with open(join(dirname(__file__), '../resources/car.jpg'), 'rb') as image_file:
+# with open(join(dirname(__file__), '../resources/car.jpg'), 'rb') as image_file:
 #    visual_recognition.classify(images_file=image_file)
 
 print(json.dumps(visual_recognition.classify(images_url=test_url), indent=2))
 
+print(json.dumps(visual_recognition.detect_faces(images_url=test_url), indent=2))
 
-#The service currently has a bug where even successful deletions return a 404
-#print(json.dumps(visual_recognition.delete_classifier(classifier_id='YOUR CLASSIFIER ID'), indent=2))
+# print(json.dumps(visual_recognition.delete_classifier(classifier_id='YOUR CLASSIFIER ID'), indent=2))
 
-#print(json.dumps(visual_recognition.list_classifiers(), indent=2))
+print(json.dumps(visual_recognition.list_classifiers(), indent=2))
 
 # with open(join(dirname(__file__), '../resources/test.jpg'), 'rb') as image_file:
-#     print(json.dumps(visual_recognition.classify(image_file, classifier_ids=['Tiger', 'Cat']), indent=2))
+#     print(json.dumps(visual_recognition.classify(images_file=image_file), indent=2))
+
+# with open(join(dirname(__file__), '../resources/test.jpg'), 'rb') as image_file:
+#     print(json.dumps(visual_recognition.detect_faces(images_file=image_file), indent=2))

watson_developer_cloud/visual_recognition_v3.py

@@ -34,7 +34,7 @@ def __init__(self, version, url=default_url, use_vcap_services=True, api_key=Non
         """
 
         WatsonDeveloperCloudService.__init__(
-            self, 'visual_recognition', url, None, None, use_vcap_services, api_key)
+            self, 'watson_vision_combined', url, None, None, use_vcap_services, api_key)
         self.version = version
 
     def get_classifier(self, classifier_id):
@@ -78,10 +78,10 @@ def create_classifier(self, name, **kwargs):
         params = {'version': self.version}
         data = {'name': name}
         # Params sent as url parameters here
-        return self.request(method='POST', url='/v3/classifiers', files=kwargs,
-                            data=data, params=params, accept_json=True)
+        return self.request(method='POST', url='/v3/classifiers', files=kwargs, data=data, params=params,
+                            accept_json=True)
 
-    def classify(self, images_file=None, images_url=None, classifier_ids=None):
+    def classify(self, images_file=None, images_url=None, classifier_ids=None, owners=None, threshold=None):
         """
         Returns a list of classification scores for one or more input images.
         :param images_file: An image file or zip file of image files to analyze.
@@ -97,14 +97,14 @@ def classify(self, images_file=None, images_url=None, classifier_ids=None):
         if images_file is None and images_url is None:
             raise AssertionError('You must specify either a file or a url')
 
-        params = {'version': self.version}
-        data = {'classifier_ids': classifier_ids}
+        params = {'version': self.version, 'classifier_ids': classifier_ids, 'owners': owners, 'threshold': threshold}
         # Params sent as url parameters here
         if images_url:
             params['url'] = images_url
-            return self.request(method='POST', url='/v3/classify', data=data, params=params, accept_json=True)
+            return self.request(method='GET', url='/v3/classify', params=params, accept_json=True)
         else:
-            return self.request(method='POST', url='/v3/classify', files={'images_file': images_file}, data=data, params=params, accept_json=True)
+            return self.request(method='POST', url='/v3/classify', files={'images_file': images_file}, params=params,
+                                accept_json=True)
 
     def detect_faces(self, images_file=None, images_url=None):
         """
@@ -117,7 +117,7 @@ def detect_faces(self, images_file=None, images_url=None):
         # Params sent as url parameters here
         if images_url:
             params['url'] = images_url
-            return self.request(method='POST', url='/v3/detect_faces', params=params, accept_json=True)
+            return self.request(method='GET', url='/v3/detect_faces', params=params, accept_json=True)
         else:
             return self.request(method='POST', url='/v3/detect_faces', files={'images_file': images_file},
                                 params=params, accept_json=True)
@@ -133,7 +133,7 @@ def recognize_text(self, images_file=None, images_url=None):
         # Params sent as url parameters here
         if images_url:
             params['url'] = images_url
-            return self.request(method='POST', url='/v3/recognize_text', params=params, accept_json=True)
+            return self.request(method='GET', url='/v3/recognize_text', params=params, accept_json=True)
         else:
             return self.request(method='POST', url='/v3/recognize_text',
                                 files={'images_file': images_file}, params=params, accept_json=True)

watson_developer_cloud/watson_developer_cloud_service.py

@@ -95,6 +95,8 @@ def __init__(self, vcap_services_name, url, username=None, password=None, use_vc
                     self.username = self.vcap_service_credentials['username']
                 if 'password' in self.vcap_service_credentials:
                     self.password = self.vcap_service_credentials['password']
+                if 'api_key' in self.vcap_service_credentials:
+                    self.api_key = self.vcap_service_credentials['api_key']
                 if 'apikey' in self.vcap_service_credentials:
                     self.api_key = self.vcap_service_credentials['apikey']
 
@@ -143,7 +145,10 @@ def _get_error_message(response):
         try:
             error_json = response.json()
             if 'error' in error_json:
-                error_message = 'Error: ' + error_json['error']
+                if isinstance(error_json['error'], dict) and 'description' in error_json['error']:
+                    error_message = 'Error: ' + error_json['error']['description']
+                else:
+                    error_message = 'Error: ' + error_json['error']
             if 'error_message' in error_json:
                 error_message = 'Error: ' + error_json['error_message']
             if 'description' in error_json:
@@ -227,7 +232,10 @@ def request(self, method, url, accept_json=False, headers=None, params=None, jso
         if self.api_key is not None:
             if params is None:
                 params = {}
-            params['apikey'] = self.api_key
+            if url.startswith('https://gateway-a.watsonplatform.net/calls'):
+                params['apikey'] = self.api_key
+            else:
+                params['api_key'] = self.api_key
 
         response = requests.request(method=method, url=full_url, cookies=self.jar, auth=auth, headers=headers,
                                     params=params, data=data, files=files, **kwargs)