theprogrammablemind 7.5.0-beta.4 → 7.5.0-beta.41

package/client.js

@@ -78,7 +78,15 @@ const listable = (hierarchy) => (c, type) => {
   return false
 }
 
-const isA = (hierarchy) => (child, parent) => hierarchy.isA(child, parent)
+const isA = (hierarchy) => (child, parent) => {
+  if (child.marker) {
+    child = child.marker
+  }
+  if (parent.marker) {
+    parent = parent.marker
+  }
+  return hierarchy.isA(child, parent)
+}
 
 const asList = (context) => {
   if (context.marker === 'list') {
@@ -670,9 +678,12 @@ const runTest = async (config, expected, { verbose, afterTest, testConfig, debug
     defaultErrorHandler(error)
   }
 
-  const objects = getObjects(config.config.objects)(config.uuid)
+  let objects = getObjects(config.config.objects)(config.uuid)
+  if (testConfig.testModuleName) {
+    objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
+  }
   config.beforeQuery({ query: test, isModule: false, objects })
-  config.resetMotivations()
+  // config.resetMotivations()
     try {
       const result = await _process(config, test, { errorHandler, isTest: true })
       result.query = test
@@ -783,7 +794,7 @@ const runTests = async (config, testFile, juicyBits) => {
 const saveTest = async (testFile, config, test, expected, testConfig, saveDeveloper) => {
   config.rebuild()
   const objects = getObjects(config.config.objects)(config.uuid)
-  config.resetMotivations()
+  //config.resetMotivations()
   config.beforeQuery({ query: test, isModule: false, objects })
   console.log(test)
   const result = await _process(config, test, { isTest: true })
@@ -1252,7 +1263,7 @@ const knowledgeModule = async ({
       description: 'Entodicton knowledge module'
     })
 
-    parser.add_argument('-tfn', '--testFileName', { help: 'Override the test file for the module when the tests are being run' })
+    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' })
     parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag' })
@@ -1267,7 +1278,7 @@ const knowledgeModule = async ({
     parser.add_argument('-q', '--query', { help: 'Run the specified query' })
     parser.add_argument('-ip ', '--server', { help: 'Server to run against' })
     parser.add_argument('-qp ', '--queryParams', { help: 'Query params for the server call' })
-    parser.add_argument('-td', '--testDelete', { help: 'Delete the specified query from the tests file.' })
+    parser.add_argument('-dt', '--deleteTest', { help: 'Delete the specified query from the tests file.' })
     parser.add_argument('-c', '--clean', { help: 'Remove data from the test files. a === association' })
     parser.add_argument('-od', '--objectDiff', { action: 'store_true', help: 'When showing the objects use a colour diff' })
     parser.add_argument('-daa', '--dontAddAssociations', { action: 'store_true', help: 'Do not add associations from the tests.' })
@@ -1306,11 +1317,11 @@ const knowledgeModule = async ({
       return
     }
 
-    if (args.testDelete) {
+    if (args.deleteTest) {
       let tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))
-      tests = tests.filter( (test) => test.query !== args.testDelete );
+      tests = tests.filter( (test) => test.query !== args.deleteTest );
       writeTestFile(testConfig.name, tests)
-      console.log(`Remove the test for "${args.testDelete}"`)
+      console.log(`Remove the test for "${args.deleteTest}"`)
       return
     }
 
@@ -1466,7 +1477,15 @@ const knowledgeModule = async ({
             }
             return
           }
-          runTests(config, args.testFileName ? `${args.testFileName}.test.json` : test, { debug: args.debug, testConfig: testConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
+          let useTestConfig = testConfig
+          if (args.testModuleName) {
+            useTestConfig = config.getConfigs()[args.testModuleName].getTestConfig()
+            useTestConfig.testModuleName = args.testModuleName
+            test = useTestConfig.name
+
+          }
+          // runTests(config, args.testFileName ? `${args.testFileName}.test.json` : test, { debug: args.debug, testConfig: testConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
+          runTests(config, test, { debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
             if (results.length > 0 && args.vimdiff) {
               for (const result of results) {
                 vimdiff(result.expected, result.actual)
@@ -1515,19 +1534,25 @@ const knowledgeModule = async ({
                     if (!headerShown) {
                       console.log('  Failure')
                     }
-                    console.log('    expected checked', result.expected.checked)
-                    console.log('    actual checked  ', result.actual.checked)
+                    const widths = [4, 18, 72]
+                    const lines = new Lines(widths)
+                    lines.setElement(1, 1, 'expected checked')
+                    lines.setElement(2, 2, JSON.stringify(result.expected.checked, null, 2))
+                    lines.log()
+                    lines.setElement(1, 1, 'actual checked')
+                    lines.setElement(2, 2, JSON.stringify(result.actual.checked, null, 2))
+                    lines.log()
                     newError = true
                     headerShown = true
                   }
                 }
               }
               if (!headerShown) {
-                if (!(testConfig.check && testConfig.check.length > 0)) {
+                if (!(useTestConfig.check && useTestConfig.check.length > 0)) {
                   console.log('There are failures due to things other than paraphrases, responses and checked properties being different. They are not shown because you ran -tv or -tva which only shows difference in paraphrase and results. Usually what I do is -s and do a diff to make sure there are no other problems. If the paraphrases or results were different they would have shown here.')
                 }
               }
-              if (!(testConfig.check && testConfig.check.length > 0)) {
+              if (!(useTestConfig.check && useTestConfig.check.length > 0)) {
                 console.log('use -v arg to write files expected.json and actual.json in the current directory for detailed comparison. Or do -s and then git diff the changes.')
                 // console.log(JSON.stringify(contexts))
                 console.log('**************************** ERRORS ************************')
@@ -1589,6 +1614,7 @@ const knowledgeModule = async ({
     }
   } else {
     config.addAssociationsFromTests(config.tests);
+    config.setTestConfig(testConfig)
     //for (let query in config.tests) {
     //  config.addAssociations(config.tests[query].associations || []);
     //}

package/lines.js

@@ -12,6 +12,9 @@ class Lines {
   // will wrap to next line within the column
   setElement (row, column, value) {
     const values = value.toString().split('\n')
+    if (column >= this.widths.length) {
+      throw "Column out of range."
+    }
     const width = this.widths[column]
     let index = 0
     for (value of values) {

package/package.json

@@ -61,6 +61,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.0-beta.4",
+  "version": "7.5.0-beta.41",
   "license": "ISC"
 }

package/src/config.js

@@ -330,6 +330,17 @@ class Config {
     return `${maybeName}${counter}`
   }
 
+  setTestConfig(testConfig) {
+    if (this.name == 'ui') {
+      console.log('ui setting testConfig')
+    }
+    this.testConfig = testConfig
+  }
+
+  getTestConfig() {
+    return this.testConfig
+  }
+
   defaultConfig () {
     this.config = {
       operators: [], // TODO
@@ -531,9 +542,23 @@ class Config {
       client.build({ config: this, target: this.name, beforeQuery: () => {}, template, ...options })
     } else {
       // no change
-      this.initInstances.push(instance)
-      this.instances.push(instance)
-      client.processInstance(this, instance)
+      // this.initInstances.push({ ...instance, name: config.name })
+      const isEmpty = ( instance ) => {
+        const properties = [
+          "queries",
+          "resultss",
+          "fragments",
+          "semantics",
+          "associations",
+        ]
+        return !properties.find( (property) => instance[property].length > 0 )
+      }
+      if (!isEmpty(instance)) {
+        instance.name = this.name
+        this.initInstances.push(instance)
+        this.instances.push(instance)
+        client.processInstance(this, instance)
+      }
     }
   }
 
@@ -1090,7 +1115,7 @@ class Config {
       config = _.cloneDeep(config)
       this.config = config
       for (let bridge of this.config.bridges) {
-        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'inverted', 'isA',
+        const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'implicit', 'inverted', 'isA', 'children', 'parents',
                         'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
         helpers.validProps(valid, bridge, 'bridge')
         /*
@@ -1101,6 +1126,16 @@ class Config {
           })
         }
         */
+        if (bridge.children) {
+          for (let child of bridge.children) {
+            this.addHierarchy(child, bridge.id)
+          }
+        }
+        if (bridge.parents) {
+          for (let parent of bridge.parents) {
+            this.addHierarchy(bridge.id, parent)
+          }
+        }
         if (bridge.isA) {
           for (let parent of bridge.isA) {
             this.addHierarchy(bridge.id, parent)
@@ -1379,12 +1414,13 @@ class Config {
     cp.name = this.name
     cp.description = this.description
     cp.tests = this.tests
-    cp.motivations = this.motivations
+    cp.motivations = [...this.motivations]
     cp.isModule = this.isModule
     cp.loadedForTesting = this.loadedForTesting
     cp.initInstances = this.initInstances.slice()
     cp.instances = this.instances.slice()
     cp.configCounter = this.configCounter
+    cp.testConfig = this.testConfig
 
     cp.initConfig = _.cloneDeep(this.initConfig)
     cp.defaultConfig()
@@ -1511,7 +1547,8 @@ class Config {
   }
 
   initializeFromConfigs () {
-    this.configs.forEach(({ config, namespace, uuid }) => {
+    // [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
+    [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
       /*
       let objects = this.get('objects')
       if (namespace) {
@@ -1747,6 +1784,7 @@ class Config {
     }
     this.config.objects.namespaced = {}
     this.resetWasInitialized()
+    this.resetMotivations()
 
     // reorder configs base on load ordering
     {
@@ -1762,8 +1800,17 @@ class Config {
       this.configs = [...oconfigs]
     }
 
+    const addInternals = []
     const inits = []
     const initAfterApis = []
+    if (false && this.config.hierarchy.find( (pair) => JSON.stringify(pair) === JSON.stringify(["equipable2","property"]))) {
+      debugger // happened
+    }
+    if (false && this.name == 'countable') {
+      debugger // in rebuild
+    }
+    const reverseIt = true
+    const interleaved = true
     this.configs.forEach((km) => {
       const namespace = km.namespace
       this.config.objects.namespaced[km._uuid] = {}
@@ -1796,7 +1843,12 @@ class Config {
       const args = { isModule, addWord: aw, km: kmFn, hierarchy: this.hierarchy, config, baseConfig: this, currentConfig: config, uuid: config._uuid, objects: namespacedObjects, namespace, api: config.api }
       config.initializerFn(args)
       if (config.initAfterApi) {
-        initAfterApis.push({ config, args })
+        // reverse the list
+        initAfterApis.unshift({ config, args })
+      } else {
+        if (interleaved) {
+          initAfterApis.unshift(null)
+        }
       }
       // greg
       if (config._api) {
@@ -1804,27 +1856,112 @@ class Config {
           // reverse the list
           inits.unshift( () => config._api.initialize({ config: this, km: kmFn, api: config._api }) )
           // config._api.initialize({ config, api: config._api })
+        } else {
+          if (interleaved) {
+            inits.unshift(null)
+          }
         }
         config._api.objects = namespacedObjects
         config._api.config = () => this
         config._api.uuid = config._uuid
+      } else {
+        if (interleaved) {
+          inits.unshift(null)
+        }
       }
       config.setUUIDs()
       config.applyNamespace(config.config, namespace, config.uuid)
       if (!isSelf) {
-        this.addInternal(config, true, false, false, true)
+        if (!reverseIt) {
+          addInternals.push(config)
+        } else {
+          addInternals.unshift(config)
+        }
+        // this.addInternal(config, true, false, false, true)
+      } else {
+        if (interleaved) {
+          addInternals.unshift(null)
+        }
       }
       km.valid()
     })
-    // console.log('inits from config', inits)
-    for (const init of inits) {
-      init()
+
+    if (addInternals.length !== inits.length || addInternals.length !== initAfterApis.length) {
+      debugger // bug
     }
-    for (let init of initAfterApis) {
-      // init.args.isAfterApi = true
-      init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+
+    const generators = this.config.generators
+    const semantics = this.config.semantics
+    if (reverseIt) {
+      this.config.generators = []
+      this.config.semantics = []
     }
-    this.instances.forEach((instance) => client.processInstance(this, instance))
+
+    if (!interleaved) {
+      for (const config of addInternals) {
+        if (!reverseIt) {
+          this.addInternal(config, true, false, false, true)
+        } else {
+          this.addInternalR(config, true, false, false, true)
+        }
+      }
+      // console.log('inits from config', inits)
+      for (const init of inits) {
+        init()
+      }
+      for (let init of initAfterApis) {
+        // init.args.isAfterApi = true
+        init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+      }
+      this.instances.forEach((instance) => client.processInstance(this, instance))
+    } else {
+      const base = {
+        operators: this.config.operators,
+        bridges: this.config.bridges,
+        hierarchy: this.config.hierarchy,
+        priorities: this.config.priorities,
+        associations: this.config.associations,
+        words: this.config.words
+      }
+
+      this.config.operators = []
+      this.config.bridges = []
+      this.config.hierarchy = []
+      this.config.priorities = []
+      this.config.associations = { positive: [], negative: [] }
+      this.config.words = {}
+
+      for (let i = 0; i < addInternals.length; ++i) {
+        let name;
+        if (addInternals[i]) {
+          this.addInternalR(addInternals[i], true, false, false, true)
+          name = addInternals[i].name
+        } else{
+          this.addInternalR(base, true, false, false, true)
+          name = this.name
+        }
+        // console.log('name -------------', name)
+        if (inits[i]) {
+          inits[i]()
+        }
+        if (initAfterApis[i]) {
+          const init = initAfterApis[i]
+          init.config.initializerFn({ ...init.args, kms: this.getConfigs(), isAfterApi: true })
+        }
+        const instance = this.instances.find((instance) => instance.name == name)
+        if (instance) {
+          client.processInstance(this, instance)
+        }
+        this.hierarchy.edges = this.config.hierarchy
+      }
+      // this.instances.forEach((instance) => client.processInstance(this, instance))
+    }
+
+    if (reverseIt) {
+      this.config.generators = generators.concat(this.config.generators)
+      this.config.semantics = semantics.concat(this.config.semantics)
+    }
+    this.hierarchy.edges = this.config.hierarchy
     this.valid()
     this.checkBridges()
   }
@@ -2191,6 +2328,13 @@ class Config {
     this.configs.forEach((km) => {
       this.instances = (km._config.instances || this.initInstances.slice()).concat(this.instances)
     })
+    let noDups = []
+    for (let instance of this.instances) {
+      if (!noDups.find( (existing) => existing.name == instance.name )) {
+        noDups.push(instance)
+      }
+    }
+    this.instances = noDups
 
     this.rebuild()
     this.valid()
@@ -2308,6 +2452,128 @@ class Config {
     }
     return this
   }
+
+  // assumes this is called in reverse order
+  addInternalR (more, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false) {
+    if (more instanceof Config) {
+      more.initialize({ force: false })
+      if (useOldVersion) {
+        more = more.config
+      } else {
+        // more = more.initConfig
+        more = _.cloneDeep(more.initConfig)
+      }
+    }
+    for (const key of Object.keys(more)) {
+      const value = more[key]
+      // TODO remove name and description on the config bag
+      const noOverwrite = ['name', 'namespaced']
+      if (!this.config[key]) {
+        if (allowNameToBeNull) {
+          if (noOverwrite.includes(key)) {
+            continue
+          }
+        } else if (this.config[key] && noOverwrite.includes(key)) {
+          continue
+        }
+        this.config[key] = value
+        continue
+      }
+      if (key === 'words') {
+        const configWords = this.config.words
+        const moreWords = more.words
+        for (const word of Object.keys(moreWords)) {
+          if (!configWords[word]) {
+            configWords[word] = []
+          }
+          // configWords[word] = configWords[word].concat(moreWords[word])
+          configWords[word] = moreWords[word].concat(configWords[word])
+        }
+      } else if (key === 'name') {
+        /*
+        if (this.config[key] === '') {
+          this.config[key] = more[key]
+        }
+        */
+      } else if (key === 'namespaces') {
+        if (includeNamespaces) {
+          Object.assign(this.config[key], more[key])
+        }
+      } else if (key === 'debug') {
+        this.config[key] = this.config[key] || more[key]
+      } else if (key === 'description') {
+        // this.config[key] += ' ' + more[key].trim()
+        this.config[key] = more[key].trim() + ' ' + this.config[key]
+      } else if (key === 'objects') {
+        if (!skipObjects) {
+          // namespaced is special
+          const namespaced = this.config.objects.namespaced
+          Object.assign(this.config[key], more[key])
+          this.config.objects.namespaced = namespaced
+        }
+      } else if (key === 'associations') {
+        const configAssociations = this.config.associations
+        const moreAssociations = more.associations
+        if (moreAssociations.positive) {
+          // configAssociations.positive = configAssociations.positive.concat(moreAssociations.positive)
+          configAssociations.positive = moreAssociations.positive.concat(configAssociations.positive)
+        }
+        if (moreAssociations.negative) {
+          // configAssociations.negative = configAssociations.negative.concat(moreAssociations.negative)
+          configAssociations.negative = moreAssociations.negative.concat(configAssociations.negative)
+        }
+      } else if (Array.isArray(value)) {
+        // handle allowDups
+        if (key == 'operators') {
+          // TODO what about other props
+          const isDup = (op1, op2) => op1.pattern == op2.pattern
+          for (const newOne of more[key]) {
+            for (let iOldOne = 0; iOldOne < this.config[key].length; ++iOldOne) {
+              const oldOne = this.config[key][iOldOne];
+              if (isDup(newOne, oldOne)) {
+                if (oldOne.allowDups) {
+                  // the old one takes precedence to match what would happen during the original load
+                  debugger
+                  this.config[key].splice(iOldOne, 1)
+                  break;
+                }
+              }
+            }
+          }
+        }
+        if (key == 'bridges') {
+          // TODO what about other props
+          const idDup = (b1, b2) => b1.id == b2.id && b1.level == b2.level && b1.bridge == b2.bridge
+          for (const newOne of more[key]) {
+            for (let iOldOne = 0; iOldOne < this.config[key].length; ++iOldOne) {
+              const oldOne = this.config[key][iOldOne];
+              if (newOne.id == oldOne.id) {
+                if (oldOne.allowDups) {
+                  // the old one takes precedence to match what would happen during the original load
+                  this.config[key].splice(iOldOne, 1)
+                  break;
+                }
+              }
+            }
+          }
+        }
+        // console.log('key', key, 'XXX')
+        // console.log('more', JSON.stringify(more, null, 2))
+        // this.config[key] = this.config[key].concat(more[key])
+        if (key == '2enerators') {
+          debugger
+        }
+        // this.config[key] = this.config[key].concat(more[key])
+        this.config[key] = more[key].concat(this.config[key])
+      } else {
+        if (!(key in this.config)) {
+          throw `Unexpected property in config ${key}`
+        }
+        this.config[key] = more[key]
+      }
+    }
+    return this
+  }
 }
 
 module.exports = {

package/src/digraph.js

@@ -28,6 +28,10 @@ class Digraph {
     return this._edges
   }
 
+  set edges(edges) {
+    this._edges = edges
+  }
+
 /*
   set edges(edges) {
     this._edges = edges.map( toA )

package/src/generators.js

@@ -195,10 +195,12 @@ class Generators {
           } catch( e ) {
             // the next if handle this
             generated = null
+            e.retryCall = () => generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
+            const help = 'The error has a retryCall property that will recall the function that failed.'
             if (e.stack && e.message) {
-              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}`
+              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}. ${help}`
             } else if (e.error) {
-              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.error.join()}. Generator is ${generator.toString()}`
+              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.error.join()}. Generator is ${generator.toString()}. ${help}`
             } else {
 							errorMessage = e.toString()
 						}

package/src/helpers.js

@@ -227,7 +227,7 @@ const validProps = (valids, object, type) => {
       }
     }
     if (!okay) {
-      throw `Unknown property "${prop}" in the ${type}. Valid properties are ${valid}. The ${type} is ${JSON.stringify(object)}`
+      throw `Unknown property "${prop}" in the ${type}. Valid properties are ${valids}. The ${type} is ${JSON.stringify(object)}`
     }
   }
 }

package/src/semantics.js

@@ -189,10 +189,12 @@ class Semantics {
         } catch( e ) {
           contextPrime = null
           let errorMessage
+          e.retryCall = () => semantic.apply(args, context, s, log, options)
+          const help = 'The error has a retryCall property that will recall the function that failed.'
           if (e.stack && e.message) {
-            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.toString()} stack is ${e.stack}. Semantic is ${semantic.toString()}`
+            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.toString()} stack is ${e.stack}. Semantic is ${semantic.toString()}. ${help}`
           } else if (e.error) {
-            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.error.join()}. Semantic is ${semantic.toString()}`
+            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.error.join()}. Semantic is ${semantic.toString()}. ${help}`
           } else {
  						errorMessage = e.toString();
 					}