tpmkms 9.8.0-beta.8 → 9.9.0

package/common/math.instance.json

@@ -87,7 +87,23 @@
           "isA": [
             "mathematicalExpression"
           ],
-          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
+          ],
+          "semantic": "async ({e, context}) => {\n          const x = toValue(await e(context.x, where())) \n          const y = toValue(await e(context.y, where()))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
@@ -118,7 +134,23 @@
           "isA": [
             "mathematicalExpression"
           ],
-          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
+          ],
+          "semantic": "async ({e, context}) => {\n          const x = toValue(await e(context.x, where())) \n          const y = toValue(await e(context.y, where()))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
@@ -158,7 +190,23 @@
           "isA": [
             "mathematicalExpression"
           ],
-          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
+          ],
+          "semantic": "async ({e, context}) => {\n          const x = toValue(await e(context.x, where())) \n          const y = toValue(await e(context.y, where()))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/math.js:33",
@@ -197,7 +245,29 @@
           "isA": [
             "mathematicalExpression"
           ],
-          "evaluator": "async ({e, context}) => {\n          const x = toValue(await e(context.x)) \n          const y = toValue(await e(context.y))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
+          ],
+          "semantic": "async ({e, context}) => {\n          const x = toValue(await e(context.x, where())) \n          const y = toValue(await e(context.y, where()))\n          if (!x || !y) {\n            // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }\n            context.isResponse = false\n          } else {\n            context.evalue = { marker: 'number', value: apply(x, y) }\n            // context.evalue = apply(x, y)\n            context.evalue.isResponse = true\n            context.evalue.paraphrase = false\n            // context.paraphrase = false\n            // context.isResponse = true\n          }\n          /*\n          if (!context.value) {\n            context.isResponse = false\n            context.paraphrase = true\n          }\n          */\n        }"
+        }
+      ],
+      "semantics": [
+        {
+          "match": "({context, isA, callId, isMany}) => {\n        return context.marker == 'same' && isA(context.two, 'mathematicalExpression') && !isMany(context.one)\n      }",
+          "apply": "({context}) => {\n        // dont so the other one for is\n      }"
         }
       ]
     }
@@ -541,6 +611,22 @@
           "bridge": "{ ...next(operator) }",
           "isA": [
             "mathematicalExpression"
+          ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
           ]
         },
         {
@@ -570,6 +656,22 @@
           "bridge": "{ ...next(operator) }",
           "isA": [
             "mathematicalExpression"
+          ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
           ]
         },
         {
@@ -608,6 +710,22 @@
           "bridge": "{ ...next(operator) }",
           "isA": [
             "mathematicalExpression"
+          ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
           ]
         },
         {
@@ -645,8 +763,27 @@
           "bridge": "{ ...next(operator) }",
           "isA": [
             "mathematicalExpression"
+          ],
+          "check": [
+            "marker",
+            "text",
+            "verbatim",
+            "value",
+            "evalue",
+            "isResponse",
+            {
+              "properties": "modifiers"
+            },
+            {
+              "properties": "postModifiers"
+            },
+            "x",
+            "y"
           ]
         }
+      ],
+      "semantics": [
+        {}
       ]
     }
   ],

package/common/math.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const dialogues = require('./dialogues')
 const numbers = require('./numbers')
 const punctuation = require('./punctuation')
@@ -47,9 +47,10 @@ function mathematicalOperator(name, words, apply, before = []) {
         bridge: "{ ...next(operator) }",
         isA: ['mathematicalExpression'],
         // generatorp: async ({gp, context}) => `${await gp(context.x)} ${context.word} ${await gp(context.y)}`,
-        evaluator: async ({e, context}) => {
-          const x = toValue(await e(context.x)) 
-          const y = toValue(await e(context.y))
+        check: defaultContextCheckProperties(['x', 'y']),
+        semantic: async ({e, context}) => {
+          const x = toValue(await e(context.x, where())) 
+          const y = toValue(await e(context.y, where()))
           if (!x || !y) {
             // context.evalue = { ...context, paraphrase: true, x: { ...context.x, value: x }, y: { ...context.y, value: y } }
             context.isResponse = false
@@ -107,6 +108,16 @@ const config = {
     ...mathematicalOperator('times', ['times', '*'], (x, y) => x * y, [['plusOperator', 0], ['minusOperator', 0]]),
     ...mathematicalOperator('divideBy', ['/'], (x, y) => x / y, [['plusOperator', 0], ['minusOperator', 0]]),
   ],
+  semantics: [
+    {
+      match: ({context, isA, callId, isMany}) => {
+        return context.marker == 'same' && isA(context.two, 'mathematicalExpression') && !isMany(context.one)
+      },
+      apply: ({context}) => {
+        // dont so the other one for is
+      }
+    },
+  ],
 };
 
 const template = {
@@ -129,7 +140,9 @@ knowledgeModule( {
     name: './math.test.json',
     contents: tests,
     checks: {
-      context: [defaultContextCheck()],
+      context: [
+        defaultContextCheck()
+      ],
     }
   },
 })

package/common/menus.instance.json

@@ -14,6 +14,7 @@
       "bridges": [
         {
           "id": "close_menus",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:130",
           "isA": [
             "verb"
           ],
@@ -25,6 +26,7 @@
         },
         {
           "id": "show_menus",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:141",
           "isA": [
             "verb"
           ],
@@ -43,7 +45,7 @@
       "semantics": [
         {
           "match": "({context, isA}) => isA(context, 'showable_menus')",
-          "apply": "async ({context, insert, s, fragments}) => {\n            const instantiation = await fragments(\"show showable\", { 'showable_menus': context })\n            await s(instantiation)\n          }"
+          "apply": "async ({context, insert, e, fragments}) => {\n            const instantiation = await fragments(\"show showable\", { 'showable_menus': context })\n            await e(instantiation, where())\n          }"
         }
       ]
     },
@@ -1702,6 +1704,7 @@
       "bridges": [
         {
           "id": "close_menus",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:130",
           "isA": [
             "verb"
           ],
@@ -1712,6 +1715,7 @@
         },
         {
           "id": "show_menus",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:141",
           "isA": [
             "verb"
           ],
@@ -1728,7 +1732,7 @@
       ],
       "semantics": [
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:156"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/menus.js:159"
         }
       ]
     },

package/common/menus.js

@@ -127,6 +127,7 @@ const template = {
       bridges: [
         {
           id: 'close_menus',
+          where: where(),
           isA: ['verb'],
           associations: ['menus'],
           bridge: "{ ...next(operator), closee: after[0], generate: ['this', 'closee'] }",
@@ -136,6 +137,8 @@ const template = {
         },
         {
           id: 'show_menus',
+          where: where(),
+          where: where(),
           isA: ['verb'],
           bridge: "{ ...next(operator), show: after[0], generate: ['this', 'show'] }",
           semantic: ({context, api}) => {
@@ -155,9 +158,9 @@ const template = {
         {
           where: where(),
           match: ({context, isA}) => isA(context, 'showable_menus'),
-          apply: async ({context, insert, s, fragments}) => {
+          apply: async ({context, insert, e, fragments}) => {
             const instantiation = await fragments("show showable", { 'showable_menus': context })
-            await s(instantiation)
+            await e(instantiation, where())
           }
         },
       ]

package/common/meta.js

@@ -78,7 +78,7 @@ const config = {
       id: 'synonymOfWord',
       operator: "((synonym/*) [synonymOfWord|of] (word))",
       bridge: "{ ...next(operator), word: after[0] }",
-      evaluator: ({context}) => {
+      semantic: ({context}) => {
       }
     },
     */
@@ -192,10 +192,10 @@ const config = {
     {
       where: where(),
       match: ({context}) => context.marker == 'orList',
-      apply: async ({context, s}) => {
+      apply: async ({context, e}) => {
         const response = []
         for (const value of context.value) {
-          response.push(await s(value))
+          response.push(await e(value, where()))
         }
         context.evalue = {
           marker: 'orList', 
@@ -219,7 +219,7 @@ const config = {
             function invertMappings(mappings) {
               return mappings.map( ({ from, to }) => { return { to: from, from: to } } )
             }
-            return async ({context, s, config}) => { 
+            return async ({context, e, config}) => { 
               DEFINITIONs = _.cloneDeep(DEFINITIONs)
               //const mappings = mappingss[0]
               let toPrimes = []
@@ -229,7 +229,7 @@ const config = {
                 }
                 // next move add debug arg to s and g
                 TO.query = true
-                toPrimes.push([await s(TO), mappings])
+                toPrimes.push([await e(TO, where()), mappings])
               }
 
               let hasResponse = false
@@ -323,12 +323,12 @@ const config = {
             return ({context}) => context.evalue == defContext.from.value && !context.query && !context.objects
           }
           function apply(mappings, TO) {
-            return async ({context, s}) => {
+            return async ({context, e}) => {
               TO = _.cloneDeep(TO)
               for (const { from, to } of mappings) {
                 hashIndexesSet(TO, to, hashIndexesGet(context, from))
               }
-              toPrime = await s(TO)
+              toPrime = await e(TO, where())
               context.result = toPrime.result
             }
           }
@@ -349,14 +349,15 @@ const config = {
 
         // setup the read semantic
         {
+          // TODO change this disable to callOnce
           function matchByMarker(defContext) {
-            return ({context, uuid}) => context.marker == defContext.from.marker && (context.query || context.evaluate) && !context[`disable${uuid}`]
+            return ({context, uuid}) => context.marker == defContext.from.marker && !context[`disable${uuid}`]
           }
           function matchByValue(defContext) {
-            return ({context, uuid}) => context.value == defContext.from.value && (context.query || context.evaluate) && !context[`disable${uuid}`]
+            return ({context, uuid, stack}) => context.value == defContext.from.value && !context[`disable${uuid}`]
           }
           function apply(mappings, TO) {
-            return async ({uuid, context, s, g, config}) => {
+            return async ({uuid, context, e, g, config}) => {
               TO = _.cloneDeep(TO)
               for (const { from, to } of mappings) {
                 hashIndexesSet(TO, to, hashIndexesGet(context, from))
@@ -366,11 +367,10 @@ const config = {
               if (context.query) {
                 TO.query = context.query
               } else {
-                TO.evaluate = context.evaluate
                 TO.metaDefinition = true
               }
               TO[`disable${uuid}`] = true
-              toPrime = await s(TO)
+              toPrime = await e(TO, where())
               if (context.query) {
                 if (toPrime.evalue) {
                   context.evalue = toPrime.evalue

package/common/nameable.js

@@ -88,6 +88,7 @@ const config = {
     },
     {
       id: 'getNamesByType',
+      where: where(),
       scope: "testing",
       isA: ['verb'],
       bridge: "{ ...next(operator), type: after[0] }",
@@ -113,6 +114,7 @@ const config = {
     },
     {
       id: 'call',
+      where: where(),
       isA: ['verb'],
       words: englishHelpers.conjugateVerb('call'),
       bridge: `{ 
@@ -124,7 +126,7 @@ const config = {
       `,
       // generatorp: async ({context, g, gs}) => `call ${await g(context.nameable)} ${await gs(context.name)}`,
       semantic: async ({config, context, api, e, verbatim, g}) => {
-        const nameable = (await e(context.nameable))?.evalue
+        const nameable = (await e(context.nameable, where()))?.evalue
         if (!nameable) {
           verbatim(`${await g(context.nameable)} is not known`)
           return
@@ -188,7 +190,9 @@ knowledgeModule( {
             context: [
               defaultContextCheck({ extra: ['pullFromContext'] }),
             ],
-            objects: ['mentioned', { km: 'stm' }],
+            objects: [
+              { km: 'stm' }
+            ],
           },
     include: {
       words: [ "peter james chunkington", "banana" ],

package/common/ordering.instance.json

@@ -203,8 +203,7 @@
             "types": [
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "marker": "xfx",

package/common/percentages.js

@@ -12,6 +12,7 @@ const config = {
   bridges: [
     { 
       id: "percent", 
+      where: where(),
       words: ['percent', '%'],
       separators: '?',
       bridge: "{ ...next(operator), modifiers: ['scale'], scale: before[0] }",
@@ -19,11 +20,12 @@ const config = {
     },
     { 
       id: "percentageOf", 
+      where: where(),
       words: ['percent', '%'],
       bridge: "{ ...next(operator), percentage: before[0], isResponse: true, semanticIsEvaluate: true, value: after[0] }",
-      evaluator: async ({context, e}) => {
+      semantic: async ({context, e}) => {
         const scale = context.percentage.scale
-        const number = await e(context.value)
+        const number = await e(context.value, where())
         const percentage = number.value * scale.value / 100
         const result = { ...number, value: percentage, evalue: percentage, word: null, text: null }
         context.evalue = result