tpmkms_4wp 9.5.1-beta.9 → 9.6.0-beta.0

package/common/colors.instance.json

@@ -359,6 +359,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -848,6 +858,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1843,6 +1863,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -3586,20 +3616,6 @@
             0
           ]
         ],
-        [
-          [
-            "is",
-            0
-          ],
-          [
-            "list",
-            1
-          ],
-          [
-            "unknown",
-            0
-          ]
-        ],
         [
           [
             "is",
@@ -8901,6 +8917,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -10243,6 +10269,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -11934,6 +11970,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -14691,6 +14737,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -17608,6 +17664,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "teal_colors",
           "green_colors",
@@ -21316,6 +21382,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "teal_colors",
           "green_colors",
@@ -24058,6 +24134,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -27495,6 +27581,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -30066,6 +30162,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -30465,7 +30571,7 @@
             "end": 25
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "brightness_colors",
               "number": "one",
@@ -32275,6 +32381,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -32674,7 +32790,7 @@
             "end": 17
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "hex",
               "unknown": true,
@@ -34691,6 +34807,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "tan_colors",
           "brown_colors",
@@ -35827,20 +35953,6 @@
         0
       ]
     ],
-    [
-      [
-        "is",
-        0
-      ],
-      [
-        "list",
-        1
-      ],
-      [
-        "unknown",
-        0
-      ]
-    ],
     [
       [
         "is",

package/common/colors.js

@@ -1,7 +1,7 @@
 const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const colors_tests = require('./colors.test.json')
-const colors_instance = require('./colors.instance.json')
+const instance = require('./colors.instance.json')
 const hierarchy = require('./hierarchy')
 
 const template = {
@@ -59,9 +59,6 @@ knowledgeModule( {
       context: [defaultContextCheck()],
     }
   },
-  template: {
-    template,
-    instance: colors_instance,
-  },
-
+  instance,
+  template,
 })

package/common/comparable.instance.json

@@ -223,6 +223,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -352,7 +362,7 @@
             "end": 21
           },
           "dead": true,
-          "modifiers": [
+          "conceptModifiers": [
             {
               "value": "sort",
               "unknown": true,
@@ -773,6 +783,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",
@@ -1602,6 +1622,16 @@
           "adjective",
           false
         ],
+        [
+          "stm_current",
+          "adjective",
+          false
+        ],
+        [
+          "stm_previous",
+          "adjective",
+          false
+        ],
         [
           "that",
           "thisitthat",

package/common/comparable.js

@@ -4,7 +4,7 @@ const dialogues = require("./dialogues")
 const concept = require("./concept")
 const numbers = require("./numbers")
 const comparable_tests = require('./comparable.test.json')
-const comparable_instance = require('./comparable.instance.json')
+const instance = require('./comparable.instance.json')
 
 
 const config = {
@@ -70,11 +70,8 @@ const template = {
 knowledgeModule({ 
   config,
   includes: [dialogues, numbers, concept],
-  template: {
-    template,
-    instance: comparable_instance
-  },
-
+  instance,
+  template,
   module,
   description: 'Comparable things',
   test: {

package/common/concept.js

@@ -1,5 +1,5 @@
 const { knowledgeModule, flatten, where, Digraph } = require('./runtime').theprogrammablemind
-const { defaultContextCheck } = require('./helpers')
+const { defaultContextCheck, defaultContextCheckProperties } = require('./helpers')
 const { API }= require('./helpers/concept')
 const dialogues = require('./dialogues.js')
 const concept_tests = require('./concept.test.json')
@@ -27,7 +27,26 @@ config = {
       isA: ['verb'],
       words: [{ word: 'modifies', number: 'one', flatten: false }, { word: 'modify', number: 'many', flatten: true }],
       // bridge: "{ ...next(operator), modifiers: before, concept: after[0], flatten: true }"
-      bridge: "{ ...next(operator), modifiers: before[0], concept: after[0] }"
+      bridge: "{ ...next(operator), conceptModifiers: before[0], concept: after[0] }",
+      semantic: {
+        notes: 'define a modifier',
+        where: where(),
+        apply: ({config, query, km, context}) => {
+          let modifiers
+          if (context.literally) {
+            literalModifiers = context.conceptModifiers[0]
+            // modifiers = literalModifiers.value.map(modifier => modifier.value)
+            modifiers = literalModifiers.value
+            modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
+          } else {
+            modifiers = context.conceptModifiers
+            // modifiers = context.modifiers.map(modifier => modifier.value)
+          }
+          // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
+          km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
+        }
+      },
+      check: defaultContextCheckProperties(['concept', 'conceptModifiers']),
     },
     { id: "literally", bridge: "{ ...after[0], flatten: false, literally: true }" },
     { id: "concept" },
@@ -62,7 +81,7 @@ config = {
         },
       */
       where: where(),
-      match: ({context}) => {
+      match: ({context, callId}) => {
         if (!context.paraphrase) {
           return
         }
@@ -103,39 +122,18 @@ config = {
       match: ({context}) => context.marker == 'modifies' && context.paraphrase,
       apply: async ({context, gp, gw}) => {
         const modifiers = []
-        for (modifier of context.modifiers) {
+        for (modifier of context.conceptModifiers) {
           modifiers.push(await gp(modifier))
         }
         if (context.literally) {
-          return `${modifiers.join(" ")} literally ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
+          return `${modifiers.join(" ")} literally ${await gw(context, { number: context.conceptModifiers[context.conceptModifiers.length - 1] })} ${await gp(context.concept)}`
         } else {
-          return `${modifiers.join(" ")} ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
+          return `${modifiers.join(" ")} ${await gw(context, { number: context.conceptModifiers[context.conceptModifiers.length - 1] })} ${await gp(context.concept)}`
         }
       }
       // const chosen = chooseNumber(context, word.singular, word.plural)
     },
   ],
-  semantics: [
-    {
-      notes: 'define a modifier',
-      where: where(),
-      match: ({context}) => context.marker == 'modifies',
-      apply: ({config, query, km, context}) => {
-        let modifiers
-        if (context.literally) {
-          literalModifiers = context.modifiers[0]
-          // modifiers = literalModifiers.value.map(modifier => modifier.value)
-          modifiers = literalModifiers.value
-          modifiers = modifiers.slice(0, -1).concat([literalModifiers.marker]).concat(modifiers.slice(-1))
-        } else {
-          modifiers = context.modifiers
-          // modifiers = context.modifiers.map(modifier => modifier.value)
-        }
-        // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
-        km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
-      }
-    },
-  ],
 }
 
 knowledgeModule({