ekms 8.0.0 → 8.1.0

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,21 +68,17 @@ 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,
     checks: {
-            context: defaultContextCheck,
+            context: defaultContextCheck(),
           },
   }
 })

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: [
@@ -98,7 +98,6 @@ let configStruct = {
         const words = context.words.map( (context) => context.word )
         const utterance = words.join(' ')
         const config = km('characters')
-        debugger
         const api = config._api.apis[context.value]
         api.process(config, utterance).then( (result) => {
           if (!api.response) {
@@ -127,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}) {
@@ -151,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}) {
@@ -174,41 +176,32 @@ 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,
     checks: {
-        context: defaultContextCheck,
+        context: defaultContextCheck(),
           },
   },
 })