ekms 8.0.0 → 8.1.0-beta.1

package/common/conjunction.js

@@ -0,0 +1,104 @@
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
+const gdefaults = require('./gdefaults.js')
+const conjunction_tests = require('./conjunction.test.json')
+const { defaultContextCheck } = require('./helpers')
+
+let config = {
+  name: 'conjunction',
+  operators: [
+    "(x [list|and] y)",
+  ],
+  bridges: [
+    // context.instance == variables.instance (unification)
+    {
+      id: "list", 
+      level: 0, 
+      selector: {
+          match: "same", 
+          left: [ { pattern: '($type && context.instance == variables.instance)' } ], 
+          right: [ { pattern: '($type && context.instance == variables.instance)' } ], 
+          // left: [ { pattern: '($type)' } ], 
+          // right: [ { pattern: '($type)' } ], 
+          passthrough: true
+      }, 
+      bridge: "{ ...next(operator), listable: true, isList: true, value: append(before, after) }"
+    },
+    {
+      id: "list", 
+      level: 1, 
+      selector: {
+          match: "same", 
+          left: [ { pattern: '($type && context.instance == variables.instance)' } ], 
+          passthrough: true
+     }, 
+      bridge: "{ ...operator, value: append(before, operator.value) }"
+    },
+  ],
+  generators: [
+    {
+      where: where(),
+      notes: 'handle lists with yes no',
+      // ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value,
+      // ({context, hierarchy}) => context.marker == 'list' && context.value,
+      match: ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value && context.value.length > 0 && context.value[0].marker == 'yesno',
+      apply: async ({context, g, gs}) => {
+        return `${await g(context.value[0])} ${await gs(context.value.slice(1), ', ', ' and ')}`
+      }
+    },
+
+    {
+      where: where(),
+      notes: 'handle lists',
+      // ({context, hierarchy}) => context.marker == 'list' && context.paraphrase && context.value,
+      // ({context, hierarchy}) => context.marker == 'list' && context.value,
+      match: ({context, hierarchy}) => context.marker == 'list' && context.value,
+      apply: async ({context, gs}) => {
+        if (context.newLinesOnly) {
+          return await gs(context.value, '\n')
+        } else {
+          return await gs(context.value, ', ', ' and ')
+        }
+      }
+    },
+  ],
+};
+
+const initializer = ({objects, config, isModule}) => {
+  config.addArgs(({config, api, isA}) => ({ 
+    isAListable: (context, type) => {
+      if (context.marker == 'list' || context.listable) {
+        return context.value.every( (element) => isA(element.marker, type) )
+      } else {
+        return isA(context.marker, type)
+      } 
+    },
+    toContext: (v) => {
+      if (Array.isArray(v)) {
+        return { marker: 'list', level: 1, value: v }
+      }
+      if (v.marker == 'list') {
+        return v
+      }
+      return v
+    },
+  }))
+}
+
+knowledgeModule( { 
+  config,
+  includes: [gdefaults],
+  initializer,
+
+  module,
+  description: 'framework for conjunction',
+  newWay: true,
+  test: {
+    name: './conjunction.test.json',
+    contents: conjunction_tests,
+    checks: {
+            objects: ['idSuffix'],
+            context: defaultContextCheck(),
+          },
+
+  },
+})

package/common/conjunction.test.json

@@ -0,0 +1,322 @@
+[
+  {
+    "associations": [
+      [
+        [
+          "list",
+          0
+        ],
+        [
+          "unknown",
+          0
+        ]
+      ],
+      [
+        [
+          "list",
+          0
+        ],
+        [
+          "unknown",
+          0
+        ],
+        [
+          "unknown",
+          1
+        ]
+      ],
+      [
+        [
+          "list",
+          0
+        ],
+        [
+          "unknown",
+          1
+        ]
+      ],
+      [
+        [
+          "list",
+          1
+        ],
+        [
+          "unknown",
+          1
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "default": true,
+        "isList": true,
+        "level": 1,
+        "listable": true,
+        "marker": "list",
+        "range": {
+          "end": 8,
+          "start": 0
+        },
+        "text": "1 2 and 3",
+        "topLevel": true,
+        "types": [
+          "list",
+          "unknown"
+        ],
+        "value": [
+          {
+            "dead": true,
+            "level": 1,
+            "marker": "unknown",
+            "range": {
+              "end": 0,
+              "start": 0
+            },
+            "text": "1",
+            "types": [
+              "unknown"
+            ],
+            "unknown": true,
+            "value": "1",
+            "word": "1"
+          },
+          {
+            "dead": true,
+            "level": 1,
+            "marker": "unknown",
+            "range": {
+              "end": 2,
+              "start": 2
+            },
+            "text": "2",
+            "types": [
+              "unknown"
+            ],
+            "unknown": true,
+            "value": "2",
+            "word": "2"
+          },
+          {
+            "dead": true,
+            "level": 1,
+            "marker": "unknown",
+            "range": {
+              "end": 8,
+              "start": 8
+            },
+            "text": "3",
+            "types": [
+              "unknown"
+            ],
+            "unknown": true,
+            "value": "3",
+            "word": "3"
+          }
+        ],
+        "word": "and"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "list",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "list",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 3,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "list",
+              0
+            ],
+            [
+              "unknown",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 4,
+          "op": [
+            "list",
+            0
+          ],
+          "ops": [
+            [
+              "list",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 5,
+          "op": [
+            "list",
+            1
+          ],
+          "ops": [
+            [
+              "list",
+              1
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "conjunction": "conjunction1",
+        "gdefaults": "gdefaults2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "conjunction1": {
+        },
+        "gdefaults2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "default": true,
+            "isList": true,
+            "level": 1,
+            "listable": true,
+            "marker": "list",
+            "range": {
+              "end": 8,
+              "start": 0
+            },
+            "text": "1 2 and 3",
+            "topLevel": true,
+            "types": [
+              "list",
+              "unknown"
+            ],
+            "value": [
+              {
+                "dead": true,
+                "level": 1,
+                "marker": "unknown",
+                "range": {
+                  "end": 0,
+                  "start": 0
+                },
+                "text": "1",
+                "types": [
+                  "unknown"
+                ],
+                "unknown": true,
+                "value": "1",
+                "word": "1"
+              },
+              {
+                "dead": true,
+                "level": 1,
+                "marker": "unknown",
+                "range": {
+                  "end": 2,
+                  "start": 2
+                },
+                "text": "2",
+                "types": [
+                  "unknown"
+                ],
+                "unknown": true,
+                "value": "2",
+                "word": "2"
+              },
+              {
+                "dead": true,
+                "level": 1,
+                "marker": "unknown",
+                "range": {
+                  "end": 8,
+                  "start": 8
+                },
+                "text": "3",
+                "types": [
+                  "unknown"
+                ],
+                "unknown": true,
+                "value": "3",
+                "word": "3"
+              }
+            ],
+            "word": "and"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "1, 2 and 3",
+          "paraphrasesParenthesized": "((1), (2) and (3))",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "1, 2 and 3"
+    ],
+    "paraphrasesParenthesized": [
+      "((1), (2) and (3))"
+    ],
+    "query": "1 2 and 3",
+    "responses": [
+      ""
+    ]
+  }
+]

package/common/countable.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require("./hierarchy")
 const numbers = require("./numbers")
@@ -11,12 +11,14 @@ const countable_tests = require('./countable.test.json')
     2 6 and 3 10 piece nuggets
  */
 
-let configStruct = {
+let config = {
   name: 'countable',
   operators: [
     "(([quantifier|]) [counting] ([countable]))",
     "(([number|]) [countOfPieces|] ([piece]))",
     "((countOfPieces/*) [countingPieces] ([hasCountOfPieces]))",
+    "([more] (countable/*))",
+    "([less] (countable/*))",
     "([all])",
     // everything
   ],
@@ -24,7 +26,7 @@ let configStruct = {
     { 
       id: "counting", 
       convolution: true, 
-      before: ['verby'],
+      before: ['verb'],
       bridge: "{ ...after, modifiers: append(['quantity'], after[0].modifiers), quantity: before[0], number: default(before[0].number, before[0].value), instance: true }" 
     },
     { 
@@ -44,6 +46,14 @@ let configStruct = {
     { 
       id: "piece", 
     },
+    { 
+      id: "more", 
+      bridge: "{ ...next(after[0]), more: operator, modifiers: append(['more'], after[0].modifiers) }",
+    },
+    { 
+      id: "less", 
+      bridge: "{ ...next(after[0]), less: operator, modifiers: append(['less'], after[0].modifiers) }",
+    },
     { 
       id: "quantifier", 
       children: ['number', 'all'],
@@ -63,34 +73,30 @@ let configStruct = {
     { 
       where: where(),
       match: ({context}) => false && context.quantity,
-      apply: ({context, g}) => {
+      apply: async ({context, g}) => {
         let number = context.quantity.number || 'one'
         if (context.quantity.value > 1) {
           number = 'many'
         }
-        const countable = g({ ...context, quantity: undefined, number})
-        return `${g(context.quantity)} ${countable}`
+        const countable = await g({ ...context, quantity: undefined, number})
+        return `${await g(context.quantity)} ${countable}`
       }
     },
   ]
 };
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.add(dialogues(), numbers())
-  return config
-}
-
 knowledgeModule({ 
+  config,
+  includes: [dialogues, numbers],
+
   module,
   description: 'Countable things',
-  createConfig,
   test: {
     name: './countable.test.json',
     contents: countable_tests,
     checks: {
             context: [
-              ...defaultContextCheck, 
+              ...defaultContextCheck(), 
               { 
                 property: 'quantity', 
                 filter: ['marker', 'value'],