theprogrammablemind 9.0.0-beta.0 → 9.0.0-beta.1

package/client.js

@@ -1888,7 +1888,7 @@ const knowledgeModuleImpl = async ({
     // no cache 21 minutes + rebuild fails "node tester_rebuild -m colors"
     // cache okay
     createConfigExport = async () => {
-      if (createConfig.cached) {
+      if (false && createConfig.cached) {
         return createConfig.cached
       }
       const config = await createConfig()

package/package.json

@@ -67,6 +67,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.0.0-beta.0",
+  "version": "9.0.0-beta.1",
   "license": "UNLICENSED"
 }

package/src/configHelpers.js

@@ -260,7 +260,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
+const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -324,37 +324,44 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
       if (contextPrime.controlRemove) {
         continue
       }
-      let assumed = { isResponse: true }
-      const generated = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
-      let generatedParenthesized = []
-      if (generateParenthesized) {
-        config.parenthesized = true
-        generatedParenthesized = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
-        config.parenthesized = false
-      }
-      // assumed = { paraphrase: true, response: false };
-      assumed = { paraphrase: true, isResponse: false, response: false }
-      if (generateParenthesized) {
-        config.parenthesized = false
-      }
-      const paraphrases = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
+      let paraphrases = []
       let paraphrasesParenthesized = []
-      if (generateParenthesized) {
-        config.parenthesized = true
-        paraphrasesParenthesized = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
-        config.parenthesized = false
-      }
-      contextsPrime.push(contextPrime)
-      generatedPrime.push(generated)
-      paraphrasesPrime.push(paraphrases)
-      if (generateParenthesized) {
-        paraphrasesParenthesizedPrime.push(paraphrasesParenthesized)
-        generatedParenthesizedPrime.push(generatedParenthesized)
-      }
-      if (contextPrime.isResponse) {
-        responsesPrime.push(generated)
+      let generatedParenthesized = []
+      if (forTemplate) {
+        // noop
       } else {
-        responsesPrime.push('')
+        let assumed = { isResponse: true }
+        const generated = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
+        let generatedParenthesized = []
+        if (generateParenthesized) {
+          config.parenthesized = true
+          generatedParenthesized = contextPrime.isResponse ? await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed) : ''
+          config.parenthesized = false
+        }
+        // assumed = { paraphrase: true, response: false };
+        assumed = { paraphrase: true, isResponse: false, response: false }
+        if (generateParenthesized) {
+          config.parenthesized = false
+        }
+        const paraphrases = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
+        let paraphrasesParenthesized = []
+        if (generateParenthesized) {
+          config.parenthesized = true
+          paraphrasesParenthesized = await config.getGenerators(json.logs).apply({ ...args, assumed }, contextPrime, assumed)
+          config.parenthesized = false
+        }
+        contextsPrime.push(contextPrime)
+        generatedPrime.push(generated)
+        paraphrasesPrime.push(paraphrases)
+        if (generateParenthesized) {
+          paraphrasesParenthesizedPrime.push(paraphrasesParenthesized)
+          generatedParenthesizedPrime.push(generatedParenthesized)
+        }
+        if (contextPrime.isResponse) {
+          responsesPrime.push(generated)
+        } else {
+          responsesPrime.push('')
+        }
       }
 
       // add results to processed list
@@ -424,7 +431,7 @@ const loadInstance = async (config, instance) => {
       if (results.skipSemantics) {
         config.config.skipSemantics = results.skipSemantics
       }
-      const args = { config, hierarchy, json: results, commandLineArgs: {} }
+      const args = { config, hierarchy, json: results, commandLineArgs: {}, forTemplate: true }
       args.isInstance = `instance${i}`
       args.instance = ''
       await processContextsB(args)

package/src/digraph_internal.js

@@ -24,6 +24,7 @@ class DigraphInternal {
   addEdge (edge) {
     edge = toA(edge)
     if (this._edges.find((existing) => _.isEqual(edge, existing))) {
+    // if (this._edges.find((existing) => edge[0] == existing[0] && edge[1] == edge[2])) {
       return false
     }
     this._edges.push(edge)