theprogrammablemind 7.6.0-beta.9 → 7.7.0-beta.0

package/client.js

@@ -1182,7 +1182,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   }
 
   if (responses.explain_priorities) {
-    console.log("Explain Priorities")
+    console.log("Explain Priorities (listed from lower priority to higher priority)")
     for ([inputss, outpus, reason] of responses.explain_priorities) {
       console.log(`    ${JSON.stringify(inputss)} reason: ${reason}`)
     }
@@ -1283,6 +1283,7 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
         }
         if (results.contexts.length > 1) {
           console.log(`query "${query.query}". There is ${results.contexts.length} contexts in the results. Make sure its producing the results that you expect.`)
+          throw new Error(`query "${query.query}". There is ${results.contexts.length} contexts in the results. Make sure its producing the results that you expect.`)
         } else if (results.paraphrases[0] != query.query) {
           console.log(`query "${query.query}". The paraphrase is different from the query "${results.paraphrases[0]}".`)
         } else {
@@ -1308,14 +1309,18 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
       // it will just get added to the config
       const extraConfig = queryOrExtraConfig
       console.log('config', extraConfig)
-      try {
-        config.addInternal(_.cloneDeep(extraConfig), { handleCalculatedProps: true } )
-      } catch ( e ) {
-        const where = extraConfig.where ? ` ${extraConfig.where}` : ''
-        throw new Error(`Error processing extra config${where}: ${e.stack}}`)
+      if (extraConfig.stop) {
+        await looper([])
+      } else {
+        try {
+          config.addInternal(_.cloneDeep(extraConfig), { handleCalculatedProps: true } )
+        } catch ( e ) {
+          const where = extraConfig.where ? ` ${extraConfig.where}` : ''
+          throw new Error(`Error processing extra config${where}: ${e.stack}}`)
+        }
+        accumulators[property].push({ extraConfig: true, ...extraConfig })
+        await looper(queries)
       }
-      accumulators[property].push({ extraConfig: true, ...extraConfig })
-      await looper(queries)
     }
   }
 
@@ -1398,7 +1403,7 @@ const checkTest = (testConfig) => {
   }
 }
 
-const knowledgeModule = async ({
+const knowledgeModuleImpl = async ({
   module: moduleFromJSFile,
   description,
   section,
@@ -1712,7 +1717,13 @@ const knowledgeModule = async ({
         options.rebuild = true
         config.config.rebuild = true
       }
-      config.load(template.template, template.instance, { rebuild: needsRebuild })
+      try {
+        config.load(template.template, template.instance, { rebuild: needsRebuild })
+      } catch( e ) {
+        debugger
+        console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}`)
+        runtime.process.exit(-1)
+      }
       if (!args.query) {
         printConfig()
       }
@@ -1792,14 +1803,14 @@ const knowledgeModule = async ({
                       console.log(`    actual ${label}  `, actual)
                       newError = true
                       headerShown = true
+                      if (args.vimdiff) {
+                        vimdiff(result.actual.paraphrasesParenthesized, result.expected.paraphrasesParenthesized)
+                      }
                     }
                   }
                   show('paraphrases', result.expected.paraphrases, result.actual.paraphrases)
                   if (!args.testNoParenthesized) {
                     show('paraphrases parenthesized', result.expected.paraphrasesParenthesized, result.actual.paraphrasesParenthesized)
-                    if (args.vimdiff) {
-                      vimdiff(result.actual.paraphrasesParenthesized, result.expected.paraphrasesParenthesized)
-                    }
                   }
                   /*
                   }
@@ -1832,10 +1843,10 @@ const knowledgeModule = async ({
                     }
                     const widths = [4, 18, 72]
                     const lines = new Lines(widths)
-                    lines.setElement(1, 1, 'expected checked')
+                    lines.setElement(1, 1, 'expected checked objects')
                     lines.setElement(2, 2, JSON.stringify(result.expected.checked, null, 2))
                     lines.log()
-                    lines.setElement(1, 1, 'actual checked')
+                    lines.setElement(1, 1, 'actual checked objects')
                     lines.setElement(2, 2, JSON.stringify(result.actual.checked, null, 2))
                     lines.log()
                     if (args.vimdiff) {
@@ -1850,10 +1861,10 @@ const knowledgeModule = async ({
                     }
                     const widths = [4, 18, 72]
                     const lines = new Lines(widths)
-                    lines.setElement(1, 1, 'expected checkedContexts', true)
+                    lines.setElement(1, 1, 'expected checked contexts', true)
                     lines.setElement(2, 2, JSON.stringify(result.expected.checkedContexts, null, 2))
                     lines.log()
-                    lines.setElement(1, 1, 'actual checkedContexts', true)
+                    lines.setElement(1, 1, 'actual checked contexts', true)
                     lines.setElement(2, 2, JSON.stringify(result.actual.checkedContexts, null, 2))
                     lines.log()
                     if (args.vimdiff) {
@@ -1985,7 +1996,6 @@ const knowledgeModule = async ({
     }
     moduleFromJSFile.exports = createConfigExport
   }
-
 }
 
 /*
@@ -2033,6 +2043,10 @@ function w(func) {
   return func
 }
 
+const knowledgeModule = async (...args) => {
+  await knowledgeModuleImpl(...args).catch((e) => console.error(e))
+}
+
 module.exports = {
   process: _process,
   where,

package/package.json

@@ -64,6 +64,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.6.0-beta.9",
+  "version": "7.7.0-beta.0",
   "license": "ISC"
 }

package/src/config.js

@@ -27,7 +27,7 @@ const config_toServer = (config) => {
 
 const debugPriority = (priority) => {
   if (global.entodictonDebugPriority) {
-    if (helpers.safeEquals(entodictonDebugPriority, priority)) {
+    if (helpers.subPriority(entodictonDebugPriority, priority)) {
       debugger; // debug hierarchy hit
     }
   }

package/src/generators.js

@@ -169,7 +169,7 @@ class Generators {
   // assumed - properties added to context before the generators are called. For setting paraphrase property
   apply (args, context, assumed = {}, options = {}) {
     if (Array.isArray(context)) {
-      return new Error("Expected a context not an array")
+      throw new Error("Expected a context not an array")
     }
     if (typeof context !== 'object') {
       return String(context)

package/src/helpers.js

@@ -334,6 +334,45 @@ const ecatch = (where, call) => {
   }
 }
 
+const equalKey = (key1, key2) => {
+  return key1[0] == key2[0] && key1[1] == key2[1]
+}
+
+// matches for { context: ..., [ordered], choose: ... } exactely OR
+//             [ <id1>, <id2> ] - where id1 is chosen
+const subPriority = (sub, sup) => {
+  if (Array.isArray(sub)) {
+    const subChoosen = sub[0]
+    const subOther = sub[1]
+    const hasChoosen = sup.choose.find( (index) => equalKey(sup.context[index], subChoosen)) != undefined
+    const hasOtherChosen = sup.choose.find( (index) => equalKey(sup.context[index], subOther)) != undefined
+    const hasOther = sup.context.find( (other) => equalKey(other, subOther) ) !== undefined
+    return !!(hasChoosen && hasOther) && !hasOtherChosen
+  }
+
+  if (!safeEquals([...sub.choose].sort(), [...sup.choose].sort())) {
+    return false
+  }
+
+  const choose = (priority) => {
+    const chosen = []
+    for (const i of priority.choose) {
+      chosen.push(priority.context[i])
+    }
+    return chosen
+  }
+  const chosen1 = choose(sub)
+  const chosen2 = choose(sup)
+  const sameId = (id1, id2) => id1[0] == id2[0] && id1[1] == id2[1]
+  // same length so only need one way
+  const missing1 = chosen1.find( (id1) => !chosen2.find( (id2) => sameId(id1, id2)) )
+  if (missing1) {
+    return false
+  }
+
+  return true
+}
+
 module.exports = { 
   ecatch,
   functionsToStrings,
@@ -354,5 +393,6 @@ module.exports = {
   isCompound, 
   InitCalls, 
   hashCode, 
-  sortJson 
+  sortJson,
+  subPriority,
 }

package/src/project.js

@@ -16,6 +16,9 @@ const project = (object, filter) => {
       return object.map( element => project(element, filter) )
     } else {
       for (let properties of filter) {
+        if (typeof properties == 'function') {
+          properties = properties(object)
+        }
         if (typeof properties == 'object') {
           if (properties.propertyLists) {
             for (const propertyList in properties.propertyLists) {