theprogrammablemind_4wp 7.5.8-beta.26 → 7.5.8-beta.28

package/client.js

@@ -15,14 +15,16 @@ const sortJson = runtime.sortJson
 
 const getAsk = (config) => (uuid) => (asks) => {
   for (let ask of asks) {
-    config.addMotivation({
+    config.addSemantic({
       uuid,
+      oneShot: true,
       match: (args) => ask.matchr(args),
       apply: (args) => ask.applyr(args)
     })
   }
-  config.addMotivation({
+  config.addSemantic({
       uuid,
+      oneShot: true,
       match: ({context}) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
       apply: (args) => {
         for (let ask of asks) {
@@ -37,7 +39,7 @@ const getAsk = (config) => (uuid) => (asks) => {
             }
           }
           if (matchq(args)) {
-            args.context.motivationKeep = true
+            // args.context.motivationKeep = true
             args.context.verbatim = applyq(args)
             args.context.isResponse = true;
             delete args.context.controlRemove;
@@ -144,7 +146,6 @@ const setupArgs = (args, config, logs, hierarchy) => {
       apis: getAPIs(uuid)
     }
   }
-  args.motivation = (m) => config.addMotivation(m)
   args.breakOnSemantics = false
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value
@@ -420,18 +421,16 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       }
       const generateParenthesized = isTest || (commandLineArgs && commandLineArgs.save)
       if (!config.get('skipSemantics')) {
-        if (!config.doMotivations(args, context)) {
-          const semantics = config.getSemantics(json.logs)
-          try {
-            contextPrime = semantics.apply(args, context)
-          } catch( e ) {
-            if (e.message == 'Maximum call stack size exceeded') {
-              const mostCalled = semantics.getMostCalled()
-              e.message += `\nThe most called semantic was:\nnotes: ${mostCalled.notes}\nmatch: ${mostCalled.matcher.toString()}\napply: ${mostCalled._apply.toString()}\n`
-            }
-            // contextPrime = semantics.apply(args, { marker: 'error', context, error: e })
-            contextPrime = semantics.apply(args, { marker: 'error', context, reason: e.reason })
+        const semantics = config.getSemantics(json.logs)
+        try {
+          contextPrime = semantics.apply(args, context)
+        } catch( e ) {
+          if (e.message == 'Maximum call stack size exceeded') {
+            const mostCalled = semantics.getMostCalled()
+            e.message += `\nThe most called semantic was:\nnotes: ${mostCalled.notes}\nmatch: ${mostCalled.matcher.toString()}\napply: ${mostCalled._apply.toString()}\n`
           }
+          // contextPrime = semantics.apply(args, { marker: 'error', context, error: e })
+          contextPrime = semantics.apply(args, { marker: 'error', context, reason: e.reason })
         }
       }
       if (contextPrime.controlRemove) {
@@ -767,7 +766,6 @@ const runTest = async (config, expected, { args, verbose, afterTest, testConfig,
     testConfigName = testConfig.testModuleName
   }
   config.beforeQuery({ query: test, isModule: false, objects })
-  // config.resetMotivations()
     try {
       const result = await _process(config, test, { errorHandler, isTest: true })
       result.query = test
@@ -785,12 +783,17 @@ const runTest = async (config, expected, { args, verbose, afterTest, testConfig,
       delete expected_objects.nameToUUID
       const actual_objects = sortJson(convertToStable(config.config.objects), { depth: 25 })
       const failed_paraphrases = !matching(result.paraphrases, expected.paraphrases)
-      const failed_paraphrasesParenthesized = !matching(result.paraphrasesParenthesized, expected.paraphrasesParenthesized)
-      const failed_generatedParenthesized = !matching(result.generatedParenthesized, expected.generatedParenthesized)
+      let failed_paraphrasesParenthesized = !matching(result.paraphrasesParenthesized, expected.paraphrasesParenthesized)
+      let failed_generatedParenthesized = !matching(result.generatedParenthesized, expected.generatedParenthesized)
       const failed_responses = !matching(result.responses, expected.responses)
       const failed_contexts = !matching(result.contexts, expected.contexts)
       const failed_objects = !matching(actual_objects, expected_objects)
 
+      if (args.testNoParenthesized) {
+        failed_paraphrasesParenthesized = false
+        failed_generatedParenthesized = false
+      }
+
       const pickEm = (getObjects) => {
         const picked = {}
         for (let prop of (testConfig.check || [])) {
@@ -816,6 +819,11 @@ const runTest = async (config, expected, { args, verbose, afterTest, testConfig,
         }
         return expected.objects.namespaced[expected.objects.nameToUUID[name]]
       }
+      try {
+        sortJson(pickEm(expectedGetObjects), { depth: 25 })
+      } catch ( e ) {
+        debugger
+      }
       const expected_checked = sortJson(pickEm(expectedGetObjects), { depth: 25 })
       const actualGetObjects = (name) => {
         if (!name) {
@@ -942,7 +950,6 @@ const runTests = async (config, testFile, juicyBits) => {
 const saveTest = async (testFile, config, test, expected, testConfig, saveDeveloper) => {
   config.rebuild()
   const objects = getObjects(config.config.objects)(config.uuid)
-  //config.resetMotivations()
   config.beforeQuery({ query: test, isModule: false, objects })
   console.log(test)
   const result = await _process(config, test, { isTest: true })
@@ -1216,8 +1223,6 @@ entodicton.knowledgeModule( {
 */
 
 const rebuildTemplate = async ({ config, target, template, errorHandler = defaultErrorHandler }) => {
-  debugger
-  // config = config.base()
   const accumulators = {
     resultss: [],
     fragments: [],
@@ -1241,8 +1246,6 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
       if (property == 'fragments') {
         global.transitoryMode = true
       }
-      // greg32 
-      // config.addInternal( query )
       if (hierarchy) {
         for (let edge of hierarchy) {
           if (Array.isArray(edge)) {
@@ -1284,6 +1287,12 @@ const rebuildTemplate = async ({ config, target, template, errorHandler = defaul
       // it will just get added to the config
       const extraConfig = queryOrExtraConfig
       console.log('config', extraConfig)
+      try {
+        config.addInternal(_.cloneDeep(extraConfig), { handleCalculatedProps: true } )
+      } catch ( e ) {
+        const where = extraConfig.where ? ` ${extraConfig.where}` : ''
+        throw new Error(`Error processing extra config${where}: ${e.stack}}`)
+      }
       accumulators[property].push({ extraConfig: true, ...extraConfig })
       await looper(queries)
     }
@@ -1474,6 +1483,7 @@ const knowledgeModule = async ({
     parser.add_argument('-t', '--test', { action: 'store_true', help: 'Run the tests. Create tests by running with the --query + --save flag' })
     parser.add_argument('-tv', '--testVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. Create tests by running with the --query or --loop with the --save flag' })
     parser.add_argument('-tva', '--testAllVerbose', { action: 'store_true', help: 'Run the tests in verbose mode. All the tests will be run instead of stopping at first failure. Create tests by running with the --query or --loop with the --save flag' })
+    parser.add_argument('-tnp', '--testNoParenthesized', { action: 'store_true', help: 'Don\' check parenthesized differences for the tests' })
     parser.add_argument('-n', '--count', { help: 'Number of times to run the tests. Default is one. Use this to check for flakey test. If possible the system will print out a message with the word "hint" suggesting how to fix the problem' })
     // parser.add_argument('-b', '--build', { help: 'Specify the template file name of the form <kmName>. There should be a file called <baseKmName>.<kmName>.template.json with the queries to run. For example { queries: [...] }. The template file will be run and generate an instantiation called <baseKmName>.<kmName>.instance.json and a file called <kmName>.js that will load the template file (this is file generated only if not already existing) and a test file called <KmName>.tests.json. This can then be loaded into an instance of the current knowledge module to setup initial conditions.' })
     parser.add_argument('-rt', '--rebuildTemplate', { action: 'store_true', help: 'Force a template rebuild' })
@@ -1730,11 +1740,13 @@ const knowledgeModule = async ({
                 if (JSON.stringify(result.expected.paraphrases) !== JSON.stringify(result.actual.paraphrases)) {
                   hasError = true
                 }
-                if (JSON.stringify(result.expected.paraphrasesParenthesized) !== JSON.stringify(result.actual.paraphrasesParenthesized)) {
-                  hasError = true
-                }
-                if (JSON.stringify(result.expected.generatedParenthesized) !== JSON.stringify(result.actual.generatedParenthesized)) {
-                  hasError = true
+                if (!args.testNoParenthesized) {
+                    if (JSON.stringify(result.expected.paraphrasesParenthesized) !== JSON.stringify(result.actual.paraphrasesParenthesized)) {
+                      hasError = true
+                    }
+                    if (JSON.stringify(result.expected.generatedParenthesized) !== JSON.stringify(result.actual.generatedParenthesized)) {
+                      hasError = true
+                    }
                 }
                 if (JSON.stringify(result.expected.responses) !== JSON.stringify(result.actual.responses)) {
                   hasError = true
@@ -1760,9 +1772,13 @@ const knowledgeModule = async ({
                     }
                   }
                   show('paraphrases', result.expected.paraphrases, result.actual.paraphrases)
-                  show('paraphrases parenthesized', result.expected.paraphrasesParenthesized, result.actual.paraphrasesParenthesized)
+                  if (!args.testNoParenthesized) {
+                    show('paraphrases parenthesized', result.expected.paraphrasesParenthesized, result.actual.paraphrasesParenthesized)
+                  }
                   show('responses', result.expected.responses, result.actual.responses)
-                  show('responses parenthesized', result.expected.generatedParenthesized, result.actual.generatedParenthesized)
+                  if (!args.testNoParenthesized) {
+                    show('responses parenthesized', result.expected.generatedParenthesized, result.actual.generatedParenthesized)
+                  }
                   /*
                   if (JSON.stringify(result.expected.paraphrases) !== JSON.stringify(result.actual.paraphrases)) {
                     if (!headerShown) {

package/package.json

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

package/src/config.js

@@ -1,7 +1,7 @@
 // lookup = (name) => returns <config>
 const { Semantics, normalizeGenerator } = require('./semantics')
 const { Generators } = require('./generators')
-// const { uuid: uuidv4 } = require('uuidv4')
+const { v4 : uuidv4 } = require('uuid');
 const client = require('../client')
 const DigraphInternal = require('./digraph_internal')
 const helpers = require('./helpers')
@@ -30,6 +30,41 @@ const config_toServer = (config) => {
   }
 }
 
+const validConfigProps = (config) => {
+  const valid = [ 
+    'hierarchy', 
+    'objects', 
+    'bridges', 
+    'operators', 
+    'words', 
+    'priorities', 
+    'contextual_priorities', 
+    'associations', 
+    'name', 
+    'version', 
+    'generators', 
+    'semantics', 
+    'where', 
+    'floaters', 
+    'debug',
+
+    // TODO Fix these from the test app
+    'implicits',
+    'convolution',
+    'expected_generated',
+    'expected_results',
+    'skipSemantics',
+    'description',
+    'contexts',
+    'utterances',
+    'flatten',
+
+    'namespaces',
+    'eqClasses',
+  ]
+  helpers.validProps(valid, config, 'config')
+}
+
 const setupInitializerFNArgs = (config, args) => {
   const aw = (word, def) => config.addWord(word, def, args.uuid)
   const ag = (generator) => config.addGenerator(generator, args.uuid, config.name)
@@ -169,7 +204,7 @@ const handleBridgeProps = (config, bridge) => {
             config.addWordInternal(def, {"id": bridge.id, "initial": `{ value: "${def}"}` })
           } else {
             const word = def.word
-            def = { initial: JSON.stringify(def), id: bridge.id, word: undefined }
+            def = { initial: JSON.stringify(def), id: bridge.id, word }
             config.addWordInternal(word, def)
           }
         }
@@ -249,7 +284,7 @@ const handleBridgeProps = (config, bridge) => {
 const handleCalculatedProps = (baseConfig, moreConfig) => {
   for (let bridge of moreConfig.bridges) {
     const valid = [ 'after', 'before', 'bridge', 'development', 'evaluator', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
-                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where' ]
+                    'level', 'optional', 'selector', 'semantic',  'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid' ]
     helpers.validProps(valid, bridge, 'bridge')
     handleBridgeProps(baseConfig, bridge)
   }
@@ -357,6 +392,14 @@ const normalizeConfig = (config) => {
         }
       }
     }
+
+    if (config.semantics) {
+      for (let semantic of config.semantics) {
+        if (semantic.oneShot) {
+          semantic.id = uuid()
+        }
+      }
+    }
   }
 }
 
@@ -606,10 +649,9 @@ class Config {
       if (km.isSelf) {
         continue
       }
-      console.log(km.config.name)
       base.add(km.config)
     }
-
+    return base
   }
 
   getPseudoConfig (uuid, config) {
@@ -624,6 +666,7 @@ class Config {
       addOperator: (...args) => this.addOperator(...args, uuid),
       addPriorities: (...args) => this.addPriorities(...args),
       addSemantic: (...args) => this.addSemantic(...args, uuid, config.name),
+      removeSemantic: (...args) => this.removeSemantic(...args, uuid, config.name),
       addWord: (...args) => this.addWord(...args, uuid),
 
       getHierarchy: (...args) => this.config.hierarchy,
@@ -1111,6 +1154,7 @@ class Config {
     if (!(typeof semantic.match === 'function')) {
       throw new Error('addSemantic: Expected match to be a function')
     }
+
     if (!(typeof semantic.apply === 'function')) {
       throw new Error('addSemantic: Expected apply to be a function')
     }
@@ -1124,10 +1168,17 @@ class Config {
     }
 
     const semantics = this.config.semantics
-    Object.assign(semantic, { uuid: uuid || this._uuid, km: name || this.name, index: semantics.length })
+    Object.assign(semantic, { uuid: uuid || semantic.uuid || this._uuid, km: name || this.name, index: semantics.length, id: semantic.id || uuidv4() })
     semantics.unshift(semantic)
   }
 
+  removeSemantic(deleteSemantic) {
+    const index = this.config.semantics.findIndex( (semantic) => semantic.id === deleteSemantic.id )
+    if (index >= 0) {
+      this.config.semantics.splice(index, 1)
+    }
+  }
+
   addOperator (objectOrPattern, uuid) {
     if (!this.config.operators) {
       this.config.operators = []
@@ -1390,34 +1441,7 @@ class Config {
     }
 
     if (config) {
-      const valid = [ 
-        'hierarchy', 
-        'objects', 
-        'bridges', 
-        'operators', 
-        'words', 
-        'priorities', 
-        'contextual_priorities', 
-        'associations', 
-        'name', 
-        'version', 
-        'generators', 
-        'semantics', 
-        'floaters', 
-        'debug',
-
-        // TODO Fix these from the test app
-        'implicits',
-        'convolution',
-        'expected_generated',
-        'expected_results',
-        'skipSemantics',
-        'description',
-        'contexts',
-        'utterances',
-        'flatten',
-      ]
-      helpers.validProps(valid, config, 'config')
+      validConfigProps(config)
 
       config.operators = config.operators || []
       config.bridges = config.bridges || []
@@ -1500,7 +1524,6 @@ class Config {
     if (config) {
       this.name = config.name
     }
-    this.motivations = []
     this.loadOrder = new DigraphInternal()
     this.wasInitialized = false
     this.configs = []
@@ -1654,40 +1677,6 @@ class Config {
     // this.valid() init was not run because the kms are not all setup yet
   }
 
-  // motivation === { match, apply, uuid }
-  addMotivation (motivation) {
-    if (!motivation.uuid) {
-      motivation.uuid = this.uuid
-    }
-    this.motivations.push(motivation)
-  }
-
-  resetMotivations () {
-    this.motivations = []
-  }
-
-  doMotivations (args, context) {
-    args = Object.assign({}, args, { context, api: this.api })
-    // console.log('src/config doMotivations this.uuid', this.uuid)
-    // args.objects = args.getObjects(this.uuid)
-    const motivations = this.motivations
-    this.motivations = []
-    let done = false
-    for (const motivation of motivations) {
-      args.objects = args.getObjects(motivation.uuid)
-      if (!done && motivation.match(args)) {
-        motivation.apply(args)
-        if (args.context.controlKeepMotivation || motivation.repeat) {
-          this.motivations.push(motivation)
-        }
-        done = true
-      } else {
-        this.motivations.push(motivation)
-      }
-    }
-    return done
-  }
-
   // TODO add more details
   equal(config) {
     if (JSON.stringify(this.config) != JSON.stringify(config.config)) {
@@ -1721,7 +1710,6 @@ class Config {
     cp.name = this.name
     cp.description = this.description
     cp.tests = this.tests
-    cp.motivations = [...this.motivations]
     cp.isModule = this.isModule
     cp.loadedForTesting = this.loadedForTesting
     cp.initInstances = this.initInstances.slice()
@@ -1924,16 +1912,6 @@ class Config {
       // const baseConfig = args.baseConfig
       const currentConfig = args.currentConfig
 
-      /*
-      if (currentConfig.api) {
-        // currentConfig.api.objects = args.objects
-        // GREG42 currentConfig.api.config = () => this
-        // currentConfig.api.config = () => args.baseConfig
-        // currentConfig.api.uuid = currentConfig._uuid
-      }
-      */
-      // this.instances.forEach( (instance) => client.processInstance(this, instance) )
-      // greg55
       if (args.isAfterApi) {
         fn(args)
       }
@@ -2103,7 +2081,6 @@ class Config {
     }
     this.config.objects.namespaced = {}
     this.resetWasInitialized()
-    this.resetMotivations()
 
     // reorder configs base on load ordering
     {
@@ -2164,7 +2141,6 @@ class Config {
         uuid: config._uuid, 
         objects: namespacedObjects, 
         namespace, 
-        motivation: (m) => this.addMotivation(m),
         api: config.api,
       }))
 
@@ -2284,7 +2260,6 @@ class Config {
         }
         this.hierarchy.edges = this.config.hierarchy
       }
-      // this.instances.forEach((instance) => client.processInstance(this, instance))
     }
 
     if (reverseIt) {
@@ -2683,6 +2658,7 @@ class Config {
 
   // TODO get rid of useOldVersion arg
   addInternal (more, { useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false, handleCalculatedProps : hcps = false } = {}) {
+    validConfigProps(more)
     if (more instanceof Config) {
       more.initialize({ force: false })
       if (useOldVersion) {
@@ -2780,7 +2756,7 @@ class Config {
                   this.config[key].splice(iOldOne, 1)
                   break;
                 }
-              }
+              } 
             }
           }
         }

package/src/helpers.js

@@ -320,7 +320,7 @@ const ecatch = (where, call) => {
   try {
     return call()
   } catch( e ) {
-    throw new Error(`${where} ${e}`)
+    throw new Error(`${where} ${e.stack}`)
   }
 }
 

package/src/semantics.js

@@ -6,7 +6,7 @@ class Semantic {
   // constructor ({match, apply, uuid, index, km, notes}) {
   constructor (semantic) {
     semantic = normalizeSemantic(semantic)
-    const { match, apply, uuid, index, km, notes, priority, debug, where, applyWrapped, property } = semantic
+    const { match, apply, uuid, index, km, notes, priority, debug, where, applyWrapped, property, oneShot, id } = semantic
     this.matcher = match
     this._apply = apply
     this._applyWrapped = applyWrapped
@@ -18,6 +18,8 @@ class Semantic {
     this.notes = notes
     this.callId = debug
     this.where = where
+    this.oneShot = oneShot
+    this.id = id
   }
 
   toLabel () {
@@ -197,6 +199,9 @@ class Semantics {
         const log = (message) => { this.logs.push(message) }
         try {
           contextPrime = semantic.apply(args, context, s, log, options)
+          if (!contextPrime.controlKeepMotivation && semantic.oneShot) {
+            args.config.removeSemantic(semantic)
+          }
         } catch( e ) {
           contextPrime = null
           let errorMessage