theprogrammablemind_4wp 7.5.8-beta.13 → 7.5.8-beta.15

package/client.js

@@ -9,6 +9,7 @@ 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
@@ -109,7 +110,7 @@ class ErrorReason extends Error {
 
 const setupArgs = (args, config, logs, hierarchy) => {
   config.setArgs(args)
-  args.calls = new InitCalls(config.name)
+  args.calls = new InitCalls(args.isInstance ? `${args.isInstance}#${config.name}` : config.name)
   if (global.theprogrammablemind && global.theprogrammablemind.loadForTesting) {
     args.calls = new InitCalls(Object.keys(global.theprogrammablemind.loadForTesting)[0])
   }
@@ -367,7 +368,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, query, data, retries, url, commandLineArgs }) => {
+const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, isInstance, query, data, retries, url, commandLineArgs }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -378,7 +379,7 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
   const contexts = setupContexts(json.contexts)
 
   const objects = config.get('objects')
-  const args = { objects, isResponse: true, response: json, isTest, getObjects: getObjects(objects) }
+  const args = { objects, isResponse: true, response: json, isTest, isInstance, getObjects: getObjects(objects), isInstance }
   if (!json.logs) {
     json.logs = []
   }
@@ -551,6 +552,8 @@ const setupProcessB = ({ config, initializer, allowDelta=false } = {}) => {
   } else {
     Object.assign(data, config.config)
   }
+
+  config_toServer(data)
  
   if (data.namespaces) { 
     for (const uuid of Object.keys(data.namespaces)) {
@@ -586,7 +589,7 @@ const processInstance = (config, instance) => {
       // config.addInternal(config.template.queries[i], { handleCalculatedProps: true } )
       config.addInternal(instance.template.queries[i], { handleCalculatedProps: true } )
     } else {
-      processContextsB({ config, hierarchy, json: results/*, generators, semantics */, commandLineArgs: {} })
+      processContextsB({ config, hierarchy, json: results/*, generators, semantics */, commandLineArgs: {}, isInstance: `instance${i}` })
     }
   }
   global.transitoryMode = transitoryMode
@@ -1447,9 +1450,10 @@ const knowledgeModule = async ({
       description: 'Entodicton knowledge module'
     })
 
-    const helpDebugAssociation = 'In order to get a debug break when a specific association is created set the DEBUG_ASSOCIATION environment variable to the JSON of the association to break on. For example DEBUG_ASSOCIATION=\'["the#0", "mammel#0"]\' })'
-    const helpDebugHierarchy = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_HIERARCHY environment variable to the JSON of the child-parent pair to break on. For example DEBUG_HIERARCHY=\'["cat#1", "mammel#1"]\' })'
-    const helpDebugPriority = 'In order to get a debug break when a specific set of priorities is created set set DEBUG_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_PRIORITY=\'["verb#0", "article#0"]\' })'
+    const helpDebugAssociation = 'In order to get a debug break when a specific association is created set the DEBUG_ASSOCIATION environment variable to the JSON of the association to break on. For example DEBUG_ASSOCIATION=\'[["the", 0], ["mammal", 1]]\' })'
+    const helpDebugHierarchy = 'In order to get a debug break when a specific hierarchy is created set the DEBUG_HIERARCHY environment variable to the JSON of the child-parent pair to break on. For example DEBUG_HIERARCHY=\'[["cat", 1], ["mammel", 1]]\' })'
+    const helpDebugPriority = 'In order to get a debug break when a specific set of priorities is created set set DEBUG_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_PRIORITY=\'[["verb", 0], ["article", 0]]\' })'
+    const helpDebugContextualPriority = 'In order to get a debug break when a specific set of contextual priorities is created set set DEBUG_CONTEXTUAL_PRIORITY environment variable to the JSON of the priorities that you want to break on. For example DEBUG_CONTEXTUAL_PRIORITY=\'{ context: [["verb", 0], ["article", 0], select: 1}\' })'
     const helpDebugBridge = 'In order to get a debug break when a specific bridge is created set the DEBUG_BRIDGE environment variable to id/level to break on. For example DEBUG_BRIDGE=\'id#level\' })'
     const helpDebugOperator = 'In order to get a debug break when a specific hierarcy is created set the DEBUG_OPERATOR environment variable to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\' })'
 
@@ -1484,6 +1488,7 @@ const knowledgeModule = async ({
     parser.add_argument('-da', '--debugAssociation', { help: helpDebugAssociation })
     parser.add_argument('-dh', '--debugHierarchy', { help: helpDebugHierarchy })
     parser.add_argument('-dp', '--debugPriority', { help: helpDebugPriority })
+    parser.add_argument('-dcp', '--debugContextualPriority', { help: helpDebugContextualPriority })
     parser.add_argument('-db', '--debugBridge', { help: helpDebugBridge })
     parser.add_argument('-do', '--debugOperator', { help: helpDebugOperator })
 

package/package.json

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

package/src/config.js

@@ -22,6 +22,83 @@ const indent = (string, indent) => {
     return string.replace(/^/gm, ' '.repeat(indent));
 }
 
+const config_toServer = (config) => {
+  if (config.contextual_priorities) {
+    config.contextual_priorities = config.contextual_priorities.map((cp) => {
+      return [cp.context, cp.choose]
+    })
+  }
+}
+
+const contextual_priorities_toServer = (cp) => {
+  if (cp.context && cp.choose) {
+    return [cp.context, cp.choose]
+  }
+  return cp
+}
+
+const contextual_priorities_toClient = (cp) => {
+  if (cp.context && cp.choose) {
+    return cp
+  }
+  return { context: cp[0], choose: cp[1] }
+}
+
+const operatorKey_valid = (key) => {
+  if (
+        !_.isArray(key) ||
+        key.length != 2 ||
+        !_.isString(key[0]) ||
+        !_.isInteger(key[1]) ||
+        key[1] < 0
+     ) {
+
+    let details = ''
+    if (!_.isArray(key)) {
+      details = "Expected an array."
+    } else if (key.length != 2) {
+      details = "Expected an array of length two."
+    } else if (!_.isString(key[0])) {
+      details = "Expected element zero to be a string that is an operator id."
+    } else if (!_.isInteger(key[1])) {
+      details = "Expected element one to be a number that is an operator level."
+    } else if (key[1] < 0) {
+      details = "Expected element one to be a number that is an operator level which is greater than zero."
+    }
+    throw new Error(`${JSON.stringify(key)} is not a valid operator key. Values are of the form [<operatorId>, <operatorLevel>]. ${details}`)
+  }
+}
+
+const elist = (list, check, prefix) => {
+  for ([index, element] of list.entries()) {
+    try {
+      check(element)
+    } catch( e ) {
+      throw new Error(prefix(index, e))
+    }
+  }
+}
+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}`)
+}
+
+const contextual_priority_valid = (cp) => {
+  if (!cp.context) {
+    throw new Error(`The contextual priority ${JSON.stringify(cp)} is missing the "context" property. That is a list of the operator keys that are to be prioritized differently.`)
+  }
+  if (!_.isArray(cp.context)) {
+    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}.`)
+  }
+}
+
 const handleBridgeProps = (config, bridge) => {
   ecatch(`While processing the bridge for ${bridge.id}#${bridge.level}`,
     () => {
@@ -171,6 +248,10 @@ if (runtime.process.env.DEBUG_PRIORITY) {
   global.entodictonDebugPriority = JSON.parse(runtime.process.env.DEBUG_PRIORITY)
 }
 
+if (runtime.process.env.DEBUG_CONTEXTUAL_PRIORITY) {
+  global.entodictonDebugContextualPriority = JSON.parse(runtime.process.env.DEBUG_CONTEXTUAL_PRIORITY)
+}
+
 if (runtime.process.env.DEBUG_ASSOCIATION) {
   global.entodictonDebugAssociation = JSON.parse(runtime.process.env.DEBUG_ASSOCIATION)
 }
@@ -548,6 +629,7 @@ class Config {
       },
       eqClasses: [],
       priorities: [], // Done
+      contextual_priorities: [],
       version: '3',
       debug: false,
       associations: { // Done
@@ -586,6 +668,7 @@ class Config {
           'namespaces',
           'eqClasses',
           'priorities',
+          'contextual_priorities',
           'associations',
           'words',
           'floaters',
@@ -825,6 +908,22 @@ class Config {
     this._delta.json.priorities.push({ action: 'add', priorities })
   }
 
+  // [ operators: <list of [id, level]>, select: <index of prioritized operator> ]
+  addContextualPriority(contextual_priority) {
+    if (!this.config.contextual_priorities) {
+      this.config.contextual_priorities = []
+    }
+    if (global.entodictonDebugContextualPriority) {
+      if (helpers.safeEquals(entodictonDebugContextualPriority, contextual_priorities)) {
+        debugger; // debug hierarchy hit
+      }
+    }
+    contextual_priority_valid(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 })
+  }
+
   addHierarchy (child, parent) {
     if (child && parent || !child || Array.isArray(child) || (typeof child == 'string' && !parent)) {
       this.addHierarchyChildParent(child, parent)
@@ -1233,6 +1332,7 @@ class Config {
         'operators', 
         'words', 
         'priorities', 
+        'contextual_priorities', 
         'associations', 
         'name', 
         'version', 
@@ -1262,6 +1362,7 @@ class Config {
       config.hierarchy = config.hierarchy || []
       config.associations = config.associations || { negative: [], positive: [] }
       config.priorities = config.priorities || []
+      config.contextual_priorities = config.contextual_priorities || []
     }
 
     this.maxDepth = 20 // for generators and semantics
@@ -1315,6 +1416,10 @@ class Config {
       }
     }
 
+    if (config && config.contextual_priorities) {
+      contextual_priorities_valid(config.contextual_priorities)
+    }
+
     normalizeConfig(config)
 
     // set the default server so stuff just works
@@ -1385,7 +1490,10 @@ class Config {
   }
 
   delta () {
-    return { cacheKey: this._delta.cacheKey, json: this._delta.json }
+    return { 
+      cacheKey: this._delta.cacheKey, 
+      json: this._delta.json 
+    }
   }
 
   resetDelta (cacheKey) {
@@ -1397,6 +1505,7 @@ class Config {
         bridges: [],
         associations: [],
         priorities: [],
+        contextual_priorities: [],
         hierarchy: [],
       }
     }
@@ -2051,6 +2160,7 @@ class Config {
         bridges: this.config.bridges,
         hierarchy: this.config.hierarchy,
         priorities: this.config.priorities,
+        contextual_priorities: this.config.contextual_priorities,
         associations: this.config.associations,
         words: this.config.words
       }
@@ -2059,6 +2169,7 @@ class Config {
       this.config.bridges = []
       this.config.hierarchy = []
       this.config.priorities = []
+      this.config.contextual_priorities = []
       this.config.associations = { positive: [], negative: [] }
       this.config.words = {}
 
@@ -2279,6 +2390,18 @@ class Config {
       config.priorities = priorities
     }
 
+    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 ]
+      })
+      config.contextual_priorities = contextual_priorities
+    }
+
     for (const bag of bags) {
       if (config[bag]) {
         config[bag] = config[bag].map((b) => {
@@ -2708,5 +2831,7 @@ class Config {
 }
 
 module.exports = {
-  Config
+  Config,
+  config_toServer,
+  operatorKey_valid,
 }