tpmkms_4wp 9.8.0-beta.1 → 9.8.0-beta.15

package/common/actions.instance.json

@@ -46,7 +46,7 @@
               "action": "(@<= 'action' || @<= 'doAction')"
             }
           },
-          "semantic": "async ({context, fragments, e, s, toFinalValue, kms}) => {\n        const instantiation = await fragments(\"quantity in milliseconds\", { quantity: context.delayTime })\n        const result = await e(instantiation)\n        const milliseconds = toFinalValue(toFinalValue(result).amount)\n        await kms.time.api.sleep(milliseconds)\n        await s(context.action)\n      }"
+          "semantic": "async ({context, fragments, e, toFinalValue, kms}) => {\n        const instantiation = await fragments(\"quantity in milliseconds\", { quantity: context.delayTime })\n        const result = await e(instantiation, where())\n        const milliseconds = toFinalValue(toFinalValue(result).amount)\n        await kms.time.api.sleep(milliseconds)\n        await e(context.action, where())\n      }"
         },
         {
           "where": "/home/dev/code/theprogrammablemind/kms/common/actions.js:62",
@@ -142,7 +142,7 @@
               "action"
             ]
           ],
-          "semantic": "async ({context, toArray, s}) => {\n        for (const action of toArray(context.action)) {\n          await s(action)\n        }\n      }"
+          "semantic": "async ({context, toArray, e}) => {\n        for (const action of toArray(context.action)) {\n          await e(action, where())\n        }\n      }"
         }
       ],
       "words": {
@@ -166,8 +166,8 @@
       },
       "semantics": [
         {
-          "match": "({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')",
-          "apply": "async ({context, _continue, testLog, g, remember}) => {\n        remember(context)\n        await testLog(() => g(context))\n        _continue()\n      }"
+          "match": "({context, isA, contextHierarchy, stack, namespaced}) => {\n        return !context.pullFromContext && !contextHierarchy.under('call') && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')\n      }",
+          "apply": "async ({context, _continue, testLog, gp, remember}) => {\n        remember(context)\n        await testLog(() => gp(context))\n        _continue()\n      }"
         }
       ]
     }

package/common/actions.js

@@ -50,12 +50,12 @@ const config = {
           action: "(@<= 'action' || @<= 'doAction')",
         },
       },
-      semantic: async ({context, fragments, e, s, toFinalValue, kms}) => {
+      semantic: async ({context, fragments, e, toFinalValue, kms}) => {
         const instantiation = await fragments("quantity in milliseconds", { quantity: context.delayTime })
-        const result = await e(instantiation)
+        const result = await e(instantiation, where())
         const milliseconds = toFinalValue(toFinalValue(result).amount)
         await kms.time.api.sleep(milliseconds)
-        await s(context.action)
+        await e(context.action, where())
       }
     },
     {
@@ -98,9 +98,9 @@ const config = {
       bridge: "{ ...next(operator), value: append(before, operator.value) }",
       semantic: {
         match: ({context}) => context.isList,
-        apply: async ({context, toArray, s}) => {
+        apply: async ({context, toArray, e}) => {
           for (const action of toArray(context)) {
-            await s(action)
+            await e(action, where())
           }
         },
       }
@@ -131,9 +131,9 @@ const config = {
       }`,
       localHierarchy: [['thisitthat', 'action']],
       where: where(),
-      semantic: async ({context, toArray, s}) => {
+      semantic: async ({context, toArray, e}) => {
         for (const action of toArray(context.action)) {
-          await s(action)
+          await e(action, where())
         }
       },
     },
@@ -147,10 +147,12 @@ const config = {
     {
       where: where(),
       priority: -1,
-      match: ({context, isA, stack, namespaced}) => !context.pullFromContext && !context.evaluate && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged'),
-      apply: async ({context, _continue, testLog, g, remember}) => {
+      match: ({context, isA, contextHierarchy, stack, namespaced}) => {
+        return !context.pullFromContext && !contextHierarchy.under('call') && (isA(context.marker, 'action') || isA(context.marker, 'doAction')) && !namespaced.get('actions', context, 'logged')
+      },
+      apply: async ({context, _continue, testLog, gp, remember}) => {
         remember(context)
-        await testLog(() => g(context))
+        await testLog(() => gp(context))
         _continue()
       }
     },

package/common/askfor.instance.json

@@ -30,17 +30,19 @@
         },
         {
           "id": "known",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:77",
           "isA": [
             "queryable"
           ],
-          "evaluator": "async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const known = await kms.properties.api.getProperty(context.subjects[0], 'property')\n            resolveEvaluate(context, known)\n          }"
+          "semantic": "async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const known = await kms.properties.api.getProperty(context.subjects[0], 'property')\n            resolveEvaluate(context, known)\n          }"
         },
         {
           "id": "information",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:86",
           "isA": [
             "noun"
           ],
-          "evaluator": "async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const properties = objects.askFor\n            const values = []\n            for (const property of properties) {\n              // const value = toEValue(await e(property))\n              const value = (await e(property)).evalue\n              values.push({ marker: 'labelledValue', label: property, value })\n            }\n            resolveEvaluate(context, toList(values))\n          }"
+          "semantic": "async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {\n            const properties = objects.askFor\n            const values = []\n            for (const property of properties) {\n              try {\n                const value = (await e(property, where())).evalue\n                values.push({ marker: 'labelledValue', label: property, value })\n              } catch( e ) {\n              }\n            }\n            resolveEvaluate(context, toList(values))\n          }"
         },
         {
           "id": "for_askfor",
@@ -57,6 +59,7 @@
         },
         {
           "id": "askfor_askfor",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:114",
           "isA": [
             "verb"
           ],
@@ -64,7 +67,7 @@
             "ask"
           ],
           "bridge": "{\n            ...next(operator),\n            properties: after[0],\n            interpolate: [{ self: true }, { property: 'properties' }]\n          }",
-          "semantic": "async ({e, s, gp, objects, flatten, context, ask, fragments, toEValue}) => {\n            const argument = context.properties.argument\n            const getValue = (property) => async (args) => {\n              const value = toEValue(await e(property))\n              if (value.marker == 'answerNotKnown') {\n                return\n              }\n              return value\n            }\n\n            const setValue = (property) => async ({ context, namespaced, tag }) => {\n              const is = { marker: 'is', one: property, two: context }\n              namespaced.set('dialogs', is, 'allowHierarchy', false)\n              await s(is)\n            }\n\n            const properties = flattenInPlace(argument)\n            counter = 0\n            for (const property of properties.reverse()) {\n              counter += 1\n              const query = memoizeAsync(async () => await(gp(await fragments(\"what is the concept?\", { concept: property }))))\n              const compatible_types = property.compatible_types || [property.marker]\n              const matchr = ({context, isA}) => {\n                return !context.same && !context.evaluate && isA(context, compatible_types)\n              }\n              objects.askFor.push(property);\n              askForProperty({\n                ask,\n                tag: `ask#${counter}`,\n                getValue: getValue(property),\n                setValue: setValue(property),\n                query,\n                matchr,\n              })\n            }\n          }"
+          "semantic": "async ({e, gp, objects, flatten, context, ask, fragments, toEValue}) => {\n            const argument = context.properties.argument\n            const getValue = (property) => async (args) => {\n              try {\n                const value = toEValue(await e(property, where()))\n                if (value.marker === 'undefined') {\n                  return\n                }\n                return value\n              } catch (e) {\n              }\n            }\n\n            const setValue = (property) => async ({ context, namespaced, tag }) => {\n              const is = { marker: 'is', one: property, two: context }\n              namespaced.set('dialogs', is, 'allowHierarchy', false)\n              await e(is, where())\n            }\n\n            const properties = flattenInPlace(argument)\n            counter = 0\n            for (const property of properties.reverse()) {\n              counter += 1\n              const query = memoizeAsync(async () => await(gp(await fragments(\"what is the concept?\", { concept: property }))))\n              const compatible_types = property.compatible_types || [property.marker]\n              const matchr = ({context, isA}) => {\n                return !context.same && isA(context, compatible_types)\n              }\n              objects.askFor.push(property);\n              askForProperty({\n                ask,\n                tag: `ask#${counter}`,\n                getValue: getValue(property),\n                setValue: setValue(property),\n                query,\n                matchr,\n              })\n            }\n          }"
         }
       ]
     },
@@ -440,189 +443,11 @@
           ],
           "level": 2,
           "context_index": 1,
-          "topLevel": true,
-          "evalue": {
-            "default": true,
-            "marker": "is",
-            "one": {
-              "marker": "concept",
-              "value": "concept",
-              "default": true,
-              "text": "the concept",
-              "dead": true,
-              "word": "concept",
-              "range": {
-                "start": 8,
-                "end": 18
-              },
-              "types": [
-                "concept"
-              ],
-              "focusableForPhrase": true,
-              "pullFromContext": true,
-              "concept": true,
-              "wantsValue": true,
-              "checks": [
-                "determiner"
-              ],
-              "determiner": {
-                "modifiers": [],
-                "text": "the",
-                "marker": "the",
-                "word": "the",
-                "range": {
-                  "start": 8,
-                  "end": 10
-                },
-                "level": 0
-              },
-              "theable": {
-                "marker": "concept",
-                "value": "concept",
-                "default": true,
-                "text": "concept",
-                "dead": true,
-                "word": "concept",
-                "range": {
-                  "start": 12,
-                  "end": 18
-                },
-                "types": [
-                  "concept"
-                ],
-                "level": 0
-              },
-              "flattenInPlace": [
-                [
-                  "value",
-                  "theable"
-                ]
-              ],
-              "flatten_ignore": [
-                "theable"
-              ],
-              "interpolate": [
-                {
-                  "property": "determiner"
-                },
-                {
-                  "property": "theable"
-                }
-              ],
-              "level": 0
-            },
-            "two": {
-              "marker": "concept",
-              "value": {
-                "marker": "surname",
-                "isVariable": true,
-                "evaluate": false,
-                "pullFromContext": false,
-                "value": "last_name",
-                "fromSTM": true,
-                "namespaced": {
-                  "stm": {
-                    "id": 1
-                  }
-                }
-              },
-              "default": true,
-              "text": "the concept",
-              "dead": true,
-              "word": "concept",
-              "range": {
-                "start": 8,
-                "end": 18
-              },
-              "types": [
-                "concept"
-              ],
-              "focusableForPhrase": true,
-              "pullFromContext": true,
-              "concept": true,
-              "wantsValue": true,
-              "checks": [
-                "determiner"
-              ],
-              "determiner": {
-                "modifiers": [],
-                "text": "the",
-                "marker": "the",
-                "word": "the",
-                "range": {
-                  "start": 8,
-                  "end": 10
-                },
-                "level": 0
-              },
-              "theable": {
-                "marker": "concept",
-                "value": "concept",
-                "default": true,
-                "text": "concept",
-                "dead": true,
-                "word": "concept",
-                "range": {
-                  "start": 12,
-                  "end": 18
-                },
-                "types": [
-                  "concept"
-                ],
-                "level": 0
-              },
-              "flattenInPlace": [
-                [
-                  "value",
-                  "theable"
-                ]
-              ],
-              "flatten_ignore": [
-                "theable"
-              ],
-              "interpolate": [
-                {
-                  "property": "determiner"
-                },
-                {
-                  "property": "theable"
-                }
-              ],
-              "level": 0,
-              "evalue": {
-                "marker": "surname",
-                "isVariable": true,
-                "evaluate": false,
-                "pullFromContext": false,
-                "value": "last_name",
-                "fromSTM": true,
-                "namespaced": {
-                  "stm": {
-                    "id": 1
-                  }
-                }
-              },
-              "touchedBy": [
-                "askfor#call3",
-                "askfor#call2"
-              ],
-              "instance": true,
-              "focus": true
-            },
-            "focusable": [
-              "two",
-              "one"
-            ],
-            "word": "is"
-          },
-          "isResponse": true,
-          "touchedBy": [
-            "askfor#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [
-        "the concept is last_name"
+        ""
       ],
       "paraphrases": [
         "what is the concept?"
@@ -630,7 +455,7 @@
       "paraphrasesParenthesized": [],
       "generatedParenthesized": [],
       "responses": [
-        "the concept is last_name"
+        ""
       ],
       "associations": [],
       "summaries": [
@@ -893,12 +718,14 @@
         },
         {
           "id": "known",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:77",
           "isA": [
             "queryable"
           ]
         },
         {
           "id": "information",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:86",
           "isA": [
             "noun"
           ]
@@ -918,6 +745,7 @@
         },
         {
           "id": "askfor_askfor",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/askfor.js:114",
           "isA": [
             "verb"
           ],

package/common/askfor.js

@@ -74,22 +74,26 @@ const template = {
         },
         {
           id: 'known',
+          where: where(),
           isA: ['queryable'],
-          evaluator: async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
+          semantic: async ({kms, context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
             const known = await kms.properties.api.getProperty(context.subjects[0], 'property')
             resolveEvaluate(context, known)
           },
         },
         {
           id: 'information',
+          where: where(),
           isA: ['noun'],
-          evaluator: async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
+          semantic: async ({context, e, callId, toList, flatten, toEValue, resolveEvaluate, objects}) => {
             const properties = objects.askFor
             const values = []
             for (const property of properties) {
-              // const value = toEValue(await e(property))
-              const value = (await e(property)).evalue
-              values.push({ marker: 'labelledValue', label: property, value })
+              try {
+                const value = (await e(property, where())).evalue
+                values.push({ marker: 'labelledValue', label: property, value })
+              } catch( e ) {
+              }
             }
             resolveEvaluate(context, toList(values))
           },
@@ -107,6 +111,7 @@ const template = {
         },
         {
           id: 'askfor_askfor',
+          where: where(),
           isA: ['verb'],
           words: ['ask'],
           bridge: `{
@@ -114,20 +119,23 @@ const template = {
             properties: after[0],
             interpolate: [{ self: true }, { property: 'properties' }]
           }`,
-          semantic: async ({e, s, gp, objects, flatten, context, ask, fragments, toEValue}) => {
+          semantic: async ({e, gp, objects, flatten, context, ask, fragments, toEValue}) => {
             const argument = context.properties.argument
             const getValue = (property) => async (args) => {
-              const value = toEValue(await e(property))
-              if (value.marker == 'answerNotKnown') {
-                return
+              try {
+                const value = toEValue(await e(property, where()))
+                if (value.marker === 'undefined') {
+                  return
+                }
+                return value
+              } catch (e) {
               }
-              return value
             }
 
             const setValue = (property) => async ({ context, namespaced, tag }) => {
               const is = { marker: 'is', one: property, two: context }
               namespaced.set('dialogs', is, 'allowHierarchy', false)
-              await s(is)
+              await e(is, where())
             }
 
             const properties = flattenInPlace(argument)
@@ -137,7 +145,7 @@ const template = {
               const query = memoizeAsync(async () => await(gp(await fragments("what is the concept?", { concept: property }))))
               const compatible_types = property.compatible_types || [property.marker]
               const matchr = ({context, isA}) => {
-                return !context.same && !context.evaluate && isA(context, compatible_types)
+                return !context.same && isA(context, compatible_types)
               }
               objects.askFor.push(property);
               askForProperty({

package/common/asking.js

@@ -26,6 +26,7 @@ const config = {
   bridges: [
     {
       id: "nevermind",
+      where: where(),
       bridge: "{ ...next(operator), complete: true }",
       semantic: (args) => {
         const {config, context} = args
@@ -51,6 +52,7 @@ const config = {
 
     {
       id: "whichOnesTestSetup",
+      where: where(),
       scope: "testing",
       generatorp: async ({context, gs}) => `${context.marker} ${await gs(context.choices)}`,
       bridge: "{ ...next(operator), choices: after[0] }",
@@ -91,6 +93,7 @@ const config = {
 
     {
       id: "nevermindTestSetup",
+      where: where(),
       scope: "testing",
       bridge: "{ ...next(operator), type: after[0], postModifiers: ['type'] }",
       semantic: ({ask, context}) => {
@@ -156,7 +159,9 @@ function getAsk(config) {
             oneShot: ask.oneShot ?? true,
             where: semantic.where || ask.where || where(2),
             source: 'response',
-            match: (args) => !args.context.isResponse && !args.context.evaluate && !args.context.isControl && semantic.match(args),
+            match: async (args) => await args.callOnce(args, 'asking.1', async (args) => {
+              return !args.context.isResponse &&                           args.context.topLevel && !args.context.isControl && await semantic.match(args)
+            }),
             apply: async (args) => {
               setWasApplied(true)
               await semantic.apply({ ...args, tag: ask.tag })
@@ -187,13 +192,13 @@ function getAsk(config) {
               matchq = () => !wasAsked,
               applyq = (args) => {
                 wasAsked = true
-                return ask.applyq({ ...args, tag: ask.tag })
+                return args.stack.wrap(() => ask.applyq({ ...args, tag: ask.tag }), where())
               }
             }
-            if (await matchq(args)) {
+            if (await args.stack.wrap(() => matchq(args), where())) {
               setWasApplied(false)
               // args.context.motivationKeep = true
-              const query = await applyq({ ...args, wasAsked: getWasAsked() })
+              const query = await args.stack.wrap(() => applyq({ ...args, wasAsked: getWasAsked() }), where())
               if (typeof query != 'string') {
                 throw new Error(`ask expects the value return from applyq to be a string. ${ask.where}. Instead got ${JSON.stringify(query, null, 2)}.`)
               }

package/common/avatar.js

@@ -27,7 +27,7 @@ const config = {
     {
        where: where(),
        notes: "unknown answer default response for avatar",
-       match: ({context}) => context.marker == 'answerNotKnown',
+       match: ({context}) => context.marker === 'undefined',
        apply: ({context}) => `I don't know`,
     },
     {

package/common/can.instance.json

@@ -298,15 +298,7 @@
           "voice": "passive",
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "control": {
-            "seen": {
-              "length": 0
-            }
-          },
-          "touchedBy": [
-            "can#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [
@@ -801,15 +793,7 @@
           ],
           "level": 1,
           "context_index": 1,
-          "topLevel": true,
-          "control": {
-            "seen": {
-              "length": 0
-            }
-          },
-          "touchedBy": [
-            "can#call2"
-          ]
+          "topLevel": true
         }
       ],
       "generated": [

package/common/can.js

@@ -115,7 +115,7 @@ const config = {
   semantics: [
     {
       match: ({context}) => context.toVoice == 'passive',
-      apply: async ({g, context, fragmentMapper}) => {
+      apply: async ({g, context}) => {
         for (const element of propertyToArray(context)) {
           if (!element.voice) {
             continue
@@ -140,7 +140,7 @@ const config = {
     },
     {
       match: ({context}) => context.toVoice == 'active',
-      apply: async ({g, context, fragmentMapper}) => {
+      apply: async ({g, context}) => {
         // From 
         //    [{"property":"canSubject"},{"property":"operator","number":"canSubject"},{"property":"canObject"}]
         for (const element of propertyToArray(context)) {

package/common/comparable.instance.json

@@ -1339,8 +1339,7 @@
               "queryable",
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "value": "concepts",
@@ -1627,8 +1626,7 @@
               "queryable",
               "unknown"
             ],
-            "level": 0,
-            "evaluate": false
+            "level": 0
           },
           "two": {
             "value": "condition",
@@ -2200,8 +2198,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "lowest",
@@ -2232,8 +2229,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "maximum",
@@ -2249,8 +2245,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               },
               {
                 "value": "minimum",
@@ -2266,8 +2261,7 @@
                 "types": [
                   "unknown"
                 ],
-                "level": 0,
-                "evaluate": false
+                "level": 0
               }
             ],
             "level": 1

package/common/concept.instance.json

@@ -11,6 +11,7 @@
         {
           "id": "modifies",
           "enhanced_associations": false,
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:28",
           "isA": [
             "verb"
           ],
@@ -100,6 +101,7 @@
       "bridges": [
         {
           "id": "isOpenCompound",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:154",
           "isA": [
             "verb"
           ],
@@ -142,6 +144,7 @@
         {
           "id": "modifies",
           "enhanced_associations": false,
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:28",
           "isA": [
             "verb"
           ],
@@ -160,7 +163,7 @@
           "bridge": "{ ...next(operator), conceptModifiers: before[0], concept: after[0] }",
           "semantic": {
             "notes": "define a modifier",
-            "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:34"
+            "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:35"
           },
           "check": [
             "marker",
@@ -217,10 +220,10 @@
       "generators": [
         {
           "notes": "\"fire type, water type and earth type\" to \"fire water and earth type\"",
-          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:84"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:85"
         },
         {
-          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:123"
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:124"
         }
       ]
     },
@@ -682,6 +685,7 @@
       "bridges": [
         {
           "id": "isOpenCompound",
+          "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:154",
           "isA": [
             "verb"
           ],
@@ -690,7 +694,7 @@
             "is"
           ],
           "semantic": {
-            "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:163"
+            "where": "/home/dev/code/theprogrammablemind/kms/common/concept.js:165"
           },
           "enhanced_associations": true,
           "check": [