tpmkms 9.8.0 → 9.9.0

package/common/reports.js

@@ -194,7 +194,7 @@ const config = {
 
         generatorp: async ({context, gp}) => `move ${await gp(context.from)} ${await gp(context.to)}`,
         semantic: async ({context, e, objects, kms, insert}) => {
-          const report = await e(context.on)
+          const report = await e(context.on, where())
           const id = report.value.value
           const listing = objects.listings[id]
 
@@ -222,7 +222,7 @@ const config = {
         bridge: "{ ...next(operator), on: { marker: 'report', pullFromContext: true }, removee: after[0] }",
         generatorp: async ({context, gp}) => `remove ${await gp(context.removee)}`,
         semantic: async ({context, e, kms, insert, objects}) => {
-          const report = await e(context.on)
+          const report = await e(context.on, where())
           const id = report.value.value
           const listing = objects.listings[id]
           const column = context.removee.index.value
@@ -337,7 +337,7 @@ const config = {
         return `call ${await g(context.namee)} ${await gs(context.name)}`
       },
       semantic: async ({context, objects, e, config, km}) => {
-        const namee = (await e(context.namee)).evalue
+        const namee = (await e(context.namee, where())).evalue
         const id = namee.value
         const listing = objects.listings[id]
         // const name = context.name.text
@@ -410,7 +410,7 @@ const config = {
         if (context.report) {
           return `show ${await gp(context.report)}`
         } else {
-          const report = await e(context.on)
+          const report = await e(context.on, where())
           const id = report.value.value
           const listing = objects.listings[id]
           return `the properties being shown are ${await gs(listing.columns, ', ', ' and ')}`
@@ -462,8 +462,8 @@ const config = {
           kms.stm.api.setVariable('price', { marker: 'price', value: 23 })
           kms.stm.api.setVariable('quantity', { marker: 'quantity', value: 3 })
           const c1 = { marker: 'worth', value: 'worth' }
-          r1 = toEValue(await e(c1));
-          r2 = await e({ marker: 'supplier', value: 'supplier' })
+          r1 = toEValue(await e(c1, where()));
+          r2 = await e({ marker: 'supplier', value: 'supplier' }, where())
         }
         const data = []
         for (const product of products) {
@@ -472,7 +472,7 @@ const config = {
             kms.stm.api.setVariable(p, { marker: p, value: product[p] })
           }
           for (const property of columns) {
-            const value = toFinalValue(await e({ marker: property, value: property }));
+            const value = toFinalValue(await e({ marker: property, value: property }, where()));
             row.push(value)
           }
           data.push(row)
@@ -504,7 +504,7 @@ const config = {
           const responses = []
           for (let value of values) {
             if (!value.value || value.pullFromContext) {
-              value = await e(value)
+              value = await e(value, where())
             }
             let id = value.value
             if (value.evalue) {
@@ -527,7 +527,7 @@ const config = {
           }
           context.isResponse = true
         } else {
-          const report = await e(context.on)
+          const report = await e(context.on, where())
           const id = report.value.value
           const listing = objects.listings[id]
           const values = propertyToArray(context.properties)
@@ -554,7 +554,7 @@ const config = {
         //const name = '***current***'
         if (context.api) {
           // id = newReport({km, objects})
-          const report = await e({ marker: 'report', pullFromContext: true })
+          const report = await e({ marker: 'report', pullFromContext: true }, where())
           const id = report.value.value
           const listing = objects.listings[id]
           listing.api = context.api
@@ -562,7 +562,7 @@ const config = {
           context.id = id
           context.listing = apis[listing.api].getAllProducts(listing)
         } else {
-          const report = await e({ marker: 'report', pullFromContext: true })
+          const report = await e({ marker: 'report', pullFromContext: true }, where())
           const id = report.evalue.value
           const listing = objects.listings[id]
           const api = apis[listing.api]
@@ -575,7 +575,7 @@ const config = {
     {
       match: ({context}) => context.marker == 'answer', 
       apply: async ({e, context, objects, kms, insert}) => {
-        const report = await e({ marker: 'report', pullFromContext: true })
+        const report = await e({ marker: 'report', pullFromContext: true }, where())
         const id = report.value.value
         const listing = objects.listings[id]
         listing.type = context.type

package/common/scorekeeper.js

@@ -145,9 +145,9 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'player' && context.same,
+      match: ({context}) => context.marker == 'same' && context.one.marker == 'player',
       apply: ({context, objects, config, km}) => {
-        const players = context.same.value.map( (props) => props.value )
+        const players = context.two.value.map( (props) => props.value )
         setPlayers(objects, config, players)
         for (const player of objects.players) {
           objects.scores[player] = 0
@@ -204,7 +204,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'turn' && context.evaluate && context.whose,
+      match: ({context}) => context.marker == 'turn' && context.whose,
       apply: ({context, objects}) => {
         if (Number.isInteger(objects.nextPlayer)) {
           context.evalue = `${objects.players[objects.nextPlayer]}'s turn`
@@ -215,7 +215,18 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'next' && context.evaluate,
+      match: ({context}) => context.marker == 'unify' && context.terms[0].whose,
+      apply: ({context, objects}) => {
+        if (Number.isInteger(objects.nextPlayer)) {
+          context.evalue = `${objects.players[objects.nextPlayer]}'s turn` 
+        } else {
+          context.evalue = "no one's turn"
+        }
+      }
+    },
+    {
+      where: where(),
+      match: ({context}) => context.marker == 'next',
       apply: ({context, objects}) => {
         if (Number.isInteger(objects.nextPlayer)) {
           context.evalue = objects.players[objects.nextPlayer]
@@ -226,7 +237,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'player' && context.evaluate && context.pullFromContext,
+      match: ({context}) => context.marker == 'player' && context.pullFromContext,
       apply: async ({context, objects, gs}) => {
         const players = objects.players
         if (players.length == 0) {
@@ -239,15 +250,14 @@ const config = {
       // same
     {
       where: where(),
-      match: ({context}) => context.marker == 'score' && context.same && context.winning,
+      match: ({context}) => context.marker == 'same' && context.one.marker == 'score' && context.one.winning,
       apply: ({context, objects}) => {
-        // objects.winningScore = context.same.amount.value
-        objects.winningScore = context.same.value
+        objects.winningScore = context.two.value
       }
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'score' && context.evaluate && context.winning,
+      match: ({context}) => context.marker == 'score' && context.winning,
       apply: ({context, objects}) => {
         //context.value = { marker: 'point', value: objects.winningScore }
         // i got the value by running -q '20 points'
@@ -270,7 +280,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'score' && context.evaluate,
+      match: ({context}) => context.marker == 'score',
       apply: ({context, objects}) => {
         const players = Object.keys(objects.scores);
         let allScoresAreZero = true

package/common/sdefaults.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
-const { defaultContextCheck, concats, toEValue, toFinalValue } = require('./helpers')
+const { isMany, defaultContextCheck, concats, toEValue, toFinalValue } = require('./helpers')
 const control = require('./control')
 const sdefaults_tests = require('./sdefaults.test.json')
 
@@ -26,16 +26,17 @@ const config = {
       priority: -1,
       // match: ({context}) => context.flatten || context.listable && context.value[0].flatten,
       // match: (args) => okay(args, ({context}) => (context.flatten || context.listable && context.value.some((value) => value.flatten))),
-      match: (args) => args.callOnce(args, ({context}) => (context.flatten || context.listable && context.value.some((value) => value.flatten))),
+      match: async (args) => await args.callOnce(args, 'sdefaults.1', ({context}) => (context.flatten || context.listable && context.value.some((value) => value.flatten))),
       // match: ({context}) => context.flatten || context.listable || (Array.isArray(context.value) && context.value.some((value) => value.flatten)),
-      apply: async ({config, km, context, s, _continue, flatten}) => {
+      apply: async ({config, km, context, e, _continue, flatten}) => {
         const flats = flatten(['list'], context)
         const evalues = []
         for (const flat of flats) {
           if (!flat.control) {
             flat.control = context.control
           }
-          const result = await s(flat)
+          flat.topLevel = context.topLevel
+          const result = await e(flat, where())
           if (result.evalue) {
             evalues.push(result.evalue)
           }
@@ -51,14 +52,15 @@ const config = {
       notes: 'flatten relation',
       where: where(),
       priority: -1,
-      match: (args) => args.callOnce(args, ({context}) => (context.flatten && context.relation)),
-      apply: async ({flatten, config, km, context, s}) => {
+      // sdefault.1 tag is the same as above on purpose
+      match: async (args) => await args.callOnce(args, 'sdefaults.1', ({context}) => (context.flatten && context.relation)),
+      apply: async ({flatten, config, km, context, e}) => {
         const flats = flatten(['list'], context)
         for (const flat of flats) {
           if (!flat.control) {
             flat.control = context.control
           }
-          await s(flat)
+          await e(flat, where())
         }
       }
     },
@@ -68,7 +70,7 @@ const config = {
       priority: -1,
       match: ({context}) => context.semanticIsEvaluate,
       apply: async ({context, e}) => {
-        context.evalue = await e({ ...context, semanticIsEvaluate: false })
+        context.evalue = await e({ ...context, semanticIsEvaluate: false }, where())
         context.isResponse = true
       }
     },
@@ -84,13 +86,32 @@ const config = {
         _continue()
       }
     },
+    {
+      where: where(),
+      match: ({context}) => {
+        const retval = context.marker == 'unify' && 
+          context.terms && 
+          context.terms.every((term) => term.isInstance) &&
+          context.terms[0].value == context.terms[1].value
+        return retval
+      },
+      apply: ({context, resolveEvaluate}) => resolveEvaluate(context, context.terms[0]),
+    },
   ],
 };
 
 function initializer({objects, config, isModule}) {
-  config.addArgs(() => ({
+  config.addArgs(({e}) => ({
     toFinalValue,
     toEValue,
+    isMany,
+    unify: async (term1, term2) => {
+      const unification = await e({
+        marker: 'unify',
+        terms: [term1, term2],
+      }, where())
+      return unification?.evalue
+    },
   }))
 }
 

package/common/spock.instance.json

@@ -106,7 +106,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "spock#call2"
           ]
@@ -232,6 +231,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "you are spock",
       "key": {
         "query": "you are spock"

package/common/stm.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
-const { defaultContextCheckProperties, defaultContextCheck } = require('./helpers')
+const { defaultContextCheckProperties, defaultContextCheck, toFinalValue } = require('./helpers')
 const helpers = require('./helpers')
 const helpers_conjunction = require('./helpers/conjunction')
 const articles = require('./articles')
@@ -55,8 +55,6 @@ class API {
       return
     }
 
-    concept.evaluate = false
-
     if (!frameOfReference) {
       frameOfReference = this._objects
     }
@@ -266,6 +264,7 @@ const config = {
     },
     { 
       id: 'delete', 
+      where: where(),
       isA: ['verb'],
       bridge: "{ ...next(operator), deletable: after[0], operator: operator, interpolate: [{ property: 'operator' }, { property: 'deletable' }] }",
       semantic: async ({context, recall}) => {
@@ -286,19 +285,21 @@ const config = {
     },
     { 
       id: 'recall', 
+      where: where(),
       bridge: "{ ...next(operator), postModifiers: ['recallee'], recallee: after[0] }",
       isA: ['verb'],
-      semantic: async ({context, recall, resolveResponse, e}) => {
+      semantic: async ({context, recall, resolveEvaluate, e}) => {
         const object = await recall({ context: context.recallee })
-        resolveResponse(context, object)
+        resolveEvaluate(context, object)
       },
     },
     { 
       id: 'remember', 
+      where: where(),
       bridge: "{ ...next(operator), postModifiers: ['rememberee'], rememberee: after[0] }",
       isA: ['verb'],
       semantic: async ({context, api, e}) => {
-        let value = (await e(context.rememberee)).evalue
+        let value = toFinalValue((await e(context.rememberee, where())))
         if (value == context.rememberee.value) {
           value = context.rememberee
         }
@@ -324,7 +325,7 @@ const config = {
   semantics: [
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate && context.args?.context?.distributer,
+      match: ({context}) => context.marker == 'mentions' && context.args?.context?.distributer,
       apply: async ({callId, _continue, toList, context, kms, e, log, toArray, retry}) => {
         context.args.filter ??= (r) => r
         context.args.all = true
@@ -337,7 +338,7 @@ const config = {
     },
     {
       where: where(),
-      match: ({context}) => context.marker == 'mentions' && context.evaluate,
+      match: ({context}) => context.marker == 'mentions',
       apply: ({context, kms, toList, resolveEvaluate}) => {
         const value = kms.stm.api.recall(context.args)
         if (value) {
@@ -366,21 +367,15 @@ const config = {
         }
 
         if (!context.value) {
-          context.evalue = { marker: 'answerNotKnown' }
+          context.evalue = { marker: 'undefined' }
           return
         }
       
-        if (context.evaluate) { 
-          const instance = await e(context.value)
-          if (instance.evalue && !instance.edefault) {
-            context.value = instance.evalue
-          }
-          if (context.evaluate) {
-            context.evalue = context.value
-          }
-        } else {
-          await s(context.value)
+        const instance = await e(context.value, where())
+        if (instance.evalue && !instance.edefault) {
+          context.value = instance.evalue
         }
+        context.evalue = context.value
       },
     },
   ],
@@ -422,13 +417,13 @@ function initializer({config}) {
 
     recall: async (args) => {
       if (args.frameOfReference?.nameable_named) {
-        const result = await e(args.frameOfReference)
+        const result = await e(args.frameOfReference, where())
         if (result.evalue) {
           args.frameOfReference = result.evalue
         }
       }
 
-      const result = await e({ marker: 'mentions', args })
+      const result = await e({ marker: 'mentions', args }, where())
       // evalue will return the argument if there is no evalue. dont want that for this case
       if (!result.evalue) {
         return

package/common/temperature.instance.json

@@ -140,7 +140,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "temperature#call2"
           ]
@@ -321,6 +320,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "temperature is a dimension",
       "key": {
         "query": "temperature is a dimension"
@@ -725,7 +727,6 @@
           "level": 2,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "temperature#call2"
           ]
@@ -1376,6 +1377,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "celcius fahrenheit and kelvin are units of temperature",
       "key": {
         "query": "celcius fahrenheit and kelvin are units of temperature"
@@ -1700,7 +1704,7 @@
                 },
                 "y": {
                   "value": 9,
-                  "instance": true,
+                  "isInstance": true,
                   "text": "9",
                   "marker": "integer",
                   "word": "9",
@@ -1731,7 +1735,7 @@
               },
               "y": {
                 "value": 5,
-                "instance": true,
+                "isInstance": true,
                 "text": "5",
                 "marker": "integer",
                 "word": "5",
@@ -1762,7 +1766,7 @@
             },
             "y": {
               "value": 32,
-              "instance": true,
+              "isInstance": true,
               "text": "32",
               "marker": "integer",
               "word": "32",
@@ -1794,7 +1798,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "temperature#call2"
           ]
@@ -2285,6 +2288,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "fahrenheit = celcius*9/5 + 32",
       "key": {
         "query": "fahrenheit = celcius*9/5 + 32"
@@ -2656,7 +2662,7 @@
                   },
                   "y": {
                     "value": 32,
-                    "instance": true,
+                    "isInstance": true,
                     "text": "32",
                     "marker": "integer",
                     "word": "32",
@@ -2688,7 +2694,7 @@
                 },
                 "y": {
                   "value": 5,
-                  "instance": true,
+                  "isInstance": true,
                   "text": "5",
                   "marker": "integer",
                   "word": "5",
@@ -2719,7 +2725,7 @@
               },
               "y": {
                 "value": 8,
-                "instance": true,
+                "isInstance": true,
                 "text": "8",
                 "marker": "integer",
                 "word": "8",
@@ -2750,7 +2756,7 @@
             },
             "y": {
               "value": 32,
-              "instance": true,
+              "isInstance": true,
               "text": "32",
               "marker": "integer",
               "word": "32",
@@ -2782,7 +2788,6 @@
           "level": 1,
           "context_index": 1,
           "topLevel": true,
-          "context_id": 2,
           "touchedBy": [
             "temperature#call2"
           ]
@@ -3678,6 +3683,9 @@
         }
       ],
       "learned_contextual_priorities": [],
+      "explain_associations_details": [
+        null
+      ],
       "query": "celcius = (fahrenheit - 32)*5/8 + 32",
       "key": {
         "query": "celcius = (fahrenheit - 32)*5/8 + 32"

package/common/testing.js

@@ -14,7 +14,7 @@ const config = {
       id: 'testingEvaluate',
       generatorp: async ({context, g}) => `${context.word} ${await g(context.value)}`,
       semantic: async ({context, e}) => {
-        context.evalue = await e(context.value)
+        context.evalue = await e(context.value, where())
         context.isResponse = true
       },
       bridge: "{ ...next(operator), value: after[0] }",
@@ -22,7 +22,7 @@ const config = {
     { 
       where: where(),
       id: 'testingValue',
-      evaluator: ({context}) => {
+      semantic: ({context}) => {
         context.evalue = 'evaluated testingValue'
       }
     },