tpmkms 9.8.0 → 9.9.0

package/common/fastfood.js

@@ -147,10 +147,10 @@ const template = {
         "((meal/* && context.comboNumber == undefined) [comboMeal] (combo/*))",
         "((combo/*) [comboNumber] (number/* || numberNumberCombo/*))",
         "((numberNumberCombo/1) [numberNumberCombo_combo|] (combo/0))",
-        "((number/0,1 && context.instance == false) [numberNumberCombo] (number/0,1 && instance == true))",
+        "((number/0,1 && context.isInstance == false) [numberNumberCombo] (number/0,1 && isInstance == true))",
         "((combo/*) [([withModification|with] ([modification]))])",
       ],
-      floaters: ['instance'],
+      floaters: ['isInstance'],
       priorities: [
        // { "context": [['counting', 0], ['strawberry_smoothie', 0], ], "choose": [0] },
        { "context": [['counting', 0], ['strawberry_smoothie', 0], ], "choose": [1] },
@@ -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)}`,
@@ -225,7 +226,7 @@ const template = {
           convolution: true,
           before: ['combo', 'preposition'],
           // after: ['comma'],
-          bridge: "{ ...next(before[0]), postModifiers: append(before[0].postModifiers, ['comboNumber']), comboNumber: after[0], instance: true, flatten: true }",
+          bridge: "{ ...next(before[0]), postModifiers: append(before[0].postModifiers, ['comboNumber']), comboNumber: after[0], isInstance: true, flatten: true }",
         },
         { 
           id: 'numberNumberCombo',
@@ -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,16 +44,48 @@
           ],
           "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: 'answerNotKnown' }\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.response = await api.solveFor(context.equality, context.variable)\n          context.isResponse = true\n          context.value = null\n        } catch( e ) {\n        }\n        if (!context.response) {\n          // TODO some KM for talking to the user wrt brief+avatar\n          context.verbatim = `Solving failed`\n        }\n      }"
+          "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      }"
         },
         {
           "id": "forVariable",
@@ -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": [
             "="
           ],
@@ -230,7 +293,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "formulas#call2"
           ]
@@ -391,6 +453,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "formulas are concepts",
       "key": {
         "query": "formulas are concepts"
@@ -438,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",
@@ -466,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",
@@ -480,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": [
             "="
           ],
@@ -602,8 +730,7 @@
           },
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -746,6 +873,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "x = y",
       "skipSemantics": true,
       "key": {
@@ -854,8 +984,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -928,6 +1057,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "x + y",
       "skipSemantics": true,
       "key": {
@@ -1036,8 +1168,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -1110,6 +1241,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "x - y",
       "skipSemantics": true,
       "key": {
@@ -1218,8 +1352,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -1292,6 +1425,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "x * y",
       "skipSemantics": true,
       "key": {
@@ -1400,8 +1536,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "context_id": 2
+          "topLevel": true
         }
       ],
       "generated": [
@@ -1474,6 +1609,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "x / y",
       "skipSemantics": true,
       "key": {

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,13 +86,14 @@ 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 }
         } else {
-          context.evalue = { marker: 'answerNotKnown' }
+          context.evalue = { marker: 'undefined' }
         }
       }
     },
@@ -101,15 +102,16 @@ 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 {
-          context.response = await api.solveFor(context.equality, context.variable)
+          context.evalue = await api.solveFor(context.equality, context.variable)
           context.isResponse = true
           context.value = null
         } catch( e ) {
         }
-        if (!context.response) {
+        if (!context.evalue) {
           // TODO some KM for talking to the user wrt brief+avatar
           context.verbatim = `Solving failed`
         }
@@ -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(),