Merge pull request #362 from watson-developer-cloud/codegen/conversation

Regenerate conversation and add more tests

Author: germanattanasio

test/unit/test_conversation_v1.py

@@ -1446,3 +1446,51 @@ def test_update_workspace():
     assert workspace == response
     # Verify that response can be converted to a Workspace
     Workspace._from_dict(workspace)
+
+@responses.activate
+def test_dialog_nodes():
+    url = 'https://gateway.watsonplatform.net/conversation/api/v1/workspaces/id/dialog_nodes'
+    responses.add(
+        responses.GET,
+        url,
+        body='{ "application/json": { "dialog_node": "location-atm" }}',
+        status=200,
+        content_type='application/json')
+
+    responses.add(
+        responses.POST,
+        "{0}?version=2017-05-26".format(url),
+        body='{ "application/json": { "dialog_node": "location-done" }}',
+        status=200,
+        content_type='application/json')
+
+    responses.add(
+        responses.DELETE,
+        "{0}/location-done?version=2017-05-26".format(url),
+        body='{"description": "deleted successfully"}',
+        status=200,
+        content_type='application/json')
+
+    responses.add(
+        responses.GET,
+        "{0}/location-done?version=2017-05-26".format(url),
+        body='{ "application/json": { "dialog_node": "location-atm" }}',
+        status=200,
+        content_type='application/json')
+
+    conversation = watson_developer_cloud.ConversationV1('2017-05-26',
+        username="username", password="password")
+
+    conversation.create_dialog_node('id', 'location-done')
+    assert responses.calls[0].response.json()['application/json']['dialog_node'] == 'location-done'
+
+    conversation.delete_dialog_node('id', 'location-done')
+    assert responses.calls[1].response.json() == {"description": "deleted successfully"}
+
+    conversation.get_dialog_node('id', 'location-done')
+    assert responses.calls[2].response.json() == { "application/json": { "dialog_node": "location-atm" }}
+
+    conversation.list_dialog_nodes('id')
+    assert responses.calls[3].response.json() == { "application/json": { "dialog_node": "location-atm" }}
+
+    assert len(responses.calls) == 4

watson_developer_cloud/__init__.py

@@ -18,7 +18,6 @@
 from .watson_service import WatsonInvalidArgument
 from .authorization_v1 import AuthorizationV1
 from .conversation_v1 import ConversationV1
-from .dialog_v1 import DialogV1
 from .language_translation_v2 import LanguageTranslationV2
 from .language_translator_v2 import LanguageTranslatorV2
 from .natural_language_classifier_v1 import NaturalLanguageClassifierV1

watson_developer_cloud/conversation_v1.py

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-# Copyright 2017 IBM All Rights Reserved.
+# Copyright 2018 IBM All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -213,7 +213,8 @@ def update_workspace(self,
                          dialog_nodes=None,
                          counterexamples=None,
                          metadata=None,
-                         learning_opt_out=None):
+                         learning_opt_out=None,
+                         append=None):
         """
         Update workspace.
 
@@ -230,6 +231,7 @@ def update_workspace(self,
         :param list[CreateCounterexample] counterexamples: An array of objects defining input examples that have been marked as irrelevant input.
         :param object metadata: Any metadata related to the workspace.
         :param bool learning_opt_out: Whether training data from the workspace can be used by IBM for general service improvements. `true` indicates that workspace training data is not to be used.
+        :param bool append: Specifies that the elements included in the request body are to be appended to the existing data in the workspace. The default value is `false`.
         :return: A `dict` containing the `Workspace` response.
         :rtype: dict
         """
@@ -243,7 +245,7 @@ def update_workspace(self,
             dialog_nodes = [self._convert_model(x) for x in dialog_nodes]
         if counterexamples is not None:
             counterexamples = [self._convert_model(x) for x in counterexamples]
-        params = {'version': self.version}
+        params = {'version': self.version, 'append': append}
         data = {
             'name': name,
             'description': description,
@@ -264,14 +266,16 @@ def update_workspace(self,
     # message
     #########################
 
+
     def message(self,
                 workspace_id,
                 input=None,
                 alternate_intents=None,
                 context=None,
                 entities=None,
                 intents=None,
-                output=None):
+                output=None,
+                nodes_visited_details=None):
         """
         Get a response to a user's input.
 
@@ -282,6 +286,7 @@ def message(self,
         :param list[RuntimeEntity] entities: Include the entities from the previous response when they do not need to change and to prevent Watson from trying to identify them.
         :param list[RuntimeIntent] intents: An array of name-confidence pairs for the user input. Include the intents from the previous response when they do not need to change and to prevent Watson from trying to identify them.
         :param OutputData output: System output. Include the output from the request when you have several requests within the same Dialog turn to pass back in the intermediate information.
+        :param bool nodes_visited_details: Whether to include additional diagnostic information about the dialog nodes that were visited during processing of the message.
         :return: A `dict` containing the `MessageResponse` response.
         :rtype: dict
         """
@@ -297,7 +302,10 @@ def message(self,
             intents = [self._convert_model(x) for x in intents]
         if output is not None:
             output = self._convert_model(output)
-        params = {'version': self.version}
+        params = {
+            'version': self.version,
+            'nodes_visited_details': nodes_visited_details
+        }
         data = {
             'input': input,
             'alternate_intents': alternate_intents,
@@ -1310,7 +1318,7 @@ def update_dialog_node(self,
         :param object new_metadata: The metadata for the dialog node.
         :param DialogNodeNextStep new_next_step: The next step to execute following this dialog node.
         :param str new_title: The alias used to identify the dialog node.
-        :param str new_type: How the node is processed.
+        :param str new_type: How the dialog node is processed.
         :param str new_event_name: How an `event_handler` node is processed.
         :param str new_variable: The location in the dialog context where output is stored.
         :param list[DialogNodeAction] new_actions: The actions for the dialog node.
@@ -2726,6 +2734,58 @@ def __ne__(self, other):
         return not self == other
 
 
+class DialogNodeVisitedDetails(object):
+    """
+    DialogNodeVisitedDetails.
+
+    :attr str dialog_node: (optional) A dialog node that was triggered during processing of the input message.
+    :attr str title: (optional) The title of the dialog node.
+    """
+
+    def __init__(self, dialog_node=None, title=None):
+        """
+        Initialize a DialogNodeVisitedDetails object.
+
+        :param str dialog_node: (optional) A dialog node that was triggered during processing of the input message.
+        :param str title: (optional) The title of the dialog node.
+        """
+        self.dialog_node = dialog_node
+        self.title = title
+
+    @classmethod
+    def _from_dict(cls, _dict):
+        """Initialize a DialogNodeVisitedDetails object from a json dictionary."""
+        args = {}
+        if 'dialog_node' in _dict:
+            args['dialog_node'] = _dict['dialog_node']
+        if 'title' in _dict:
+            args['title'] = _dict['title']
+        return cls(**args)
+
+    def _to_dict(self):
+        """Return a json dictionary representing this model."""
+        _dict = {}
+        if hasattr(self, 'dialog_node') and self.dialog_node is not None:
+            _dict['dialog_node'] = self.dialog_node
+        if hasattr(self, 'title') and self.title is not None:
+            _dict['title'] = self.title
+        return _dict
+
+    def __str__(self):
+        """Return a `str` version of this DialogNodeVisitedDetails object."""
+        return json.dumps(self._to_dict(), indent=2)
+
+    def __eq__(self, other):
+        """Return `true` when self and other are equal, false otherwise."""
+        if not isinstance(other, self.__class__):
+            return False
+        return self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        """Return `true` when self and other are not equal, false otherwise."""
+        return not self == other
+
+
 class Entity(object):
     """
     Entity.
@@ -3980,20 +4040,28 @@ class OutputData(object):
     :attr list[LogMessage] log_messages: Up to 50 messages logged with the request.
     :attr list[str] text: An array of responses to the user.
     :attr list[str] nodes_visited: (optional) An array of the nodes that were triggered to create the response.
+    :attr list[DialogNodeVisitedDetails] nodes_visited_details: (optional) An array of objects containing detailed diagnostic information about the nodes that were triggered during processing of the input message.
     """
 
-    def __init__(self, log_messages, text, nodes_visited=None, **kwargs):
+    def __init__(self,
+                 log_messages,
+                 text,
+                 nodes_visited=None,
+                 nodes_visited_details=None,
+                 **kwargs):
         """
         Initialize a OutputData object.
 
         :param list[LogMessage] log_messages: Up to 50 messages logged with the request.
         :param list[str] text: An array of responses to the user.
         :param list[str] nodes_visited: (optional) An array of the nodes that were triggered to create the response.
+        :param list[DialogNodeVisitedDetails] nodes_visited_details: (optional) An array of objects containing detailed diagnostic information about the nodes that were triggered during processing of the input message.
         :param **kwargs: (optional) Any additional properties.
         """
         self.log_messages = log_messages
         self.text = text
         self.nodes_visited = nodes_visited
+        self.nodes_visited_details = nodes_visited_details
         for _key, _value in kwargs.items():
             setattr(self, _key, _value)
 
@@ -4020,6 +4088,12 @@ def _from_dict(cls, _dict):
         if 'nodes_visited' in _dict:
             args['nodes_visited'] = _dict['nodes_visited']
             del xtra['nodes_visited']
+        if 'nodes_visited_details' in _dict:
+            args['nodes_visited_details'] = [
+                DialogNodeVisitedDetails._from_dict(x)
+                for x in _dict['nodes_visited_details']
+            ]
+            del xtra['nodes_visited_details']
         args.update(xtra)
         return cls(**args)
 
@@ -4032,6 +4106,11 @@ def _to_dict(self):
             _dict['text'] = self.text
         if hasattr(self, 'nodes_visited') and self.nodes_visited is not None:
             _dict['nodes_visited'] = self.nodes_visited
+        if hasattr(self, 'nodes_visited_details'
+                  ) and self.nodes_visited_details is not None:
+            _dict['nodes_visited_details'] = [
+                x._to_dict() for x in self.nodes_visited_details
+            ]
         if hasattr(self, '_additionalProperties'):
             for _key in self._additionalProperties:
                 _value = getattr(self, _key, None)
@@ -4040,7 +4119,9 @@ def _to_dict(self):
         return _dict
 
     def __setattr__(self, name, value):
-        properties = {'log_messages', 'text', 'nodes_visited'}
+        properties = {
+            'log_messages', 'text', 'nodes_visited', 'nodes_visited_details'
+        }
         if not hasattr(self, '_additionalProperties'):
             super(OutputData, self).__setattr__('_additionalProperties', set())
         if name not in properties: