theprogrammablemind 7.5.8-beta.65 → 7.5.8-beta.67

package/client.js

@@ -13,6 +13,22 @@ const { appendNoDups, InitCalls, updateQueries } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
 
+const getConfig_getObjectCheck = (testConfig) => {
+  return (testConfig.checks && testConfig.checks.objects) || testConfig.check || []
+}
+
+const getConfig_getContextCheck = (testConfig) => {
+  return (testConfig.checks && testConfig.checks.context) || []
+}
+
+const pickContext = (testConfig) => (context) => {
+  const picked = {}
+  for (let prop of getConfig_getContextCheck(testConfig)) {
+    picked[prop] = context[prop]
+  }
+  return sortJson(picked, { depth: 25 })
+}
+
 const getAsk = (config) => (uuid) => (asks) => {
   for (let ask of asks) {
     config.addSemantic({
@@ -788,6 +804,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
       const failed_paraphrases = !matching(result.paraphrases, expected.paraphrases)
       let failed_paraphrasesParenthesized = !matching(result.paraphrasesParenthesized, expected.paraphrasesParenthesized)
       let failed_generatedParenthesized = !matching(result.generatedParenthesized, expected.generatedParenthesized)
+      // TODO fix the naming conventions: camelcase + use actual instead of result
       const failed_responses = !matching(result.responses, expected.responses)
       const failed_contexts = !matching(result.contexts, expected.contexts)
       const failed_objects = !matching(actual_objects, expected_objects)
@@ -797,14 +814,18 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
         failed_generatedParenthesized = false
       }
 
+      const pickedResultContexts = result.contexts.map(pickContext(testConfig))
+      const pickedExpectedContexts = expected.contexts.map(pickContext(testConfig))
+      const failedCheckedContexts = !matching(pickedResultContexts, pickedExpectedContexts)
+
       const pickEm = (getObjects) => {
         const picked = {}
-        for (let prop of (testConfig.check || [])) {
+        for (let prop of getConfig_getObjectCheck(testConfig)) {
           if (prop.km) {
             c = config.getConfig(prop.km)
             o = getObjects(prop.km)
             picked[prop.km] = {}
-            for (let p of c.testConfig.check) {
+            for (let p of getConfig_getObjectCheck(c.testConfig)) {
               if (p.km) {
                 continue
               }
@@ -822,11 +843,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
         }
         return expected.objects.namespaced[expected.objects.nameToUUID[name]]
       }
-      try {
-        sortJson(pickEm(expectedGetObjects), { depth: 25 })
-      } catch ( e ) {
-        debugger
-      }
+      sortJson(pickEm(expectedGetObjects), { depth: 25 })
       const expected_checked = sortJson(pickEm(expectedGetObjects), { depth: 25 })
       const actualGetObjects = (name) => {
         if (!name) {
@@ -842,7 +859,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
       const actual_config = sortJson(convertToStable(getConfigForTest(config, testConfig)), { depth: 25 })
       const expected_config = sortJson(convertToStable(expected.config), { depth: 25 })
       const failed_config = !matching(actual_config, expected_config)
-      let failed = failed_paraphrases || failed_paraphrasesParenthesized || failed_generatedParenthesized || failed_responses || failed_contexts || failed_objects || failed_config || failed_checked
+      let failed = failed_paraphrases || failed_paraphrasesParenthesized || failed_generatedParenthesized || failed_responses || failed_contexts || failed_objects || failed_config || failed_checked || failedCheckedContexts
 
       if (expected.metadata && result.metadata && failed) {
         const priorities = analyzeMetaData(expected.metadata, result.metadata)
@@ -861,6 +878,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
             generatedParenthesized: expected.generatedParenthesized, 
             results: expected.contexts, 
             checked: expected_checked, 
+            checkedContexts: pickedExpectedContexts,
             objects: expected_objects, 
             config: expected.config 
           },
@@ -871,6 +889,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
             generatedParenthesized: result.generatedParenthesized, 
             results: result.contexts, 
             checked: actual_checked, 
+            checkedContexts: pickedResultContexts,
             objects: actual_objects, 
             config: actual_config 
           }
@@ -1130,7 +1149,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   const pickEm = () => {
     const picked = {}
     const namespaced = config.get('objects')['namespaced']
-    for (let prop of (config.testConfig.check || [])) {
+    for (let prop of getConfig_getObjectCheck(config.testConfig)) {
       if (prop.km) {
         /*
         const objects = namespaced[prop.km]]
@@ -1380,10 +1399,10 @@ const knowledgeModule = async ({
         test = test.name
       }
     } else {
-      if (typeof runtime.fs == 'function' && runtime.fs.existsSync(test)) {
+      if (runtime.fs && runtime.fs.existsSync(test)) {
         config.tests = JSON.parse(runtime.fs.readFileSync(test))
       } else {
-        config.tests = []
+        config.tests = {}
       }
     }
     config.setTestConfig(testConfig)
@@ -1674,6 +1693,9 @@ const knowledgeModule = async ({
                 if (JSON.stringify(result.expected.checked) !== JSON.stringify(result.actual.checked)) {
                   hasError = true
                 }
+                if (JSON.stringify(result.expected.checkedContexts) !== JSON.stringify(result.actual.checkedContexts)) {
+                  hasError = true
+                }
               }
 
               if (hasError) {
@@ -1737,6 +1759,24 @@ const knowledgeModule = async ({
                     newError = true
                     headerShown = true
                   }
+                  if (JSON.stringify(result.expected.checkedContexts) !== JSON.stringify(result.actual.checkedContexts)) {
+                    if (!headerShown) {
+                      console.log('  Failure')
+                    }
+                    const widths = [4, 18, 72]
+                    const lines = new Lines(widths)
+                    lines.setElement(1, 1, 'expected checkedContexts', true)
+                    lines.setElement(2, 2, JSON.stringify(result.expected.checkedContexts, null, 2))
+                    lines.log()
+                    lines.setElement(1, 1, 'actual checkedContexts', true)
+                    lines.setElement(2, 2, JSON.stringify(result.actual.checkedContexts, null, 2))
+                    lines.log()
+                    if (args.vimdiff) {
+                      vimdiff(result.actual.checkedContexts, result.expected.checkedContexts)
+                    }
+                    newError = true
+                    headerShown = true
+                  }
                 }
               } else {
                 if (results.length > 0 && args.vimdiff) {

package/lines.js

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

package/package.json

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