tpmkms 8.0.0-beta.41 → 8.0.0-beta.43

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 = async () => {
-  const config = new Config({ name: 'animals' }, module)
-  await 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

@@ -1,10 +1,10 @@
-const { Config, knowledgeModule, where, stableId } = require('./runtime').theprogrammablemind
+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 configStruct = {
+let config = {
   name: 'articles',
   operators: [
     "([thisitthat|])",
@@ -84,18 +84,13 @@ let configStruct = {
 
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(pos, gdefaults)
-  await config.restart_auto_rebuild()
-  return config
-}
-
 knowledgeModule( { 
+  config,
+  includes: [pos, gdefaults],
+
   module,
   description: 'articles',
-  createConfig, newWay: true,
+  newWay: true,
   test: {
     name: './articles.test.json',
     contents: tests,

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 = async () => {
-  const config = new Config(configStruct, module)
-  await 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,34 +176,27 @@ const initializeApi = (config, api) => {
 }
 
 
-const createConfig = async () => {
-  const timeKM = await createTimeKM()
-  const currencyKM = await createCurrencyKM()
-  const api = new Sally(timeKM)
-  const api2 = new Bob(currencyKM)
-
-  const config = new Config(configStruct, module)
-  config.stop_auto_rebuild()
-  await config.add(gdefaults)
-
-  await config.setMultiApi(initializeApi)
-  config.initializer( async ({isModule, km}) => {
-    if (!isModule) {
-      const config = km('characters')
-      await config.setApi(api2)
-      await config.setApi(api)
-    }
-  })
-  await 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,

package/common/colors.instance.json

@@ -3210,6 +3210,20 @@
             1
           ]
         ],
+        [
+          [
+            "is",
+            0
+          ],
+          [
+            "list",
+            1
+          ],
+          [
+            "unknown",
+            1
+          ]
+        ],
         [
           [
             "is",
@@ -25552,6 +25566,20 @@
         1
       ]
     ],
+    [
+      [
+        "is",
+        0
+      ],
+      [
+        "list",
+        1
+      ],
+      [
+        "unknown",
+        1
+      ]
+    ],
     [
       [
         "is",

package/common/colors.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, where } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const colors_tests = require('./colors.test.json')
 const colors_instance = require('./colors.instance.json')
@@ -46,15 +46,11 @@ const template = {
   ],
 }
 
-const createConfig = async () => {
-  const config = new Config({ name: 'colors' }, module)
-  await config.add(hierarchy)
-  return config
-}
-
 knowledgeModule( { 
+  config: { name: 'colors' },
+  includes: [hierarchy],
+
   module,
-  createConfig,
   description: 'talking about colors',
   test: {
     name: './colors.test.json',

package/common/comparable.js

@@ -1,10 +1,10 @@
-const { Config, knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const dialogues = require("./dialogues")
 const numbers = require("./numbers")
 const comparable_tests = require('./comparable.test.json')
 
-let configStruct = {
+let config = {
   name: 'comparable',
   operators: [
     "([condition|])",
@@ -47,16 +47,12 @@ let configStruct = {
   ],
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  await config.add(dialogues, numbers)
-  return config
-}
-
 knowledgeModule({ 
+  config,
+  includes: [dialogues, numbers],
+
   module,
   description: 'Comparable things',
-  createConfig,
   test: {
     name: './comparable.test.json',
     contents: comparable_tests,

package/common/concept.js

@@ -1,4 +1,4 @@
-const { Config, knowledgeModule, flatten, where, Digraph } = require('./runtime').theprogrammablemind
+const { knowledgeModule, flatten, where, Digraph } = require('./runtime').theprogrammablemind
 const { defaultContextCheck } = require('./helpers')
 const { API }= require('./helpers/concept')
 const dialogues = require('./dialogues.js')
@@ -14,141 +14,137 @@ const concept_instance = require('./concept.instance.json')
   plain and regular fries mean the same thing
 */
 
-const createConfig = async () => {
-  const config = new Config({
-    name: 'concept',
-    operators: [
-      "((context.punctuation != true)* [modifies|] (concept))",
-      "([concept])",
-      "([literally] (modifies/0))",
-    ],
-    bridges: [
-      {
-        id: "modifies",
-        isA: ['verby'],
-        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, concept: after[0] }"
-      },
-      { id: "literally", bridge: "{ ...after[0], flatten: false, literally: true }" },
-      { id: "concept", bridge: "{ ...next(operator) }" },
-    ],
-    priorities: [
-      { "context": [['literally', 0], ['modifies', 0], ], "choose": [0] },
-    ],
-    hierarchy: [
-      ['concept', 'theAble'],
-      ['concept', 'queryable'],
-    ],
-    generators: [
-      {
-        notes: '"fire type, water type and earth type" to "fire water and earth type"',
-        /*
-          {
-            "water": {
-              "marker": "water",
-              "value": "water",
-              "word": "water"
-            },
-            "marker": "water_type",
-            "modifiers": [
-              "water"
-            ],
-            "types": [
-              "water_type"
-            ],
-            "value": "water_type",
-            "word": "type",
-            "paraphrase": true
+config = {
+  name: 'concept',
+  operators: [
+    "((context.punctuation != true)* [modifies|] (concept))",
+    "([concept])",
+    "([literally] (modifies/0))",
+  ],
+  bridges: [
+    {
+      id: "modifies",
+      isA: ['verby'],
+      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, concept: after[0] }"
+    },
+    { id: "literally", bridge: "{ ...after[0], flatten: false, literally: true }" },
+    { id: "concept", bridge: "{ ...next(operator) }" },
+  ],
+  priorities: [
+    { "context": [['literally', 0], ['modifies', 0], ], "choose": [0] },
+  ],
+  hierarchy: [
+    ['concept', 'theAble'],
+    ['concept', 'queryable'],
+  ],
+  generators: [
+    {
+      notes: '"fire type, water type and earth type" to "fire water and earth type"',
+      /*
+        {
+          "water": {
+            "marker": "water",
+            "value": "water",
+            "word": "water"
           },
-        */
-        where: where(),
-        match: ({context}) => {
-          if (!context.paraphrase) {
-            return
-          }
-          if (context.marker !== 'list') {
-            return
-          }
-          if ((context.value || []).length < 2) {
-            return
-          }
-          if (!context.value[0].word) {
-            return
-          }
-          const word = context.value[0].word
-
-          for (let value of context.value) {
-            if (!(value.modifiers && value.modifiers.length == 1 && value.word == word)) {
-              return
-            }
-          }
-          return true
+          "marker": "water_type",
+          "modifiers": [
+            "water"
+          ],
+          "types": [
+            "water_type"
+          ],
+          "value": "water_type",
+          "word": "type",
+          "paraphrase": true
         },
-        apply: async ({g, context}) => {
-          const modifiers = context.value.map( (p) => p[p.modifiers[0]] )
-          context.word = context.value[0].word
-          context.value = null
-          context.modifiers = ['modifier']
-          context.modifier = {
-            marker: 'list',
-            paraphrase: true,
-            value: modifiers
-          }
-          context.paraphrase = true
-          return await g(context)
+      */
+      where: where(),
+      match: ({context}) => {
+        if (!context.paraphrase) {
+          return
         }
-      },
-      {
-        where: where(),
-        match: ({context}) => context.marker == 'modifies' && context.paraphrase,
-        apply: async ({context, gp, gw}) => {
-          const modifiers = []
-          for (modifier of context.modifiers) {
-            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)}`
-          } else {
-            return `${modifiers.join(" ")} ${await gw(context, { number: context.modifiers[context.modifiers.length - 1] })} ${await gp(context.concept)}`
-          }
+        if (context.marker !== 'list') {
+          return
         }
-        // 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)
+        if ((context.value || []).length < 2) {
+          return
+        }
+        if (!context.value[0].word) {
+          return
+        }
+        const word = context.value[0].word
+
+        for (let value of context.value) {
+          if (!(value.modifiers && value.modifiers.length == 1 && value.word == word)) {
+            return
           }
-          // km('concept').api.kindOfConcept({ config, modifiers, object: context.concept.value || context.concept.marker })
-          km('concept').api.kindOfConcept({ config, modifiers, object: context.concept })
         }
+        return true
       },
-    ],
-  }, module)
-  config.stop_auto_rebuild()
-  await config.setApi(new API())
-  await config.add(dialogues)
-  await config.restart_auto_rebuild()
-  return config
+      apply: async ({g, context}) => {
+        const modifiers = context.value.map( (p) => p[p.modifiers[0]] )
+        context.word = context.value[0].word
+        context.value = null
+        context.modifiers = ['modifier']
+        context.modifier = {
+          marker: 'list',
+          paraphrase: true,
+          value: modifiers
+        }
+        context.paraphrase = true
+        return await g(context)
+      }
+    },
+    {
+      where: where(),
+      match: ({context}) => context.marker == 'modifies' && context.paraphrase,
+      apply: async ({context, gp, gw}) => {
+        const modifiers = []
+        for (modifier of context.modifiers) {
+          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)}`
+        } else {
+          return `${modifiers.join(" ")} ${await gw(context, { number: context.modifiers[context.modifiers.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({ 
+  config,
+  includes: [dialogues],
+  api: () => new API(),
+
   module,
   description: 'The idea of a concept whatever that might end up being',
-  createConfig,
   test: {
     name: './concept.test.json',
     contents: concept_tests,

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,7 +11,7 @@ const countable_tests = require('./countable.test.json')
     2 6 and 3 10 piece nuggets
  */
 
-let configStruct = {
+let config = {
   name: 'countable',
   operators: [
     "(([quantifier|]) [counting] ([countable]))",
@@ -75,16 +75,12 @@ let configStruct = {
   ]
 };
 
-const createConfig = async () => {
-  const config = new Config(configStruct, module)
-  await config.add(dialogues, numbers)
-  return config
-}
-
 knowledgeModule({ 
+  config,
+  includes: [dialogues, numbers],
+
   module,
   description: 'Countable things',
-  createConfig,
   test: {
     name: './countable.test.json',
     contents: countable_tests,