Merge pull request #15 from Oliver-I/chore/refactor-context-for-v2-api

chore(context):Removed context inline with V2 API

Author: Steve Green

index.js

@@ -32,12 +32,7 @@ const assistant = new AssistantV2({
 
 const date = new Date();
 date.setMonth(date.getMonth() + 1);
-const newContext = {
-  global: {
-    system: {
-      turn_count: 1,
-    },
-  },
+const initContext = {
   skills: {
     'main skill': {
       user_defined: {
@@ -97,12 +92,6 @@ app.post('/api/message', (req, res) => {
     });
   }
 
-  const contextWithAcc = (req.body.context) ? req.body.context : newContext;
-
-  if (req.body.context) {
-    contextWithAcc.global.system.turn_count += 1;
-  }
-
   let textIn = '';
 
   if (req.body.input) {
@@ -113,16 +102,16 @@ app.post('/api/message', (req, res) => {
   const payload = {
     assistant_id: assistantId,
     session_id: req.body.session_id,
-    context: contextWithAcc,
     input: {
       message_type: 'text',
       text: textIn,
-      options: {
-        return_context: true,
-      },
     },
   };
 
+  if (req.body.isFirstCall || req.body.context) {
+    payload.context = req.body.context || initContext;
+  }
+
   // send payload to Conversation and return result
   return assistant.message(payload, (err, data) => {
     if (err) {

package-lock.json

@@ -110,8 +110,9 @@ class App extends React.Component {
     // TODO: wrap in a settimeout of 0
     // this puts it within the event loop
     // so that rendering
+    const firstCallVal = true;
     setTimeout(() => {
-      this.routeToPath(this.state.paths[0]);
+      this.routeToPath(this.state.paths[0], firstCallVal);
     }, 0);
   }
 
@@ -183,8 +184,8 @@ class App extends React.Component {
       actions.forEach((act) => {
         executeClientAction(act)
           .then((result) => {
-            if (!outputObj.context.skip_user_input) {
-              this.sendMessageToConversation(result.result, this.state.lastMessageContext);
+            if (outputObj.context === undefined) {
+              this.sendMessageToConversation(result.result);
             } else if (result.result === 'statement') {
               const action = executeWorkspaceAction({ statement_display: result.dates });
               responses.push(action);
@@ -246,7 +247,7 @@ class App extends React.Component {
     }
   }
 
-  routeToPath(path) {
+  routeToPath(path, firstCallVal) {
     trackEvent('Navigated to Panel', 'Button', 'NavButton');
     this.setState({ messages: [] });
     this.setState({ currentPath: path.id });
@@ -255,7 +256,7 @@ class App extends React.Component {
     // the fetchMessage call clears the existing context
     // the sendMessageToConversation call sets the context to the selected
     // path
-    fetchMessage('', null, (err, data) => {
+    fetchMessage('', null, firstCallVal, (err, data) => {
       if (data) {
         this.updateConversationContext(data.context);
         this.sendMessageToConversation(path.path, this.state.lastMessageContext);
@@ -267,7 +268,7 @@ class App extends React.Component {
   sendMessageToConversation(text, context = null) {
     this.updateMessageStatus(IN_PROGRESS);
 
-    fetchMessage(text, context, (err, data) => {
+    fetchMessage(text, context, false, (err, data) => {
       // data.code is set for an error response
       if (err || data.code !== undefined) {
         this.updateMessageStatus(FAILED);

src/components/App.js

@@ -1,12 +1,12 @@
 let sessionId = null;
 
-function getMessage(text, context, callback) {
+function getMessage(text, context, firstCallVal, callback) {
   const payload = {
     session_id: sessionId,
     input: { text },
     context,
+    isFirstCall: firstCallVal,
   };
-
   fetch('/api/message', {
     method: 'POST',
     headers: {
@@ -55,18 +55,19 @@ function getSessionId(callback) {
  *
  * @param {String} text - the inputted text from the user
  * @param {Object} context - the current context object for the conversation
+ * @param {boolean} firstCallVal - determines whether context is to be sent with payload
  */
-const fetchMessage = (text, context, callback) => {
+const fetchMessage = (text, context, firstCallVal, callback) => {
   if (sessionId === null) {
     getSessionId((err) => {
       if (err) {
         console.log(`ERROR ${JSON.stringify(err)}`);
         callback(err);
       }
-      getMessage(text, context, callback);
+      getMessage(text, context, firstCallVal, callback);
     });
   } else {
-    getMessage(text, context, callback);
+    getMessage(text, context, firstCallVal, callback);
   }
 };