theprogrammablemind 7.5.4-beta.10 → 7.5.4-beta.12

package/client.js

@@ -1299,6 +1299,7 @@ const knowledgeModule = async ({
     parser.add_argument('-p', '--print', { help: 'Print the specified elements c === config, w === words, b === bridges, o === operators d === objects (d for data), h === hierarchy, g === generators, s === semantics, l === load t=tests ordering p === priorities a == associations j == JSON sent to server. for example --print wb' })
     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('-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"]\'' })
@@ -1362,6 +1363,7 @@ const knowledgeModule = async ({
     if (args.debug) {
       config.config.debug = true
     }
+    config.config.debugIncludeConvolutions = args.debugIncludeConvolutions
 
     if (template) {
       const needsRebuild = config.needsRebuild(template.template, template.instance, options)

package/package.json

@@ -62,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.4-beta.10",
+  "version": "7.5.4-beta.12",
   "license": "ISC"
 }

package/src/config.js

@@ -72,6 +72,10 @@ const handleBridgeProps = (config, bridge) => {
       config.config.generators.unshift(generator)
     }
   }
+  if (bridge.generatorpr) {
+    bridge.generatorp = bridge.generatorpr
+    bridge.generatorr = bridge.generatorpr
+  }
   if (bridge.generatorp) {
     config.config.generators.unshift({ 
       where: bridge.generatorp.where || bridge.where || client.where(4),
@@ -113,7 +117,7 @@ const handleBridgeProps = (config, bridge) => {
 
 const handleCalculatedProps = (baseConfig, moreConfig) => {
   for (let bridge of moreConfig.bridges) {
-    const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+    const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
                     'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where' ]
     helpers.validProps(valid, bridge, 'bridge')
     handleBridgeProps(baseConfig, bridge)
@@ -684,7 +688,20 @@ class Config {
     return !(instance && sameQueries && sameFragments)
   }
 
+  validifyTemplate (template) {
+    if (!template.queries && !template.fragments) {
+      throw new Error(`Expected the template for ${this.name} to be an object that can have the properties: queries and fragments`)
+    }
+    for (let query of template.queries || []) {
+      if (typeof query == 'string') {
+      } else if (query instanceof Config) {
+        throw new Error(`For the template for ${this.name}, each element in queries should be either a string or a structure with a config (not a Config object).`)
+      }
+    }
+  }
+
   load (template, instance, options = { rebuild: false } ) {
+    this.validifyTemplate(template)
     instance.template = template
     this.logs.push(`loading template for ${this.name}`)
     if (instance && instance.associations && !options.rebuild) {
@@ -2595,7 +2612,6 @@ class Config {
               if (isDup(newOne, oldOne)) {
                 if (oldOne.allowDups) {
                   // the old one takes precedence to match what would happen during the original load
-                  debugger
                   this.config[key].splice(iOldOne, 1)
                   break;
                 }

package/src/generators.js

@@ -200,9 +200,11 @@ class Generators {
             e.retryCall = () => generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
             const help = 'The error has a retryCall property that will recall the function that failed.'
             if (e.stack && e.message) {
-              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}. ${help}`
+              const info = `${generator.notes ? generator.notes : ''}${generator.where ? generator.where : ''}`
+              errorMessage = `Error applying generator '${info}. Error is ${e.toString()} stack is ${e.stack}. Generator is ${generator.toString()}. ${help}`
             } else if (e.error) {
-              errorMessage = `Error applying generator '${generator.notes}'. Error is ${e.error.join()}. Generator is ${generator.toString()}. ${help}`
+              const info = `${generator.notes ? generator.notes : ''}${generator.where ? generator.where : ''}`
+              errorMessage = `Error applying generator '${info}. Error is ${e.error.join()}. Generator is ${generator.toString()}. ${help}`
             } else {
 							errorMessage = e.toString()
 						}

package/src/semantics.js

@@ -194,9 +194,11 @@ class Semantics {
           e.retryCall = () => semantic.apply(args, context, s, log, options)
           const help = 'The error has a retryCall property that will recall the function that failed.'
           if (e.stack && e.message) {
-            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.toString()} stack is ${e.stack}. Semantic is ${semantic.toString()}. ${help}`
+            const info = `${semantic.notes ? semantic.notes : ''}${semantic.where ? semantic.where : ''}`
+            errorMessage = `Error applying semantics '${info}'. Error is ${e.toString()} stack is ${e.stack}. Semantic is ${semantic.toString()}. ${help}`
           } else if (e.error) {
-            errorMessage = `Error applying semantics '${semantic.notes}'. Error is ${e.error.join()}. Semantic is ${semantic.toString()}. ${help}`
+            const info = `${semantic.notes ? semantic.notes : ''}${semantic.where ? semantic.where : ''}`
+            errorMessage = `Error applying semantics '${info}'. Error is ${e.error.join()}. Semantic is ${semantic.toString()}. ${help}`
           } else {
  						errorMessage = e.toString();
 					}