feat(filename): Update filename when not present, errorMessage

Author: ehdsouza

ibm_cloud_sdk_core/api_exception.py

@@ -57,6 +57,8 @@ def _get_error_message(self, response):
                 error_message = error_json['error']
             elif 'message' in error_json:
                 error_message = error_json['message']
+            elif 'errorMessage' in error_json:
+                error_message = error_json['errorMessage']
             return error_message
         except:
             return response.text or error_message

ibm_cloud_sdk_core/base_service.py

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 import os
-from os.path import dirname, isfile, join, expanduser, abspath
+from os.path import dirname, isfile, join, expanduser, abspath, basename
 import platform
 import json as json_import
 import sys
@@ -277,9 +277,9 @@ def request(self, method, url, accept_json=False, headers=None,
                 params=None, json=None, data=None, files=None, **kwargs):
         full_url = self.url + url
 
-        headers = CaseInsensitiveDict(headers)
-        headers = remove_null_values(headers)
+        headers = remove_null_values(headers) if headers else {}
         headers = cleanup_values(headers)
+        headers = CaseInsensitiveDict(headers)
 
         if self.default_headers is not None:
             headers.update(self.default_headers)
@@ -319,6 +319,14 @@ def request(self, method, url, accept_json=False, headers=None,
         if self.verify is not None:
             kwargs['verify'] = self.verify
 
+        if files is not None:
+            for k, file_tuple in files.items():
+                if file_tuple and len(file_tuple) == 3 and file_tuple[0] is None:
+                    file = file_tuple[1]
+                    if file and hasattr(file, 'name'):
+                        filename = basename(file.name)
+                        files[k] = (filename, file_tuple[1], file_tuple[2])
+
         response = requests.request(method=method, url=full_url,
                                     cookies=self.jar, auth=auth,
                                     headers=headers,

test/test_api_exception.py

@@ -49,6 +49,15 @@ def test_api_exception():
     exception = ApiException(500, http_response=mock_response)
     assert exception.message == 'Unknown error'
 
+    responses.add(responses.GET,
+                  'https://test-errormessage.com',
+                  status=500,
+                  body=json.dumps({'errorMessage': 'IAM error message'}),
+                  content_type='application/json')
+    mock_response = requests.get('https://test-errormessage.com')
+    exception = ApiException(500, http_response=mock_response)
+    assert exception.message == 'IAM error message'
+
     responses.add(responses.GET,
                   'https://test-for-text.com',
                   status=500,

test/test_base_service.py

@@ -387,3 +387,18 @@ def test_user_agent_header():
 
     response = service.request('GET', url='', headers=None)
     assert response.get_result().request.headers.__getitem__('user-agent') == user_agent_header['User-Agent']
+
+@responses.activate
+def test_files():
+    service = AnyServiceV1('2018-11-20', username='username', password='password')
+
+    responses.add(responses.GET,
+                  'https://gateway.watsonplatform.net/test/api',
+                  status=200,
+                  body=json.dumps({'foo': 'bar'}),
+                  content_type='application/json')
+    form_data = {}
+    file = os.path.join(os.path.dirname(__file__), '../resources/ibm-credentials.env')
+    form_data['file1'] = (None, file, 'application/octet-stream')
+    form_data['string1'] = (None, 'hello', 'text.plain')
+    service.request('GET', url='', headers={'X-opt-out': True}, files=form_data)