theprogrammablemind_4wp 7.5.8-beta.1 → 7.5.8-beta.2

package/client.js

@@ -663,7 +663,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
     return response
   } catch(error) {
       error.query = query
-      throw error
+      errorHandler(error)
   }
 }
 
@@ -697,11 +697,13 @@ const getConfigForTest = (config, testConfig) => {
   return configForTest
 }
 
-const runTest = async (config, expected, { verbose, afterTest, testConfig, debug }) => {
+const runTest = async (config, expected, { args, verbose, afterTest, testConfig, debug }) => {
   const test = expected.query
   // initialize in between test so state is not preserved since the test was adding without state
   config.rebuild()
-  config.addAssociationsFromTests(config.tests)
+  if (!args.dontAddAssociations) {
+    config.addAssociationsFromTests(config.tests)
+  }
   // config.addAssocationsFromTests(
   const errorHandler = (error) => {
     if (error.metadata) {
@@ -866,12 +868,10 @@ const saveTest = async (testFile, config, test, expected, testConfig, saveDevelo
   const args = {
   }
   const saveObjects = {...config.config.objects}
-  /*
   saveObjects.nameToUUID = {}
   for (let km of config.configs) {
     saveObjects.nameToUUID[km.name] = km.uuid
   }
-  */
   writeTest(testFile, test, saveObjects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
 }
 
@@ -1368,6 +1368,13 @@ const knowledgeModule = async ({
       description: 'Entodicton knowledge module'
     })
 
+    const helpDebugAssociation = 'In order to get a debug break when a specific association is created set the DEBUG_ASSOCIATION environment variable to the JSON of the association to break on. For example DEBUG_ASSOCIATION=\'["the#0", "mammel#0"]\' })'
+    const helpDebugHierarchy = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_HIERARCHY environment variable to the JSON of the child-parent pair to break on. For example DEBUG_HIERARCHY=\'["cat#1", "mammel#1"]\' })'
+    const helpDebugPriority = 'In order to get a debug break when a specific set of priorities is created set set DEBUG_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_PRIORITY=\'["verb#0", "article#0"]\' })'
+    const helpDebugBridge = 'In order to get a debug break when a specific bridge is created set the DEBUG_BRIDGE environment variable to id/level to break on. For example DEBUG_BRIDGE=\'id#level\' })'
+    const helpDebugOperator = 'In order to get a debug break when a specific hierarcy is created set the DEBUG_OPERATOR environment variable to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\' })'
+
+
     parser.add_argument('-tmn', '--testModuleName', { help: 'When running tests instead of using the current modules tests use the specified modules tests' })
     parser.add_argument('-t', '--test', { action: 'store_true', help: 'Run the tests. Create tests by running with the --query + --save flag' })
     parser.add_argument('-tv', '--testVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. Create tests by running with the --query or --loop with the --save flag' })
@@ -1394,30 +1401,34 @@ const knowledgeModule = async ({
     parser.add_argument('-dic', '--debugIncludeConvolutions', { action: 'store_true', help: 'When running with the --debugIncludeConvolutions flag the logs will include convolutions which are somewhat annoying verbose. Default is false' })
     parser.add_argument('-dl', '--debugLoops', { action: 'store_true', help: 'When running with the --debugLoops flag the logs calls to semantics and generators will be immediately written to the console '})
     parser.add_argument('-d', '--debug', { action: 'store_true', help: 'When running with the --debug flag this set the debug flag in the config' })
-    parser.add_argument('-da', '--debugAssociation', { help: 'When running with the --debugAssociation flag the debugging will break when the specified association is added to the config' })
-    parser.add_argument('-dh', '--debugHierarchy', { help: 'When running with the --debugHierarchy flag the debugging will break when the specified child-parent pair is added to the config for the main config. Set DEBUG_HIERARCHY to debug any config loaded. For example DEBUG_HIERARCHY=\'["cat", "mammel"]\'' })
-    parser.add_argument('-db', '--debugBridge', { help: 'When running with the --debugBridge flag the debugging will break when the specified bridge is added to the config for the main config. Set DEBUG_BRIDGE to debug any config loaded. For example DEBUG_BRIDGE=\'id/level\'' })
-    parser.add_argument('-do', '--debugOperator', { help: 'When running with the --debugOperator flag the debugging will break when the specified operator is added to the config for the main config. Set DEBUG_OPERATOR to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\'' })
+    parser.add_argument('-da', '--debugAssociation', { help: helpDebugAssociation })
+    parser.add_argument('-dh', '--debugHierarchy', { help: helpDebugHierarchy })
+    parser.add_argument('-dp', '--debugPriority', { help: helpDebugPriority })
+    parser.add_argument('-db', '--debugBridge', { help: helpDebugBridge })
+    parser.add_argument('-do', '--debugOperator', { help: helpDebugOperator })
 
     const args = parser.parse_args()
     args.count = args.count || 1
 
     if (args.debugAssociation) {
-      global.entodictonDebugAssociation = JSON.parse(args.debugAssociation)
+      console.log(helpDebugAssociation)
+      runtime.process.exit(-1)
     }
     if (args.debugHierarchy) {
-      global.entodictonDebugHierarchy = JSON.parse(args.debugHierarchy)
+      console.log(helpDebugHierarchy)
+      runtime.process.exit(-1)
+    }
+    if (args.debugPriority) {
+      console.log(helpDebugPriority)
+      runtime.process.exit(-1)
     }
     if (args.debugBridge) {
-        // id/level
-      global.entodictonDebugBridge = args.debugBridge.split('/')
-      if (global.entodictonDebugBridge.length !== 2) {
-        console.log('Expected DEBUG_BRIDGE to be of the form "id/level"');
-      }
+      console.log(helpDebugBridge)
+      runtime.process.exit(-1)
     }
     if (args.debugOperator) {
-        // id/level
-      global.entodictonDebugOperator = args.debugOperator
+      console.log(helpDebugOperator)
+      runtime.process.exit(-1)
     }
 
     if (args.clean) {
@@ -1486,87 +1497,94 @@ const knowledgeModule = async ({
     }
     */
 
-    if (args.print) {
-      if (args.print.includes('t')) {
-        console.log("Test queries")
-        let counter = 0
-        for (const test of config.tests) {
-          console.log(`${counter} - ${test.query}`)
-          counter += 1
-        }
-      }
-      if (args.print.includes('c')) {
-        const { data } = setupProcessB({ config })
-        console.log("Config as sent to server")
-        console.log(JSON.stringify(data, null, 2));
+    let configPrinted = false
+    const printConfig = () => {
+      if (configPrinted) {
+        return
       }
+      configPrinted = true
+      if (args.print) {
+        if (args.print.includes('t')) {
+          console.log("Test queries")
+          let counter = 0
+          for (const test of config.tests) {
+            console.log(`${counter} - ${test.query}`)
+            counter += 1
+          }
+        }
+        if (args.print.includes('c')) {
+          const { data } = setupProcessB({ config })
+          console.log("Config as sent to server")
+          console.log(JSON.stringify(data, null, 2));
+        }
 
-      if (args.print.includes('l')) {
-        console.log('Module load ordering')
-        for (const km of config.configs) {
-          console.log(`  ${km.name}`)
+        if (args.print.includes('l')) {
+          console.log('Module load ordering')
+          for (const km of config.configs) {
+            console.log(`  ${km.name}`)
+          }
         }
-      }
-      if (args.print.includes('w')) {
-        for (const word in config.config.words) {
-          console.log(word.concat('          ', ...config.config.words[word].map((def) => JSON.stringify(def))))
+        if (args.print.includes('w')) {
+          for (const word in config.config.words) {
+            console.log(word.concat('          ', ...config.config.words[word].map((def) => JSON.stringify(def))))
+          }
         }
-      }
-      if (args.print.includes('b')) {
-        for (const bridge of config.config.bridges) {
-          console.log(JSON.stringify(bridge))
+        if (args.print.includes('b')) {
+          for (const bridge of config.config.bridges) {
+            console.log(JSON.stringify(bridge))
+          }
         }
-      }
-      if (args.print.includes('o')) {
-        for (const operator of config.config.operators) {
-          console.log(JSON.stringify(operator))
+        if (args.print.includes('o')) {
+          for (const operator of config.config.operators) {
+            console.log(JSON.stringify(operator))
+          }
         }
-      }
-      if (args.print.includes('j')) {
-        const { data } = setupProcessB( { config } )
-        console.log(JSON.stringify(data, null, 2))
-      }
-      if (args.print.includes('a')) {
-        console.log('associations ================')
-        const properties = ['negative', 'positive']
-        for (let property of properties) {
-          console.log(`  ${property} ===============`)
-          for (let association of config.config.associations[property]) {
-            console.log(`  ${JSON.stringify(association)}`)
+        if (args.print.includes('j')) {
+          const { data } = setupProcessB( { config } )
+          console.log(JSON.stringify(data, null, 2))
+        }
+        if (args.print.includes('a')) {
+          console.log('associations ================')
+          const properties = ['negative', 'positive']
+          for (let property of properties) {
+            console.log(`  ${property} ===============`)
+            for (let association of config.config.associations[property]) {
+              console.log(`  ${JSON.stringify(association)}`)
+            }
           }
         }
-      }
-      if (args.print.includes('d')) {
-        console.log(JSON.stringify(config.config.objects, null, 2))
-      }
-      if (args.print.includes('p')) {
-        for (let priority of config.config.priorities) {
-          console.log(JSON.stringify(priority))
+        if (args.print.includes('d')) {
+          console.log(JSON.stringify(config.config.objects, null, 2))
         }
-      }
-      if (args.print.includes('h')) {
-        for (let edge of config.config.hierarchy) {
-          console.log(JSON.stringify(edge))
+        if (args.print.includes('p')) {
+          for (let priority of config.config.priorities) {
+            console.log(JSON.stringify(priority))
+          }
         }
-      }
-      if (args.print.includes('g')) {
-        const easyToRead = _.cloneDeep(config.config.generators)
-        for (const semantic of easyToRead) {
-          semantic.match = semantic.match.toString()
-          semantic.apply = semantic.apply.toString()
-          if (semantic.applyWrapped) {
-            semantic.applyWrapped = semantic.applyWrapped.toString()
+        if (args.print.includes('h')) {
+          for (let edge of config.config.hierarchy) {
+            console.log(JSON.stringify(edge))
           }
         }
-        console.dir(easyToRead)
-      }
-      if (args.print.includes('s')) {
-        const easyToRead = _.cloneDeep(config.config.semantics)
-        for (const semantic of easyToRead) {
-          semantic.match = semantic.match.toString()
-          semantic.apply = semantic.apply.toString()
+        if (args.print.includes('g')) {
+          const easyToRead = _.cloneDeep(config.config.generators)
+          for (const semantic of easyToRead) {
+            semantic.match = semantic.match.toString()
+            semantic.apply = semantic.apply.toString()
+            if (semantic.applyWrapped) {
+              semantic.applyWrapped = semantic.applyWrapped.toString()
+            }
+          }
+          console.dir(easyToRead)
+        }
+        if (args.print.includes('s')) {
+          const easyToRead = _.cloneDeep(config.config.semantics)
+          for (const semantic of easyToRead) {
+            semantic.match = semantic.match.toString()
+            semantic.apply = semantic.apply.toString()
+          }
+          console.dir(easyToRead)
         }
-        console.dir(easyToRead)
       }
     }
 
@@ -1601,7 +1619,7 @@ const knowledgeModule = async ({
             test = useTestConfig.name
 
           }
-          runTests(config, test, { debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
+          runTests(config, test, { args, debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
             let newError = false
             if (results.length > 0) {
               let headerShown = false
@@ -1727,11 +1745,12 @@ const knowledgeModule = async ({
       }
       config.beforeQuery({ query: args.query, isModule: false, objects })
       try {
-        processResults(_process(config, args.query, { commandLineArgs: args, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
+        await processResults(_process(config, args.query, { commandLineArgs: args, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
       } catch( error ) {
         console.log('Error', error);
       }
     }
+    printConfig()
   } else {
     config.addAssociationsFromTests(config.tests);
     //for (let query in config.tests) {
@@ -1739,6 +1758,7 @@ const knowledgeModule = async ({
     //}
     module()
   }
+
 }
 
 /*

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.1",
+  "version": "7.5.8-beta.2",
   "license": "ISC"
 }

package/src/config.js

@@ -5,6 +5,7 @@ const { Generators } = require('./generators')
 const client = require('../client')
 const DigraphInternal = require('./digraph_internal')
 const helpers = require('./helpers')
+const { ecatch } = require('./helpers')
 const runtime = require('../runtime')
 const _ = require('lodash')
 
@@ -22,98 +23,102 @@ const indent = (string, indent) => {
 }
 
 const handleBridgeProps = (config, bridge) => {
-  if (!bridge.bridge) {
-    bridge.bridge = "{ ...next(operator) }"
-  }
-  if (!bridge.level) {
-    bridge.level = 0
-  }
-  if (bridge.children) {
-    for (let child of bridge.children) {
-      config.addHierarchy(child, bridge.id)
-    }
-  }
-  if (bridge.parents) {
-    for (let parent of bridge.parents) {
-      config.addHierarchy(bridge.id, parent)
-    }
-  }
-  if (bridge.isA) {
-    for (let parent of bridge.isA) {
-      config.addHierarchy(bridge.id, parent)
-    }
-  }
-  if (bridge.before) {
-    for (let after of bridge.before) {
-      if (typeof after == 'string') {
-        after = [after, 0]
+  ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
+    () => {
+      if (!bridge.bridge) {
+        bridge.bridge = "{ ...next(operator) }"
       }
-      config.addPriorities([after, [bridge.id, bridge.level]])
-    }
-  }
-  if (bridge.words) {
-    for (let def of bridge.words) {
-      if (typeof def == 'string') {
-        config.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
-      } else {
-        const word = def.word
-        def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
-        config.addWordInternal(word, def)
+      if (!bridge.level) {
+        bridge.level = 0
+      }
+      if (bridge.children) {
+        for (let child of bridge.children) {
+          config.addHierarchy(child, bridge.id)
+        }
+      }
+      if (bridge.parents) {
+        for (let parent of bridge.parents) {
+          config.addHierarchy(bridge.id, parent)
+        }
+      }
+      if (bridge.isA) {
+        for (let parent of bridge.isA) {
+          config.addHierarchy(bridge.id, parent)
+        }
+      }
+      if (bridge.before) {
+        for (let after of bridge.before) {
+          if (typeof after == 'string') {
+            after = [after, 0]
+          }
+          config.addPriorities([after, [bridge.id, bridge.level]])
+        }
+      }
+      if (bridge.words) {
+        for (let def of bridge.words) {
+          if (typeof def == 'string') {
+            config.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
+          } else {
+            const word = def.word
+            def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
+            config.addWordInternal(word, def)
+          }
+        }
+      }
+      if (bridge.generator) {
+        config.config.generators.unshift(bridge.generator)
+      }
+      if (bridge.generators) {
+        const generators = [...bridge.generators]
+        generators.reverse()
+        for (let generator of generators) {
+          config.config.generators.unshift(generator)
+        }
+      }
+      if (bridge.generatorpr) {
+        bridge.generatorp = bridge.generatorpr
+        bridge.generatorr = bridge.generatorpr
+      }
+      if (bridge.generatorp) {
+        config.config.generators.unshift({ 
+          where: bridge.generatorp.where || bridge.where || client.where(4),
+          // match: ({context}) => bridge.id == context.marker && context.paraphrase,
+          match: ({context}) => bridge.id == context.marker && context.level == bridge.level + 1 && context.paraphrase,
+          apply: (args) => bridge.generatorp(args),
+          applyWrapped: bridge.generatorp,
+          property: 'generatorp',
+        })
+      }
+      if (bridge.generatorr) {
+        config.config.generators.unshift({ 
+          // TODO merge response and isResponse
+          where: bridge.generatorr.where || bridge.where || client.where(3),
+          match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
+          apply: (args) => bridge.generatorr(args),
+          applyWrapped: bridge.generatorr,
+          property: 'generatorr',
+        })
+      }
+      if (bridge.evaluator) {
+        config.config.semantics.unshift({ 
+          where: bridge.evaluator.where || bridge.where || client.where(3),
+          match: ({context}) => bridge.id == context.marker && context.evaluate,
+          apply: (args) => bridge.evaluator(args),
+          applyWrapped: bridge.evaluator,
+          property: 'evaluator',
+        })
+      }
+      if (bridge.semantic) {
+        config.config.semantics.unshift({ 
+          where: bridge.semantic.where || bridge.where || client.where(3),
+          match: ({context}) => bridge.id == context.marker,
+          apply: (args) => bridge.semantic(args),
+          applyWrapped: bridge.semantic,
+          property: 'semantic',
+        })
       }
     }
-  }
-  if (bridge.generator) {
-    config.config.generators.unshift(bridge.generator)
-  }
-  if (bridge.generators) {
-    const generators = [...bridge.generators]
-    generators.reverse()
-    for (let generator of generators) {
-      config.config.generators.unshift(generator)
-    }
-  }
-  if (bridge.generatorpr) {
-    bridge.generatorp = bridge.generatorpr
-    bridge.generatorr = bridge.generatorpr
-  }
-  if (bridge.generatorp) {
-    config.config.generators.unshift({ 
-      where: bridge.generatorp.where || bridge.where || client.where(4),
-      // match: ({context}) => bridge.id == context.marker && context.paraphrase,
-      match: ({context}) => bridge.id == context.marker && context.level == bridge.level + 1 && context.paraphrase,
-      apply: (args) => bridge.generatorp(args),
-      applyWrapped: bridge.generatorp,
-      property: 'generatorp',
-    })
-  }
-  if (bridge.generatorr) {
-    config.config.generators.unshift({ 
-      // TODO merge response and isResponse
-      where: bridge.generatorr.where || bridge.where || client.where(3),
-      match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
-      apply: (args) => bridge.generatorr(args),
-      applyWrapped: bridge.generatorr,
-      property: 'generatorr',
-    })
-  }
-  if (bridge.evaluator) {
-    config.config.semantics.unshift({ 
-      where: bridge.evaluator.where || bridge.where || client.where(3),
-      match: ({context}) => bridge.id == context.marker && context.evaluate,
-      apply: (args) => bridge.evaluator(args),
-      applyWrapped: bridge.evaluator,
-      property: 'evaluator',
-    })
-  }
-  if (bridge.semantic) {
-    config.config.semantics.unshift({ 
-      where: bridge.semantic.where || bridge.where || client.where(3),
-      match: ({context}) => bridge.id == context.marker,
-      apply: (args) => bridge.semantic(args),
-      applyWrapped: bridge.semantic,
-      property: 'semantic',
-    })
-  }
+  )
 }
 
 const handleCalculatedProps = (baseConfig, moreConfig) => {
@@ -138,6 +143,14 @@ if (runtime.process.env.DEBUG_HIERARCHY) {
   global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
 }
 
+if (runtime.process.env.DEBUG_PRIORITY) {
+  global.entodictonDebugPriority = JSON.parse(runtime.process.env.DEBUG_PRIORITY)
+}
+
+if (runtime.process.env.DEBUG_ASSOCIATION) {
+  global.entodictonDebugAssociation = JSON.parse(runtime.process.env.DEBUG_ASSOCIATION)
+}
+
 if (runtime.process.env.DEBUG_BRIDGE) {
   // id/level
   global.entodictonDebugBridge = runtime.process.env.DEBUG_BRIDGE.split('/')
@@ -779,10 +792,15 @@ class Config {
     if (!this.config.priorities) {
       this.config.priorities = []
     }
+    if (global.entodictonDebugPriority) {
+      if (helpers.safeEquals(entodictonDebugPriority, priorities)) {
+        debugger; // debug hierarchy hit
+      }
+    }
     this.config.priorities.push(priorities)
     this._delta.json.priorities.push({ action: 'add', priorities })
   }
- 
+
   addHierarchy (child, parent) {
     if (child && parent || !child || Array.isArray(child) || (typeof child == 'string' && !parent)) {
       this.addHierarchyChildParent(child, parent)
@@ -801,7 +819,7 @@ class Config {
       throw `addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`
     }
     if (global.entodictonDebugHierarchy) {
-      if ((helpers.safeEquals.entodictonDebugHierarchy, [child, parent])) {
+      if (helpers.safeEquals(entodictonDebugHierarchy, [child, parent])) {
         debugger; // debug hierarchy hit
       }
     }
@@ -848,7 +866,7 @@ class Config {
     }
     const bridges = this.config.bridges
     const def = Object.assign({}, bridge, { uuid: this._uuid })
-   
+  
     if (global.entodictonDebugBridge) {
       if (global.entodictonDebugBridge[0] == bridge.id && global.entodictonDebugBridge[1] == bridge.level) {
         debugger; // debug hierarchy hit

package/src/helpers.js

@@ -309,7 +309,16 @@ const functionsToStrings = (config) => {
   return config
 }
 
+const ecatch = (where, call) => {
+  try {
+    return call()
+  } catch( e ) {
+    throw new Error(`${where} ${e}`)
+  }
+}
+
 module.exports = { 
+  ecatch,
   functionsToStrings,
   updateQueries,
   mapInPlace,