tpmkms 7.12.3 → 7.12.4-beta.1

package/common/fastfood.js

@@ -160,7 +160,6 @@ const template = {
        { "context": [['smoothie_ingredient', 1], ['list', 0], ['smoothie_ingredient', 1], ['smoothie', 1]], ordered: true, choose: [1] },
 
        { "context": [['list', 0], ['number', 1], ['combo', 1], ['number', 1]], ordered: true, choose: [2,3] },
-       { "context": [['withModification', 0], ['modification', 1], ['list', 0], ['modification', 1]], ordered: true, choose: [2] },
 
 
        { context: [['comboNumber', 0], ['counting',0]], choose: [0] },
@@ -224,7 +223,7 @@ const template = {
         { 
           id: 'withModification',
           level: 0,
-          isA: ['preposition'],
+          before: ['preposition'],
           generatorp: ({context, gp}) => `with ${gp(context.modifications)}`,
           bridge: "{ ...next(operator), modifications: after[0], flatten: false }",
         },
@@ -250,7 +249,7 @@ const template = {
         { 
           id: 'comboNumber',
           convolution: true,
-          before: ['combo'],
+          before: ['combo', 'preposition'],
           bridge: "{ ...next(before[0]), postModifiers: append(before[0].postModifiers, ['comboNumber']), comboNumber: after[0], instance: true, flatten: true }",
         },
         { 
@@ -297,17 +296,24 @@ const template = {
             const naArray = api.getAskedForButNotAvailable()
             naArray.forEach((f) => f.paraphrase = true)
             const naContext = toContext(naArray)
-            /*
-            naContext.isResponse = true
-            naContext.marker = 'verbatim'
-            naContext.verbatim = `The following are not menu items: ${gp(naContext)}`
-            insert(naContext)
-            */
             verbatim(`The following are not menu items: ${gp(naContext)}`)
             // allow other motivation to run
             context.cascade = true
           }
         },
+        {
+          where: where(),
+          match: ({context, api}) => context.marker == 'controlEnd' && api.hasAskedForButNotAvailableModification(),
+          apply: ({context, api, gp, toContext, verbatim}) => {
+            const naArray = api.getAskedForButNotAvailableModification().map(({ item, modification }) => {
+              // return `${gp(item)} can not be modified with ${gp(modification)}.`
+              return `XXX can not be modified with ${gp(modification)}.`
+            })
+            verbatim(naArray.join(' '))
+            // allow other motivation to run
+            context.cascade = true
+          }
+        },
       ]
     },
     ({ask, api}) => {
@@ -342,17 +348,26 @@ const template = {
         {
           where: where(),
           oneShot: false,
-          matchq: (args) => askAbout(args).length > 0,
+          matchq: (args) => askAbout(args).length > 0 && args.context.marker == 'controlEnd',
           applyq: (args) => {
             args.context.cascade = true
             const needsDrink = askAbout(args)
+            // const details = args.gp({ marker: 'list', value: needsDrink.map((item) => item.food)})
             if (needsDrink.length > 1) {
               return `What drinks do you want?`
             } else {
               return `What drink do you want?`
             }
           },
-          matchr: (args) => args.isA(args.context.marker, 'drink') && askAbout(args).length > 0,
+          matchr: (args) => {
+            if (args.isA(args.context.marker, 'drink') && askAbout(args).length > 0) {
+              const needsDrink = askAbout(args)
+              if (args.api.isAvailableModification(needsDrink[0].food, { ...args.context , id: args.context.value })) {
+                return true
+              }
+            }
+            return false
+          },
           applyr: (args) => {
             // TODO check for is available for all modifications
             const needsDrink = askAbout(args)
@@ -375,6 +390,33 @@ const template = {
       ])
     },
     {
+      operators: [
+        "([change] (meal/* || drink/*) (to/1))",
+      ],
+      hierarchy: [
+        ['meal', 'toAble'],
+        ['drink', 'toAble'],
+      ],
+      bridges: [
+        { 
+          id: "change",
+          isA: ['verby'],
+          localHierarchy: [ ['thisitthat', 'meal'] ],
+          generatorp: ({context, gp}) => `change ${gp(context.from)} to ${gp(context.to)}`,
+          bridge: "{ ...next(operator), from: after[0], to: after[1].toObject }",
+          semantic: ({context, api, e}) => {
+            const state = api.state
+            const eFrom = e(context.from).evalue
+            const from = state.getIdCombo(eFrom.fromSTM ? eFrom : context.from)
+            const to = state.getIdCombo(context.to)
+            for (const item of api.items()) {
+              if (item.id == from.id) {
+                api.modify(item, { id: to.id })
+              }
+            }
+          }
+        },
+      ],
       priorities: [
         { context: [['combo', 0], ['number',1], ['list', 0], ['combo', 0]], ordered: true, choose: [0,1] },
         { context: [['list', 0], ['combo',0], ['number',1]], ordered: true, choose: [1,2] },
@@ -382,6 +424,12 @@ const template = {
         { context: [['mango', 0], ['passion',0], ['list', 0]], ordered: true, choose: [0,1] },
         { context: [['number', 1], ['mango_passion',1], ['list', 0]], ordered: true, choose: [0,1] },
         { context: [['mango', 0], ['mango_passion',0], ['passion',0], ['list', 0]], ordered: true, choose: [0,1,2] },
+
+        { context: [['drink', 0], ['list',0], ['combo',0], ['number', 0]], ordered: true, choose: [2,3] },
+        { context: [['drink', 1], ['list',0], ['combo',0], ['number', 0]], ordered: true, choose: [2,3] },
+        { context: [['withModification', 0], ['modification', 1], ['list', 0], ['modification', 1]], ordered: true, choose: [2] },
+        { context: [['withModification', 0], ['modification', 1], ['list', 0], ['combo', 1]], ordered: true, choose: [0] },
+        { context: [['combo', 2], ['list', 0], ['combo', 1], ['withModification', 1]], ordered: true, choose: [3] },
       ],
     },
   ],
@@ -392,6 +440,7 @@ class API {
     this._objects = objects
     this._objects.items = []
     this._objects.notAvailable = []
+    this._objects.notAvailableModification = []
   }
 
   show() {
@@ -412,8 +461,12 @@ class API {
     return this._objects.items[item_id]
   }
 
+  modify(item, changes) {
+    Object.assign(this._objects.items[item.item_id], changes)
+  }
+
   items() {
-    return this._objects.items
+    return [...this._objects.items]
   }
 
   addDrink(item_id, drink) {
@@ -430,17 +483,40 @@ class API {
     return this._objects.notAvailable.length > 0
   }
 
+  hasAskedForButNotAvailableModification(item) {
+    return this._objects.notAvailableModification.length > 0
+  }
+
   getAskedForButNotAvailable(item) {
     const na = this._objects.notAvailable
     this._objects.notAvailable = []
     return na
   }
 
+  getAskedForButNotAvailableModification(item) {
+    const na = this._objects.notAvailableModification
+    this._objects.notAvailableModification = []
+    return na
+  }
+
   addAskedForButNotAvailable(item) {
     this._objects.notAvailable.push(item)
   }
 
+  addAskedForButNotAvailableModification(item, modification) {
+    this._objects.notAvailableModification.push({item, modification})
+  }
+
+  isAvailableModification(food, modification) {
+    if (this.isAvailable(modification)) {
+      if (this.args.isA(modification.id, 'fry') || this.args.isA(modification.id, 'pop')) {
+        return true
+      }
+    }
+  }
+
   isAvailable(item) {
+    item.id = item.id || item.value
     if (item.id == 'chicken_nugget') {
       if (![4,5,6,10].includes(item.pieces)) {
         return false
@@ -468,6 +544,10 @@ class API {
       item.id = 'coca_cola'
     }
 
+    if (item.id == 'fry') {
+      item.id = 'french_fry'
+    }
+
     return [
       "hamburger",
       "cheeseburger",
@@ -567,17 +647,13 @@ class State {
     this.api = api
   }
 
-  add(food) {
-    let quantity = 1
-    if (food.quantity) {
-      quantity = food.quantity.value
-    }
+  getIdCombo(food) {
     let id, combo
     if (food.comboNumber?.marker == 'numberNumberCombo') {
       id = this.api.getCombo(food.comboNumber.comboNumber.value)
       if (!id) {
         this.api.addAskedForButNotAvailable(food)
-        return
+        return { done: true }
       }
       combo = true
     }
@@ -585,7 +661,7 @@ class State {
       id = this.api.getCombo(food.comboNumber.value)
       if (!id) {
         this.api.addAskedForButNotAvailable(food)
-        return
+        return { done: true }
       }
       combo = true
     } else if (food.marker == 'combo') {
@@ -600,6 +676,20 @@ class State {
       id = 'chicken_nugget'
     }
 
+    return { id, combo }
+  }
+
+  add(food) {
+    let quantity = 1
+    if (food.quantity) {
+      quantity = food.quantity.value
+    }
+
+    const { id, combo, done } = this.getIdCombo(food)
+    if (done) {
+      return
+    }
+
     const addSize = (item, data) => {
       if (item.size) {
         data.size = item.size.value
@@ -607,15 +697,39 @@ class State {
       return data
     }
 
+    const getAvailableChildren = (item) => {
+      // see if this is a categories of items 
+      const descendants = this.api.args.hierarchy.descendants(item.id)
+      const available = []
+      for (const descendant of descendants) {
+        if (this.api.isAvailable({ id: descendant})) {
+          available.push(descendant)
+        }
+      }
+      return available
+    }
+
     let modifications
+    const addsInsteadOfModifications = []
     if (food.modifications) {
       modifications = []
       for (const modification of propertyToArray(food.modifications.modifications)) {
         if (modification.size) {
           food.size = modification.size
         }
-        addSize(modification, { id: modification.value })
-        modifications.push(addSize(modification, { id: modification.value }))
+     
+        // if not a modification treat as top level request 
+        if (!this.api.isAvailableModification(food, { ...modification, id: modification.value })) {
+          if (this.api.isAvailable(modification)) {
+            //this.add(modification)
+            addsInsteadOfModifications.push(modification)
+          } else {
+            this.api.addAskedForButNotAvailable(modification)
+          }
+        } else {
+          addSize(modification, { id: modification.value })
+          modifications.push(addSize(modification, { id: modification.value }))
+        }
       }
     }
 
@@ -636,42 +750,11 @@ class State {
         return
       }
 
-      const item_id = this.api.add(item)
-
-      if (false) {
-        // see if followup for drink is needed
+      this.api.add(item)
+      this.api.args.mentioned(food)
 
-        const hasDrink = (item_id) => {
-          const item = this.api.get(item_id)
-          let hasDrink = false
-          for (let modification of (item.modifications || [])) {
-            if (!this.api.args.isA(modification.id, 'drink')) {
-              hasDrink = true
-              break
-            }
-          }
-          return hasDrink
-        }
-        const needsDrink = (item_id) => {
-          const item = this.api.get(item_id)
-          return item.needsDrink
-        }
-
-        if (!hasDrink(item_id) && needsDrink(item_id)) {
-          this.api.args.ask([
-              {
-                where: where(),
-                matchq: ({objects}) => !hasDrink(item_id) && needsDrink(item_id),
-                applyq: () => `What drink do you want?`,
-                matchr: ({context, isA}) => isA(context.marker, 'drink'),
-                applyr: ({context, objects, api}) => {
-                  // TODO check for is available for all modifications
-                  this.api.addDrink(item_id, { id: context.value }) 
-                }
-              },
-            ]
-          )
-        }
+      for (const addIt of addsInsteadOfModifications) {
+        this.add(addIt)
       }
     }
   }
@@ -686,7 +769,7 @@ class State {
   }
 }
 
-const createConfig = () => {
+const createConfig = (additionalConfig) => {
   const config = new Config({ 
     name: 'fastfood',
     operators: [
@@ -708,7 +791,7 @@ const createConfig = () => {
       },
       {
         where: where(),
-        match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse,
+        match: ({context, isAListable}) => isAListable(context, 'edible') && context.marker !== 'edible' && !context.same && !context.isResponse && !context.evaluate,
         apply: ({context, km, api, instance}) => {
           for (const element of propertyToArray(context)) {
             km('fastfood').api.state.add(element)
@@ -737,14 +820,16 @@ const createConfig = () => {
       },
     ],
   }, module)
-  config.add(edible())
-  config.add(countable())
-  config.add(events())
-  config.add(sizeable())
+  config.stop_auto_rebuild()
+  config.add(edible(), countable(), events(), sizeable())
   config.api = api
   config.initializer( ({api}) => {
     api.state = new State(api)
   })
+  if (additionalConfig) {
+    additionalConfig(config)
+  }
+  config.restart_auto_rebuild()
   return config
 }
 
@@ -752,6 +837,7 @@ knowledgeModule( {
     module,
     description: 'fastfood related concepts',
     createConfig,
+    acceptsAdditionalConfig: true,
     test: {
             name: './fastfood.test.json',
             contents: fastfood_tests,
@@ -762,6 +848,7 @@ knowledgeModule( {
                 'changes', 
                 'response', 
                 { property: 'notAvailable', filter: [ 'marker', 'value', 'text' ] }, 
+                { property: 'notAvailableModification', filter: [ 'marker', 'value', 'text' ] }, 
                 { property: 'quantity', filter: ['marker', 'value', 'text' ] },
                 { property: 'pieces', filter: ['marker', 'value', 'text' ] },
               ],