theprogrammablemind 7.6.0-beta.4 → 7.6.0-beta.6

package/client.js

@@ -660,6 +660,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         opChoices: []
       },
       times: 0.0,
+      clientSideTimes: 0.0,
       trace: '',
       contexts: [],
       generated: [],
@@ -701,8 +702,16 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
       if (json.status !== 200) {
         throw json
       } else {
+        let clientSideTime
+        if (isTest) {
+          start = runtime.performance.performance.now()
+        }
         const { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
                                   processContextsB({ isTest, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+        if (isTest) {
+          end = runtime.performance.performance.now()
+          clientSideTime = end - start
+        }
         response.associations = json.associations
         response.learned_contextual_priorities = json.learned_contextual_priorities
         response.hierarchy = json.hierarchy
@@ -713,6 +722,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         // appendNoDups(response.metadata.priorities, json.metadata.priorities)
         appendNoDups(response.metadata.opChoices, json.metadata.opChoices)
         response.times += json.times
+        response.clientSideTimes += clientSideTime
         response.trace = response.trace.concat(json.trace)
         response.version = json.version
         response.explain_priorities = json.explain_priorities
@@ -802,10 +812,10 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
         defaultInnerProcess(config, errorHandler, result)
       }
       if (verbose) {
-        const widths = [100, 20]
+        const widths = [100, 60]
         const lines = new Lines(widths)
         lines.setElement(0, 0, test)
-        lines.setElement(0, 1, `time on server ${result.times.toFixed(2)}`)
+        lines.setElement(0, 1, `time on server: ${result.times.toFixed(2)} client: ${(result.clientSideTimes/1000).toFixed(2)}`)
         lines.log()
       }
       const expected_objects = sortJson(convertToStable(expected.objects), { depth: 25 })
@@ -1323,6 +1333,7 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
           } else {
             delete result.load_cache_time
             delete result.times
+            delete result.clientSideTimes
             delete result.memory_free_percent
             delete result.logs
             delete result.version
@@ -1362,6 +1373,28 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
   await looper(Object.assign([], todo))
 }
 
+const checkTemplate = (template) => {
+  return
+  if (!template) {
+    return
+  }
+  if (template.checks) {
+    throw new Error("The 'checks' property should be in the 'test' property not the 'template' property")
+  }
+}
+
+const checkTest = (testConfig) => {
+  if (!testConfig) {
+    return
+  }
+  if (!testConfig.name) {
+    throw new Error("The 'test' property is missing the 'name' property that contains the name of the '<km>.test.json' file")
+  }
+  if (!testConfig.contents) {
+    throw new Error("The 'test' property is missing the 'contents' property that contains contents of the '<km>.test.json' file")
+  }
+}
+
 const knowledgeModule = async ({
   module: moduleFromJSFile,
   description,
@@ -1395,9 +1428,10 @@ const knowledgeModule = async ({
   if (!description) {
     throw new Error("'description' is a required parameter. The value should the description of the knowledge module.")
   }
-  if (!test) {
+  if (!testConfig) {
     throw new Error("'test' is a required parameter. The value should the path to the file used to store the tests of the knowledge module and the contents of the file in the form { name: <filePath>, contexts: <json> }.")
   }
+  checkTest(testConfig)
 
   const isProcess = require.main === moduleFromJSFile
 
@@ -1666,6 +1700,8 @@ const knowledgeModule = async ({
       }
     }
 
+    checkTemplate(template)
+
     if (template) {
       const needsRebuild = config.needsRebuild(template.template, template.instance, options)
       if (needsRebuild) {
@@ -1674,7 +1710,9 @@ const knowledgeModule = async ({
         config.config.rebuild = true
       }
       config.load(template.template, template.instance, { rebuild: needsRebuild })
-      printConfig()
+      if (!args.query) {
+        printConfig()
+      }
       if (needsRebuild) {
         return
       }
@@ -1687,7 +1725,6 @@ const knowledgeModule = async ({
     if (args.test || args.testVerbose || args.testAllVerbose || args.save) {
       global.transitoryMode = true
     }
-
     if (!args.query && !args.test && !args.info && (args.save || args.saveDeveloper)) {
       global.transitoryMode = true
       saveTests(config, test, testConfig, args.saveDeveloper)
@@ -1709,7 +1746,6 @@ const knowledgeModule = async ({
             useTestConfig = config.getConfigs()[args.testModuleName].getTestConfig()
             useTestConfig.testModuleName = args.testModuleName
             test = useTestConfig.name
-
           }
           runTests(config, test, { args, debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
             let newError = false
@@ -1827,16 +1863,18 @@ const knowledgeModule = async ({
                   }
                 }
               }
-              if (!headerShown) {
+              if (hasError) {
+                if (!headerShown) {
+                  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 (!(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.')
+                  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 ************************')
                 }
               }
-              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 ************************')
-              }
             }
             // const contexts = { failures: results }
             l(n - 1, hasError || newError)

package/package.json

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

package/runtime.js

@@ -15,4 +15,5 @@ module.exports = {
   jsonDiff: require('json-diff'),
   sortJson: require('sort-json'),
   util: require('util'),
+  performance: require('perf_hooks'),
 }

package/src/flatten.js

@@ -81,6 +81,9 @@ const flatten = (markers, value) => {
     return flattenListHelper(markers, value)
   }
 
+  if (value.flatten === false) {
+    return [[value], false]
+  }
   const marker = value.marker
   let properties = value
 

package/src/project.js

@@ -45,7 +45,6 @@ const project = (object, filter) => {
           if (properties.property) {
             const property = properties.property
             if (properties.isPropertyList) {
-              debugger
               if (!Array.isArray(object[property])) {
                 return projection
               }