theprogrammablemind 7.10.0-beta.1 → 7.10.0-beta.11

package/client.js

@@ -362,7 +362,7 @@ const writeTest = (fn, query, objects, generated, paraphrases, responses, contex
   }
   associations.sort()
   // tests[query] = sortJson({ paraphrases, responses, contexts, objects: convertToStable(objects), associations, metadata, config, developerTest: saveDeveloper }, { depth: 25 })
-  results = sortJson({ 
+  const results = sortJson({ 
     query, 
     paraphrases, 
     responses, 
@@ -667,7 +667,11 @@ const loadInstance = (config, instance) => {
   global.transitoryMode = transitoryMode
 }
 
-const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = defaultErrorHandler } = {}) => {
+const throwErrorHandler = (error) => {
+  throw error
+}
+
+const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = throwErrorHandler } = {}) => {
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
@@ -1462,6 +1466,19 @@ const knowledgeModuleImpl = async ({
   ...rest
 } = {}) => {
 
+  /*
+  if (description == 'fastfood related concepts') {
+    debugger
+    global.old = template.template.queries[91].bridges[0]
+  }
+  let old
+  if (template && template.template && template.template.queries) {
+    old = template.template.queries
+    template.template.queries = _.cloneDeep(template.template.queries)
+    template.wasCopied = true
+  }
+  */
+
   const unknownArgs = Object.keys(rest)
   if (unknownArgs.length > 0) {
     throw new Error(`Unknown arguments to knowledgeModule: ${unknownArgs.join()}`)
@@ -2011,6 +2028,12 @@ const knowledgeModuleImpl = async ({
     printConfig()
   } else {
     const initConfig = (config) => {
+      if (template) {
+        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
+          const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
+          throw new Error(error)
+        }
+      }
       setupConfig(config)
 
       let loadForTesting = false
@@ -2038,10 +2061,6 @@ const knowledgeModuleImpl = async ({
       }
 
       if (template) {
-        if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
-          const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
-          throw new Error(error)
-        }
         try {
           config.load(template.template, template.instance)
         } catch( e ) {

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.10.0-beta.1",
+  "version": "7.10.0-beta.11",
   "license": "ISC"
 }

package/src/config.js

@@ -204,6 +204,9 @@ const handleBridgeProps = (config, bridge, addFirst) => {
   ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
     () => {
       if (!bridge.bridge) {
+        if (bridge.id == 'modification') {
+          debugger
+        }
         bridge.bridge = "{ ...next(operator) }"
       }
       if (!bridge.level) {
@@ -344,11 +347,15 @@ const handleBridgeProps = (config, bridge, addFirst) => {
 }
 
 const handleCalculatedProps = (baseConfig, moreConfig, addFirst) => {
-  for (let bridge of (moreConfig.bridges || [])) {
-    const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
-    helpers.validProps(valid, bridge, 'bridge')
-    handleBridgeProps(baseConfig, bridge, addFirst)
+  if (moreConfig.bridges) {
+    moreConfig.bridges = moreConfig.bridges.map((bridge) => {
+      bridge = {...bridge}
+      const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+                      'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
+      helpers.validProps(valid, bridge, 'bridge')
+      handleBridgeProps(baseConfig, bridge, addFirst)
+      return bridge
+    })
   }
   if (moreConfig.operators) {
     moreConfig.operators = moreConfig.operators.map((operator) => {
@@ -1103,7 +1110,8 @@ class Config {
       }
     }
 
-    if (startOfChanges) {
+    const debug = true
+    if (debug && startOfChanges) {
       console.log('templateQueries[startOfChanges]', templateQueries[startOfChanges]);
       console.log('instanceQueries[startOfChanges]', instanceQueries[startOfChanges]);
     }
@@ -1114,7 +1122,6 @@ class Config {
     }
     // const sameQueries = helpers.safeEquals(toCanonicalQueries(template.queries || []).map(helpers.updateQueries), toCanonicalQueries(instance.queries || []))
 
-    const debug = false
     if (debug) {
       if (!(instance && sameQueries && sameFragments)) {
         if (!sameQueries) {