theprogrammablemind_4wp 8.0.0-beta.0 → 8.0.0-beta.10

package/client.js

@@ -47,7 +47,13 @@ const getConfig_getObjectsCheck = (config, testConfig) => {
   }
   const checks = (testConfig.checks && testConfig.checks.objects) || []
   if (Array.isArray(checks)) {
-    return { [testConfigName]: checks }
+    const kmToChecks = { [testConfigName]: checks.filter( (check) => !check.km ) }
+    for (const check of checks) {
+      if (check.km) {
+        kmToChecks[check.km] = config.km(check.km).testConfig.checks.objects
+      }
+    }
+    return kmToChecks
   } else {
     return checks
   }
@@ -441,7 +447,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
+const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -491,6 +497,9 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
             reason: e.reason,
             error: e.stack || e.error
           })
+          if (rebuildingTemplate) {
+            throw e
+          }
         }
       }
       if (contextPrime.controlRemove) {
@@ -764,7 +773,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
           start = runtime.performance.performance.now()
         }
         const { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  processContextsB({ isTest, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+                                  processContextsB({ isTest, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         if (isTest) {
           end = runtime.performance.performance.now()
           clientSideTime = end - start
@@ -1557,19 +1566,16 @@ const knowledgeModuleImpl = async ({
   }
 
   if (isProcess) {
-    const config = createConfig()
-    setupConfig(config)
-    processResults = processResults({ config, errorHandler })
-    // setup();
     const parser = new runtime.ArgumentParser({
       description: 'Entodicton knowledge module'
     })
 
+    const helpDebugWord = 'In order to get a debug break when a specific word is created set the DEBUG_WORD environment variable to the JSON of the association to break on. For example DEBUG_WORD=\'"the"\''
     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], ["mammal", 1]]\''
     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 helpDebugContextualPriority = 'In order to get a debug break when a specific set of contextual priorities is created set set DEBUG_CONTEXTUAL_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_CONTEXTUAL_PRIORITY=\'{ context: [["verb", 0], ["article", 0], select: 1}\''
-    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 helpDebugBridge = 'In order to get a debug break when a specific bridge is created set the DEBUG_BRIDGE environment variable to id to break on. For example DEBUG_BRIDGE=\'car\''
     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' })
@@ -1601,6 +1607,7 @@ const knowledgeModuleImpl = async ({
     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', { action: 'store_true', help: helpDebugAssociation })
+    parser.add_argument('-dw', '--debugWord', { action: 'store_true', help: helpDebugWord })
     parser.add_argument('-dh', '--debugHierarchy', { action: 'store_true', help: helpDebugHierarchy })
     parser.add_argument('-dp', '--debugPriority', { action: 'store_true', help: helpDebugPriority })
     parser.add_argument('-dcp', '--debugContextualPriority', { action: 'store_true', help: helpDebugContextualPriority })
@@ -1616,6 +1623,21 @@ const knowledgeModuleImpl = async ({
       args.rebuildTemplate = true
     }
 
+    // dont debug the load of the KM's if rebuild template is on since we want to debug the template rebuild not the load
+    if (args.rebuildTemplate) {
+      global.pauseDebugging = true
+    }
+
+    const config = createConfig()
+    setupConfig(config)
+    processResults = processResults({ config, errorHandler })
+
+    if (args.rebuildTemplate) {
+      global.pauseDebugging = false
+    }
+
+    // setup();
+
     if (args.parenthesized) {
       config.parenthesized = true
     }
@@ -1641,7 +1663,7 @@ const knowledgeModuleImpl = async ({
           throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
         }
       } catch (e) {
-        throw new Error(`Error parsing JSON of the checkForLoop argument. ${e}`)
+        throw new Error('Error for the checkForLoop argument. Expected a JSON array of operator keys of the form "[<id>, <level>]"')
       }
     } else {
       if (process.argv.includes('--checkForLoop') || process.argv.includes('-cl')) {
@@ -1652,6 +1674,10 @@ const knowledgeModuleImpl = async ({
       console.log(helpDebugAssociation)
       runtime.process.exit(-1)
     }
+    if (args.debugWord) {
+      console.log(helpDebugWord)
+      runtime.process.exit(-1)
+    }
     if (args.debugHierarchy) {
       console.log(helpDebugHierarchy)
       runtime.process.exit(-1)
@@ -1744,8 +1770,14 @@ const knowledgeModuleImpl = async ({
           }
         }
         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))))
+          // { literals: Object, patterns: Array(2), hierarchy: Array(97) }
+          console.log('literals')
+          for (const word in config.config.words.literals) {
+            console.log('  ' + word.concat('          ', ...config.config.words.literals[word].map((def) => JSON.stringify(def))))
+          }
+          console.log('patterns')
+          for (const pattern of config.config.words.patterns) {
+            console.log('  ' + JSON.stringify(pattern))
           }
         }
         if (args.print.includes('b')) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "devDependencies": {
-    "eslint-plugin-import": "^2.23.4",
-    "jest": "^29.7.0",
-    "@typescript-eslint/parser": "^4.28.4",
     "@typescript-eslint/eslint-plugin": "^4.28.4",
-    "eslint-plugin-node": "^11.1.0",
+    "@typescript-eslint/parser": "^4.28.4",
+    "eslint": "^7.31.0",
     "eslint-config-standard": "^16.0.3",
+    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^5.1.0",
-    "eslint": "^7.31.0"
+    "jest": "^29.7.0"
   },
   "scripts": {
     "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
@@ -52,19 +52,18 @@
   ],
   "author": "dev@thinktelligence.com",
   "dependencies": {
+    "base-64": "^1.0.0",
     "deep-equal": "^2.0.4",
-    "uuid": "^8.3.2",
+    "fs": "0.0.1-security",
     "json-diff": "^1.0.3",
+    "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.20",
-    "fs": "0.0.1-security",
-    "base-64": "^1.0.0",
-    "sort-json": "^2.0.0",
+    "node-fetch": "^2.6.1",
     "readline": "^1.3.0",
     "scriptjs": "^2.5.9",
-    "underscore": "^1.13.1",
-    "json-stable-stringify": "^1.0.1",
-    "node-fetch": "^2.6.1"
+    "sort-json": "^2.0.0",
+    "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.0",
+  "version": "8.0.0-beta.10",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -40,6 +40,9 @@ const initWords = (words) => {
 }
 
 const debugPriority = (priority) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (global.entodictonDebugPriority) {
     if (helpers.subPriority(entodictonDebugPriority, priority)) {
       debugger // debug hierarchy hit
@@ -48,6 +51,9 @@ const debugPriority = (priority) => {
 }
 
 const debugAssociation = (association) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (global.entodictonDebugAssociation) {
     if (helpers.safeEquals(global.entodictonDebugAssociation, association)) {
       debugger // debug association hit
@@ -55,7 +61,21 @@ const debugAssociation = (association) => {
   }
 }
 
+const debugWord = (word) => {
+  if (global.pauseDebugging) {
+    return
+  }
+  if (global.entodictonDebugWord) {
+    if (helpers.safeEquals(global.entodictonDebugWord, word)) {
+      debugger // debug word hit
+    }
+  }
+}
+
 const debugHierarchy = (pair) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (global.entodictonDebugHierarchy) {
     if (helpers.safeEquals(global.entodictonDebugHierarchy, pair)) {
       debugger // debug hierarchy hit
@@ -64,14 +84,20 @@ const debugHierarchy = (pair) => {
 }
 
 const debugBridge = (bridge) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (global.entodictonDebugBridge) {
-    if (global.entodictonDebugBridge[0] == bridge.id && global.entodictonDebugBridge[1] == bridge.level) {
+    if (global.entodictonDebugBridge == bridge.id) {
       debugger // debug hierarchy hit
     }
   }
 }
 
 const debugOperator = (operator) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (global.entodictonDebugOperator) {
     if ((operator.pattern || operator) === global.entodictonDebugOperator) {
       debugger // debug operator hit
@@ -80,18 +106,29 @@ const debugOperator = (operator) => {
 }
 
 const debugConfigProps = (config) => {
+  if (global.pauseDebugging) {
+    return
+  }
   if (!config) {
     return
   }
   const checkProps = [
     { property: 'priorities', check: (v) => debugPriority(v) },
     { property: 'association', check: (v) => debugAssociation(v) },
+    { property: 'words', check: (v) => debugAssociation(v) },
     { property: 'hierarchy', check: (v) => debugHierarchy(v) },
     { property: 'operators', check: (v) => debugOperator(v) },
     { property: 'bridges', check: (v) => debugBridge(v) }
   ]
   for (const { property, check } of checkProps) {
-    if (config[property]) {
+    if (property == 'words') {
+      if (config[property]) {
+        for (const value in config[property].literals) {
+          check(value)
+        }
+      }
+    }
+    else if (config[property]) {
       for (const value of config[property]) {
         check(value)
       }
@@ -225,7 +262,12 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
       if (bridge.children) {
         for (const child of bridge.children) {
-          config.addHierarchy(child, bridge.id)
+          // config.addHierarchy(child, bridge.id)
+          if (child.child) {
+            config.addHierarchy(child.child, bridge.id, child.instance)
+          } else {
+            config.addHierarchy(child, bridge.id)
+          }
         }
       }
       if (bridge.operator) {
@@ -233,12 +275,20 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       }
       if (bridge.parents) {
         for (const parent of bridge.parents) {
-          config.addHierarchy(bridge.id, parent)
+          if (parent.parent) {
+            config.addHierarchy(bridge.id, parent.parent, parent.instance)
+          } else {
+            config.addHierarchy(bridge.id, parent)
+          }
         }
       }
       if (bridge.isA) {
         for (const parent of bridge.isA) {
-          config.addHierarchy(bridge.id, parent)
+          if (parent.parent) {
+            config.addHierarchy(bridge.id, parent.parent, parent.instance)
+          } else {
+            config.addHierarchy(bridge.id, parent)
+          }
         }
       }
       if (bridge.before) {
@@ -260,7 +310,7 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
       if (bridge.words) {
         for (let def of bridge.words) {
           if (typeof def === 'string') {
-            config.addWordInternal(def, { id: bridge.id, initial: `{ value: "${def}"}` })
+            config.addWordInternal(def, { id: bridge.id, initial: `{ value: "${bridge.id}"}` })
           } else {
             const word = def.word
             def = { initial: JSON.stringify(def), id: bridge.id, word }
@@ -404,13 +454,13 @@ if (runtime.process.env.DEBUG_ASSOCIATION) {
   global.entodictonDebugAssociation = JSON.parse(runtime.process.env.DEBUG_ASSOCIATION)
 }
 
+if (runtime.process.env.DEBUG_WORD) {
+  global.entodictonDebugWord = runtime.process.env.DEBUG_WORD
+}
+
 if (runtime.process.env.DEBUG_BRIDGE) {
-  // id/level
-  global.entodictonDebugBridge = runtime.process.env.DEBUG_BRIDGE.split('/')
-  if (global.entodictonDebugBridge.length !== 2) {
-    console.log('Expected DEBUG_BRIDGE to be of the form "id/level"')
-    process.exit(-1)
-  }
+  // id
+  global.entodictonDebugBridge = runtime.process.env.DEBUG_BRIDGE
   global.entodictonDebugBridge[1] = parseInt(global.entodictonDebugBridge[1])
 }
 
@@ -1272,9 +1322,9 @@ class Config {
     }
   }
 
-  addHierarchy (child, parent) {
+  addHierarchy (child, parent, instance) {
     if (child && parent || !child || Array.isArray(child) || (typeof child === 'string' && !parent)) {
-      this.addHierarchyChildParent(child, parent)
+      this.addHierarchyChildParent(child, parent, instance)
       // this.addHierarchyProperties ({ child, parent })
     } else {
       this.addHierarchyProperties(child)
@@ -1282,26 +1332,32 @@ class Config {
   }
 
   addHierarchyProperties (edge) {
-    const { child, parent } = edge
+    const { child, parent, instance } = edge
     if (typeof child !== 'string') {
       throw new Error(`addHierarchy expected child property to be a string. got ${JSON.stringify(child)}`)
     }
     if (typeof parent !== 'string') {
       throw new Error(`addHierarchy expected parent property to be a string. got ${JSON.stringify(parent)}`)
     }
+    if (instance && typeof instance !== 'boolean') {
+      throw new Error(`addHierarchy expected instance property to be a boolean or undefined. got ${JSON.stringify(instance)}`)
+    }
     debugHierarchy([child, parent])
     this.config.hierarchy.push(edge)
     // TODO greg11 this.hierarchy.addEdge(edge)
-    this._delta.json.hierarchy.push([child, parent])
+    this._delta.json.hierarchy.push([child, parent, instance || false])
   }
 
-  addHierarchyChildParent (child, parent) {
+  addHierarchyChildParent (child, parent, instance) {
     if (typeof child !== 'string') {
       throw new Error(`addHierarchy expected child to be a string. got ${JSON.stringify(child)}`)
     }
     if (typeof parent !== 'string') {
       throw new Error(`addHierarchy expected parent to be a string. got ${JSON.stringify(parent)}`)
     }
+    if (instance && typeof instance !== 'boolean') {
+      throw new Error(`addHierarchy expected instance property to be a boolean or undefined. got ${JSON.stringify(instance)}`)
+    }
     debugHierarchy([child, parent])
     if (this.config.hierarchy.find((element) => {
       const hc = hierarchyCanonical(element)
@@ -1312,9 +1368,9 @@ class Config {
       return
     }
 
-    this.config.hierarchy.push([child, parent])
+    this.config.hierarchy.push([child, parent, instance || false])
     // this.hierarchy.addEdge([child, parent])
-    this._delta.json.hierarchy.push([child, parent])
+    this._delta.json.hierarchy.push([child, parent, instance || false])
   }
 
   getBridge (id, level) {
@@ -1458,6 +1514,7 @@ class Config {
         hierarchy: [],
       }
     }
+    debugWord(word)
 
     const literals = this.config.words.literals
     def = Object.assign({}, def, { uuid: uuid || this._uuid })
@@ -1582,6 +1639,14 @@ class Config {
     return client.process(this, query, options)
   }
 
+  query (query, options) {
+    return this.process(query, options)
+  }
+
+  processQuery (query, options) {
+    return this.process(query, options)
+  }
+
   initDefaults () {
     const init = (config) => {
       if (!config.objects) {