theprogrammablemind 9.5.1-beta.3 → 9.5.1-beta.5

package/client.js

@@ -316,6 +316,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
     }
 
     let startCounter = 0
+    let contextIdCounter = 0
     while (true) {
       if (queries.length === 0) {
         break
@@ -356,8 +357,9 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
         }
         const summary = { summaries: json.summaries, length: json.contexts.length }
         summaries.push(summary)
-        const { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  await processContextsB({ isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+        const { updatedContextIdCounter, contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
+                                  await processContextsB({ contextIdCounter, isTest, isProcess, isModule, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+        contextIdCounter = updatedContextIdCounter
         if (isTest) {
           const end = runtime.performance.performance.now()
           clientSideTime = end - start
@@ -475,6 +477,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug, tim
     return
   }
   // initialize in between test so state is not preserved since the test was adding without state
+  config.testConfig.testModuleName = testConfig.testModuleName
   await config.rebuild()
   const errorHandler = (error) => {
     if (error.metadata) {

package/package.json

@@ -71,6 +71,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.1-beta.3",
+  "version": "9.5.1-beta.5",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1911,12 +1911,15 @@ class Config {
       } else if (this.scope == 'development') {
         new_result = !(element.scope === 'testing')
       }
+      /*
       if (global.GORDO && old_result !== new_result) {
         global.GORDO = false
         console.log("THERE WAS A DIFFERENCE ------------------------------------------------")
         debugger // greg23old
       }
-      return old_result
+      */
+      // return old_result
+      return new_result
     }
 
     config.operators = config.operators.filter((element) => keep(element))

package/src/configHelpers.js

@@ -133,6 +133,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   args.addPattern = (pattern, def) => config.addPattern(pattern, args.uuid)
   args.addGenerator = (generator) => config.addGenerator(generator, args.uuid, config.name)
 
+  if (config.testConfig?.testModuleName) {
+    args.testModuleName = config.testConfig.testModuleName
+  }
   args.addAssumedScoped = (args, assumed) => {
     const addAssumed = (args, ...moreAssumed) => {
       return { ...args, assumed: Object.assign({}, assumed, (args.assumed || {}), ...moreAssumed) }
@@ -291,7 +294,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, isProcess, isModule, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs, forTemplate }) => {
+const processContextsB = async ({ config, hierarchy, 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 = []
@@ -311,14 +314,13 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
   args.insert = (context) => toDo.unshift(context)
   let overlap, lastRange
   config.debugLoops = commandLineArgs && commandLineArgs.debugLoops
-  let context_id_counter = 0
   while (toDo.length > 0) {
     const context = toDo.shift()
     args.calls.next()
     let contextPrime = context
     context.topLevel = true
-    context_id_counter += 1
-    context.context_id = context_id_counter
+    contextIdCounter += 1
+    context.context_id = contextIdCounter
     try {
       if (json.has_errors) {
         throw new Error('There are errors in the logs. Run with the -d flag and grep for Error')
@@ -328,6 +330,9 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
         const semantics = config.getSemantics(json.logs)
         try {
           contextPrime = await semantics.apply(args, context)
+          // contextPrime.greg = 'yes'
+//          console.log("context_id", context.context_id)
+//          console.log("semantics.apply", JSON.stringify(contextPrime, null, 2))
         } catch (e) {
           if (e.message == 'Maximum call stack size exceeded') {
             const mostCalled = semantics.getMostCalled()
@@ -421,7 +426,7 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
       throw e
     }
   }
-  return { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime }
+  return { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime, updatedContextIdCounter: contextIdCounter }
 }
 
 // instance template loadTemplate
@@ -479,6 +484,9 @@ const loadInstance = async (config, instance) => {
         args.isModule = true
         args.isProcess = false
       }
+      if (instance.name == config.testConfig.testModuleName) {
+        args.isTesting = true
+      }
       await results.apply(args)
     } else if (results.isFragment) {
     } else {
@@ -490,6 +498,9 @@ const loadInstance = async (config, instance) => {
       args.instance = ''
       args.isProcess = !config.isModule
       args.isModule = !!config.isModule
+      if (instance.name == config.testConfig.testModuleName) {
+        args.isTesting = true
+      }
       await processContextsB(args)
       if (results.skipSemantics) {
         config.config.skipSemantics = null