tpmkms 9.6.3-beta.2 → 9.6.3-beta.21

package/common/fastfood.instance.json

@@ -93420,6 +93420,11 @@
           "context_index": 1,
           "topLevel": true,
           "context_id": 2,
+          "control": {
+            "seen": [],
+            "nextId": 2
+          },
+          "control_id": 1,
           "touchedBy": [
             "fastfood#call2"
           ]
@@ -114677,24 +114682,6 @@
             0
           ]
         ],
-        [
-          [
-            "ingredient",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "smoothie",
-            0
-          ]
-        ],
         [
           [
             "ingredient",
@@ -340122,24 +340109,6 @@
             0
           ]
         ],
-        [
-          [
-            "a",
-            0
-          ],
-          [
-            "go_wrap",
-            0
-          ],
-          [
-            "is",
-            0
-          ],
-          [
-            "sandwich",
-            0
-          ]
-        ],
         [
           [
             "go_wrap",
@@ -627587,24 +627556,6 @@
         0
       ]
     ],
-    [
-      [
-        "a",
-        0
-      ],
-      [
-        "go_wrap",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "sandwich",
-        0
-      ]
-    ],
     [
       [
         "a",
@@ -632645,24 +632596,6 @@
         0
       ]
     ],
-    [
-      [
-        "ingredient",
-        0
-      ],
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "smoothie",
-        0
-      ]
-    ],
     [
       [
         "ingredient",

package/common/fastfood.js

@@ -893,7 +893,7 @@ class State {
       }
 
       this.api.add(item)
-      this.api.args.mentioned({ context: food })
+      this.api.args.remember({ context: food })
 
       for (const addIt of addsInsteadOfModifications) {
         this.add(addIt)

package/common/formulas.instance.json

@@ -547,11 +547,6 @@
           "concept",
           false
         ],
-        [
-          "mathematicalExpression",
-          "number",
-          false
-        ],
         [
           "mathematical_operator",
           "adjective",

package/common/formulas.js

@@ -1,4 +1,4 @@
-const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph, debug } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues.js')
 const pos = require('./pos.js')

package/common/gdefaults.js

@@ -319,6 +319,7 @@ function initializer({config}) {
           if (Array.isArray(interpolate)) {
             const strings = []
             let separator = ''
+            const byPosition = []
             for (const element of interpolate) {
               // { "word": { "marker": "canPassive" } ie { word: <selectionCriteria> }
               if (element.word) {
@@ -363,13 +364,20 @@ function initializer({config}) {
                   if (element.context) {
                     value = { ...value, ...element.context }
                   }
-                  strings.push(separator)
-                  if (Array.isArray(value)) {
-                    strings.push(await args.gsp(value))
+                  async function handleProperty(value) {
+                    strings.push(separator)
+                    if (Array.isArray(value)) {
+                      strings.push(await args.gsp(value))
+                    } else {
+                      strings.push(await args.gp(value))
+                    }
+                    separator = ' '
+                  }
+                  if (element.byPosition) {
+                    byPosition.push(((value) => () => handleProperty(value))(value))
                   } else {
-                    strings.push(await args.gp(value))
+                    await handleProperty(value)
                   }
-                  separator = ' '
                 }
               } else if (element.context) {
                 let value = element.context
@@ -390,6 +398,9 @@ function initializer({config}) {
                 }
               }
             }
+            for (const bp of byPosition) {
+              await bp()
+            }
             return strings.join('')
           } else {
             return await helpers.processTemplateString(interpolate, evaluator)

package/common/helpers/conjunction.js

@@ -5,6 +5,7 @@ function asList(context, maybe=false) {
     return {
       marker: 'list',
       // types: [context.marker],
+      listable: true,
       value: context
     }
   } else if (context.marker === 'list') {
@@ -15,6 +16,7 @@ function asList(context, maybe=false) {
   } else {
     return {
       marker: 'list',
+      listable: true,
       types: [context.marker],
       value: [context]
     }

package/common/helpers/formulas.js

@@ -97,6 +97,7 @@ class API {
   }
 
   gets(name) {
+    // debugger
     if (!this._objects.formulas[name.value]) {
       return []
     }
@@ -131,6 +132,11 @@ class API {
 
   // currently only supportings x = f(x) type formulas
   add(name, formula, equality) {
+    /*
+    if (name.value == 'minute' || name.value == 'minutes') {
+      debugger
+    }
+    */ // greg66
     if (!this._objects.formulas[name.value]) {
       this._objects.formulas[name.value] = []
     }

package/common/helpers/properties.js

@@ -170,7 +170,7 @@ class API {
         }
         const selected = instance.evalue.value.map( (r) => r[property] )
         context.constraints = undefined;
-        context.evalue = { marker: 'list', value: selected }
+        context.evalue = { marker: 'list', listable: true, value: selected }
       },
     })
     config.addGenerator({
@@ -575,9 +575,9 @@ class API {
               const response = _.clone(context)
               response.isResponse = true
               response.query = undefined
-              context.evalue = { marker: 'list', value: [response] }
+              context.evalue = { marker: 'list', listable: true, value: [response] }
             } else {
-              context.evalue = { marker: 'list', value: unflatten(matches) }
+              context.evalue = { marker: 'list', listable: true, value: unflatten(matches) }
               context.evalue.isResponse = true
             }
             context.evalue.truthValue = matches.length > 0
@@ -588,8 +588,8 @@ class API {
             }
 
             // ADD this line back and remove it to check
-            // context.response = { marker: 'list', value: [response], isResponse: true }
-            // Object.assign(context, { marker: 'list', value: responses, focusable: ['value'], paraphrase: true, truthValue: matches.length > 0 })
+            // context.response = { marker: 'list', listable: true, value: [response], isResponse: true }
+            // Object.assign(context, { marker: 'list', listable: true, value: responses, focusable: ['value'], paraphrase: true, truthValue: matches.length > 0 })
           } else {
             // see if anything is preferred greg
             // what does greg like
@@ -598,7 +598,7 @@ class API {
               // Object.assign(context, { marker: 'idontknow', query: _.clone(context) })
               context.evalue = { marker: 'idontknow', query: _.clone(context), isResponse: true }
             } else {
-              context.evalue = { marker: 'list', value: matches, isResponse: true }
+              context.evalue = { marker: 'list', listable: true, value: matches, isResponse: true }
             }
             context.isResponse = true
             context.evalue.truthValue = matches.length > 0 && matches[0].marker == ordering.marker
@@ -641,12 +641,14 @@ class API {
           const api = km('properties').api
           context.evalue = {
             marker: 'list',
+            listable: true,
             value: unflatten(api.relation_get(context, before.concat(after).map( (arg) => arg.tag ) ))
           }
           context.evalue.isResponse = true
           context.isResponse = true
           if (context.evalue.value.length == 0) {
             context.evalue.marker = 'answerNotKnown';
+            context.evalue.listable = true
             context.evalue.value = [];
           } else {
             // context.evalue.truthValue = true
@@ -815,7 +817,7 @@ class API {
           values.push(`${await g(key)}: ${await g({ ...objectProps[key].value, paraphrase: true })}`)
         }
       }
-      return { marker: 'list', value: values }
+      return { marker: 'list', listable: true, value: values }
     } else {
       return (await this.propertiesFH.getValue([object, property])).value
     }

package/common/helpers.js

@@ -161,12 +161,15 @@ function focus(context) {
 // fromList
 function propertyToArray(value) {
   if (Array.isArray(value)) {
-    return value
-  } else if (value.marker == 'list') {
-    return value.value
-  } else {
-    return [value]
+    return value;
+  }
+
+  if (value?.listable || value?.marker == 'list') {
+    return value.value.flatMap(item => propertyToArray(item));
   }
+
+  // Single value → wrap in array
+  return [value];
 }
 
 // values is marker: 'list' or some context
@@ -181,6 +184,7 @@ function concats(values) {
   }
   return {
     marker: 'list',
+    listable: true,
     value: combined
   }
 }

package/common/hierarchy.js

@@ -24,6 +24,7 @@ function getTypes( km, digraph, concept, instance ) {
   instance = {
     marker: 'list', 
     value: words,
+    listable: true,
     paraphrase: true,
   }
   instance.focus = true
@@ -278,6 +279,7 @@ const config = {
         const values = children.map( (t) => conceptApi.getWordForValue(t, { number: isA(type, 'concept') ? 'one' : 'many'}))
         context.evalue = {
           marker: 'list',
+          listable: true,
           value: values,
         }
         if (children.length > 1) {