tpmkms 9.8.0-beta.8 → 9.9.0

package/common/fastfood.js

@@ -196,6 +196,7 @@ const template = {
         { id: 'modification' },
         { 
           id: 'withModification',
+          where: where(),
           level: 0,
           before: ['preposition'],
           generatorp: async ({context, gp}) => `with ${await gp(context.modifications)}`,
@@ -260,7 +261,7 @@ const template = {
         {
           // split "sprite and fanta" into separate things so the ask will pick them up
           match: ({context}) => context.marker == 'list' && context.topLevel && !context.flatten,
-          apply: async ({context, s}) => await s({...context, flatten: true}),
+          apply: async ({context, e}) => await e({...context, flatten: true}, where()),
         },
         {
           where: where(),
@@ -386,13 +387,14 @@ const template = {
       bridges: [
         { 
           id: "change",
+          where: where(),
           isA: ['verb'],
           localHierarchy: [ ['thisitthat', 'meal'], ['thisitthat', 'drink'] ],
           generatorp: async ({context, gp}) => `change ${await gp(context.from)} to ${await gp(context.to)}`,
           bridge: "{ ...next(operator), from: after[0], to: after[1].toObject }",
-          semantic: async ({context, api, e}) => {
+          semantic: async ({callId, context, api, e, toEValue}) => {
             const state = api.state
-            const eFrom = (await e(context.from)).evalue
+            const eFrom = toEValue(await e(context.from, where()))
             const from = state.getIdCombo(eFrom.fromSTM ? eFrom : context.from)
             const to = state.getIdCombo(context.to)
             for (const item of api.items()) {
@@ -426,6 +428,7 @@ const template = {
       bridges: [
         {
           id: 'remove',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), remove: after[0], postModifiers: ['remove'] }",
           semantic: ({context, api}) => {
@@ -439,6 +442,7 @@ const template = {
         },
         {
           id: 'reset',
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator) }",
           semantic: ({context, api}) => {
@@ -885,9 +889,9 @@ class State {
                 },
                 {
                   where: where(),
-                  match: ({context, isA}) => isA(context.marker, 'number') && !context.evaluate,
+                  match: ({context, isA}) => isA(context.marker, 'number'),
                   apply: async ({context, e}) => {
-                    food.comboNumber = { value: (await e(context)).value }
+                    food.comboNumber = { value: (await e(context, where())).value }
                     this.add(Object.assign(food, context))
                   }
                 },
@@ -947,15 +951,15 @@ const config = {
       where: where(),
       priority: -10,
       match: ({context}) => context.marker == 'compound_operator',
-      apply: async ({context, s}) => {
+      apply: async ({context, e}) => {
         context.marker = 'list'
         context.flatten = true
-        await s(context)
+        await e(context, where())
       }
     },
     {
       where: where(),
-      match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
+      match: ({context, contextHierarchy, isAListable, stack}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !contextHierarchy.under('change'),
       apply: ({context, km, api, instance}) => {
         for (const element of propertyToArray(context)) {
           km('fastfood').api.state.add(element)
@@ -967,14 +971,16 @@ const config = {
   bridges: [
     { 
       id: 'orderNoun',
+      where: where(),
       parents: ['noun', 'queryable'],
-      evaluator: ({context, api}) => {
+      semantic: ({context, api}) => {
         context.evalue = { marker: 'list', value: api.objects.items }
         api.show()
       }
     },
     { 
       id: 'showOrder',
+      where: where(),
       parents: ['verb'],
       bridge: "{ ...next(operator), order: after[0] }",
       generatorp: async ({context, g}) => `show ${await g(context.order)}`,
@@ -1001,7 +1007,9 @@ knowledgeModule( {
                 'show', 
                 { 
                   property: 'items', 
-                  check: [
+                  check: [{
+                    property: (key) => typeof key == 'number',
+                    check: [
                       'combo', 
                       'pieces', 
                       'size', 
@@ -1009,8 +1017,9 @@ knowledgeModule( {
                       'id', 
                       { property: 'food', check: [ 'marker', 'value', 'text' ] }, 
                       { property: 'modifications', check: [ 'id', 'item_id', 'food' ] }, 
-                      'needsDrink'
-                  ],
+                      'needsDrink',
+                    ]
+                  }],
                 },
                 'changes', 
                 'response', 
@@ -1021,6 +1030,12 @@ knowledgeModule( {
               ],
               context: [
                 defaultContextCheck({ extra: ['comboNumber'] }),
+                defaultContextCheck({ marker: 'combo', exported: true, extra: ['comboNumber'] }),
+                {
+                  match: ({context}) => context.combo,
+                  apply: () => ['food', 'needsDrink'],
+                },
+
               ],
             },
           },

package/common/formulas.instance.json

@@ -29,8 +29,8 @@
       ],
       "semantics": [
         {
-          "match": "({context, api}) => context.evaluate && api.get(context)",
-          "apply": "async ({context, api, e}) => {\n        const { formula } = api.get(context)\n        context.evalue = await e(formula) \n      }"
+          "match": "({context, api, stack}) => !context.topLevel && api.get(context)",
+          "apply": "async ({context, api, e}) => {\n        const { formula } = api.get(context)\n        context.evalue = await e(formula, where()) \n      }"
         }
       ],
       "bridges": [
@@ -44,14 +44,46 @@
           ],
           "convolution": true,
           "bridge": "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "equality",
+            "variable"
+          ],
           "generatorp": "async ({context, g}) => `${await g(context.what)} ${await g(context.equality)} ${await g(context.variable)}`",
-          "evaluator": "({context, api, objects, verbatim}) => {\n        const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })\n        if (formulas.length > 0) {\n          context.evalue = { marker: 'list', value: formulas }\n        } else {\n          context.evalue = { marker: 'undefined' }\n        }\n      }"
+          "semantic": "({context, api, objects, verbatim}) => {\n        const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })\n        if (formulas.length > 0) {\n          context.evalue = { marker: 'list', value: formulas }\n        } else {\n          context.evalue = { marker: 'undefined' }\n        }\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:100",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:101",
           "id": "solve",
           "enhanced_associations": false,
           "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "equality",
+            "variable"
+          ],
           "generatorp": "async ({context, gp}) => `${context.word} ${await gp(context.equality)} for ${await gp(context.variable)}`",
           "semantic": "async ({api, context, fragments}) => {\n        try {\n          context.evalue = await api.solveFor(context.equality, context.variable)\n          context.isResponse = true\n          context.value = null\n        } catch( e ) {\n        }\n        if (!context.evalue) {\n          // TODO some KM for talking to the user wrt brief+avatar\n          context.verbatim = `Solving failed`\n        }\n      }"
         },
@@ -75,12 +107,27 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:131",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:133",
           "id": "calculate",
           "isA": [
             "verb"
           ],
           "bridge": "{ ...next(operator), expression: after[0] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "expression"
+          ],
           "generatorp": "async ({context, g}) => `${context.word} ${await g(context.expression)}`",
           "localHierarchy": [
             [
@@ -88,12 +135,28 @@
               "expression"
             ]
           ],
-          "semantic": "async ({context, e}) => {\n        context.evalue = await e(context.expression)\n        context.isResponse = true\n      }"
+          "semantic": "async ({context, e}) => {\n        context.evalue = await e(context.expression, where())\n        context.isResponse = true\n      }"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:143",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:146",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "left",
+            "right"
+          ],
           "words": [
             "="
           ],
@@ -440,13 +503,45 @@
             "queryable"
           ],
           "convolution": true,
-          "bridge": "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }"
+          "bridge": "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "equality",
+            "variable"
+          ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:100",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:101",
           "id": "solve",
           "enhanced_associations": false,
-          "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }"
+          "bridge": "{ ...next(operator), equality: after[0], variable: after[2] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "equality",
+            "variable"
+          ]
         },
         {
           "id": "forVariable",
@@ -468,12 +563,27 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:131",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:133",
           "id": "calculate",
           "isA": [
             "verb"
           ],
           "bridge": "{ ...next(operator), expression: after[0] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "expression"
+          ],
           "localHierarchy": [
             [
               "unknown",
@@ -482,9 +592,25 @@
           ]
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:143",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/formulas.js:146",
           "id": "equals",
           "bridge": "{ ...next(operator), left: before[0], right: after[0] }",
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "left",
+            "right"
+          ],
           "words": [
             "="
           ],

package/common/formulas.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where, Digraph, debug } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const dialogues = require('./dialogues.js')
 const pos = require('./pos.js')
 const math = require('./math.js')
@@ -71,10 +71,10 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context, api}) => context.evaluate && api.get(context),
+      match: ({context, api, stack}) => !context.topLevel && api.get(context),
       apply: async ({context, api, e}) => {
         const { formula } = api.get(context)
-        context.evalue = await e(formula) 
+        context.evalue = await e(formula, where()) 
       }    
     },
   ],
@@ -86,8 +86,9 @@ const config = {
       isA: ['preposition', 'queryable'],
       convolution: true,
       bridge: "{ number: before[0].number, ...next(operator), what: before[0], equality: after[0], variable: after[1] }",
+      check: defaultContextCheckProperties(['equality', 'variable']),
       generatorp: async ({context, g}) => `${await g(context.what)} ${await g(context.equality)} ${await g(context.variable)}`,
-      evaluator: ({context, api, objects, verbatim}) => {
+      semantic: ({context, api, objects, verbatim}) => {
         const formulas = api.gets(context.variable).map((f) => { return { ...f.equality, paraphrase: true } })
         if (formulas.length > 0) {
           context.evalue = { marker: 'list', value: formulas }
@@ -101,6 +102,7 @@ const config = {
       id: 'solve', 
       enhanced_associations: false,
       bridge: "{ ...next(operator), equality: after[0], variable: after[2] }",
+      check: defaultContextCheckProperties(['equality', 'variable']),
       generatorp: async ({context, gp}) => `${context.word} ${await gp(context.equality)} for ${await gp(context.variable)}`,
       semantic: async ({api, context, fragments}) => {
         try {
@@ -132,10 +134,11 @@ const config = {
       id: 'calculate',
       isA: ['verb'],
       bridge: "{ ...next(operator), expression: after[0] }",
+      check: defaultContextCheckProperties(['expression']),
       generatorp: async ({context, g}) => `${context.word} ${await g(context.expression)}`,
       localHierarchy: [ ['unknown', 'expression'] ],
       semantic: async ({context, e}) => {
-        context.evalue = await e(context.expression)
+        context.evalue = await e(context.expression, where())
         context.isResponse = true
       } 
     },
@@ -143,6 +146,7 @@ const config = {
       where: where(),
       id: 'equals',
       bridge: "{ ...next(operator), left: before[0], right: after[0] }",
+      check: defaultContextCheckProperties(['left', 'right']),
       words: ['='],
       after: ['mathematical_operator'],
       // TODO have this be per argument then 'is' can map to equals where this only applied to before[0] and not after[0]
@@ -195,7 +199,12 @@ knowledgeModule({
     contents: tests,
     checks: {
       objects: [
-        'formulas',
+        { 
+          property: 'formulas',
+          check: [
+            { property: () => true, check: ['name', 'formula', 'equality'] },
+          ],
+        },
       ],
       context: [
         defaultContextCheck(),

package/common/gdefaults.js

@@ -139,75 +139,11 @@ const config = {
       }
     },
 
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.marker == 'modifies' && context.evaluateWord && context.paraphrase && context.number == 'one',
-      apply: ({context}) => 'modifies'
-    },
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.marker == 'modifies' && context.evaluateWord && context.paraphrase && (context.number == 'many' || context.number > 1),
-      apply: ({context}) => 'modify'
-    },
-
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.evaluateWord && context.isVerb && context.paraphrase && context.word && !context.imperative && !context.interpolate,
-      apply: ({context}) => {
-        const infinitive = englishHelpers.getInfinitive(context.word)
-        if (context.form == 'infinitive') {
-          const cases = englishHelpers.conjugateVerb(infinitive)
-          const def = cases.find((def) => def.form == context.form)
-          return def.word
-        } else if (context.tense) {
-          const cases = englishHelpers.conjugateVerb(infinitive)
-          const def = cases.find((def) => def.tense == context.tense)
-          return def.word
-        } else {
-          return pluralize.plural(context.word)
-        }
-      },
-    },
-
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.evaluateWord && context.paraphrase && context.word && (context.number == 'many' || context.number > 1) && !context.interpolate,
-      apply: ({context}) => pluralize.plural(context.word),
-    },
-
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.evaluateWord && context.isVerb && context.paraphrase && context.word && context.number == 'one' && !context.imperative && !context.interpolate,
-      apply: ({context}) => {
-        const infinitive = englishHelpers.getInfinitive(context.word)
-        const cases = englishHelpers.conjugateVerb(infinitive)
-        return pluralize.plural(context.word)
-      },
-    },
-
-    {
-      where: where(),
-      priority: -1,
-      match: ({context}) => context.evaluateWord && context.paraphrase && context.word && context.number == 'one' && !context.interpolate,
-      apply: ({context}) => {
-        return pluralize.singular(context.word)
-      },
-    },
-
     {
       where: where(),
       match: ({context}) => context.paraphrase && context.word && (context.number == 'many' || context.number > 1) && !context.isModifier,
-      apply: ({context}) => {
-        // TODO make the sentence that the plural celcius is celcius work
-        if (["fahrenheit", "celcius"].includes(context.word)) {
-          return context.word
-        }
-        return pluralize.plural(context.word)
+      apply: ({context, kms}) => {
+        return kms.words.api.toPlural(context)
       }
     },
 
@@ -312,11 +248,6 @@ function initializer({config}) {
           }
         },
         number: (context) => isMany(context) ? "many" : "one",
-        // number/gender/person etc
-        gw: (context, { number: numberContext } = {}) => {
-          const number = numberContext ? args.number(numberContext) : context.number;
-          return args.gp( { ...context, evaluateWord: true, number } )
-        },
         verbatim, 
         say: verbatim,
         interpolate: interpolate(args),

package/common/helpers/dialogues.js

@@ -28,15 +28,6 @@ class API {
     }
   }
 
-  warningNotEvaluated(log, value) {
-    const description = 'WARNING from Dialogues KM: For semantics, implement an evaluations handler, set "value" property of the operator to the value.'
-    const match = `({context}) => context.marker == '${value.marker}' && context.evaluate && <other conditions as you like>`
-    const apply = `({context}) => <do stuff...>; context.value = <value>`
-    const input = indent(JSON.stringify(value, null, 2), 2)
-    const message = `${description}\nThe semantic would be\n  match: ${match}\n  apply: ${apply}\nThe input context would be:\n${input}\n`
-    log(indent(message, 4))
-  }
-
   //
   // duck typing: for operators you want to use here
   //
@@ -98,7 +89,7 @@ class API {
     }
 
     initial.value = source_value || concept
-    await this.args.s({ value, makeObject: true, initial })
+    await this.args.e({ value, makeObject: true, initial })
     // config.addOperator({ pattern: `(["${fixUps(concept)}"])`, allowDups: true })
     config.addOperator({ pattern: `(["${concept}"|])`, allowDups: true })
     config.addBridge({ id: concept, level: 0, bridge: `{ ...operator, dead: true, value: or(operator.value, '${source_value || concept}') }` , allowDups: true })

package/common/helpers/properties.js

@@ -496,16 +496,12 @@ class API {
     }
 
     for (const arg of args) {
-      try{
-        const u = await this.args.unify(template[arg], value[arg])
-        if (u) {
-          continue
-        }
-        if (!matches(template[arg], value[arg])) {
-          return null
-        }
-      } catch(e) {
-        console.log(e)
+      const u = await this.args.unify(template[arg], value[arg])
+      if (u) {
+        continue
+      }
+      if (!matches(template[arg], value[arg])) {
+        return null
       }
     }
     return value

package/common/helpers.js

@@ -102,6 +102,10 @@ function isMany(context) {
     }
   }
 
+  if (context.isPropertyValue) {
+    return false
+  }
+
   let number = context.number
   if (context.quantity) {
     if (context.quantity.number) {
@@ -248,7 +252,7 @@ function toEValue(context) {
 }
 
 function toFinalValue(context) {
-  while( context.evalue || context.value ) {
+  while( context?.evalue || context?.value ) {
     if (context.evalue) {
       context = context.evalue
     } else {
@@ -279,7 +283,6 @@ function defaultContextCheck({marker, extra = [], exported = false} = {}) {
   if (marker) {
     match = ({context}) => context.marker == marker
   } else {
-    match = () => true
   }
   return {
     marker,

package/common/hierarchy.js

@@ -15,7 +15,7 @@ function getTypes( km, digraph, concept, instance ) {
     return new Set([...set1].filter(x => set2.has(x)))
   }
   const descendants = digraph.descendants(concept.value || concept.marker)
-  const ancestors = digraph.ancestors(instance.evalue)
+  const ancestors = digraph.ancestors(instance.evalue || instance.value)
   const common = intersect(ancestors, descendants)
   const answer = Array.from(digraph.minima(common))
   const words = answer.map( (value) => conceptAPI.getWordForValue(value) )
@@ -70,6 +70,7 @@ const config = {
           hierarchy.isA(context.marker, 'is') && 
           context.query && 
           !context.one.pullFromContext &&
+          (context.one?.marker == 'type' || context.two?.marker == 'type') &&
           !['what'].includes(context.one.marker) && 
           !['what'].includes(context.two.marker) && 
           (context.one.query || context.two.query),
@@ -84,7 +85,7 @@ const config = {
           concept = two;
           value = one;
         }
-        let instance = await e(value)
+        let instance = await e(value, where())
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           context.isResponse = true
@@ -118,7 +119,7 @@ const config = {
       apply: async ({context, hierarchy, objects, e, gs, km, log}) => {
         const concept = context.objects[0];
         const value = context.objects[1];
-        let instance = await e(value)
+        let instance = await e(value, where())
         if (instance.verbatim) {
           context.evalue = { verbatim: instance.verbatim }
           return
@@ -230,11 +231,13 @@ const config = {
       notes: 'humans are mammels',
       where: where(),
       match: ({debug, context, listable, hierarchy, isA, callId}) => {
-        // debug.b2reakAt('dates#call4')
         if (context.marker !== 'same') {
           return
         }
         const { one, two } = context
+        if (one.query || two.query) {
+          return
+        }
 
         // let the "the metric system is a measurement system" threw but block 'the gender is male'
         if (one.theable && !two.determiner && !two.pullFromContext) {
@@ -242,8 +245,6 @@ const config = {
         }
         if (two.determiner && two.determiner.marker == 'a') {
           two.concept = true;
-        } else if (two.evaluate) {
-          return // some kind of instance
         } else if (two.word && pluralize.isPlural(two.word)) {
           two.concept = true;
         } else if (one.number == 'many') {
@@ -342,7 +343,10 @@ knowledgeModule( {
     contents: hierarchy_tests,
     // TODO doesnt this need the KM
     checks: {
-      objects: ['children', 'concept', 'parents', 'properties'],
+      objects: [
+        'children', 'concept', 'parents', 'properties',
+        { km: 'properties' },
+      ],
       context: [
         defaultContextCheck(),
       ],