theprogrammablemind 7.3.0 → 7.3.2

package/client.js

@@ -270,16 +270,37 @@ const writeTest = (fn, query, objects, generated, paraphrases, responses, contex
   writeTestFile(fn, tests)
 }
 
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest }) => {
-  // TODO fix this name to contextsPrime
-  const contextsPrime = []
-  const generatedPrime = []
-  const paraphrasesPrime = []
-  const responsesPrime = []
-  const contexts = []
+const combineRange = (r1, r2) => {
+  let start = r2.start;
+  if (r1.start < r2.start) {
+    start = r1.start
+  }
+  let end = r2.end
+  if (r1.end > r2.end) {
+    end = r2.end
+  }
+  return { start, end }
+}
+
+const overlaps = (r1, context) => {
+  if (!context.range) {
+    return true;
+  }
+  const r2 = context.range
+  if (r1.start <= r2.end && r1.start >= r2.start) {
+    return true;
+  }
+  if (r1.end <= r2.end && r1.end >= r2.start) {
+    return true;
+  }
+  return false
+}
+
+const setupContexts = (rawContexts) => {
   let first = true
+  const contexts = []
   contexts.push({ marker: 'controlStart', controlRemove: true })
-  for (const context of json.contexts) {
+  for (const context of rawContexts) {
     if (first) {
       first = false
     } else {
@@ -288,14 +309,49 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
     contexts.push(context)
   }
   contexts.push({ marker: 'controlEnd', controlRemove: true })
+  return contexts
+}
+
+const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, query, data, retries, url }) => {
+  // TODO fix this name to contextsPrime
+  const contextsPrime = []
+  const generatedPrime = []
+  const paraphrasesPrime = []
+  const responsesPrime = []
+  const contexts = setupContexts(json.contexts)
+
   const objects = config.get('objects')
   const args = { objects, isResponse: true, response: json, isTest, getObjects: getObjects(objects) }
   setupArgs(args, config, json.logs, hierarchy)
   const toDo = [...contexts]
   args.insert = (context) => toDo.unshift(context)
+  let overlap, lastRange;
   while (toDo.length > 0) {
-    args.calls.next()
     const context = toDo.shift()
+    /*
+    if (false && query) {
+      if (config.wasChanged()) {
+        // process contexts that overlap
+        overlap = lastRange
+      } else {
+        config.watch()
+      }
+      if (overlap) {
+        if (overlaps(overlap, context)) {
+          // okay
+          query = query.slice(overlap.end+1)
+          data.utterance = query
+          debugger;
+          const json = await doWithRetries(retries, url, data)
+          toDo = setupContexts(json.contexts).slice(1) // take off the start context
+        }
+        overlap = undefined
+      }
+      lastRange = context.range
+    }
+    */
+
+    args.calls.next()
     let contextPrime = context
     context.topLevel = true
     try {
@@ -924,7 +980,7 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
     semantics: [],
     associations: [],
   }
-  const looper = (queries) => {
+  const looper = async (queries) => {
     if (queries.length === 0) {
       finish()
       return
@@ -955,7 +1011,7 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
       }
 
       try {
-        const results = _process(config, query.query, { beforeQuery })
+        const results = await _process(config, query.query, { beforeQuery })
         if (config.config.debug) {
           // TODO pass in the error handler like the other ones
           defaultInnerProcess(config, defaultErrorHandler, results)
@@ -967,7 +1023,7 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
         results.key = { query: query.query, hierarchy }
         accumulators[property].push(results)
         accumulators.associations = accumulators.associations.concat(results.associations)
-        looper(queries)
+        await looper(queries)
       } catch(e) {
         const error = { errors: [e], query: query.query };
         config.config.skipSemantics = null
@@ -979,7 +1035,7 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
       const extraConfig = queryOrExtraConfig
       console.log('config', extraConfig)
       accumulators[property].push({ extraConfig: true, ...extraConfig })
-      looper(queries)
+      await looper(queries)
     }
   }
 
@@ -1031,7 +1087,7 @@ const build = async ({ config, target, beforeQuery, template, errorHandler = def
   let todo = (template.queries || []).map((query) => { return { property: 'resultss', query, skipSemantics: false } })
   todo = todo.concat((template.fragments || []).map((query) => { return Object.assign({}, toProperties(query), { property: 'fragments', skipSemantics: false }) }))
   todo = todo.concat((template.semantics || []).map((definition) => { return { property: 'semantics', query: `${definition.from}\n${definition.to}`, skipSemantics: true } }))
-  looper(Object.assign([], todo))
+  await looper(Object.assign([], todo))
 }
 
 const knowledgeModule = async ({
@@ -1325,8 +1381,11 @@ const knowledgeModule = async ({
     } else if (args.test || args.testVerbose || args.testAllVerbose) {
       // TODO make test always a string
       if (typeof test === 'string') {
-        const l = (n) => {
+        const l = (n, hasError) => {
           if (n === 0) {
+            if (hasError) {
+              process.exit(-1)
+            }
             return
           }
           runTests(config, test, { debug: args.debug, testConfig: testConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose, beforeQuery, beforeTests, afterTests, beforeTest, afterTest }).then((results) => {
@@ -1335,6 +1394,7 @@ const knowledgeModule = async ({
                 vimdiff(result.expected, result.actual)
               }
             }
+            let newError = false
             if (results.length > 0) {
               let headerShown = false
               console.log('**************************** ERRORS ************************')
@@ -1346,7 +1406,7 @@ const knowledgeModule = async ({
                   }
                   console.log('    expected paraphrases', result.expected.paraphrases)
                   console.log('    actual paraphrases  ', result.actual.paraphrases)
-
+                  newError = true
                   headerShown = true
                 }
                 if (JSON.stringify(result.expected.responses) !== JSON.stringify(result.actual.responses)) {
@@ -1355,6 +1415,7 @@ const knowledgeModule = async ({
                   }
                   console.log('    expected responses  ', result.expected.responses)
                   console.log('    actual responses    ', result.actual.responses)
+                  newError = true
                   headerShown = true
                 }
               }
@@ -1366,12 +1427,12 @@ const knowledgeModule = async ({
               console.log('**************************** ERRORS ************************')
             }
             // const contexts = { failures: results }
-            l(n - 1)
+            l(n - 1, hasError || newError)
           }).catch((error) => {
             errorHandler(error)
           })
         }
-        l(args.count)
+        l(args.count, false)
       } else {
         test()
       }

package/package.json

@@ -1,4 +1,42 @@
 {
+  "dependencies": {
+    "base-64": "^1.0.0",
+    "sort-json": "^2.0.0",
+    "json-stable-stringify": "^1.0.1",
+    "lodash": "^4.17.20",
+    "json-diff": "^1.0.3",
+    "uuid": "^8.3.2",
+    "readline": "^1.3.0",
+    "scriptjs": "^2.5.9",
+    "deep-equal": "^2.0.4",
+    "underscore": "^1.13.1",
+    "node-fetch": "^2.6.1",
+    "fs": "0.0.1-security"
+  },
+  "author": "dev@thinktelligence.com",
+  "devDependencies": {
+    "eslint-plugin-promise": "^5.1.0",
+    "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "@typescript-eslint/eslint-plugin": "^4.28.4",
+    "eslint-plugin-node": "^11.1.0",
+    "@typescript-eslint/parser": "^4.28.4",
+    "jest": "^26.6.3",
+    "eslint": "^7.31.0"
+  },
+  "version": "7.3.2",
+  "scripts": {
+    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO",
+    "to": "node node_modules/.bin/jest --runInBand -t NEO",
+    "test": "jest --config ./jest.config.json",
+    "tod": "node inspect node_modules/.bin/jest --runInBand -t NEO",
+    "lint": "eslint \"**/*.js\"",
+    "test:debug": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
+    "test:watch": "npm run test -- --watch",
+    "lint:fix": "eslint \"**/*.js\" --fix"
+  },
+  "license": "ISC",
+  "name": "theprogrammablemind",
   "keywords": [
     "NLP",
     "NLU",
@@ -8,17 +46,6 @@
     "natural language understanding",
     "chatbot"
   ],
-  "devDependencies": {
-    "@typescript-eslint/parser": "^4.28.4",
-    "jest": "^26.6.3",
-    "eslint": "^7.31.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-import": "^2.23.4",
-    "eslint-plugin-promise": "^5.1.0",
-    "eslint-config-standard": "^16.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.28.4"
-  },
-  "name": "theprogrammablemind",
   "files": [
     "client.js",
     "index.js",
@@ -34,32 +61,5 @@
     "src/generators.js",
     "src/semantics.js"
   ],
-  "version": "7.3.0",
-  "author": "dev@thinktelligence.com",
-  "dependencies": {
-    "base-64": "^1.0.0",
-    "json-stable-stringify": "^1.0.1",
-    "uuid": "^8.3.2",
-    "readline": "^1.3.0",
-    "scriptjs": "^2.5.9",
-    "node-fetch": "^2.6.1",
-    "fs": "0.0.1-security",
-    "sort-json": "^2.0.0",
-    "deep-equal": "^2.0.4",
-    "lodash": "^4.17.20",
-    "underscore": "^1.13.1",
-    "json-diff": "^1.0.3"
-  },
-  "main": "index.js",
-  "license": "ISC",
-  "scripts": {
-    "test:watch": "npm run test -- --watch",
-    "lint:fix": "eslint \"**/*.js\" --fix",
-    "test": "jest --config ./jest.config.json",
-    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO",
-    "lint": "eslint \"**/*.js\"",
-    "test:debug": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
-    "to": "node node_modules/.bin/jest --runInBand -t NEO",
-    "tod": "node inspect node_modules/.bin/jest --runInBand -t NEO"
-  }
+  "main": "index.js"
 }

package/src/config.js

@@ -393,6 +393,9 @@ class Config {
   }
 
   wasChanged() {
+    if (!this.watchStart) {
+      return false;
+    }
     return this.watchStart !== this.watching()
   }