Skip to content

Commit 174375f

Browse files
committed
updated reset conversation action
1 parent 56c9ea7 commit 174375f

File tree

4 files changed

+38
-16
lines changed

4 files changed

+38
-16
lines changed

server/routes/middleware.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,16 @@ function routeRequest(req, res, next, agentObj){
4747
}
4848
}
4949

50+
function sendOutput(http_code, res, body) {
51+
res.writeHead(http_code, {
52+
'Access-Control-Allow-Origin': '*',
53+
'Content-Type': 'application/json'
54+
});
55+
if (body !== "") {
56+
res.write(body);
57+
}
58+
res.end();
59+
}
5060
module.exports = {
5161
parseRasaRequest: parseRasaRequest
5262
};

server/routes/mw_routes/core_router.js

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,25 @@ var await = require('asyncawait/await');
2222
}
2323

2424
function restartRasaCoreConversation(req, res, next) {
25-
console.log("Rasa Core Version Request -> " + global.rasacoreendpoint + "/version");
26-
var responseBody =rasaCoreRequest(req,"continue",JSON.stringify({"events": [{"event": "restart"}]}));
27-
console.log("RestartResponse" + JSON.stringify(responseBody));
25+
console.log("Rasa Core Restart Request -> " + global.rasacoreendpoint);
26+
try {
27+
request({method: "POST",
28+
uri: global.rasacoreendpoint +"/conversations/"+req.jwt.username+ "/continue",
29+
body: JSON.stringify({"events": [{"event": "restart"}]})
30+
}, function (error, response, body) {
31+
if(error){
32+
console.log(error);
33+
sendHTTPResponse(500, res, '{"error" : "Exception caught !!"}');
34+
return;
35+
}
36+
console.log("Restart Response" + JSON.stringify(body));
37+
sendHTTPResponse(200, res, body);
38+
});
39+
}catch (err) {
40+
console.log(err);
41+
sendHTTPResponse(500, res, '{"error" : "Exception caught !!"}');
42+
return;
43+
}
2844
}
2945

3046
function parseRequest(req, res, next, agentObj) {
@@ -89,6 +105,7 @@ var await = require('asyncawait/await');
89105
console.log(error);
90106
reject(err); return;
91107
}
108+
console.log("After request:"+body);
92109
resolve(JSON.parse(body));
93110
});
94111
});
@@ -176,7 +193,7 @@ var await = require('asyncawait/await');
176193
var webhookResponse =await(fetchActionDetailsFromWebhook(req,rasa_core_response, agentObj));
177194
if(webhookResponse != undefined){
178195
rasa_core_response.response_text = JSON.parse(webhookResponse).displayText;
179-
rasa_response.response_rich=JSON.parse(webhookResponse).dataToClient;
196+
rasa_core_response.response_rich=JSON.parse(webhookResponse).dataToClient;
180197
console.log("Sending Rasa Core Response + Webhook response");
181198
addResponseInfoToCache(req,cacheKey,rasa_core_response);
182199
}else{

web/src/app/shared/aside/aside.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ <h6 class="dropdown-header">Rasa Core Options</h6>
2525
<span class="dropdown-item" id="btnGroupAddon" style="margin: 2px;">
2626
<input class="form-check-input position-static" type="checkbox" id="blankCheckbox" ng-model="wsEnabled"> Enable Web Socket
2727
</span>
28-
<a class="dropdown-item" href="#" ng-click="restartConversation()">Reset Conversation</a>
28+
<a class="dropdown-item" style="cursor: pointer" ng-click="restartConversation()">Reset Conversation</a>
2929
</div>
3030

3131
</span>

web/src/app/shared/aside/aside.js

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,11 @@ function AsideController($scope, $rootScope, $interval, $http,Rasa_Parse, Rasa_C
6767
}
6868
$scope.restartConversation=function(){
6969
$scope.test_text_response={};
70-
$http.post(api_endpoint_v2 + "/rasa/restart")
71-
.then(
72-
function(response){
73-
// success callback
74-
alert("Restarted Successfully");
75-
},
76-
function(errorResponse){
77-
// failure callback
78-
}
79-
);
70+
$http.post(api_endpoint_v2 + "/rasa/restart");
71+
$scope.response_text=[];
72+
$scope.test_text_response={};
73+
$scope.test_text='';
74+
$rootScope.$broadcast('setAlertText', "Conversation restarted!!");
8075
}
8176

8277
$scope.executeTestRequest = function() {
@@ -104,11 +99,11 @@ function AsideController($scope, $rootScope, $interval, $http,Rasa_Parse, Rasa_C
10499
$scope.response_text.push(response.response_text);
105100
})
106101
}
102+
$scope.test_text='';
107103
},
108104
function(errorResponse){
109105
// failure callback
110106
}
111107
);
112-
113108
}
114109
}

0 commit comments

Comments
 (0)