theprogrammablemind_4wp 7.5.5 → 7.5.6-beta.0

package/client.js

@@ -130,6 +130,10 @@ const setupArgs = (args, config, logs, hierarchy) => {
     }
   }
   args.motivation = (m) => config.addMotivation(m)
+  args.breakOnSemantics = false
+  args.theDebugger = {
+    breakOnSemantics: (value) => args.breakOnSemantics = value
+  }
   args.s = (c) => config.getSemantics(logs).apply(args, c)
   args.g = (c) => config.getGenerators(logs).apply(args, c)
   args.gp = (c) => config.getGenerators(logs).apply(args, { ...c, paraphrase: true, isResponse: false, response: false})
@@ -240,14 +244,18 @@ const processContext = (context, { objects = {}, config, logs = [] }) => {
 }
 
 const convertToStable = (objects) => {
-  const stableObjects = Object.assign({}, objects)
-  stableObjects.namespaced = {}
-  let counter = 0
-  Object.keys(((objects || {}).namespaced || {})).forEach((uuid) => {
-    stableObjects.namespaced[`${counter}`] = objects.namespaced[uuid]
-    counter += 1
-  })
-  return stableObjects
+  if (true) {
+    return objects
+  } else {
+    const stableObjects = Object.assign({}, objects)
+    stableObjects.namespaced = {}
+    let counter = 0
+    Object.keys(((objects || {}).namespaced || {})).forEach((uuid) => {
+      stableObjects.namespaced[`${counter}`] = objects.namespaced[uuid]
+      counter += 1
+    })
+    return stableObjects
+  }
 }
 
 const writeTestFile = (fn, tests) => {
@@ -330,7 +338,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 +352,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()
     /*
@@ -373,7 +382,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
     context.topLevel = true
     try {
       if (json.has_errors) {
-        throw new Error('There are errors in the logs')
+        throw new Error('There are errors in the logs. Run with the -d flag and grep for Error')
       }
       if (!config.get('skipSemantics')) {
         if (!config.doMotivations(args, context)) {
@@ -523,7 +532,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 +613,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
@@ -685,8 +694,10 @@ const runTest = async (config, expected, { verbose, afterTest, testConfig, debug
   }
 
   let objects = getObjects(config.config.objects)(config.uuid)
+  let testConfigName = config.name
   if (testConfig.testModuleName) {
     objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
+    testConfigName = testConfig.testModuleName
   }
   config.beforeQuery({ query: test, isModule: false, objects })
   // config.resetMotivations()
@@ -717,7 +728,8 @@ const runTest = async (config, expected, { verbose, afterTest, testConfig, debug
         }
         return picked
       }
-      const expected_checked = sortJson(pickEm(expected.objects.namespaced[0]), { depth: 25 })
+      debugger
+      const expected_checked = sortJson(pickEm(expected.objects.namespaced[expected.objects.nameToUUID[testConfigName]]), { depth: 25 })
       const actual_checked = sortJson(pickEm(objects), { depth: 25 })
       const failed_checked = !matching(actual_objects, expected_objects)
 
@@ -806,7 +818,14 @@ const saveTest = async (testFile, config, test, expected, testConfig, saveDevelo
   const result = await _process(config, test, { isTest: true })
   // const actualObjects = config.config.objects
   const actualConfig = getConfigForTest(config, testConfig)
-  writeTest(testFile, test, config.config.objects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
+  const args = {
+  }
+  const saveObjects = {...config.config.objects}
+  saveObjects.nameToUUID = {}
+  for (let km of config.configs) {
+    saveObjects.nameToUUID[km.name] = km.uuid
+  }
+  writeTest(testFile, test, saveObjects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
 }
 
 const saveTestsHelper = async (testFile, config, tests, todo, testConfig, saveDeveloper) => {
@@ -935,6 +954,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 +969,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
 }
 
@@ -1136,6 +1162,8 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
             delete result.load_cache_time
             delete result.times
             delete result.memory_free_percent
+            delete result.logs
+            delete result.version
             result.hierarchy.sort()
             stabilizeAssociations(result.associations)
           }
@@ -1251,9 +1279,11 @@ const knowledgeModule = async ({
   processResults = processResults({ config, errorHandler })
   config.description = description
   config.demo = demo
-  if (typeof test === 'object' && test.contents) {
-    config.tests = test.contents
-    test = test.name
+  if (typeof test === 'object') {
+    if (test.contents) {
+      config.tests = test.contents
+      test = test.name
+    }
   } else {
     if (runtime.fs && runtime.fs.existsSync(test)) {
       config.tests = JSON.parse(runtime.fs.readFileSync(test))
@@ -1261,6 +1291,7 @@ const knowledgeModule = async ({
       config.tests = {}
     }
   }
+  config.setTestConfig(testConfig)
  
   if (!isProcess) {
     if (template) {
@@ -1300,6 +1331,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"]\'' })
@@ -1508,7 +1540,6 @@ const knowledgeModule = async ({
             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) {
@@ -1638,7 +1669,6 @@ const knowledgeModule = async ({
     }
   } else {
     config.addAssociationsFromTests(config.tests);
-    config.setTestConfig(testConfig)
     //for (let query in config.tests) {
     //  config.addAssociations(config.tests[query].associations || []);
     //}

package/package.json

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

package/src/config.js

@@ -1220,6 +1220,9 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.maxDepth = 20 // 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) {
@@ -109,6 +115,9 @@ class Generator {
             apis: this.getAPIs(config) 
           }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
+    if (this.property == 'generatorp') {
+      args.g = args.gp
+    }
     // if (this.callId) {
     // greg
     /*
@@ -256,10 +265,10 @@ class Generators {
             lines.newRow()
             lines.setElement(0, 1, 'STACK')
             lines.setElement(0, 2, stack)
-            lines.newRow()
 						lines.newRow()
 						lines.setElement(0, 1, 'DEBUG')
 						lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+						lines.newRow()
             lines.setElement(0, 1, 'TO')
             lines.setElement(0, 2, `(HASHCODE ${helpers.hashCode(JSON.stringify(helpers.sortJson(context, { depth: 25 })))})`)
             lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 25 }), null, 2))

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()
@@ -111,6 +118,9 @@ class Semantic {
         callId == this.callId) {
       debugger;
     }
+    if (args.breakOnSemantics) {
+      debugger
+    }
     this._apply(args)
     return contextPrime
   }
@@ -168,7 +178,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)