KB is almost working in V4.

deploy/core.gbapp/services/GBConversationalService.ts

@@ -30,6 +30,7 @@
 |                                                                             |
 \*****************************************************************************/
 
+
 "use strict";
 
 const logger = require("../../../src/logger");
@@ -51,7 +52,7 @@ export class GBConversationalService implements IGBConversationalService {
         this.coreService = coreService;
     }
 
-    async sendEvent(dc: any, name: string, value: any) {
+    async sendEvent(dc: any, name: string, value: any): Promise<any> {
         const msg = MessageFactory.text('');
         msg.value = value;
         msg.type = "event";
@@ -71,7 +72,7 @@ export class GBConversationalService implements IGBConversationalService {
             serviceEndpoint: min.instance.nlpServerUrl
         });
 
-        return await model.recognize(dc.context).then(res => {
+        let res = await model.recognize(dc.context);
 
         // Resolve intents returned from LUIS
         let topIntent = LuisRecognizer.topIntent(res);
@@ -87,24 +88,20 @@ export class GBConversationalService implements IGBConversationalService {
             );
 
             try {
-                    dc.replace("/" + intent);
+                await dc.replace("/" + intent);
             } catch (error) {
                 logger.info("error: intent: [" + intent + "] error: [" + error + "]");
-
+                await dc.context.sendActivity("Desculpe-me, não encontrei nada a respeito...");
-                    dc.context.sendActivity("Desculpe-me, não encontrei nada a respeito...");
+                await dc.replace("/ask", { isReturning: true });
-                    dc.replace("/ask", { isReturning: true });
             }
 
             return Promise.resolve({ intent, entities: res.entities });
-            } else {
 
-                dc.context.sendActivity("Lamento, não achei nada a respeito...");
+        } else {
-                dc.replace("/ask", { isReturning: true });
+            await dc.context.sendActivity("Lamento, não achei nada a respeito...");
-                resolve(null);
+            await dc.replace("/ask", { isReturning: true });
+
+            return Promise.resolve(null);
         }
     }
-        ).catch(err => {
-            return Promise.reject(new GBError(err, GBERROR_TYPE.nlpGeneralError));
-        });
-    }
 }

deploy/core.gbapp/services/GBMinService.ts

@@ -269,15 +269,19 @@ export class GBMinService {
         }
       }
       else if (context.activity.type === 'message') {
+
         // Check to see if anyone replied. If not then start echo dialog
+        
         if (context.activity.text === "admin") {
           await dc.begin("/admin");
         }
         else {
           await dc.continue();
         }
+
       }
       else if (context.activity.type === 'event') {
+        
         if (context.activity.name === "whoAmI") {
           await dc.begin("/whoAmI");
         }
@@ -293,8 +297,8 @@ export class GBMinService {
           await dc.begin("/faq");
         }
         else if (context.activity.name === "ask") {
-          dc.begin("/answer", {
+          await dc.begin("/answer", {
-            // TODO: query: context.activity.data,
+            query: (context.activity as any).data,
             fromFaq: true
           });
         }

deploy/customer-satisfaction.gbapp/dialogs/FeedbackDialog.ts

@@ -52,8 +52,7 @@ export class FeedbackDialog extends IGBDialog {
     const service = new CSService();
 
     min.dialogs.add("/feedbackNumber", [
-      async (dc, args) => {
+      async (dc) => {
-
         let messages = [
           "O que achou do meu atendimento, de 1 a 5?",
           "Qual a nota do meu atendimento?",
@@ -88,11 +87,8 @@ export class FeedbackDialog extends IGBDialog {
         await dc.prompt('textPrompt', messages[0]);
       },
       async (dc, value) => {
-        AzureText.getSentiment(
+        let rate = await AzureText.getSentiment(min.instance.textAnalyticsKey, "pt-br", value);
-          min.instance.textAnalyticsKey,
+        if (rate > 0) {
-          value,
-          (err, rate) => {
-            if (!err && rate > 0) {
           dc.context.sendActivity("Bom saber que você gostou. Conte comigo.");
         } else {
           dc.context.sendActivity(
@@ -100,9 +96,6 @@ export class FeedbackDialog extends IGBDialog {
           );
         }
         dc.replace('/ask', { isReturning: true });
-          }
+      }]);
-        );
-      }
-    ]);
   }
 }

deploy/kb.gbapp/dialogs/AskDialog.ts

@@ -50,7 +50,7 @@ export class AskDialog extends IGBDialog {
    */
   static setup(bot: BotAdapter, min: GBMinInstance) {
 
-    const service = new KBService();
+    const service = new KBService(min.core.sequelize);
 
     const model = new LuisRecognizer({
       appId: min.instance.nlpAppId,
@@ -65,7 +65,14 @@ export class AskDialog extends IGBDialog {
         // Initialize values.
 
         const user = min.userState.get(dc.context);
-        let text = "";
+        let text = args.query;
+        if (!text) {
+          throw new Error(`/answer being called with no args.query text.`)
+        }
+
+        // Stops any content on projector.
+
+        await min.conversationalService.sendEvent(dc, "stop", null);
 
         // Handle extra text from FAQ.
 
@@ -78,35 +85,31 @@ export class AskDialog extends IGBDialog {
             `Aguarde, por favor, enquanto acho sua resposta...`
           ];
 
-          dc.context.sendActivity(messages[0]); // TODO: Handle rnd.
+          await dc.context.sendActivity(messages[0]); // TODO: Handle rnd.
         }
 
         // Spells check the input text before sending Search or NLP.
 
-        // DISABLED:
+        if (min.instance.spellcheckerKey) {
-        // AzureText.getSpelledText(
+          let data = await AzureText.getSpelledText(
-        //   min.instance.spellcheckerKey,
+            min.instance.spellcheckerKey,
-        //   text,
+            text);
-        //   async (data, err) => {
-        // var data = res.text;
-        // if (data != text) {
-        //   logger.info("Spelled Text: " + data);
-        //   text = data;
-        // }
 
-        user.lastQuestion = text;
+          if (data != text) {
+            logger.info(`Spelling corrected: ${data}`);
+            text = data;
+          }
+        }
 
         // Searches KB for the first time.
 
+        user.lastQuestion = text;
         let resultsA = await service.ask(
           min.instance,
           text,
           min.instance.searchScore,
           user.subjects);
 
-        // Stops any content on projector.
-        
-        min.conversationalService.sendEvent(dc, "stop", null);
 
         // If there is some result, answer immediately.
 
@@ -119,10 +122,7 @@ export class AskDialog extends IGBDialog {
 
           // Sends the answer to all outputs, including projector.
 
-          service.sendAnswer(min.conversationalService,
+          await service.sendAnswer(min.conversationalService, dc, resultsA.answer);
-            dc,
-            resultsA.answer
-          );
 
           // Goes to ask loop, again.
 
@@ -132,11 +132,8 @@ export class AskDialog extends IGBDialog {
 
           // Second time running Search, now with no filter.
 
-          let resultsB = await service.ask(
+          let resultsB = await service.ask(min.instance, text,
-            min.instance,
+            min.instance.searchScore, null);
-            text,
-            min.instance.searchScore,
-            null);
 
           // If there is some result, answer immediately.
 
@@ -148,7 +145,7 @@ export class AskDialog extends IGBDialog {
             user.isAsking = false;
             user.lastQuestionId = resultsB.questionId;
 
-            // Inform user that a broader search will be used.
+            // Informs user that a broader search will be used.
 
             if (user.subjects.length > 0) {
               let subjectText =
@@ -161,25 +158,17 @@ export class AskDialog extends IGBDialog {
                 `Vou te responder de modo mais abrangente... 
                                 Não apenas sobre ${subjectText}`
               ];
-              dc.context.sendActivity(messages[0]); // TODO: Handle rnd.
+              await dc.context.sendActivity(messages[0]); // TODO: Handle rnd.
             }
 
             // Sends the answer to all outputs, including projector.
 
-            service.sendAnswer(min.conversationalService,
+            await service.sendAnswer(min.conversationalService, dc, resultsB.answer);
-              dc,
+            await dc.replace("/ask", { isReturning: true });
-              resultsB.answer
-            );
-            dc.replace("/ask", { isReturning: true });
-
 
           } else {
-            await min.conversationalService.runNLP(
-              dc,
-              min,
-              text,
-              (data, error) => {
 
+            let data = await min.conversationalService.runNLP(dc, min, text);
             if (!data) {
               let messages = [
                 "Desculpe-me, não encontrei nada a respeito.",
@@ -190,15 +179,11 @@ export class AskDialog extends IGBDialog {
               dc.context.sendActivity(messages[0]); // TODO: Handle rnd.
               dc.replace("/ask", { isReturning: true });
             }
-              }).catch(err => {
-                console.log(err);
-              });
           }
         }
       }
     ]);
 
-
     min.dialogs.add("/ask", [
       async (dc, args) => {
         const user = min.userState.get(dc.context);

deploy/kb.gbapp/dialogs/FaqDialog.ts

@@ -46,7 +46,7 @@ export class FaqDialog extends IGBDialog {
    */
   static setup(bot: BotAdapter, min: GBMinInstance) {
 
-    const service = new KBService();
+    const service = new KBService(min.core.sequelize);
 
     min.dialogs.add("/faq", [
       async (dc, args) => {

deploy/kb.gbapp/dialogs/MenuDialog.ts

@@ -60,7 +60,7 @@ export class MenuDialog extends IGBDialog {
    */
   static setup(bot: BotAdapter, min: GBMinInstance) {
 
-    var service = new KBService();
+    var service = new KBService(min.core.sequelize);
 
     bot
     min.dialogs.add("/menu", [

deploy/kb.gbapp/services/KBService.ts

@@ -41,6 +41,7 @@ const path = require("path")
 const asyncPromise = require('async-promises')
 const walkPromise = require('walk-promise')
 
+import { Sequelize } from 'sequelize-typescript'
 import { GBConfigService } from './../../core.gbapp/services/GBConfigService'
 import { GuaribasQuestion, GuaribasAnswer, GuaribasSubject } from "../models"
 import { IGBCoreService, IGBConversationalService, IGBInstance } from "botlib"
@@ -55,6 +56,12 @@ export class KBServiceSearchResults {
 
 export class KBService {
 
+  sequelize: Sequelize
+
+  constructor(sequelize: Sequelize) {
+    this.sequelize = sequelize
+  }
+
   async getAnswerById(
     instanceId: number,
     answerId: number
@@ -78,32 +85,26 @@ export class KBService {
     instanceId: number,
     text: string
   ): Promise<any> {
-    return new Promise(
-      (resolve, reject) => {
 
-        GuaribasQuestion.findOne({
+    const Op = Sequelize.Op
+
+    let question = await GuaribasQuestion.findOne({
       where: {
         instanceId: instanceId,
-            content: `%${text.trim()}%`
+        content: { [Op.like]: `%${text.trim()}%` }
       }
-        }).then((question: GuaribasQuestion) => {
+    })
+
     if (question) {
-            GuaribasAnswer.findAll({
+      let answer = await GuaribasAnswer.findOne({
         where: {
           instanceId: instanceId,
           answerId: question.answerId
         }
-            }).then((answer: GuaribasAnswer[]) => {
-              resolve({ question: question, answer: answer[0] })
       })
+      return Promise.resolve({ question: question, answer: answer })
     }
-          else {
+    return Promise.resolve(null)
-            resolve(null)
-          }
-        }).error((reason) => {
-          reject(reason)
-        })
-      })
   }
 
   async addAnswer(obj: GuaribasAnswer): Promise<GuaribasAnswer> {
@@ -119,26 +120,24 @@ export class KBService {
 
   async ask(
     instance: IGBInstance,
-    what: string,
+    query: string,
     searchScore: number,
     subjects: GuaribasSubject[]
   ): Promise<KBServiceSearchResults> {
 
     // Builds search query.
 
-    what = what.toLowerCase()
+    query = query.toLowerCase()
-    what = what.replace("?", " ")
+    query = query.replace("?", " ")
-    what = what.replace("!", " ")
+    query = query.replace("!", " ")
-    what = what.replace(".", " ")
+    query = query.replace(".", " ")
-    what = what.replace("/", " ")
+    query = query.replace("/", " ")
-    what = what.replace("\\", " ")
+    query = query.replace("\\", " ")
 
     if (subjects) {
-      let text = KBService.getSubjectItemsSeparatedBySpaces(
+      let text = KBService.getSubjectItemsSeparatedBySpaces(subjects)
-        subjects
-      )
       if (text) {
-        what = `${what} ${text}`
+        query = `${query} ${text}`
       }
     }
     // TODO: Filter by instance. what = `${what}&$filter=instanceId eq ${instanceId}`
@@ -150,7 +149,7 @@ export class KBService {
           instance.searchIndex,
           instance.searchIndexer
         )
-        let results = await service.search(what)
+        let results = await service.search(query)
         if (results && results.length > 0 &&
           results[0]["@search.score"] >= searchScore) {
           let value = await this.getAnswerById(
@@ -159,7 +158,7 @@ export class KBService {
           return Promise.resolve({ answer: value, questionId: results[0].questionId })
         }
       } else {
-        let data = await this.getAnswerByText(instance.instanceId, what)
+        let data = await this.getAnswerByText(instance.instanceId, query)
         return Promise.resolve(
           { answer: data.answer, questionId: data.question.questionId }
         )
@@ -365,7 +364,7 @@ export class KBService {
       delimiter: "\t"
     }
 
-    let data = await parse(file, opts);
+    let data = await parse(file, opts)
     return asyncPromise.eachSeries(data, async line => {
 
       // Extracts values from columns in the current line.
@@ -422,7 +421,7 @@ export class KBService {
           content: answer,
           format: format,
           packageId: packageId
-        });
+        })
         await GuaribasQuestion.create({
           from: from,
           to: to,
@@ -434,7 +433,7 @@ export class KBService {
           instanceId: instanceId,
           answerId: answer1.answerId,
           packageId: packageId
-        });
+        })
 
         return Promise.resolve(question)
 
@@ -448,23 +447,25 @@ export class KBService {
     })
   }
 
-  sendAnswer(conversationalService: IGBConversationalService,
+  async sendAnswer(conversationalService: IGBConversationalService,
-    dc: any, answer: GuaribasAnswer) {
+    dc: any, answer: GuaribasAnswer): Promise<any> {
 
     if (answer.content.endsWith('.mp4')) {
-      conversationalService.sendEvent(dc, "play", {
+      await conversationalService.sendEvent(dc, "play", {
         playerType: "video",
         data: answer.content
       })
     } else if (answer.content.length > 140 &&
-      dc.message.source != "directline") {
+      dc.context._activity.channelId === "webchat") {
       let messages = [
         "Vou te responder na tela para melhor visualização...",
         "A resposta está na tela...",
         "Veja a resposta na tela..."
       ]
-      dc.context.sendActivity(messages[0]) // TODO: Handle rnd.
+
+      await dc.context.sendActivity(messages[0]) // TODO: Handle rnd.
       var html = answer.content
+
       if (answer.format === ".md") {
         marked.setOptions({
           renderer: new marked.Renderer(),
@@ -479,10 +480,10 @@ export class KBService {
         })
         html = marked(answer.content)
       }
-      conversationalService.sendEvent(dc, "play", { playerType: "markdown", data: html })
+      await conversationalService.sendEvent(dc, "play", { playerType: "markdown", data: html })
     } else {
-      dc.context.sendActivity(answer.content)
+      await dc.context.sendActivity(answer.content)
-      conversationalService.sendEvent(dc, "stop", null)
+      await conversationalService.sendEvent(dc, "stop", null)
     }
   }
 
@@ -490,15 +491,14 @@ export class KBService {
     localPath: string,
     packageStorage: GuaribasPackage,
     instance: IGBInstance
-  ): Promise<GuaribasQuestion[]> {
+  ): Promise<any> {
 
     // Imports subjects tree into database and return it.
 
-    return this.importSubjectFile(
+    await this.importSubjectFile(
       packageStorage.packageId,
       UrlJoin(localPath, "subjects.json"),
-      instance
+      instance);
-    ).then((value: GuaribasQuestion[]) => {
 
     // Import all .tsv files in the tabular directory.
 
@@ -507,9 +507,9 @@ export class KBService {
       instance,
       packageStorage.packageId
     )
-    })
   }
 
+
   async importKbTabularDirectory(
     localPath: string,
     instance: IGBInstance,
@@ -523,9 +523,9 @@ export class KBService {
         return this.importKbTabularFile(
           UrlJoin(file.root, file.name),
           instance.instanceId,
-          packageId);
+          packageId)
       }
-    }));
+    }))
 
   }
 
@@ -549,13 +549,13 @@ export class KBService {
           title: item.title,
           description: item.description,
           packageId: packageId
-        });
+        })
 
         if (item.children) {
           return Promise.resolve(doIt(item.children, value.subjectId))
         }
         else {
-          return Promise.resolve(item);
+          return Promise.resolve(item)
         }
 
       })
@@ -564,31 +564,26 @@ export class KBService {
     return doIt(subjects.children, null)
   }
 
-  undeployKbFromStorage(
+  async undeployKbFromStorage(
     instance: IGBInstance,
     packageId: number
   ) {
-    // TODO: call reject.
+
-    return new Promise(
+    await GuaribasQuestion.destroy({
-      (resolve, reject) => {
-        GuaribasQuestion.destroy({
       where: { instanceId: instance.instanceId, packageId: packageId }
-        }).then(value => {
+    })
-          GuaribasAnswer.destroy({
+    await GuaribasAnswer.destroy({
       where: { instanceId: instance.instanceId, packageId: packageId }
-          }).then(value => {
+    })
-            GuaribasSubject.destroy({
+    await GuaribasSubject.destroy({
       where: { instanceId: instance.instanceId, packageId: packageId }
-            }).then(value => {
+    })
-              GuaribasPackage.destroy({
+    await GuaribasPackage.destroy({
       where: { instanceId: instance.instanceId, packageId: packageId }
-              }).then(value => {
-                resolve(null)
-              })
-            })
-          })
-        })
     })
+
+    return Promise.resolve()
+
   }
 
   /**