tpmkms_4wp 8.0.0-beta.7 → 8.0.0-beta.70

package/common/animals.js

@@ -1,5 +1,5 @@
 const { defaultContextCheck } = require('./helpers')
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const hierarchy = require('./hierarchy')
 const animals_tests = require('./animals.test.json')
 const animals_instance = require('./animals.instance.json')
@@ -25,26 +25,23 @@ const template = {
   ],
 }
 
-const createConfig = () => {
-  const config = new Config({ name: 'animals' }, module)
-  config.add(hierarchy())
-  return config
-}
-
 knowledgeModule( {
-    module,
-      description: 'animals related concepts',
-      createConfig, newWay: true,
-      test: {
-              name: './animals.test.json',
-              contents: animals_tests,
-              checks: {
-                context: defaultContextCheck,
-              },
+    config: { name: 'animals' },
+    includes: [hierarchy],
 
+    module,
+    description: 'animals related concepts',
+    newWay: true,
+    test: {
+            name: './animals.test.json',
+            contents: animals_tests,
+            checks: {
+              context: defaultContextCheck,
             },
-      template: {
-        template,
-        instance: animals_instance
-      }
+
+          },
+    template: {
+      template,
+      instance: animals_instance
+    }
 })

package/common/articles.js

@@ -0,0 +1,103 @@
+const { knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
+const gdefaults = require('./gdefaults.js')
+const pos = require('./pos.js')
+const { defaultContextCheck } = require('./helpers')
+const tests = require('./articles.test.json')
+
+let config = {
+  name: 'articles',
+  operators: [
+    "([thisitthat|])",
+    "([it])",
+    "([this])",
+    "([that])",
+    "([queryable])",
+  /*
+    "(<what> ([whatAble|]))",
+    "([what:optional])",
+  */
+    "(<the|> ([theAble]))",
+    "(<a|a,an> ([theAble|]))",
+  ],
+  bridges: [
+    // { id: "what", level: 0, optional: "{ ...next(operator), query: ['what'], determined: true }", bridge: "{ ...after, query: ['what'], modifiers: ['what'], what: operator }" },
+    // { id: "whatAble", level: 0, bridge: "{ ...next(operator) }" },
+    { 
+      id: 'the', 
+      level: 0, 
+      bridge: '{ ...after[0], focusableForPhrase: true, pullFromContext: true, concept: true, wantsValue: true, determiner: "the", modifiers: append(["determiner"], after[0].modifiers)}' 
+    },
+    { 
+      id: "a", 
+      level: 0, 
+      // bridge: "{ ...after[0], pullFromContext: false, instance: true, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
+      bridge: "{ ...after[0], pullFromContext: false, instance: true, concept: true, number: 'one', wantsValue: true, determiner: operator, modifiers: append(['determiner'], after[0].modifiers) }" 
+    },
+    { id: "queryable" },
+    { 
+      id: "theAble", 
+      children: ['noun'],
+      bridge: "{ ...next(operator) }" 
+    },
+
+    { 
+      id: "thisitthat", 
+      level: 0, 
+      isA: ['queryable'], 
+      before: ['verb'],
+      bridge: "{ ...next(operator) }" 
+    },
+    { 
+      id: "it", 
+      level: 0, 
+      isA: ['thisitthat'], 
+      bridge: "{ ...next(operator), pullFromContext: true, unknown: true, determined: true }" 
+    },
+    { 
+      id: "this", 
+      level: 0, 
+      isA: ['thisitthat'], 
+      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
+    },
+    { 
+      id: "that", 
+      level: 0, 
+      isA: ['thisitthat'], 
+      bridge: "{ ...next(operator), unknown: true, pullFromContext: true }" 
+    },
+  ],
+  words: {
+    "literals": {
+      "the": [{"id": "the", "initial": "{ modifiers: [] }" }],
+    }
+  },
+  hierarchy: [
+    ['it', 'pronoun'],
+    ['this', 'pronoun'],
+    // ['questionMark', 'isEd'],
+    ['a', 'articlePOS'],
+    ['the', 'articlePOS'],
+    ['it', 'queryable'],
+    // ['it', 'toAble'],
+    ['this', 'queryable'],
+  ],
+
+};
+
+knowledgeModule( { 
+  config,
+  includes: [pos, gdefaults],
+
+  module,
+  description: 'articles',
+  newWay: true,
+  test: {
+    name: './articles.test.json',
+    contents: tests,
+    checks: {
+            objects: ['onNevermindWasCalled', 'nevermindType', 'idSuffix'],
+            context: defaultContextCheck,
+          },
+
+  },
+})

package/common/articles.test.json

@@ -0,0 +1,310 @@
+[
+  {
+    "associations": [
+      [
+        [
+          "the",
+          0
+        ],
+        [
+          "theAble",
+          0
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "concept": true,
+        "dead": true,
+        "default": true,
+        "determiner": "the",
+        "focusableForPhrase": true,
+        "level": 1,
+        "marker": "theAble",
+        "modifiers": [
+          "determiner"
+        ],
+        "pullFromContext": true,
+        "range": {
+          "end": 10,
+          "start": 0
+        },
+        "text": "the theable",
+        "topLevel": true,
+        "types": [
+          "theAble"
+        ],
+        "value": "theAble",
+        "wantsValue": true,
+        "word": "theable"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "theAble",
+            0
+          ],
+          "ops": [
+            [
+              "the",
+              0
+            ],
+            [
+              "theAble",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "the",
+            0
+          ],
+          "ops": [
+            [
+              "the",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles1",
+        "gdefaults": "gdefaults2",
+        "pos": "pos2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "articles1": {
+        },
+        "gdefaults2": {
+        },
+        "pos2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "concept": true,
+            "dead": true,
+            "default": true,
+            "determiner": "the",
+            "focusableForPhrase": true,
+            "level": 1,
+            "marker": "theAble",
+            "modifiers": [
+              "determiner"
+            ],
+            "pullFromContext": true,
+            "range": {
+              "end": 10,
+              "start": 0
+            },
+            "text": "the theable",
+            "topLevel": true,
+            "types": [
+              "theAble"
+            ],
+            "value": "theAble",
+            "wantsValue": true,
+            "word": "theable"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "the theable",
+          "paraphrasesParenthesized": "(the (theable))",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "the theable"
+    ],
+    "paraphrasesParenthesized": [
+      "(the (theable))"
+    ],
+    "query": "the theable",
+    "responses": [
+      ""
+    ]
+  },
+  {
+    "associations": [
+      [
+        [
+          "a",
+          0
+        ],
+        [
+          "theAble",
+          0
+        ]
+      ]
+    ],
+    "config": {
+    },
+    "contexts": [
+      {
+        "concept": true,
+        "dead": true,
+        "default": true,
+        "determiner": {
+          "default": true,
+          "level": 0,
+          "marker": "a",
+          "range": {
+            "end": 0,
+            "start": 0
+          },
+          "text": "a",
+          "word": "a"
+        },
+        "level": 1,
+        "marker": "theAble",
+        "modifiers": [
+          "determiner"
+        ],
+        "number": "one",
+        "pullFromContext": false,
+        "range": {
+          "end": 8,
+          "start": 0
+        },
+        "text": "a theable",
+        "topLevel": true,
+        "types": [
+          "theAble"
+        ],
+        "value": "theAble",
+        "wantsValue": true,
+        "word": "theable"
+      }
+    ],
+    "developerTest": false,
+    "generatedParenthesized": [
+      ""
+    ],
+    "metadata": {
+      "opChoices": [
+        {
+          "counter": 1,
+          "op": [
+            "theAble",
+            0
+          ],
+          "ops": [
+            [
+              "a",
+              0
+            ],
+            [
+              "theAble",
+              0
+            ]
+          ]
+        },
+        {
+          "counter": 2,
+          "op": [
+            "a",
+            0
+          ],
+          "ops": [
+            [
+              "a",
+              0
+            ]
+          ]
+        }
+      ]
+    },
+    "objects": {
+      "nameToUUID": {
+        "articles": "articles1",
+        "gdefaults": "gdefaults2",
+        "pos": "pos2",
+        "tokenize": "tokenize2"
+      },
+      "namespaced": {
+        "articles1": {
+        },
+        "gdefaults2": {
+        },
+        "pos2": {
+        },
+        "tokenize2": {
+        }
+      },
+      "processed": [
+        {
+          "context": {
+            "concept": true,
+            "dead": true,
+            "default": true,
+            "determiner": {
+              "default": true,
+              "level": 0,
+              "marker": "a",
+              "range": {
+                "end": 0,
+                "start": 0
+              },
+              "text": "a",
+              "word": "a"
+            },
+            "level": 1,
+            "marker": "theAble",
+            "modifiers": [
+              "determiner"
+            ],
+            "number": "one",
+            "pullFromContext": false,
+            "range": {
+              "end": 8,
+              "start": 0
+            },
+            "text": "a theable",
+            "topLevel": true,
+            "types": [
+              "theAble"
+            ],
+            "value": "theAble",
+            "wantsValue": true,
+            "word": "theable"
+          },
+          "generatedParenthesized": "",
+          "paraphrases": "a theable",
+          "paraphrasesParenthesized": "((a) (theable))",
+          "responses": [
+            ""
+          ]
+        }
+      ]
+    },
+    "paraphrases": [
+      "a theable"
+    ],
+    "paraphrasesParenthesized": [
+      "((a) (theable))"
+    ],
+    "query": "a theable",
+    "responses": [
+      ""
+    ]
+  }
+]

package/common/avatar.js

@@ -1,11 +1,11 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require('./dialogues')
 const hierarchy = require('./hierarchy')
 const emotions = require('./emotions')
 const avatar_tests = require('./avatar.test.json')
  
-let configStruct = {
+let config = {
   name: 'avatar',
 
   // TODO make different response for answerNotKnown based on emotions
@@ -68,16 +68,12 @@ let configStruct = {
 
 };
 
-const createConfig = () => {
-  const config = new Config(configStruct, module)
-  config.add(hierarchy(), emotions())
-  return config
-}
-
 knowledgeModule( { 
+  config,
+  includes: [hierarchy, emotions],
+
   module,
   description: 'avatar for dialogues',
-  createConfig,
   test: {
     name: './avatar.test.json',
     contents: avatar_tests,

package/common/characters.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, process:clientProcess } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const gdefaults = require('./gdefaults.js')
 const createCurrencyKM = require('./currency.js')
@@ -28,7 +28,7 @@ const getHelp = (config, indent=2) => {
     -> get response back: sally said: blah
 */
 
-let configStruct = {
+let config = {
   name: 'characters',
 
   operators: [
@@ -126,7 +126,8 @@ class Sally {
     }
     */
     this.timeKM.server(config.getServer(), config.getAPIKey())
-    return this.timeKM.process(utterance)
+    // return this.timeKM.process(utterance)
+    return clientProcess(this.timeKM, utterance)
   }
 
   response({context, result}) {
@@ -150,7 +151,9 @@ class Bob {
 
   process(config, utterance) {
     this.currencyKM.server(config.getServer(), config.getAPIKey())
-    return this.currencyKM.process(utterance, { credentials: this.credentials })
+    // return this.currencyKM.process(utterance, { credentials: this.credentials })
+    // return clientProcess(this.currencyKM.process, utterance, { credentials: this.credentials })
+    return clientProcess(this.currencyKM, utterance)
   }
 
   response({context, result}) {
@@ -173,36 +176,27 @@ const initializeApi = (config, api) => {
 }
 
 
-const createConfig = () => {
-  const timeKM = createTimeKM()
-  const currencyKM = createCurrencyKM()
-  const api = new Sally(timeKM)
-  const api2 = new Bob(currencyKM)
-
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  config.add(gdefaults())
-
-  config.multiApi = initializeApi
-  config.initializer( ({isModule, config, km}) => {
-    if (!isModule) {
-      // config.api = api2
-      // config.api = api
-      const config = km('characters')
-      config.api = api2
-      config.api = api
-    }
-  })
-  config.restart_auto_rebuild()
-  return config
+const initializer = async ({isModule, km}) => {
+  if (!isModule) {
+    const timeKM = await createTimeKM()
+    const currencyKM = await createCurrencyKM()
+    const config = km('characters')
+    const api = new Sally(timeKM)
+    const api2 = new Bob(currencyKM)
+    await config.setApi(() => api2)
+    await config.setApi(() => api)
+  }
 }
-
 // mode this to non-module init only
 knowledgeModule({
+  config,
+  includes: [gdefaults],
+  initializer,
+  multiApiInitializer: initializeApi,
+
   module,
   description: 'this module is for creating a team of characters that can respond to commands',
   demo: "https://youtu.be/eA25GZ0ZAHo",
-  createConfig,
   test: {
     name: './characters.test.json',
     contents: characters_tests,