theprogrammablemind_4wp 7.5.4-beta.2 → 7.5.4-beta.4

package/client.js

@@ -478,7 +478,7 @@ const doWithRetries = async (n, url, queryParams, data) => {
   }
 }
 
-const setupProcessB = ({ config, allowDelta=false } = {}) => {
+const setupProcessB = ({ config, initializer, allowDelta=false } = {}) => {
   const key = config._key
 
   const data = Object.assign({ key, version: '3' }, { uuid: config._uuid })
@@ -526,7 +526,7 @@ const processInstance = (config, instance) => {
   global.transitoryMode = transitoryMode
 }
 
-const _process = async (config, query, { commandLineArgs, credentials, writeTests, isTest, saveDeveloper, testConfig, testsFN, errorHandler = defaultErrorHandler } = {}) => {
+const _process = async (config, query, { initializer, commandLineArgs, credentials, writeTests, isTest, saveDeveloper, testConfig, testsFN, errorHandler = defaultErrorHandler } = {}) => {
   if (credentials) {
     config.server(credentials.server, credentials.key)
   }
@@ -546,7 +546,7 @@ const _process = async (config, query, { commandLineArgs, credentials, writeTest
     throw error
   }
 
-  let { data, /* generators, semantics, */ hierarchy } = setupProcessB({ config, allowDelta: true })
+  let { data, /* generators, semantics, */ hierarchy } = setupProcessB({ config, initializer, allowDelta: true })
   if (commandLineArgs && commandLineArgs.checkForLoop) {
     data.checkForLoop = true
   }
@@ -1057,7 +1057,7 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
       finish()
       return
     }
-    const { property, hierarchy, query: queryOrExtraConfig, skipSemantics } = queries.shift()
+    const { property, hierarchy, query: queryOrExtraConfig, initializer, skipSemantics } = queries.shift()
     // queries are strings or { query: "blah", development: true/false }
     if (typeof queryOrExtraConfig === 'string' || queryOrExtraConfig.query) {
       let query = queryOrExtraConfig;
@@ -1082,7 +1082,7 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
       }
 
       try {
-        const results = await _process(config, query.query, {})
+        const results = await _process(config, query.query, {initializer})
         if (config.config.debug) {
           // TODO pass in the error handler like the other ones
           defaultInnerProcess(config, defaultErrorHandler, results)
@@ -1160,7 +1160,9 @@ const build = async ({ config, target, template, errorHandler = defaultErrorHand
       return queryStringOrProperties
     }
   }
-  let todo = (template.queries || []).map((query) => { return { property: 'resultss', query, skipSemantics: false } })
+  let todo = []
+  todo = todo.concat((template.initializers || []).map((query) => { return { initializer: true, property: 'resultss', query, skipSemantics: false } }))
+  todo = todo.concat((template.queries || []).map((query) => { return { property: 'resultss', query, skipSemantics: false } }))
   todo = todo.concat((template.fragments || []).map((query) => { return Object.assign({}, toProperties(query), { property: 'fragments', skipSemantics: false }) }))
   todo = todo.concat((template.semantics || []).map((definition) => { return { property: 'semantics', query: `${definition.from}\n${definition.to}`, skipSemantics: true } }))
   await looper(Object.assign([], todo))
@@ -1265,7 +1267,6 @@ const knowledgeModule = async ({
       config.load(template.template, template.instance)
     }
   }
-
   if (isProcess) {
     // setup();
     const parser = new runtime.ArgumentParser({
@@ -1299,6 +1300,7 @@ const knowledgeModule = async ({
     parser.add_argument('-da', '--debugAssociation', { help: 'When running with the --debugAssociation flag the debugging will break when the specified association is added to the config' })
     parser.add_argument('-dh', '--debugHierarchy', { help: 'When running with the --debugHierarchy flag the debugging will break when the specified child-parent pair is added to the config for the main config. Set DEBUG_HIERARCHY to debug any config loaded. For example DEBUG_HIERARCHY=\'["cat", "mammel"]\'' })
     parser.add_argument('-db', '--debugBridge', { help: 'When running with the --debugBridge flag the debugging will break when the specified bridge is added to the config for the main config. Set DEBUG_BRIDGE to debug any config loaded. For example DEBUG_BRIDGE=\'id/level\'' })
+    parser.add_argument('-do', '--debugOperator', { help: 'When running with the --debugOperator flag the debugging will break when the specified operator is added to the config for the main config. Set DEBUG_OPERATOR to debug any config loaded. For example DEBUG_OPERATOR=\'([operator] ([arg]))\'' })
 
     const args = parser.parse_args()
     args.count = args.count || 1
@@ -1316,6 +1318,10 @@ const knowledgeModule = async ({
         console.log('Expected DEBUG_BRIDGE to be of the form "id/level"');
       }
     }
+    if (args.debugOperator) {
+        // id/level
+      global.entodictonDebugOperator = args.debugOperator
+    }
 
     if (args.clean) {
       const tests = JSON.parse(runtime.fs.readFileSync(testConfig.name))

package/package.json

@@ -10,12 +10,13 @@
     "eslint": "^7.31.0"
   },
   "scripts": {
-    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t ONE23",
+    "to:debug": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
     "test:debug": "node inspect node_modules/.bin/jest --runInBand --config ./jest.config.json",
-    "tod": "node inspect node_modules/.bin/jest --runInBand -t ONE23",
+    "tod": "node inspect node_modules/.bin/jest --runInBand -t NEO23",
     "lint:fix": "eslint \"**/*.js\" --fix",
     "lint": "eslint \"**/*.js\"",
-    "to": "node node_modules/.bin/jest --runInBand -t ONE23",
+    "to": "node node_modules/.bin/jest --runInBand -t NEO23",
+    "tos": "node node_modules/.bin/jest --runInBand -t NEOS23",
     "test": "jest --config ./jest.config.json",
     "test:watch": "npm run test -- --watch"
   },
@@ -61,6 +62,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.5.4-beta.2",
+  "version": "7.5.4-beta.4",
   "license": "ISC"
 }

package/src/config.js

@@ -22,6 +22,88 @@ const indent = (string, indent) => {
     return string.replace(/^/gm, ' '.repeat(indent));
 }
 
+const handleBridgeProps = (config, bridge) => {
+  if (!bridge.bridge) {
+    bridge.bridge = "{ ...next(operator) }"
+  }
+  if (!bridge.level) {
+    bridge.level = 0
+  }
+  if (bridge.children) {
+    for (let child of bridge.children) {
+      config.addHierarchy(child, bridge.id)
+    }
+  }
+  if (bridge.parents) {
+    for (let parent of bridge.parents) {
+      config.addHierarchy(bridge.id, parent)
+    }
+  }
+  if (bridge.isA) {
+    for (let parent of bridge.isA) {
+      config.addHierarchy(bridge.id, parent)
+    }
+  }
+  if (bridge.before) {
+    for (let after of bridge.before) {
+      if (typeof after == 'string') {
+        after = [after, 0]
+      }
+      config.addPriorities([after, [bridge.id, bridge.level]])
+    }
+  }
+  if (bridge.words) {
+    for (let def of bridge.words) {
+      if (typeof def == 'string') {
+        config.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
+      } else {
+        const word = def.word
+        def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
+        config.addWordInternal(word, def)
+      }
+    }
+  }
+  if (bridge.generator) {
+    config.config.generators.unshift(bridge.generator)
+  }
+  if (bridge.generators) {
+    const generators = [...bridge.generators]
+    generators.reverse()
+    for (let generator of generators) {
+      config.config.generators.unshift(generator)
+    }
+  }
+  if (bridge.generatorp) {
+    config.config.generators.unshift({ 
+      where: bridge.generatorp.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && context.paraphrase,
+      apply: (args) => bridge.generatorp(args),
+    })
+  }
+  if (bridge.generatorr) {
+    config.config.generators.unshift({ 
+      // TODO merge response and isResponse
+      where: bridge.generatorr.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && !context.paraphrase && (context.response || context.isResponse),
+      apply: (args) => bridge.generatorr(args),
+    })
+  }
+  if (bridge.evaluator) {
+    config.config.semantics.unshift({ 
+      where: bridge.evaluator.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker && context.evaluate,
+      apply: (args) => bridge.evaluator(args),
+    })
+  }
+  if (bridge.semantic) {
+    config.config.semantics.unshift({ 
+      where: bridge.semantic.where || client.where(3),
+      match: ({context}) => bridge.id == context.marker,
+      apply: (args) => bridge.semantic(args),
+    })
+  }
+}
+
 if (runtime.process.env.DEBUG_HIERARCHY) {
   global.entodictonDebugHierarchy = JSON.parse(runtime.process.env.DEBUG_HIERARCHY)
 }
@@ -35,6 +117,11 @@ if (runtime.process.env.DEBUG_BRIDGE) {
   global.entodictonDebugBridge[1] = int(global.entodictonDebugBridge[1])
 }
 
+if (runtime.process.env.DEBUG_OPERATOR) {
+  // id/level
+  global.entodictonDebugOperator = runtime.process.env.DEBUG_OPERATOR
+}
+
 const hierarchyCanonical = (element) => {
     if (element.child && element.parent) {
       return element
@@ -86,6 +173,17 @@ const normalizeConfig = (config) => {
           config[bag][i].km = config.name
         }
       }
+      
+    }
+    if (config['bridges']) {
+      for (let bridge of config['bridges']) {
+        if (!bridge.level) {
+          bridge.level = 0
+        }
+        if (!bridge.bridge) {
+          bridge.bridge = "{ ...next(operator) }"
+        }
+      }
     }
   }
 }
@@ -324,6 +422,29 @@ const multiApiImpl = (initializer) => {
 
 class Config {
 
+  // return the config with just the elements from the included KM's
+  baseConfig() {
+    const operators = this.config.operators.filter((operator) => {
+      return operator.uuid !== this.uuid
+    })
+    const bridges = this.config.bridges.filter((bridge) => {
+      return bridge.uuid !== this.uuid
+    })
+    const words = {}
+    for (let word in this.config.words) {
+      const defs = this.config.words[word].filter( (def) => def.uuid !== this.uuid )
+      if (defs.length > 0) {
+        words[word] = defs
+      }
+    }
+    debugger
+    return {
+      operators,
+      bridges,
+      words
+    }
+  }
+
   getCounter (maybeName = '') {
     const counter = this.configCounter
     this.configCounter += 1
@@ -689,6 +810,7 @@ class Config {
     if (global.transitoryMode) {
       def.transitoryMode = true
     }
+    handleBridgeProps(this, def)
     bridges.push(def)
     this.checkBridges();
     this._delta.json.bridges.push({ action: 'add', bridge: def })
@@ -751,6 +873,7 @@ class Config {
     if (!this.config.operators) {
       this.config.operators = []
     }
+
     const operators = this.config.operators
 
     let operator;
@@ -760,6 +883,12 @@ class Config {
       operator = Object.assign({}, objectOrPattern, { uuid: this._uuid })
     }
 
+    if (global.entodictonDebugOperator) {
+      if (operator.pattern === global.entodictonDebugOperator) {
+        debugger; // debug operator hit
+      }
+    }
+
     if (operator.allowDups) {
       if (operators.find( (o) => o.pattern == operator.pattern )) {
         return;
@@ -1018,6 +1147,7 @@ class Config {
         'debug',
 
         // TODO Fix these from the test app
+        'implicits',
         'convolution',
         'expected_generated',
         'expected_results',
@@ -1118,6 +1248,18 @@ class Config {
         const valid = [ 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
                         'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy' ]
         helpers.validProps(valid, bridge, 'bridge')
+        /* moved
+        if (!bridge.bridge) {
+          bridge.bridge = "{ ...next(operator) }"
+        }
+        */
+        handleBridgeProps(this, bridge)
+
+        /* moved
+        if (!bridge.level) {
+          bridge.level = 0
+        }
+        */
         /*
         if (bridge.generator) {
           this.config.generators.push({ 
@@ -1126,6 +1268,7 @@ class Config {
           })
         }
         */
+        /* moved 
         if (bridge.children) {
           for (let child of bridge.children) {
             this.addHierarchy(child, bridge.id)
@@ -1141,6 +1284,8 @@ class Config {
             this.addHierarchy(bridge.id, parent)
           }
         }
+        */
+        /* moved
         if (bridge.before) {
           for (let after of bridge.before) {
             if (typeof after == 'string') {
@@ -1163,6 +1308,8 @@ class Config {
         if (bridge.generator) {
           this.config.generators.unshift(bridge.generator)
         }
+        */
+        /* moved
         if (bridge.generators) {
           const generators = [...bridge.generators]
           generators.reverse()
@@ -1199,6 +1346,7 @@ class Config {
             apply: (args) => bridge.semantic(args),
           })
         }
+        */
       }
       if (config.operators) {
         config.operators = config.operators.map((operator) => {
@@ -1613,7 +1761,8 @@ class Config {
 
       if (currentConfig.api) {
         currentConfig.api.objects = args.objects
-        currentConfig.api.config = () => this
+        // GREG42 currentConfig.api.config = () => this
+        currentConfig.api.config = () => args.baseConfig
         currentConfig.api.uuid = currentConfig._uuid
       }
       // this.instances.forEach( (instance) => client.processInstance(this, instance) )
@@ -2560,9 +2709,6 @@ class Config {
         // console.log('key', key, 'XXX')
         // console.log('more', JSON.stringify(more, null, 2))
         // this.config[key] = this.config[key].concat(more[key])
-        if (key == '2enerators') {
-          debugger
-        }
         // this.config[key] = this.config[key].concat(more[key])
         this.config[key] = more[key].concat(this.config[key])
       } else {