theprogrammablemind_4wp 9.2.0 → 9.3.0

package/client.js

@@ -265,6 +265,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
+
   const url = config._server
   const queryParams = config._queryParams || ''
   const retries = 2
@@ -280,7 +281,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
     throw error
   }
 
-  let { data, /* generators, semantics, */ hierarchy } = setupProcessB({ config, initializer, allowDelta: true })
+  let { data, /* generators, semantics, */ hierarchy } = setupProcessB({ config, initializer, allowDelta: true, rebuildingTemplate })
   if (commandLineArgs && commandLineArgs.checkForLoop) {
     data.checkForLoop = commandLineArgs.checkForLoop
   }
@@ -371,6 +372,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         response.version = json.version
         response.explain_priorities = json.explain_priorities
         response.contextual_priorities_ambiguities = json.contextual_priorities_ambiguities
+        response.rtf_associations = json.rtf_associations
 
         response.contexts = response.contexts.concat(contextsPrime)
         response.generated = response.generated.concat(generatedPrime)
@@ -1671,12 +1673,28 @@ const knowledgeModuleImpl = async ({
                         newError = true
                         headerShown = true
                         if (args.vimdiff) {
-                          vimdiff(actual, expected, `"${result.utterance}" - ${label}`)
+                          vimdiff(actual, expected, `"${label} - ${result.utterance}"`)
                         }
                         result.hasError = true
                       }
                     }
                     if (!deepEqual(result.expected.summaries, result.actual.summaries)) {
+                      const tidy_summaries = (summaries) => {
+                        const summaries_prime = []
+                        for (const chunk of summaries) {
+                          chunk_prime = { length: chunk.length, summaries: [] }
+                          for (const summary of chunk.summaries) {
+                            const summary_prime = { counter: summary.counter, operators: [] } 
+                            for (const operator of summary.operators) {
+                              summary_prime.operators.push(`{ marker: [${operator.marker[0]}, ${operator.marker[1]}] range: { start: ${operator.range.start}, end: ${operator.range.end} } }`)
+                            }
+                            chunk_prime.summaries.push(summary_prime)
+                          }
+                          summaries_prime.push(chunk_prime)
+                        }
+                        return summaries_prime
+                      }
+                      show('operators', tidy_summaries(result.expected.summaries), tidy_summaries(result.actual.summaries))
                       /*
                       const suggestion = suggestAssociationsFix(result.expected.summaries, result.actual.summaries)
                       let suggestedFix

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.2.0",
+  "version": "9.3.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -473,7 +473,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'associations', 'before', 'bridge', 'development', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+      const valid = ['after', 'conditional', 'associations', 'before', 'bridge', 'development', 'skipable', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -642,7 +642,7 @@ function setWordsUUIDs (words, uuid) {
     pattern.defs.map((def) => Object.assign(def, { uuid }))
   }
   const hierarchy = words.hierarchy
-  for (const pair of hierarchy) {
+  for (const pair of hierarchy || []) {
     pair.uuid = uuid
   }
 }

package/src/configHelpers.js

@@ -1,5 +1,6 @@
 const { InitCalls } = require('./helpers')
 const DigraphInternal = require('./digraph_internal')
+const debug = require('./debug')
 
 const gs = (g) => async (contexts, separator, lastSeparator) => {
   if (!Array.isArray(contexts)) {
@@ -215,10 +216,12 @@ const processContext = async (context, { objects = {}, config, logs = [] }) => {
   return { context, generated, paraphrases, responses }
 }
 
-const setupProcessB = ({ config, initializer, allowDelta = false } = {}) => {
+const setupProcessB = ({ config, initializer, allowDelta = false, rebuildingTemplate = false } = {}) => {
   const key = config._key
-
   const data = Object.assign({ key, version: '3' }, { uuid: config._uuid })
+  if (rebuildingTemplate) {
+    data.return_rtf_associations = true
+  }
   if (allowDelta && config.allowDelta && config.hasDelta()) {
     // console.log('config', config)
     data.delta = config.delta()
@@ -414,6 +417,15 @@ const loadInstance = async (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
 
+  /*
+  if (config.name == 'people' && instance.name == 'people') {
+    debugger
+  }
+  */
+  const rl = instance.resultss.length
+  if (rl > 0) {
+    config.addAssociations(instance.resultss[instance.resultss.length-1].rtf_associations || [])
+  }
   /*
   TODO needs updating if still wanted
   if (instance && (instance.associations || instance.learned_contextual_priorities)) {