ekms 9.6.1 → 9.6.2

package/common/stm.js

@@ -1,6 +1,7 @@
-const { knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, debug } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const helpers = require('./helpers')
+const helpers_conjunction = require('./helpers/conjunction')
 const articles = require('./articles')
 const evaluate = require('./evaluate')
 const stm_tests = require('./stm.test.json')
@@ -68,37 +69,66 @@ class API {
       concept.value = value
     }
     concept.fromSTM = true
-    if (!concept.stm) {
-      concept.stm = {}
-    }
-    if (!concept.stm.id) {
-      concept.stm.id = this.getId()
-    }
-    frameOfReference.mentioned = (frameOfReference.mentioned || []).filter( (context) => context.stm && context.stm.id != concept.stm.id )
+    concept.namespaced ??= {}
+    concept.namespaced.stm ??= {}
+    concept.namespaced.stm.id ??= this.getId()
+    frameOfReference.mentioned = (frameOfReference.mentioned || []).filter( (context) => context.namespaced?.stm && context.namespaced.stm.id != concept.namespaced.stm.id )
     helpers.unshiftL(frameOfReference.mentioned, concept, this.maximumMentioned)
   }
 
-  mentions({ context, frameOfReference, useHierarchy=true, all, condition = (() => true) } = {}) {
-    const mentioned = frameOfReference?.mentioned || this._objects.mentioned
+  mentions({ context, frameOfReference, useHierarchy=true, all, lastN, condition = (() => true) } = {}) {
+    let mentioned = this._objects.mentioned
+    let reversed = false
+    if (frameOfReference) {
+      if (frameOfReference.namespaced?.stm?.mentioned) {
+        mentioned = [...frameOfReference[frameOfReference.namespaced.stm.mentioned]]
+        if (frameOfReference.namespaced.stm.reversed) {
+          mentioned.reverse()
+          reversed = true
+        }
+      } else {
+        if (typeof frameOfReference?.mentioned == 'string') {
+          mentioned = frameOfReference[frameOfReference.mentioned]
+        } else {
+          mentioned = frameOfReference.mentioned
+        }
+      }
+    }
+    if (!mentioned) {
+      return
+    }
     const findPrevious = !!context.stm_previous
     const forAll = []
     function addForAll(context) {
-      if (!forAll.find( (c) => c.stm.id == context.stm.id)) {
-        forAll.push(context)
+      if (!forAll.find( (c) => c.namespaced.stm.id == context.namespaced.stm.id)) {
+        if (reversed) {
+          forAll.unshift(context)
+        } else {
+          forAll.push(context)
+        }
       }
     }
 
     // care about value first
     let findCounter = 0
     for (const m of mentioned) {
+      if (lastN === 0) {
+        break
+      }
       if (context.value && (context.value == m.marker || context.value == m.value)) {
         findCounter += 1
         if (findPrevious && findCounter < 2) {
           continue
         }
+        if (context.nameable_named && m.nameable_named) {
+          continue
+        }
         if (condition(m)) {
-          if (all) {
-            allForAll(m)
+          if (all || lastN) {
+            addForAll(m)
+            if (lastN) {
+              lastN -= 1
+            }
           } else {
             return m
           }
@@ -106,6 +136,10 @@ class API {
       }
     }
 
+    if (lastN === 0) {
+      return forAll
+    }
+
     if (!useHierarchy) {
       return
     }
@@ -113,14 +147,23 @@ class API {
     // care about marker second
     findCounter = 0
     for (const m of mentioned) {
+      if (lastN === 0) {
+        break
+      }
       if (context.marker != 'unknown' && this.isA(m.marker, context.marker)) {
         findCounter += 1
         if (findPrevious && findCounter < 2) {
           continue
         }
+        if (context.nameable_named && m.nameable_named) {
+          continue
+        }
         if (condition(m)) {
-          if (all) {
+          if (all || lastN) {
             addForAll(m)
+            if (lastN) {
+              lastN -= 1
+            }
           } else {
             return m
           }
@@ -134,8 +177,14 @@ class API {
             if (findPrevious && findCounter < 2) {
               continue
             }
+            if (context.nameable_named && m.nameable_named) {
+              continue
+            }
             if (condition(m)) {
-              if (all) {
+              if (all || lastN) {
+                if (lastN) {
+                  lastN -= 1
+                }
                 addForAll(m)
               } else {
                 return m
@@ -146,17 +195,27 @@ class API {
       }
     }
 
+    if (lastN === 0) {
+      return forAll
+    }
+
     findCounter = 0
     if (context.types && context.types.length == 1) {
       for (const m of mentioned) {
+        if (lastN === 0) {
+          break
+        }
         if (context.unknown) {
           findCounter += 1
           if (findPrevious && findCounter < 2) {
             continue
           }
           if (condition(m)) {
-            if (all) {
+            if (all || lastN) {
               addForAll(m)
+              if (lastN) {
+                lastN -= 1
+              }
             } else {
               return m
             }
@@ -165,13 +224,13 @@ class API {
       }
     }
 
-    if (all) {
+    if (all || lastN) {
       return forAll
     }
   }
 
   getVariable(context) {
-    if (!context) {
+    if (!context || context.marker == 'mentions') {
       return
     }
     let valueNew = this.mentions({ context, useHierarchy: false, condition: (context) => context.isVariable })
@@ -237,19 +296,30 @@ const config = {
     },  
   ],
   semantics: [
+    {
+      where: where(),
+      match: ({context}) => context.marker == 'mentions' && context.evaluate,
+      apply: ({context, kms, toList, resolveEvaluate}) => {
+        resolveEvaluate(context, kms.stm.api.mentions(context.args))
+      }
+    },
     { 
       where: where(),
       notes: 'pull from context',
       // match: ({context}) => context.marker == 'it' && context.pullFromContext, // && context.value,
       match: ({context, callId}) => context.pullFromContext && !context.same, // && context.value,
-      apply: async ({callId, context, kms, e, log, retry}) => {
-        context.value = kms.stm.api.mentions({ context })
+      apply: async ({callId, mentions, toList, context, kms, e, log, retry}) => {
+        context.value = (await mentions({ context }))
+        if (Array.isArray(context.value)) {
+          context.value = toList(context.value)
+        }
+
         if (!context.value) {
           // retry()
           context.evalue = { marker: 'answerNotKnown' }
           return
         }
-        
+       
         const instance = await e(context.value)
         if (instance.evalue && !instance.edefault) {
           context.value = instance.evalue
@@ -263,12 +333,36 @@ const config = {
 }
 
 function initializer({config}) {
-  config.addArgs(({kms}) => ({
+  config.addArgs(({kms, e, toList}) => ({
     mentioned: (args) => {
       kms.stm.api.mentioned(args)
     },
-    mentions: (args) => {
-      return kms.stm.api.mentions(args)
+
+    frameOfReference: (context, { mentioned, reversed } = {}) => {
+      context.namespaced ??= {}
+      context.namespaced.stm ??= {}
+      if (mentioned !== null) {
+        context.namespaced.stm.mentioned = mentioned // name of property that has the mentioned objects
+      }
+      if (reversed !== null) {
+        context.namespaced.stm.reversed = reversed   // true iff the list is oldest first rather than newest first
+      }
+    },
+
+    mentions: async (args) => {
+      if (args.frameOfReference?.nameable_named) {
+        const result = await e(args.frameOfReference)
+        if (result.evalue) {
+          args.frameOfReference = result.evalue
+        }
+      }
+
+      const result = await e({ marker: 'mentions', args })
+      // evalue will return the argument if there is no evalue. dont want that for this case
+      if (!result.evalue) {
+        return
+      }
+      return helpers_conjunction.asList(helpers.toEValue(result), true)
     },
   }))
 }

package/common/temperature.instance.json

@@ -343,6 +343,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -2535,6 +2540,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -5657,6 +5667,11 @@
           "unit_temperature",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -9086,6 +9101,11 @@
           "unit_temperature",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",

package/common/time.instance.json

@@ -494,6 +494,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -3785,6 +3790,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -6426,6 +6436,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -9067,6 +9082,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -11708,6 +11728,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -14349,6 +14374,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -16990,6 +17020,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -19631,6 +19666,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",
@@ -22272,6 +22312,11 @@
           "expression",
           false
         ],
+        [
+          "forQuantity",
+          "preposition",
+          false
+        ],
         [
           "forVariable",
           "preposition",