theprogrammablemind 7.5.8-beta.15 → 7.5.8-beta.17

package/client.js

@@ -9,7 +9,6 @@ const _ = require('lodash')
 const stringify = require('json-stable-stringify')
 const Lines = require('./lines')
 const flattens = require('./src/flatten')
-const { config_toServer } = require('./src/config.js')
 const { appendNoDups, InitCalls, updateQueries } = require('./src/helpers')
 const runtime = require('./runtime')
 const sortJson = runtime.sortJson
@@ -299,7 +298,6 @@ const writeTest = (fn, query, objects, generated, paraphrases, responses, contex
   }
   associations.sort()
   // tests[query] = sortJson({ paraphrases, responses, contexts, objects: convertToStable(objects), associations, metadata, config, developerTest: saveDeveloper }, { depth: 25 })
-  debugger
   results = sortJson({ 
     query, 
     paraphrases, 
@@ -419,6 +417,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       if (json.has_errors) {
         throw new Error('There are errors in the logs. Run with the -d flag and grep for Error')
       }
+      const generateParenthesized = isTest || (commandLineArgs && commandLineArgs.save)
       if (!config.get('skipSemantics')) {
         if (!config.doMotivations(args, context)) {
           const semantics = config.getSemantics(json.logs)
@@ -440,7 +439,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       let assumed = { isResponse: true };
       const generated = contextPrime.isResponse ? config.getGenerators(json.logs).apply(args, contextPrime, assumed)[0] : ''
       let generatedParenthesized = []
-      if (isTest) {
+      if (generateParenthesized) {
         config.parenthesized = true
         generatedParenthesized = contextPrime.isResponse ? config.getGenerators(json.logs).apply(args, contextPrime, assumed)[0] : ''
         config.parenthesized = false
@@ -453,12 +452,12 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       args.gs = gs(args.g)
       args.gsp = gs(args.gsp)
       args.gsr = gs(args.gr)
-      if (isTest) {
+      if (generateParenthesized) {
         config.parenthesized = false
       }
       const paraphrases = config.getGenerators(json.logs).apply(args, contextPrime, assumed)[0]
       let paraphrasesParenthesized = []
-      if (isTest) {
+      if (generateParenthesized) {
         config.parenthesized = true
         paraphrasesParenthesized = config.getGenerators(json.logs).apply(args, contextPrime, assumed)[0]
         config.parenthesized = false
@@ -472,7 +471,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       contextsPrime.push(contextPrime)
       generatedPrime.push(generated)
       paraphrasesPrime.push(paraphrases)
-      if (isTest) {
+      if (generateParenthesized) {
         paraphrasesParenthesizedPrime.push(paraphrasesParenthesized)
         generatedParenthesizedPrime.push(generatedParenthesized)
       }
@@ -553,7 +552,7 @@ const setupProcessB = ({ config, initializer, allowDelta=false } = {}) => {
     Object.assign(data, config.config)
   }
 
-  config_toServer(data)
+  config.toServer(data)
  
   if (data.namespaces) { 
     for (const uuid of Object.keys(data.namespaces)) {
@@ -1353,9 +1352,15 @@ const knowledgeModule = async ({
   beforeTests = () => {},
   afterTests = () => {},
   beforeTest = () => {},
-  afterTest = () => {}
+  afterTest = () => {},
+  ...rest
 } = {}) => {
 
+  const unknownArgs = Object.keys(rest)
+  if (unknownArgs.length > 0) {
+    throw new Error(`Unknown arguments to knowledgeModule: ${unknownArgs.join()}`)
+  }
+
   config.beforeQuery = beforeQuery 
   config.beforeTests = beforeTests 
   config.afterTests = afterTests 
@@ -1941,3 +1946,4 @@ module.exports = {
   flattens,
   writeTest
 }
+

package/package.json

@@ -63,6 +63,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.8-beta.15",
+  "version": "7.5.8-beta.17",
   "license": "ISC"
 }

package/src/config.js

@@ -79,7 +79,6 @@ const elist = (list, check, prefix) => {
   }
 }
 const contextual_priorities_valid = (cps) => {
-  debugger
   elist(cps, (cp) => contextual_priority_valid(cp),  (index, e) => `contextual_priorities has an invalid contextual priority at position ${index}. ${e}`)
 }
 
@@ -91,12 +90,20 @@ const contextual_priority_valid = (cp) => {
     throw new Error(`The contextual priority ${JSON.stringify(cp)} has an invalid "context" value. That is a list of the operator keys that are to be prioritized differently.`)
   }
   elist(cp.context, (element) => operatorKey_valid(element), (index, e) => `The contextual priority ${JSON.stringify(cp)} has an invalid operator key at position ${index}. ${e}`)
-  if (!cp.choose && cp.choose !== 0) {
-    throw new Error(`The contextual priority ${JSON.stringify(cp)} is missing the "choose" property. That is an index into the "context" property of the operator that is to be prioritized.`)
-  }
-  if (!_.isInteger(cp.choose) || cp.choose < 0 || cp.choose >= cp.context.length) {
-    throw new Error(`The contextual priority ${JSON.stringify(cp)} is missing the "choose" property. That is an index into the "context" property of the operator that is to be prioritized. Valid values are between 0 and ${cp.context.length-1}.`)
+  if (!_.isArray(cp.choose)) {
+    throw new Error(`The contextual priority ${JSON.stringify(cp)} has an invalid "choose" value. The value should be a list of the operators in the context to consider for prioritization.`)
   }
+  elist(cp.choose, 
+      (element) => {
+        if (!element && element !== 0) {
+          throw new Error(`The value should be an index into the "context" property of the operator that is to be considered for prioritization.`)
+        }
+        if (!_.isInteger(element) || element < 0 || element >= cp.context.length) {
+          throw new Error(`The value should be an index into the "context" property of the operator that is to be considered for prioritization. Valid values are between 0 and ${cp.context.length-1}.`)
+        }
+      }, 
+      (index, e) => `The choose property in the contextual priority ${JSON.stringify(cp)} has an invalid index at position ${index}. ${e}`
+  )
 }
 
 const handleBridgeProps = (config, bridge) => {
@@ -570,6 +577,10 @@ const multiApiImpl = (initializer) => {
 
 class Config {
 
+  toServer (config) {
+    return config_toServer(config)
+  }
+
   inDevelopmentMode (call) {
     config.developmentModeOn += 1
     try {
@@ -919,8 +930,8 @@ class Config {
       }
     }
     contextual_priority_valid(contextual_priority)
+    this.config.contextual_priorities.push(contextual_priority)
     const cpServer = contextual_priorities_toServer(contextual_priority)
-    this.config.contextual_priorities.push(cpServer)
     this._delta.json.contextual_priorities.push({ action: 'add', contextual_priority: cpServer })
   }
 
@@ -2393,11 +2404,13 @@ class Config {
     if (config.contextual_priorities) {
       let contextual_priorities = config.contextual_priorities
       contextual_priorities = contextual_priorities.map((cp) => {
-        const [ context, choose ] = cp
-        const contextPrime = context.map((id) => {
-          return [toNS(id[0]), id[1]]
-        })
-        return [ contextPrime, choose ]
+        const { context, choose } = cp
+        return {
+          context: context.map((id) => {
+            return [toNS(id[0]), id[1]]
+          }),
+          choose
+        }
       })
       config.contextual_priorities = contextual_priorities
     }