From 420ebbe83644f44bba436f5efe522bb859f1c9e9 Mon Sep 17 00:00:00 2001 From: Maninderjit Bindra Date: Tue, 5 Sep 2017 19:27:01 +0530 Subject: [PATCH 1/6] fix exercise 3 issue when first intent detected is Help --- Node/exercise3-LuisDialog/.env | 2 +- Node/exercise3-LuisDialog/app.js | 10 ++++++---- Node/exercise3-LuisDialog/package.json | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Node/exercise3-LuisDialog/.env b/Node/exercise3-LuisDialog/.env index ec04142..7273cc0 100644 --- a/Node/exercise3-LuisDialog/.env +++ b/Node/exercise3-LuisDialog/.env @@ -2,4 +2,4 @@ PORT=3978 MICROSOFT_APP_ID= MICROSOFT_APP_PASSWORD= -LUIS_MODEL_URL= \ No newline at end of file +LUIS_MODEL_URL="https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/6d4e8f19-969e-4c8c-97cf-1c9e51e00b17?subscription-key=991d4cb641074f1c9ee22663d11e5db9&timezoneOffset=0&verbose=true&q=" \ No newline at end of file diff --git a/Node/exercise3-LuisDialog/app.js b/Node/exercise3-LuisDialog/app.js index a342b62..c4da0c0 100644 --- a/Node/exercise3-LuisDialog/app.js +++ b/Node/exercise3-LuisDialog/app.js @@ -1,5 +1,6 @@ /* jshint esversion: 6 */ require('dotenv').config(); +const path = require('path'); const restify = require('restify'); const fs = require('fs'); const builder = require('botbuilder'); @@ -30,7 +31,7 @@ server.post('/api/messages', connector.listen()); var bot = new builder.UniversalBot(connector, (session, args, next) => { session.endDialog(`I'm sorry, I did not understand '${session.message.text}'.\nType 'help' to know more about me :)`); }); - +// var luisModelUrl = process.env.LUIS_MODEL_URL || 'https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/6d4e8f19-969e-4c8c-97cf-1c9e51e00b17?subscription-key=991d4cb641074f1c9ee22663d11e5db9&timezoneOffset=0&verbose=true&q='; var luisRecognizer = new builder.LuisRecognizer(process.env.LUIS_MODEL_URL).onEnabled(function (context, callback) { var enabled = context.dialogStack().length === 0; callback(null, enabled); @@ -39,9 +40,9 @@ bot.recognizer(luisRecognizer); bot.dialog('Help', (session, args, next) => { - session.endDialog(`I'm the help desk bot and I can help you create a ticket.\n` + + session.send(`I'm the help desk bot and I can help you create a ticket.\n` + `You can tell me things like _I need to reset my password_ or _I cannot print_.`); - builder.Prompts.text(session, 'First, please briefly describe your problem to me.'); + session.endDialog('First, please briefly describe your problem to me.'); } ).triggerAction({ matches: 'Help' @@ -49,6 +50,7 @@ bot.dialog('Help', bot.dialog('SubmitTicket', [ (session, args, next) => { + var category = builder.EntityRecognizer.findEntity(args.intent.entities, 'category'); var severity = builder.EntityRecognizer.findEntity(args.intent.entities, 'severity'); @@ -121,7 +123,7 @@ bot.dialog('SubmitTicket', [ }); const createCard = (ticketId, data) => { - var cardTxt = fs.readFileSync('./cards/ticket.json', 'UTF-8'); + var cardTxt = fs.readFileSync(path.join(__dirname, "/cards/ticket.json"), 'UTF-8'); cardTxt = cardTxt.replace(/{ticketId}/g, ticketId) .replace(/{severity}/g, data.severity) diff --git a/Node/exercise3-LuisDialog/package.json b/Node/exercise3-LuisDialog/package.json index ffdcb0d..2b84ced 100644 --- a/Node/exercise3-LuisDialog/package.json +++ b/Node/exercise3-LuisDialog/package.json @@ -11,6 +11,7 @@ "dependencies": { "botbuilder": "^3.8.4", "dotenv": "^4.0.0", + "path": "^0.12.7", "restify": "^4.3.0" }, "devDependencies": { From 8696acc5c159e16db8669f982856330383f16f1c Mon Sep 17 00:00:00 2001 From: Maninderjit Bindra Date: Tue, 5 Sep 2017 19:27:37 +0530 Subject: [PATCH 2/6] minor change --- Node/exercise3-LuisDialog/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Node/exercise3-LuisDialog/.env b/Node/exercise3-LuisDialog/.env index 7273cc0..ec04142 100644 --- a/Node/exercise3-LuisDialog/.env +++ b/Node/exercise3-LuisDialog/.env @@ -2,4 +2,4 @@ PORT=3978 MICROSOFT_APP_ID= MICROSOFT_APP_PASSWORD= -LUIS_MODEL_URL="https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/6d4e8f19-969e-4c8c-97cf-1c9e51e00b17?subscription-key=991d4cb641074f1c9ee22663d11e5db9&timezoneOffset=0&verbose=true&q=" \ No newline at end of file +LUIS_MODEL_URL= \ No newline at end of file From f20d9a0cd024b37975c6c8dfaaf09061c51fc6c8 Mon Sep 17 00:00:00 2001 From: Maninderjit Bindra Date: Tue, 5 Sep 2017 19:30:34 +0530 Subject: [PATCH 3/6] minor change --- Node/exercise3-LuisDialog/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Node/exercise3-LuisDialog/app.js b/Node/exercise3-LuisDialog/app.js index c4da0c0..0384662 100644 --- a/Node/exercise3-LuisDialog/app.js +++ b/Node/exercise3-LuisDialog/app.js @@ -31,7 +31,6 @@ server.post('/api/messages', connector.listen()); var bot = new builder.UniversalBot(connector, (session, args, next) => { session.endDialog(`I'm sorry, I did not understand '${session.message.text}'.\nType 'help' to know more about me :)`); }); -// var luisModelUrl = process.env.LUIS_MODEL_URL || 'https://westus.api.cognitive.microsoft.com/luis/v2.0/apps/6d4e8f19-969e-4c8c-97cf-1c9e51e00b17?subscription-key=991d4cb641074f1c9ee22663d11e5db9&timezoneOffset=0&verbose=true&q='; var luisRecognizer = new builder.LuisRecognizer(process.env.LUIS_MODEL_URL).onEnabled(function (context, callback) { var enabled = context.dialogStack().length === 0; callback(null, enabled); From 1fa30c576a09bc0e5af3512e96882109a87e90ac Mon Sep 17 00:00:00 2001 From: manisbindra Date: Wed, 6 Sep 2017 11:04:32 +0530 Subject: [PATCH 4/6] minor change --- Node/exercise3-LuisDialog/app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Node/exercise3-LuisDialog/app.js b/Node/exercise3-LuisDialog/app.js index 0384662..f718c30 100644 --- a/Node/exercise3-LuisDialog/app.js +++ b/Node/exercise3-LuisDialog/app.js @@ -122,8 +122,7 @@ bot.dialog('SubmitTicket', [ }); const createCard = (ticketId, data) => { - var cardTxt = fs.readFileSync(path.join(__dirname, "/cards/ticket.json"), 'UTF-8'); - + var cardTxt = fs.readFileSync('./cards/ticket.json', 'UTF-8'); cardTxt = cardTxt.replace(/{ticketId}/g, ticketId) .replace(/{severity}/g, data.severity) .replace(/{category}/g, data.category) From 0b06e3b19a503371374800e90aad06cd06335531 Mon Sep 17 00:00:00 2001 From: manisbindra Date: Wed, 6 Sep 2017 11:07:32 +0530 Subject: [PATCH 5/6] minor change --- Node/exercise3-LuisDialog/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Node/exercise3-LuisDialog/package.json b/Node/exercise3-LuisDialog/package.json index 2b84ced..ffdcb0d 100644 --- a/Node/exercise3-LuisDialog/package.json +++ b/Node/exercise3-LuisDialog/package.json @@ -11,7 +11,6 @@ "dependencies": { "botbuilder": "^3.8.4", "dotenv": "^4.0.0", - "path": "^0.12.7", "restify": "^4.3.0" }, "devDependencies": { From b1734dbb57f84970f206103090b338edcd393265 Mon Sep 17 00:00:00 2001 From: manisbindra Date: Wed, 6 Sep 2017 11:08:50 +0530 Subject: [PATCH 6/6] minor change --- Node/exercise3-LuisDialog/app.js | 1 - 1 file changed, 1 deletion(-) diff --git a/Node/exercise3-LuisDialog/app.js b/Node/exercise3-LuisDialog/app.js index f718c30..b2962da 100644 --- a/Node/exercise3-LuisDialog/app.js +++ b/Node/exercise3-LuisDialog/app.js @@ -1,6 +1,5 @@ /* jshint esversion: 6 */ require('dotenv').config(); -const path = require('path'); const restify = require('restify'); const fs = require('fs'); const builder = require('botbuilder');