theprogrammablemind 7.5.5-beta.9 → 7.5.6-beta.0

package/client.js

@@ -244,14 +244,18 @@ const processContext = (context, { objects = {}, config, logs = [] }) => {
 }
 
 const convertToStable = (objects) => {
-  const stableObjects = Object.assign({}, objects)
-  stableObjects.namespaced = {}
-  let counter = 0
-  Object.keys(((objects || {}).namespaced || {})).forEach((uuid) => {
-    stableObjects.namespaced[`${counter}`] = objects.namespaced[uuid]
-    counter += 1
-  })
-  return stableObjects
+  if (true) {
+    return objects
+  } else {
+    const stableObjects = Object.assign({}, objects)
+    stableObjects.namespaced = {}
+    let counter = 0
+    Object.keys(((objects || {}).namespaced || {})).forEach((uuid) => {
+      stableObjects.namespaced[`${counter}`] = objects.namespaced[uuid]
+      counter += 1
+    })
+    return stableObjects
+  }
 }
 
 const writeTestFile = (fn, tests) => {
@@ -378,7 +382,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
     context.topLevel = true
     try {
       if (json.has_errors) {
-        throw new Error('There are errors in the logs')
+        throw new Error('There are errors in the logs. Run with the -d flag and grep for Error')
       }
       if (!config.get('skipSemantics')) {
         if (!config.doMotivations(args, context)) {
@@ -690,8 +694,10 @@ const runTest = async (config, expected, { verbose, afterTest, testConfig, debug
   }
 
   let objects = getObjects(config.config.objects)(config.uuid)
+  let testConfigName = config.name
   if (testConfig.testModuleName) {
     objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
+    testConfigName = testConfig.testModuleName
   }
   config.beforeQuery({ query: test, isModule: false, objects })
   // config.resetMotivations()
@@ -722,7 +728,8 @@ const runTest = async (config, expected, { verbose, afterTest, testConfig, debug
         }
         return picked
       }
-      const expected_checked = sortJson(pickEm(expected.objects.namespaced[0]), { depth: 25 })
+      debugger
+      const expected_checked = sortJson(pickEm(expected.objects.namespaced[expected.objects.nameToUUID[testConfigName]]), { depth: 25 })
       const actual_checked = sortJson(pickEm(objects), { depth: 25 })
       const failed_checked = !matching(actual_objects, expected_objects)
 
@@ -811,7 +818,14 @@ const saveTest = async (testFile, config, test, expected, testConfig, saveDevelo
   const result = await _process(config, test, { isTest: true })
   // const actualObjects = config.config.objects
   const actualConfig = getConfigForTest(config, testConfig)
-  writeTest(testFile, test, config.config.objects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
+  const args = {
+  }
+  const saveObjects = {...config.config.objects}
+  saveObjects.nameToUUID = {}
+  for (let km of config.configs) {
+    saveObjects.nameToUUID[km.name] = km.uuid
+  }
+  writeTest(testFile, test, saveObjects, result.generated, result.paraphrases, result.responses, result.contexts, result.associations, result.metadata, actualConfig, saveDeveloper)
 }
 
 const saveTestsHelper = async (testFile, config, tests, todo, testConfig, saveDeveloper) => {
@@ -1265,9 +1279,11 @@ const knowledgeModule = async ({
   processResults = processResults({ config, errorHandler })
   config.description = description
   config.demo = demo
-  if (typeof test === 'object' && test.contents) {
-    config.tests = test.contents
-    test = test.name
+  if (typeof test === 'object') {
+    if (test.contents) {
+      config.tests = test.contents
+      test = test.name
+    }
   } else {
     if (runtime.fs && runtime.fs.existsSync(test)) {
       config.tests = JSON.parse(runtime.fs.readFileSync(test))
@@ -1275,6 +1291,7 @@ const knowledgeModule = async ({
       config.tests = {}
     }
   }
+  config.setTestConfig(testConfig)
  
   if (!isProcess) {
     if (template) {
@@ -1652,7 +1669,6 @@ const knowledgeModule = async ({
     }
   } else {
     config.addAssociationsFromTests(config.tests);
-    config.setTestConfig(testConfig)
     //for (let query in config.tests) {
     //  config.addAssociations(config.tests[query].associations || []);
     //}

package/package.json

@@ -62,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.5-beta.9",
+  "version": "7.5.6-beta.0",
   "license": "ISC"
 }

package/src/generators.js

@@ -115,6 +115,9 @@ class Generator {
             apis: this.getAPIs(config) 
           }
     const args = Object.assign({}, baseArgs, moreArgs, (baseArgs.getUUIDScoped || (() => { return {} }))(this.uuid))
+    if (this.property == 'generatorp') {
+      args.g = args.gp
+    }
     // if (this.callId) {
     // greg
     /*
@@ -262,10 +265,10 @@ class Generators {
             lines.newRow()
             lines.setElement(0, 1, 'STACK')
             lines.setElement(0, 2, stack)
-            lines.newRow()
 						lines.newRow()
 						lines.setElement(0, 1, 'DEBUG')
 						lines.setElement(0, 2, `To debug this use args.callId == '${args.calls.current()}'`)
+						lines.newRow()
             lines.setElement(0, 1, 'TO')
             lines.setElement(0, 2, `(HASHCODE ${helpers.hashCode(JSON.stringify(helpers.sortJson(context, { depth: 25 })))})`)
             lines.setElement(1, 2, JSON.stringify(helpers.sortJson(context, { depth: 25 }), null, 2))