tpmkms_4wp 7.12.8 → 8.0.0-beta.1

package/common/temperature.js

@@ -5,7 +5,7 @@ const temperature_tests = require('./temperature.test.json')
 const temperature_instance = require('./temperature.instance.json')
 
 const template = {
-  "queries": [
+  configs: [
     "temperature is a dimension",
     "celcius fahrenheit and kelvin are units of temperature",
 

package/common/testing.js

@@ -15,7 +15,6 @@ let configStruct = {
       id: 'testingEvaluate',
       generatorp: ({context, g}) => `${context.word} ${g(context.value)}`,
       semantic: ({context, e}) => {
-        debugger
         context.evalue = e(context.value)
         context.isResponse = true
       },

package/common/time.js

@@ -1,6 +1,8 @@
 const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const tell = require('./tell')
+const countable = require('./countable')
+const numbers = require('./numbers')
 const helpers = require('./helpers')
 const time_tests = require('./time.test.json')
 
@@ -40,8 +42,8 @@ const configStruct = {
   name: 'time',
   operators: [
     "([time])",
-    "([use] ((<count> ([timeUnit])) [timeFormat|format]))",
-    "(([hourUnits|]) [ampm|])"
+    "([use] (([timeUnit]) [timeFormat|format]))",
+    "(([number|]) [ampm|])"
     //"(([anyConcept]) [equals|is] ([anyConcept]))",
     //"(([what0|what]) [equals] (<the> ([timeConcept])))",
     //"(<whatP|what> ([anyConcept]))",
@@ -54,40 +56,54 @@ const configStruct = {
   bridges: [
     { "id": "time", "level": 0, "bridge": "{ ...next(operator) }" },
 
-    { "id": "hourUnits", "level": 0, "bridge": "{ ...next(operator) }" },
+    // { "id": "hourUnits", "level": 0, "bridge": "{ ...next(operator) }" },
     { "id": "ampm", "level": 0, "bridge": "{ ...next(operator), hour: before[0] }" },
 
     { "id": "timeFormat", "level": 0, "bridge": "{ ...before[0], ...next(operator) }" },
-    { "id": "count", "level": 0, "bridge": "{ ...after, count: operator.value }" },
-    { "id": "timeUnit", "level": 0, "bridge": "{ ...next(operator) }" },
+    // { "id": "count", "level": 0, "bridge": "{ ...after, count: operator.value }" },
+    { 
+      "id": "timeUnit", 
+      "level": 0, 
+      words: [ 
+        ...helpers.words('hour', { initial: "{ units: 'hour' }" }),
+        ...helpers.words('minute', { initial: "{ units: 'minute' }" }),
+        ...helpers.words('second', { initial: "{ units: 'second' }" }),
+      ],
+      "bridge": "{ ...next(operator) }" 
+    },
     { "id": "use", "level": 0, 
             bridge: "{ ...next(operator), format: after[0] }",
-            generatorp: ({g, context}) => `use ${context.format.count} hour time` 
+            generatorp: ({g, context}) => `use ${context.format.quantity.value} hour time` 
     },
   ],
   hierarchy: [
     ['time', 'queryable'],
     ['ampm', 'queryable'],
     ['time', 'theAble'],
+    ['timeUnit', 'countable'],
   ],
 
   "words": {
-    " ([0-9]+)": [{"id": "count", "initial": "{ value: int(group[0]) }" }],
-    " (1[0-2]|[1-9])": [{"id": "hourUnits", "initial": "{ hour: int(group[0]) }" }],
-    "am": [{"id": "ampm", "initial": "{ ampm: 'am', determined: true }" }],
-    "pm": [{"id": "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
-    //" (1[0-2]|[1-9]) ?pm": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'pm' }" }],
-    //" (1[0-2]|[1-9]) ?am": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'am' }" }],
-    " hours?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
-    " minutes?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
-    " seconds?": [{"id": "timeUnit", "initial": "{ units: 'seconds' }" }],
+    "literals": {
+      // " ([0-9]+)": [{"id": "count", "initial": "{ value: int(group[0]) }" }],
+      // " (1[0-2]|[1-9])": [{"id": "hourUnits", "initial": "{ hour: int(group[0]) }" }],
+      "am": [{"id": "ampm", "initial": "{ ampm: 'am', determined: true }" }],
+      "pm": [{"id": "ampm", "initial": "{ ampm: 'pm', determined: true }" }],
+      //" (1[0-2]|[1-9]) ?pm": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'pm' }" }],
+      //" (1[0-2]|[1-9]) ?am": [{"id": "count", "initial": "{ hour: int(group[0]), part: 'am' }" }],
+      /*
+      " hours?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
+      " minutes?": [{"id": "timeUnit", "initial": "{ units: 'hour' }" }],
+      " seconds?": [{"id": "timeUnit", "initial": "{ units: 'seconds' }" }],
+      */
+    }
   },
 
   generators: [
     { 
       where: where(),
       match: ({context}) => context.marker == 'ampm' && context.paraphrase, 
-      apply: ({g, context}) => `${context.hour.hour} ${context.ampm}` 
+      apply: ({g, context, gp}) => `${gp(context.hour)} ${context.ampm}` 
     },
     { 
       where: where(),
@@ -137,15 +153,15 @@ const configStruct = {
     {
       notes: 'use time format working case',
       where: where(),
-      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.count == 12 || context.format.count == 24), 
+      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.quantity.value == 12 || context.format.quantity.value == 24), 
       apply: ({objects, context}) => {
-        objects.format = context.format.count
+        objects.format = context.format.quantity.value
       }
     },
     {
       notes: 'use time format error case',
       where: where(),
-      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.count != 12 && context.format.count != 24), 
+      match: ({objects, context}) => context.marker == 'use' && context.format && (context.format.quantity.value != 12 && context.format.quantity.value != 24), 
       apply: ({objects, context}) => {
         context.marker = 'response'
         context.text = 'The hour format is 12 hour or 24 hour'
@@ -157,7 +173,7 @@ const configStruct = {
 const createConfig = () => {
   const config = new Config(configStruct, module)
   config.stop_auto_rebuild()
-  config.add(tell())
+  config.add(tell()).add(numbers()).add(countable())
   config.api = api
   config.initializer( ({config, objects, kms, isModule}) => {
     if (!isModule) {

package/common/time.test.json

@@ -7,7 +7,7 @@
           0
         ],
         [
-          "hourUnits",
+          "number",
           0
         ]
       ]
@@ -21,17 +21,18 @@
         "determined": true,
         "hour": {
           "dead": true,
-          "hour": 2,
+          "instance": true,
           "level": 1,
-          "marker": "hourUnits",
+          "marker": "number",
           "range": {
             "end": 0,
             "start": 0
           },
           "text": "2",
           "types": [
-            "hourUnits"
+            "number"
           ],
+          "value": 2,
           "word": "2"
         },
         "level": 1,
@@ -53,7 +54,7 @@
         {
           "counter": 1,
           "op": [
-            "hourUnits",
+            "number",
             0
           ],
           "ops": [
@@ -62,7 +63,7 @@
               0
             ],
             [
-              "hourUnits",
+              "number",
               0
             ]
           ]
@@ -87,6 +88,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -105,6 +107,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -131,17 +135,18 @@
             "determined": true,
             "hour": {
               "dead": true,
-              "hour": 2,
+              "instance": true,
               "level": 1,
-              "marker": "hourUnits",
+              "marker": "number",
               "range": {
                 "end": 0,
                 "start": 0
               },
               "text": "2",
               "types": [
-                "hourUnits"
+                "number"
               ],
+              "value": 2,
               "word": "2"
             },
             "level": 1,
@@ -156,7 +161,7 @@
           },
           "generatedParenthesized": "",
           "paraphrases": "2 pm",
-          "paraphrasesParenthesized": "(2 pm)",
+          "paraphrasesParenthesized": "((2) pm)",
           "responses": [
             ""
           ]
@@ -167,7 +172,7 @@
       "2 pm"
     ],
     "paraphrasesParenthesized": [
-      "(2 pm)"
+      "((2) pm)"
     ],
     "query": "2 pm",
     "responses": [
@@ -182,15 +187,15 @@
           0
         ],
         [
-          "hourUnits",
+          "info",
           0
         ],
         [
-          "info",
+          "is",
           0
         ],
         [
-          "is",
+          "number",
           0
         ],
         [
@@ -216,15 +221,15 @@
           0
         ],
         [
-          "hourUnits",
+          "info",
           0
         ],
         [
-          "info",
+          "is",
           0
         ],
         [
-          "is",
+          "number",
           0
         ],
         [
@@ -246,11 +251,11 @@
           0
         ],
         [
-          "hourUnits",
+          "is",
           0
         ],
         [
-          "is",
+          "number",
           0
         ],
         [
@@ -264,11 +269,11 @@
           0
         ],
         [
-          "hourUnits",
+          "is",
           0
         ],
         [
-          "is",
+          "number",
           0
         ],
         [
@@ -286,11 +291,11 @@
           0
         ],
         [
-          "hourUnits",
+          "is",
           0
         ],
         [
-          "is",
+          "number",
           0
         ],
         [
@@ -405,17 +410,18 @@
             "determined": true,
             "hour": {
               "dead": true,
-              "hour": 2,
+              "instance": true,
               "level": 1,
-              "marker": "hourUnits",
+              "marker": "number",
               "range": {
                 "end": 25,
                 "start": 25
               },
               "text": "2",
               "types": [
-                "hourUnits"
+                "number"
               ],
+              "value": 2,
               "word": "2"
             },
             "level": 1,
@@ -497,15 +503,15 @@
               0
             ],
             [
-              "hourUnits",
+              "info",
               0
             ],
             [
-              "info",
+              "is",
               0
             ],
             [
-              "is",
+              "number",
               0
             ],
             [
@@ -538,15 +544,15 @@
               0
             ],
             [
-              "hourUnits",
+              "info",
               0
             ],
             [
-              "info",
+              "is",
               0
             ],
             [
-              "is",
+              "number",
               0
             ],
             [
@@ -575,11 +581,11 @@
               0
             ],
             [
-              "hourUnits",
+              "is",
               0
             ],
             [
-              "is",
+              "number",
               0
             ],
             [
@@ -608,11 +614,11 @@
               0
             ],
             [
-              "hourUnits",
+              "is",
               0
             ],
             [
-              "is",
+              "number",
               0
             ],
             [
@@ -628,7 +634,7 @@
         {
           "counter": 5,
           "op": [
-            "hourUnits",
+            "number",
             0
           ],
           "ops": [
@@ -637,11 +643,11 @@
               0
             ],
             [
-              "hourUnits",
+              "is",
               0
             ],
             [
-              "is",
+              "number",
               0
             ],
             [
@@ -712,6 +718,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -730,6 +737,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -793,17 +802,18 @@
                 "determined": true,
                 "hour": {
                   "dead": true,
-                  "hour": 2,
+                  "instance": true,
                   "level": 1,
-                  "marker": "hourUnits",
+                  "marker": "number",
                   "range": {
                     "end": 25,
                     "start": 25
                   },
                   "text": "2",
                   "types": [
-                    "hourUnits"
+                    "number"
                   ],
+                  "value": 2,
                   "word": "2"
                 },
                 "level": 1,
@@ -869,7 +879,7 @@
           },
           "generatedParenthesized": "",
           "paraphrases": "tell me when the time is 2 pm",
-          "paraphrasesParenthesized": "(tell (me) when ((the (time)) is (2 pm)))",
+          "paraphrasesParenthesized": "(tell (me) when ((the (time)) is ((2) pm)))",
           "responses": [
             ""
           ]
@@ -880,7 +890,7 @@
       "tell me when the time is 2 pm"
     ],
     "paraphrasesParenthesized": [
-      "(tell (me) when ((the (time)) is (2 pm)))"
+      "(tell (me) when ((the (time)) is ((2) pm)))"
     ],
     "query": "tell me when the time is 2 pm",
     "responses": [
@@ -1386,6 +1396,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -1404,6 +1415,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -2122,6 +2135,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -2140,6 +2154,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -2531,6 +2547,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -2549,6 +2566,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {
@@ -2905,6 +2924,7 @@
         "dialogues": "dialogues2",
         "gdefaults": "gdefaults2",
         "meta": "meta2",
+        "numbers": "numbers2",
         "pos": "pos2",
         "punctuation": "punctuation2",
         "sdefaults": "sdefaults2",
@@ -2923,6 +2943,8 @@
         },
         "meta2": {
         },
+        "numbers2": {
+        },
         "pos2": {
         },
         "punctuation2": {

package/common/tokenize.js

@@ -0,0 +1,47 @@
+const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { defaultContextCheck } = require('./helpers')
+const tokenize_tests = require('./tokenize.test.json')
+
+let configStruct = {
+  name: 'tokenize',
+  operators: [
+    "([unknown])",
+  ],
+  bridges: [
+    { id: "unknown", level: 0, bridge: "{ ...next(operator), unknown: true, dead: true }" },
+    { id: "unknown", level: 1, bridge: "{ ...next(operator) }" },
+  ],
+  words: {
+    patterns: [
+      { pattern: [{ type: 'space' }, { repeat: true }], defs: [ { remove: true } ] },
+      { pattern: [{ type: 'alphanumeric' }, { repeat: true }], defs: [ { id: 'unknown', initial: "{ value: text, unknown: true }" } ] },
+    ],
+    hierarchy: [
+      { child: ' ', parent: 'space' },
+      ..."0123456789".split("").map((digit) => { return { child: digit, parent: 'digit' } }),
+      { child: 'lower', parent: 'letter' }, 
+      { child: 'upper', parent: 'letter' },
+      ...'abcdefghijklmnopqrstuvwxyz'.split("").map((letter) => { return { child: letter, parent: 'lower' } }),
+      ...'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split("").map((letter) => { return { child: letter, parent: 'upper' } }),
+      { child: 'letter', parent: 'alphanumeric' },
+      { child: 'digit', parent: 'alphanumeric' },
+      { child: '_', parent: 'alphanumeric' },
+      ...`~!@#$%^&*()+-=[]{}\\|;:,<>/?'"`.split("").map((punctuation) => { return { child: punctuation, parent: 'punctuation' } }),
+    ],
+  },
+};
+
+createConfig = () => new Config(configStruct, module)
+
+knowledgeModule( { 
+  module,
+  createConfig,
+  description: 'tokenize',
+  test: {
+    name: './tokenize.test.json',
+    contents: tokenize_tests,
+    checks: {
+            context: defaultContextCheck,
+    },
+  },
+})

package/common/tokenize.test.json

@@ -0,0 +1,87 @@
+[
+  {
+    "associations": [
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "dead": true,
+        "level": 1,
+        "marker": "unknown",
+        "range": {
+          "end": 10,
+          "start": 0
+        },
+        "text": "hello_world",
+        "topLevel": true,
+        "unknown": true,
+        "value": "hello_world",
+        "word": "hello_world"
+      }
+    ],
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "unknown",
+            0
+          ],
+          "ops": [
+            [
+              "unknown",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "tokenize": "tokenize1"
+      },
+      "namespaced": {
+        "tokenize1": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "dead": true,
+            "level": 1,
+            "marker": "unknown",
+            "range": {
+              "end": 10,
+              "start": 0
+            },
+            "text": "hello_world",
+            "topLevel": true,
+            "unknown": true,
+            "value": "hello_world",
+            "word": "hello_world"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "",
+          "paraphrasesParenthesized": "()",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      ""
+    ],
+    "paraphrasesParenthesized": [
+      "()"
+    ],
+    "query": "hello_world",
+    "responses": [
+      ""
+    ]
+  }
+]