Merge branch 'iam' of github.com:watson-developer-cloud/python-sdk into iam

Author: ehdsouza

.pylintrc

@@ -1,4 +1,4 @@
 # lint Python modules using external checkers.
 [MASTER]
 ignore=SVN
-disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011,F0401,E0611,E1004,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801,C0301,C0411,R0204,W0622,inconsistent-return-statements
+disable=R0903,R0912,R0913,R0914,R0915,W0141,C0111,C0103,W0603,W0703,R0911,C0301,C0302,R0902,R0904,W0142,W0212,E1101,E1103,R0201,W0201,W0122,W0232,RP0001,RP0003,RP0101,RP0002,RP0401,RP0701,RP0801,F0401,E0611,R0801,I0011,F0401,E0611,E1004,C0111,I0011,I0012,W0704,W0142,W0212,W0232,W0613,W0702,R0201,W0614,R0914,R0912,R0915,R0913,R0904,R0801,C0301,C0411,R0204,W0622,E1121,inconsistent-return-statements

examples/speech_to_text_v1.py

@@ -56,5 +56,5 @@ def on_data(self, data):
 mycallback = MyRecognizeCallback()
 with open(join(dirname(__file__), '../resources/speech.wav'),
           'rb') as audio_file:
-    speech_to_text.recognize_with_websocket(
-        audio=audio_file, recognize_callback=mycallback)
+    speech_to_text.recognize_using_websocket(audio=audio_file, content_type="audio/l16; rate=44100",
+                                             recognize_callback=mycallback)

watson_developer_cloud/speech_to_text_v1_adapter.py

@@ -1,6 +1,7 @@
 from watson_developer_cloud.websocket import RecognizeCallback, RecognizeListener
 from .speech_to_text_v1 import SpeechToTextV1
 from .watson_service import _remove_null_values
+from .utils import deprecated
 import base64
 try:
     from urllib.parse import urlencode
@@ -10,6 +11,7 @@
 BEARER = 'Bearer'
 
 class SpeechToTextV1Adapter(SpeechToTextV1):
+    @deprecated('Use recognize_using_websocket() instead')
     def recognize_with_websocket(self,
                                  audio=None,
                                  content_type='audio/l16; rate=44100',
@@ -31,6 +33,48 @@ def recognize_with_websocket(self,
                                  smart_formatting=False,
                                  speaker_labels=None,
                                  **kwargs):
+        return self.recognize_using_websocket(audio,
+                                              content_type,
+                                              recognize_callback,
+                                              model,
+                                              customization_id,
+                                              acoustic_customization_id,
+                                              customization_weight,
+                                              version,
+                                              inactivity_timeout,
+                                              interim_results,
+                                              keywords,
+                                              keywords_threshold,
+                                              max_alternatives,
+                                              word_alternatives_threshold,
+                                              word_confidence,
+                                              timestamps,
+                                              profanity_filter,
+                                              smart_formatting,
+                                              speaker_labels,
+                                              **kwargs)
+
+    def recognize_using_websocket(self,
+                                  audio,
+                                  content_type,
+                                  recognize_callback,
+                                  model=None,
+                                  customization_id=None,
+                                  acoustic_customization_id=None,
+                                  customization_weight=None,
+                                  version=None,
+                                  inactivity_timeout=None,
+                                  interim_results=True,
+                                  keywords=None,
+                                  keywords_threshold=None,
+                                  max_alternatives=1,
+                                  word_alternatives_threshold=None,
+                                  word_confidence=False,
+                                  timestamps=False,
+                                  profanity_filter=None,
+                                  smart_formatting=False,
+                                  speaker_labels=None,
+                                  **kwargs):
         """
         Sends audio for speech recognition using web sockets.
 
@@ -125,9 +169,11 @@ def recognize_with_websocket(self,
         :rtype: dict
         """
         if audio is None:
-            raise ValueError('Audio must be provided')
+            raise ValueError('audio must be provided')
+        if content_type is None:
+            raise ValueError('content_type must be provided')
         if recognize_callback is None:
-            raise ValueError('Recognize callback must be provided')
+            raise ValueError('recognize_callback must be provided')
         if not isinstance(recognize_callback, RecognizeCallback):
             raise Exception(
                 'Callback is not a derived class of RecognizeCallback')

watson_developer_cloud/watson_service.py

@@ -202,7 +202,6 @@ def __str__(self):
 class WatsonService(object):
     def __init__(self, vcap_services_name, url, username=None, password=None,
                  use_vcap_services=True, api_key=None,
-                 x_watson_learning_opt_out=False,
                  iam_api_key=None, iam_access_token=None, iam_url=None):
         """
         Loads credentials from the VCAP_SERVICES environment variable if
@@ -232,9 +231,6 @@ def __init__(self, vcap_services_name, url, username=None, password=None,
         user_agent_string += ' ' + platform.python_version() # Python version
         self.user_agent_header = {'user-agent': user_agent_string}
 
-        if x_watson_learning_opt_out:
-            self.default_headers = {'x-watson-learning-opt-out': 'true'}
-
         if api_key is not None:
             self.set_api_key(api_key)
         elif username is not None and password is not None: