Tone Analyzer: Address comment for content-type position and add/update tests

Author: jeffpk62

examples/tone_analyzer_v3.py

@@ -4,12 +4,15 @@
 from watson_developer_cloud import ToneAnalyzerV3
 
 tone_analyzer = ToneAnalyzerV3(
-    username='YOUR SERVICE USERNAME',
-    password='YOUR SERVICE PASSWORD',
+    username='6e9af982-31bf-45c4-99b0-51f6b576e433',
+    password='2dXhAyPQjxD5',
+    # username='YOUR SERVICE USERNAME',
+    # password='YOUR SERVICE PASSWORD',
     version='2016-05-19')
 
 print("\ntone_chat() example 1:\n")
-utterances = [{'text': 'I am very happy', 'user': 'glenn'}]
+utterances = [{'text': 'I am very happy.', 'user': 'glenn'},
+              {'text': 'It is a good day.', 'user': 'glenn'}]
 print(json.dumps(tone_analyzer.tone_chat(utterances), indent=2))
 
 print("\ntone() example 1:\n")
@@ -19,27 +22,26 @@
 print("\ntone() example 2:\n")
 with open(join(dirname(__file__),
                '../resources/tone-example.json')) as tone_json:
-    tone = tone_analyzer.tone(json.load(tone_json)['text'],
-                              tones='emotion')
+    tone = tone_analyzer.tone(json.load(tone_json)['text'], 'emotion')
 print(json.dumps(tone, indent=2))
 
 print("\ntone() example 3:\n")
 with open(join(dirname(__file__),
                '../resources/tone-example.json')) as tone_json:
-    tone = tone_analyzer.tone(json.load(tone_json)['text'],
-                              content_type='text/plain', tones='emotion')
+    tone = tone_analyzer.tone(json.load(tone_json)['text'], 'emotion',
+                              True, 'text/plain')
 print(json.dumps(tone, indent=2))
 
 print("\ntone() example 4:\n")
 with open(join(dirname(__file__),
                '../resources/tone-example.json')) as tone_json:
-    tone = tone_analyzer.tone(json.load(tone_json),
-                              content_type='application/json', tones='emotion')
+    tone = tone_analyzer.tone(json.load(tone_json), 'emotion',
+                              content_type='application/json', )
 print(json.dumps(tone, indent=2))
 
 print("\ntone() example 5:\n")
 with open(join(dirname(__file__),
                '../resources/tone-example-html.json')) as tone_json:
-    tone = tone_analyzer.tone(json.load(tone_json)['text'],
-                              content_type='text/html', tones='emotion')
+    tone = tone_analyzer.tone(json.load(tone_json)['text'], 'emotion',
+                              content_type='text/html')
 print(json.dumps(tone, indent=2))

test/test_tone_analyzer_v3.py

@@ -46,7 +46,7 @@ def test_tone_with_args():
         tone_analyzer.tone(tone_text.read(), tones="social", sentences=False)
 
 
-    assert responses.calls[0].request.url.split('?')[0] == tone_url 
+    assert responses.calls[0].request.url.split('?')[0] == tone_url
     # Compare args. Order is not deterministic!
     actualArgs = {}
     for arg in responses.calls[0].request.url.split('?')[1].split('&'):
@@ -55,6 +55,31 @@ def test_tone_with_args():
     assert responses.calls[0].response.text == tone_response
     assert len(responses.calls) == 1
 
+
+@responses.activate
+## Invoking tone() with some modifiers specified as positional parameters: tones are emotion and social, and sentences is false
+def test_tone():
+    tone_url = 'https://gateway.watsonplatform.net/tone-analyzer/api/v3/tone'
+    tone_args = '?version=2016-05-19&tones=emotion%2Csocial&sentences=false'
+    tone_response = None
+    with open(os.path.join(os.path.dirname(__file__), '../resources/tone-v3-expect1.json')) as response_json:
+        tone_response = response_json.read()
+
+    responses.add(responses.POST, tone_url,
+                  body=tone_response, status=200,
+                  content_type='application/json')
+
+    with open(os.path.join(os.path.dirname(__file__), '../resources/personality.txt')) as tone_text:
+        tone_analyzer = watson_developer_cloud.ToneAnalyzerV3("2016-05-19",
+            username="username", password="password")
+        tone_analyzer.tone(tone_text.read(), 'emotion,social', False)
+
+    assert responses.calls[0].request.url == tone_url + tone_args
+    assert responses.calls[0].response.text == tone_response
+
+    assert len(responses.calls) == 1
+
+
 @responses.activate
 ## Invoking tone_chat()
 def test_tone_chat():

watson_developer_cloud/tone_analyzer_v3.py

@@ -43,19 +43,19 @@ def __init__(self, version, url=default_url, **kwargs):
     # tone
     #########################
 
-    def tone(self, text, content_type='text/plain', tones=None, sentences=None):
+    def tone(self, text, tones=None, sentences=None, content_type='text/plain'):
         """
         The general purpose tone API analyzes the "tone" of input text.
         The message is analyzed for several tones (social, emotional, and
         writing), with various characteristics derived for each tone.
         :param text: The input content to analyze.
-        :param content_type: The type of the input content: "text/plain"
-        (the default), "text/html", or "application/json".
         :param sentences: If false, sentence-level analysis is omitted; by
         default (or if true), each sentence is analyzed.
         :param tones: A comma-separated list of one or more of the following
         tones for which to analyze the input text, 'social', 'language', and
         'emotion'; the default is all tones.
+        :param content_type: The type of the input content: "text/plain"
+        (the default), "text/html", or "application/json".
         """
         params = {'version': self.version}
         if tones is not None: