theprogrammablemind 7.5.5-beta.0 → 7.5.5-beta.2

package/client.js

@@ -330,7 +330,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, query, data, retries, url }) => {
+const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, query, data, retries, url, commandLineArgs }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -344,6 +344,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
   const toDo = [...contexts]
   args.insert = (context) => toDo.unshift(context)
   let overlap, lastRange;
+  config.debugLoops = commandLineArgs && commandLineArgs.debugLoops
   while (toDo.length > 0) {
     const context = toDo.shift()
     /*
@@ -523,7 +524,7 @@ const processInstance = (config, instance) => {
       // config.addInternal(config.template.queries[i], { handleCalculatedProps: true } )
       config.addInternal(instance.template.queries[i], { handleCalculatedProps: true } )
     } else {
-      processContextsB({ config, hierarchy, json: results/*, generators, semantics */ })
+      processContextsB({ config, hierarchy, json: results/*, generators, semantics */, commandLineArgs: {} })
     }
   }
   global.transitoryMode = transitoryMode
@@ -604,7 +605,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         throw json
       } else {
         const { contextsPrime, generatedPrime, paraphrasesPrime, responsesPrime } =
-                                  processContextsB({ isTest, config, hierarchy, json/*, generators, semantics */ })
+                                  processContextsB({ isTest, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         response.associations = json.associations
         response.hierarchy = json.hierarchy
         response.load_cache_time += json.load_cache_time
@@ -935,6 +936,7 @@ const defaultErrorHandler = async (error) => {
     console.log(error.stack)
   }
 
+  let doErrorExit = false
   if (error.errors) {
     console.log('error: ')
     for (const e of error.errors) {
@@ -949,19 +951,25 @@ const defaultErrorHandler = async (error) => {
       } else {
         console.log('\n  ', e)
       }
+      doErrorExit = true
     }
   }
   if (error.error) {
     console.log('error: ')
     for (const e of error.error) {
       console.log('\n  ', e)
+      doErrorExit = true
     }
   }
 
   if (error.query) {
     console.log('query: ', error.query)
+    doErrorExit = true
   }
 
+  if (doErrorExit) {
+    runtime.process.exit(-1)
+  }
   // throw error
 }
 
@@ -1300,6 +1308,7 @@ const knowledgeModule = async ({
     parser.add_argument('-s', '--save', { action: 'store_true', help: 'When running with the --query flag this will save the current run to the test file. When running without the --query flag all tests will be run and resaved.' })
     parser.add_argument('-sd', '--saveDeveloper', { action: 'store_true', help: 'Same as -s but the query will not show up in the info command.' })
     parser.add_argument('-dic', '--debugIncludeConvolutions', { action: 'store_true', help: 'When running with the --debugIncludeConvolutions flag the logs will include convolutions which are somewhat annoying verbose. Default is false' })
+    parser.add_argument('-dl', '--debugLoops', { action: 'store_true', help: 'When running with the --debugLoops flag the logs calls to semantics and generators will be immediately written to the console '})
     parser.add_argument('-d', '--debug', { action: 'store_true', help: 'When running with the --debug flag this set the debug flag in the config' })
     parser.add_argument('-da', '--debugAssociation', { help: 'When running with the --debugAssociation flag the debugging will break when the specified association is added to the config' })
     parser.add_argument('-dh', '--debugHierarchy', { help: 'When running with the --debugHierarchy flag the debugging will break when the specified child-parent pair is added to the config for the main config. Set DEBUG_HIERARCHY to debug any config loaded. For example DEBUG_HIERARCHY=\'["cat", "mammel"]\'' })

package/package.json

@@ -62,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.5-beta.0",
+  "version": "7.5.5-beta.2",
   "license": "ISC"
 }

package/src/config.js

@@ -1220,6 +1220,9 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.maxDepth = 50 // for generators and semantics
+    this.debugLoops = false // for generators and semantics
+
     this.allowDelta = false
     this.resetDelta()
 
@@ -1482,6 +1485,8 @@ class Config {
     this.valid()
     const cp = new Config()
     cp.logs = []
+    cp.maxDepth = this.maxDepth
+    cp.debugLoops  = this.debugLoops
     cp.transitoryMode = this.transitoryMode
     cp.configs = this.configs.map((km) => km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
     cp._uuid = cp.configs[0]._uuid
@@ -1883,12 +1888,6 @@ class Config {
     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) => {

package/src/generators.js

@@ -77,7 +77,13 @@ class Generator {
     if (!log) {
       throw 'generators.apply argument log is required'
     }
+    if (baseArgs.call && config && sbaseArgs.calls.stack.length > config.maxDepth) {
+      throw new Error(`Max depth of ${config.maxDepth} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
+    }
 
+    if (config && config.debugLoops) {
+      console.log("apply", this.toLabel())
+    }
     // this.getAPI(config)
     let n = (id) => id
     if (config && 'nsToString' in config) {

package/src/semantics.js

@@ -79,6 +79,13 @@ class Semantic {
   apply (baseArgs, context, s, log, options = {}) {
     const { hierarchy, config, response } = baseArgs
     const objects = baseArgs.getObjects(this.uuid)
+    if (config && config.debugLoops) {
+      console.log("apply", this.toLabel())
+    }
+    if (baseArgs.calls && config && baseArgs.calls.stack.length > config.maxDepth) {
+      throw new Error(`Max depth of ${config.maxDepth} for calls has been exceeded. maxDepth can be set on the config object. To see the calls run with the --dl or set the debugLoops property on the config`)
+    }
+
     // const ask = baseArgs.getAsk(this.uuid)
     if (!log) {
       console.trace()
@@ -168,7 +175,6 @@ class Semantics {
     if (!(context instanceof Array || context instanceof Object)) {
       return context
     }
-
     const config = args.config
     let contextPrime = Object.assign({}, context)
     const s = (context, options) => this.apply(args, context, options)