theprogrammablemind_4wp 9.7.1-beta.15 → 9.7.1-beta.17

package/client.js

@@ -167,10 +167,12 @@ const writeTest = (fn, query, objects, generated, paraphrases, responses, contex
   if (runtime.fs.existsSync(fn)) {
     tests = JSON.parse(runtime.fs.readFileSync(fn))
   }
+  /*
   for (const association of associations) {
     association.sort()
   }
   associations.sort()
+  */
   // tests[query] = sortJson({ paraphrases, responses, contexts, objects: convertToStable(objects), associations, metadata, config, developerTest: saveDeveloper }, { depth: 25 })
   const results = sortJson({
     query,
@@ -265,7 +267,7 @@ const throwErrorHandler = (error) => {
   throw error
 }
 
-const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isProcess, isModule, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = throwErrorHandler } = {}) => {
+const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, logs, isProcess, isModule, isTest, saveDeveloper, rebuildingTemplate, testConfig, testsFN, errorHandler = throwErrorHandler } = {}) => {
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
@@ -296,11 +298,12 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   // '\\n' from tests of '\n' from users. the former is because newline is not a valid json character so the testfile has it encoded
   let queries = query.split(/\\n|\n/)
   const summaries = [] // for error
+  logs = logs || []
   try {
     const response = {
       hierarchy: [],
       load_cache_time: 0.0,
-      logs: [],
+      logs: logs,
       metadata: {
         opChoices: []
       },
@@ -334,6 +337,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
       data.utterance = queries[0]
       data.start_counter = startCounter
       let json = await doWithRetries(retries, url, queryParams, data)
+      logs.push(...json.logs)
       let resetData = false
       if (json.code === 'NOT_IN_CACHE') {
         resetData = true
@@ -367,20 +371,17 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         const summary = { summaries: json.summaries, length: json.contexts.length }
         summaries.push(summary)
         const { updatedContextIdCounter, contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  await processContextsB({ contextIdCounter, calls, isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+                                  await processContextsB({ contextIdCounter, logs, calls, isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         contextIdCounter = updatedContextIdCounter
         if (isTest) {
           const end = runtime.performance.performance.now()
           clientSideTime = end - start
         }
-        response.associations = json.associations
+        // response.associations = json.associations
         response.learned_contextual_priorities = json.learned_contextual_priorities
         response.hierarchy = json.hierarchy
         response.load_cache_time += json.load_cache_time
-        appendNoDups(response.logs, json.logs)
         response.memory_free_percent = json.memory_free_percent
-        // appendNoDups(response.metadata.associations, json.metadata.associations)
-        // appendNoDups(response.metadata.priorities, json.metadata.priorities)
         appendNoDups(response.metadata.opChoices, json.metadata.opChoices)
         response.times += json.times
         response.clientSideTimes += clientSideTime
@@ -388,7 +389,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.rtf_associations = json.rtf_associations
 
         response.contexts = response.contexts.concat(contextsPrime)
         response.generated = response.generated.concat(generatedPrime)
@@ -1064,7 +1065,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
           config.fragmentsBeingBuilt.push({ query: query.query, contexts: results.contexts })
         }
         accumulators.summaries = accumulators.summaries.concat(results.summaries)
-        accumulators.associations = accumulators.associations.concat(results.associations)
+        // accumulators.associations = accumulators.associations.concat(results.associations)
         accumulators.learned_contextual_priorities = accumulators.learned_contextual_priorities.concat(results.learned_contextual_priorities)
         await looper(configs)
       } catch (e) {
@@ -1100,7 +1101,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
         await looper([])
       } else {
         try {
-          config.addInternal(_.cloneDeep(extraConfig), { handleCalculatedProps: true })
+          config.addInternal(_.cloneDeep(extraConfig), { handleCalculatedProps: true, addFirst: true })
         } catch (e) {
           const where = extraConfig.where ? ` ${extraConfig.where}` : ''
           throw new Error(`Error processing extra config${where}: ${e.stack}}`)
@@ -1122,7 +1123,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
       associations.sort()
     }
     const stabilizeOutput = (template) => {
-      stabilizeAssociations(template.associations)
+      // stabilizeAssociations(template.associations)
       const stabilize = (results) => {
         for (let i = 0; i < results.length; ++i) {
           const result = results[i]
@@ -1137,7 +1138,7 @@ const rebuildTemplate = async ({ config, instance, target, previousResultss, reb
             delete result.logs
             delete result.version
             result.hierarchy.sort()
-            stabilizeAssociations(result.associations)
+            // stabilizeAssociations(result.associations)
             result.learned_contextual_priorities = safeNoDups(result.learned_contextual_priorities)
           }
         }
@@ -1988,7 +1989,7 @@ const knowledgeModuleImpl = async ({
           global.beforeObjects = _.cloneDeep(objects)
         }
         try {
-          await processResults(_process(config, args.query, { commandLineArgs: args, isProcess, isModule: !isProcess, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
+          await processResults(_process(config, args.query, { commandLineArgs: args, isProcess, logs: [], isModule: !isProcess, dontAddAssociations: args.dontAddAssociations, writeTests: args.save || args.saveDeveloper, saveDeveloper: args.saveDeveloper, testConfig, testsFN: test }))
         } catch (error) {
           printConfig()
           console.log('Error', error)

package/package.json

@@ -73,6 +73,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.7.1-beta.15",
+  "version": "9.7.1-beta.17",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1291,6 +1291,8 @@ class Config {
       } else {
         return fi
       }
+    } else {
+      throw new Error(`The fragment for '${query} was not found.`)
     }
   }
 

package/src/configHelpers.js

@@ -345,9 +345,11 @@ const processContext = async (context, { objects = {}, config, logs = [] }) => {
 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()
@@ -405,7 +407,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = async ({ config, calls, hierarchy, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate, contextIdCounter }) => {
+const processContextsB = async ({ config, calls, hierarchy, logs, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate, contextIdCounter }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -417,10 +419,7 @@ const processContextsB = async ({ config, calls, hierarchy, semantics, generator
 
   const objects = config.get('objects')
   const args = { objects, isResponse: true, response: json, isTest, isInstance, getObjects: getObjects(objects), instance, contexts, isProcess, isModule, calls }
-  if (!json.logs) {
-    json.logs = []
-  }
-  setupArgs(args, config, json.logs, hierarchy)
+  setupArgs(args, config, logs, hierarchy)
   const toDo = [...contexts]
   args.insert = (context) => toDo.unshift(context)
   let overlap, lastRange
@@ -438,7 +437,7 @@ const processContextsB = async ({ config, calls, hierarchy, semantics, generator
       }
       const generateParenthesized = isTest || (commandLineArgs && commandLineArgs.save)
       if (!config.get('skipSemantics')) {
-        const semantics = config.getSemantics(json.logs)
+        const semantics = config.getSemantics(logs)
         try {
           contextPrime = await semantics.apply(args, context)
           // contextPrime.greg = 'yes'
@@ -481,11 +480,11 @@ const processContextsB = async ({ config, calls, hierarchy, semantics, generator
         // noop
       } else {
         let assumed = { isResponse: true }
-        const generated = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
+        const generated = contextPrime.isResponse ? await config.getGenerators(logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
         let generatedParenthesized = []
         if (generateParenthesized) {
           config.setParenthesized(true)
-          generatedParenthesized = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
+          generatedParenthesized = contextPrime.isResponse ? await config.getGenerators(logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
           config.setParenthesized(false)
         }
         // assumed = { paraphrase: true, response: false };
@@ -493,11 +492,11 @@ const processContextsB = async ({ config, calls, hierarchy, semantics, generator
         if (generateParenthesized) {
           config.setParenthesized(false)
         }
-        const paraphrases = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
+        const paraphrases = await config.getGenerators(logs).apply({ ...args, assumed }, contextPrime, assumed)
         let paraphrasesParenthesized = []
         if (generateParenthesized) {
           config.setParenthesized(true)
-          paraphrasesParenthesized = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
+          paraphrasesParenthesized = await config.getGenerators(logs).apply({ ...args, assumed }, contextPrime, assumed)
           config.setParenthesized(false)
         }
         contextsPrime.push(contextPrime)
@@ -526,9 +525,9 @@ const processContextsB = async ({ config, calls, hierarchy, semantics, generator
       }
       e.context = contextPrime
       if (e.logs) {
-        e.logs = e.logs.concat(json.logs)
+        e.logs = e.logs.concat(logs)
       } else {
-        e.logs = json.logs
+        e.logs = logs
       }
       e.metadata = json.metadata
       if (json.trace) {
@@ -545,10 +544,12 @@ const loadInstance = async (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
 
+  /*
   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)) {

package/src/generators.js

@@ -191,6 +191,13 @@ class Generators {
         const log = (message) => { this.logs.push(message) }
         // this.logs.push(`Generators: applied ${generator.toString()}\n to\n ${stringify(context)}`)
         let errorMessage = 'The apply function did not return a value'
+        if (process.env.TPMKMS_TRACE) {
+          console.error("TPMKMS_TRACE", debug.counter("TPMKMS_TRACE"))
+          console.error(generator.toLabel())
+          console.error(generator.toString())
+          console.log(`To debug this use debug.breakAt('${args.calls.current()}')`)
+        }
+
         try {
           generated = await generator.apply(args, objects, context, hierarchy, config, response, log, options)
         } catch (e) {