Merge pull request #93 from watson-developer-cloud/entities-intents-conversation

Add entities, intents and output to conversation.message

Author: germanattanasio

watson_developer_cloud/conversation_v1.py

@@ -29,16 +29,24 @@ def __init__(self, version, url=default_url, **kwargs):
         WatsonDeveloperCloudService.__init__(self, 'conversation', url, **kwargs)
         self.version = version
 
-    def message(self, workspace_id, message_input=None, context=None):
+    def message(self, workspace_id, message_input=None, context=None, entities=None, intents=None, output=None, alternate_intents=None):
         """
         Retrieves information about a specific classifier.
         :param workspace_id: The workspace to use
         :param message_input: The input, usually containing a text field
         :param context: The optional context object
+        :param entities: The optional entities
+        :param intents: The optional intents
+        :param alternate_intents: Whether to return more than one intent.
+        :param output: The optional output object
         """
 
         params = {'version': self.version}
         data = {'input': message_input,
-                'context': context}
+                'context': context,
+                'entities': entities,
+                'intents': intents,
+                'alternate_intents': alternate_intents,
+                'output': output}
         return self.request(method='POST', url='/v1/workspaces/{0}/message'.format(workspace_id), params=params,
                             json=data, accept_json=True)