trigger API when conversation is complete (alfredfrancis#38)

* trigger API when conversation is complete

* fix overriding parameter prompt when conversation is incomplete

Author: Contextualist

app/endpoint/controllers.py

@@ -132,43 +132,9 @@ def api():
                     resultJson["speechResponse"] = currentNode["prompt"]
                 else:
                     resultJson["complete"] = True
-
                     context["parameters"] = extractedParameters
-
-                    try:
-                        if story.apiTrigger:
-                            isJson = False
-                            parameters = extractedParameters
-
-                            urlTemplate = Template(
-                                story.apiDetails.url, undefined=SilentUndefined)
-                            renderedUrl = urlTemplate.render(**context)
-                            if story.apiDetails.isJson:
-                                isJson = True
-                                requestTemplate = Template(
-                                    story.apiDetails.jsonData, undefined=SilentUndefined)
-                                parameters = requestTemplate.render(**context)
-
-                            result = callApi(renderedUrl,
-                                             story.apiDetails.requestType,
-                                             parameters, isJson)
-
-                        else:
-                            result = {}
-
-                        context["result"] = result
-                        resultTemplate = Template(
-                            story.speechResponse, undefined=SilentUndefined)
-                        resultJson["speechResponse"] = resultTemplate.render(
-                            **context)
-                    except Exception as e:
-                        print(e)
-                        resultJson["speechResponse"] = "Service is not available."
             else:
                 resultJson["complete"] = True
-                resultTemplate = Template(
-                    story.speechResponse, undefined=SilentUndefined)
-                resultJson["speechResponse"] = resultTemplate.render(**context)
 
         elif (requestJson.get("complete") is False):
             if "cancel" not in story.intentName:
@@ -185,35 +151,6 @@ def api():
                     context = {}
                     context["parameters"] = resultJson["extractedParameters"]
                     context["context"] = requestJson["context"]
-                    try:
-                        if story.apiTrigger:
-                            isJson = False
-                            parameters = resultJson["extractedParameters"]
-
-                            urlTemplate = Template(
-                                story.apiDetails.url, undefined=SilentUndefined)
-                            renderedUrl = urlTemplate.render(**context)
-                            if story.apiDetails.isJson:
-                                isJson = True
-                                requestTemplate = Template(
-                                    story.apiDetails.jsonData, undefined=SilentUndefined)
-                                parameters = requestTemplate.render(**context)
-
-                            result = callApi(renderedUrl,
-                                             story.apiDetails.requestType,
-                                             parameters, isJson)
-                            print(result)
-                        else:
-                            result = {}
-                        context["result"] = result
-
-                        template = Template(
-                            story.speechResponse, undefined=SilentUndefined)
-                        resultJson["speechResponse"] = template.render(
-                            **context)
-                    except Exception as e:
-                        print(e)
-                        resultJson["speechResponse"] = "Service is not available. "
                 else:
                     missingParameter = resultJson["missingParameters"][0]
                     resultJson["complete"] = False
@@ -227,9 +164,34 @@ def api():
                 resultJson["parameters"] = {}
                 resultJson["intent"] = {}
                 resultJson["complete"] = True
-                template = Template(
-                    story.speechResponse,
-                    undefined=SilentUndefined)
+
+        if resultJson["complete"]: 
+            if story.apiTrigger:
+                isJson = False
+                parameters = resultJson["extractedParameters"]
+
+                urlTemplate = Template(story.apiDetails.url, undefined=SilentUndefined)
+                renderedUrl = urlTemplate.render(**context)
+                if story.apiDetails.isJson:
+                    isJson = True
+                    requestTemplate = Template(story.apiDetails.jsonData, undefined=SilentUndefined)
+                    parameters = requestTemplate.render(**context)
+
+                try:
+                    result = callApi(renderedUrl,
+                                     story.apiDetails.requestType,
+                                     parameters,isJson)
+                except Exception as e:
+                    print(e)
+                    resultJson["speechResponse"] = "Service is not available. "
+                else:
+                    print(result)
+                    context["result"] = result
+                    template = Template(story.speechResponse, undefined=SilentUndefined)
+                    resultJson["speechResponse"] = template.render(**context)
+            else:
+                context["result"] = {}
+                template = Template(story.speechResponse, undefined=SilentUndefined)
                 resultJson["speechResponse"] = template.render(**context)
         logger.info(requestJson.get("input"), extra=resultJson)
         return buildResponse.buildJson(resultJson)