theprogrammablemind 8.1.0-beta.0 → 8.1.0-beta.1

package/client.js

@@ -441,7 +441,7 @@ const getConfigForTest = (config, testConfig) => {
   return configForTest
 }
 
-const runTest = async (config, expected, { args, verbose, testConfig, debug }) => {
+const runTest = async (config, expected, { args, verbose, testConfig, debug, timings={ server: 0, client: 0 } }) => {
   const test = expected.query
   if (args.query && args.query != test) {
     // no run this
@@ -472,6 +472,8 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
       const lines = new Lines(widths)
       lines.setElement(0, 0, test)
       lines.setElement(0, 1, `time on server: ${result.times.toFixed(2)} client: ${(result.clientSideTimes / 1000).toFixed(2)}`)
+      timings.server += result.times
+      timings.client += result.clientSideTimes / 1000
       lines.log()
     }
     const expected_objects = sortJson(convertToStable(expected.objects), { depth: 25 })
@@ -784,7 +786,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
     responses.errors.forEach((error) => console.log(`    ${error}`))
   }
   console.log("KM's loaded (ordered)", config.configs.map((c) => c.name))
-  console.log('This is the global objects from running semantics:\n', config.objects)
+  // console.log('This is the global objects from running semantics:\n', config.objects)
   if (!_.isEmpty(responses.learned_contextual_priorities)) {
     console.log('\nThe learned contextual priorties are :\n')
     for (const lcp of responses.learned_contextual_priorities) {
@@ -801,10 +803,12 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   }
   console.log(responses.trace)
 
-  if (global.beforeObjects) {
-    console.log('objects', runtime.jsonDiff.diffString(global.beforeObjects, config.get('objects')))
-  } else {
-    console.log('objects', runtime.util.inspect(config.get('objects'), { depth: Infinity, sorted: true }))
+  if (false) {
+    if (global.beforeObjects) {
+      console.log('objects', runtime.jsonDiff.diffString(global.beforeObjects, config.get('objects')))
+    } else {
+      console.log('objects', runtime.util.inspect(config.get('objects'), { depth: Infinity, sorted: true }))
+    }
   }
 
   const pickEm = () => {
@@ -1229,6 +1233,7 @@ const knowledgeModuleImpl = async ({
       parser.add_argument('-do', '--debugOperator', { action: 'store_true', help: helpDebugOperator })
       parser.add_argument('-ep', '--explainPriorities', { action: 'store_true', help: 'The server will return all priorities including the generated one along with an explanation of there they came from' })
       parser.add_argument('-dic', '--debugIncludeConvolutions', { nargs: '?', help: 'When running with the --debugIncludeConvolutions flag the logs will include convolutions which are somewhat annoyingly verbose. Default is false' })
+      parser.add_argument('-bc', '--bypassCache', { action: 'store_true', help: 'Bypass the cache on the server side and rebuild' })
 
       const args = parser.parse_args()
       args.count = args.count || 1
@@ -1488,7 +1493,7 @@ const knowledgeModuleImpl = async ({
         }
       }
 
-      if (args.retrain) {
+      if (args.bypassCache) {
         config.config.retrain = true
       }
 
@@ -1520,7 +1525,8 @@ const knowledgeModuleImpl = async ({
               useTestConfig.testModuleName = args.testModuleName
               test = useTestConfig.name
             }
-            await runTests(config, test, { args, debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
+            const timings = { server: 0, client: 0 }
+            await runTests(config, test, { timings, args, debug: args.debug, testConfig: useTestConfig, verbose: args.testVerbose || args.testAllVerbose, stopAtFirstError: !args.testAllVerbose }).then((results) => {
               let newError = false
               if (results.length > 0) {
                 let headerShown = false
@@ -1552,6 +1558,8 @@ const knowledgeModuleImpl = async ({
                   }
                 }
 
+                
+                console.log(`Total Server Time: ${timings.server.toFixed(2)}. Total Client Time: ${timings.client.toFixed(2)}`)
                 if (hasError) {
                   console.log('**************************** ERRORS ************************')
                   for (const result of results) {

package/package.json

@@ -65,6 +65,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.1.0-beta.0",
+  "version": "8.1.0-beta.1",
   "license": "UNLICENSED"
 }