theprogrammablemind 7.5.0-beta.3 → 7.5.0-beta.31

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.3",
+  "version": "7.5.0-beta.31",
   "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
@@ -1090,7 +1101,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 +1112,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 +1400,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()
@@ -1747,6 +1769,7 @@ class Config {
     }
     this.config.objects.namespaced = {}
     this.resetWasInitialized()
+    this.resetMotivations()
 
     // reorder configs base on load ordering
     {

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/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();
 					}