theprogrammablemind 8.0.0-beta.20 → 8.0.0-beta.21

package/client.js

@@ -447,7 +447,7 @@ const setupContexts = (rawContexts) => {
   return contexts
 }
 
-const processContextsB = ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
+const processContextsB = async ({ config, hierarchy, semantics, generators, json, isTest, rebuildingTemplate, isInstance, instance, query, data, retries, url, commandLineArgs }) => {
   // TODO fix this name to contextsPrime
   const contextsPrime = []
   const generatedPrime = []
@@ -634,7 +634,7 @@ const setupProcessB = ({ config, initializer, allowDelta = false } = {}) => {
 }
 
 // instance template loadTemplate
-const loadInstance = (config, instance) => {
+const loadInstance = async (config, instance) => {
   const transitoryMode = global.transitoryMode
   global.transitoryMode = false
 
@@ -676,7 +676,7 @@ const loadInstance = (config, instance) => {
       const args = { config, hierarchy, json: results, commandLineArgs: {} }
       args.isInstance = `instance${i}`
       args.instance = ''
-      processContextsB(args)
+      await processContextsB(args)
       if (results.skipSemantics) {
         config.config.skipSemantics = null
       }
@@ -701,7 +701,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
   // ensure same start state
   try {
     if (writeTests) {
-      config.rebuild()
+      await config.rebuild()
       const objects = getObjects(config.config.objects)(config.uuid)
     }
   } catch (error) {
@@ -773,7 +773,7 @@ const _process = async (config, query, { initializer, commandLineArgs, credentia
           start = runtime.performance.performance.now()
         }
         const { contextsPrime, generatedPrime, paraphrasesPrime, paraphrasesParenthesizedPrime, generatedParenthesizedPrime, responsesPrime } =
-                                  processContextsB({ isTest, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
+                                  await processContextsB({ isTest, rebuildingTemplate, config, hierarchy, json, commandLineArgs /*, generators, semantics */ })
         if (isTest) {
           end = runtime.performance.performance.now()
           clientSideTime = end - start
@@ -870,7 +870,7 @@ const runTest = async (config, expected, { args, verbose, testConfig, debug }) =
     return
   }
   // initialize in between test so state is not preserved since the test was adding without state
-  config.rebuild()
+  await config.rebuild()
   const errorHandler = (error) => {
     if (error.metadata) {
       const priorities = analyzeMetaData(expected.metadata, error.metadata)
@@ -1016,7 +1016,7 @@ const runTests = async (config, testFile, juicyBits) => {
 }
 
 const saveTest = async (testFile, config, test, expected, testConfig, saveDeveloper) => {
-  config.rebuild()
+  await config.rebuild()
   const objects = getObjects(config.config.objects)(config.uuid)
   console.log(test)
   const result = await _process(config, test, { isTest: true })
@@ -1037,11 +1037,11 @@ const saveTestsHelper = async (testFile, config, tests, todo, testConfig, saveDe
     return
   }
   const test = todo.pop()
-  config.rebuild()
+  await config.rebuild()
   const result = await saveTest(testFile, config, test, tests[test], testConfig, saveDeveloper)
   // initialize in between test so state is not preserved since the test was adding without state
   // config.initialize({force: true})
-  config.rebuild()
+  await config.rebuild()
   return saveTestsHelper(testFile, config, tests, todo, testConfig, saveDeveloper)
 }
 
@@ -1360,7 +1360,7 @@ const rebuildTemplate = async ({ config, target, previousResultss, startOfChange
         if (previousResults && previousResults.query == query.query) {
           results = previousResults
           prMessage = ' Using previous results. use -rtf for a hard rebuild of everything on the server side.'
-          loadInstance(config, { resultss: [results] })
+          await loadInstance(config, { resultss: [results] })
         } else {
           results = await _process(config, query.query, { initializer, rebuildingTemplate: true })
         }
@@ -1632,7 +1632,7 @@ const knowledgeModuleImpl = async ({
       global.pauseDebugging = true
     }
 
-    const config = createConfig()
+    const config = await createConfig()
     setupConfig(config)
     processResults = processResults({ config, errorHandler })
 
@@ -1864,7 +1864,7 @@ const knowledgeModuleImpl = async ({
         config.config.rebuild = true
       }
       try {
-        config.load(template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
+        await config.load(template.template, template.instance, { rebuild: needsRebuild.needsRebuild || options.rebuild, previousResultss: needsRebuild.previousResultss, startOfChanges: needsRebuild.startOfChanges })
       } catch (e) {
         console.error(`Error loading template for ${config.name}. ${e.error ? e.error : e}${e.stack ? e.stack : ''}`)
         runtime.process.exit(-1)
@@ -2109,7 +2109,7 @@ const knowledgeModuleImpl = async ({
     }
     printConfig()
   } else {
-    const initConfig = (config) => {
+    const initConfig = async (config) => {
       if (template) {
         if (config.needsRebuild(template.template, template.instance, { isModule: !isProcess }).needsRebuild) {
           const error = `This module "${config.name}" cannot be used because the instance file needs rebuilding. Run on the command line with no arguments or the -rt argument to rebuild.`
@@ -2144,24 +2144,19 @@ const knowledgeModuleImpl = async ({
 
       if (template) {
         try {
-          config.load(template.template, template.instance)
+          await config.load(template.template, template.instance)
         } catch (e) {
           errorHandler(e)
         }
       }
     }
 
-    createConfigExport = (additionalConfig) => {
+    createConfigExport = async () => {
       if (createConfig.cached) {
         return createConfig.cached
       }
-      const config = createConfig(acceptsAdditionalConfig ? additionalConfig : null)
-      if (!acceptsAdditionalConfig && additionalConfig) {
-        config.stop_auto_rebuild()
-        additionalConfig(config)
-        config.restart_auto_rebuild()
-      }
-      initConfig(config)
+      const config = await createConfig()
+      await initConfig(config)
       // config.rebuild({ isModule: true })
       createConfig.cached = config
       return createConfig.cached

package/package.json

@@ -64,6 +64,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "8.0.0-beta.20",
+  "version": "8.0.0-beta.21",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -564,7 +564,7 @@ function isLetter (char) {
 }
 */
 
-function configDup (config, options) {
+async function configDup (config, options) {
   if (config instanceof Config) {
     return config.copy(options)
   }
@@ -704,9 +704,9 @@ class KM {
     return true
   }
 
-  copy2 (options) {
+  async copy2 (options) {
     // greg -> add a flag to say don't init the api's
-    const config = configDup(this._config, options)
+    const config = await configDup(this._config, options)
     const km = new KM({
       config,
       getCounter: options.getCounter,
@@ -718,10 +718,10 @@ class KM {
     return km // copy2()
   }
 
-  copy () {
+  async copy () {
     const km = new KM({
       name: this._name,
-      config: configDup(this._config),
+      config: await configDup(this._config),
       // _uuid: uuidv4(),
       _uuid: this._config.getCounter(this._config._name),
       getCounter: (name) => this._config.getCounter(name),
@@ -773,7 +773,7 @@ const multiApiImpl = (initializer) => {
     multiApi: true,
 
     // multi functions
-    add: (config, multiApi, api) => {
+    add: async (config, multiApi, api) => {
       initializer(config, api)
       const name = api.getName()
       multiApi.apis[name] = api
@@ -811,17 +811,6 @@ class Config {
     return config_toServer(config)
   }
 
-  base () {
-    const base = new Config()
-    for (const km of this.configs.reverse()) {
-      if (km.isSelf) {
-        continue
-      }
-      base.add(km.config)
-    }
-    return base
-  }
-
   getInfo () {
     const name = this.name
     const includes = this.configs.slice(1).map((km) => km.config.name)
@@ -1237,7 +1226,7 @@ class Config {
   }
 
   // loadTemplate
-  load (template, instance, options = { rebuild: false, previousResultss: undefined, startOfChanges: undefined }) {
+  async load (template, instance, options = { rebuild: false, previousResultss: undefined, startOfChanges: undefined }) {
     this.validifyTemplate(template)
     instance.template = template
     this.logs.push(`loading template for ${this.name}`)
@@ -1270,7 +1259,7 @@ class Config {
         instance.name = this.name
         this.initInstances.push(instance)
         this.instances.push(instance)
-        client.loadInstance(this, instance)
+        await client.loadInstance(this, instance)
       }
     }
   }
@@ -1629,10 +1618,6 @@ class Config {
     return params
   }
 
-  processContexts (contexts, params) {
-    client.processContexts(contexts, this.getParams())
-  }
-
   processContext (context) {
     return client.processContext(context, this.getParams())
   }
@@ -1882,9 +1867,9 @@ class Config {
     this._stop_auto_rebuild = true
   }
 
-  restart_auto_rebuild() {
+  async restart_auto_rebuild() {
     this._stop_auto_rebuild = false
-    this.rebuild()
+    await this.rebuild()
   }
 
   getAddedArgs (args) {
@@ -1903,8 +1888,8 @@ class Config {
     }
   }
 
-  set multiApi (initializer) {
-    this.api = multiApiImpl(initializer)
+  async setMultiApi (initializer) {
+    await this.setApi(multiApiImpl(initializer))
   }
 
   get multiApi () {
@@ -1952,31 +1937,26 @@ class Config {
     }
   }
 
-  addAPI (api) {
+  async addAPI (api) {
+    // console.trace()
+    // throw "addAPI"
     if (this._api && this._api.multiApi) {
-      this._api.add(this, this._api, api)
+      await this._api.add(this, this._api, api)
     } else {
       throw new Error('Can only add apis to a multi-api')
     }
   }
 
-  set api (value) {
+  async setApi (value) {
     if (!value.initialize) {
       throw new Error(`Expected the API to have an initialize function for ${this.name}.`)
     }
 
     if (this._api && this._api.multiApi) {
-      this._api.add(this, this._api, value)
+      await this._api.add(this, this._api, value)
     } else {
       this._api = _.cloneDeep(value)
-      /*
-      if (this._api) {
-        // this._api.objects = this.config.objects
-        // this._api.config = () => this
-        // this._api.uuid = this._uuid
-      }
-      */
-      this.rebuild()
+      await this.rebuild()
     }
   }
 
@@ -1996,7 +1976,7 @@ class Config {
   }
 
   // remove all added modules and initialize with the init config
-  resetToOne () {
+  async resetToOne () {
     /*
     this.config = _.cloneDeep(this.initConfig)
     this.configs = [this.configs[0]]
@@ -2005,11 +1985,8 @@ class Config {
     */
     this.configs = [this.configs[0]]
     this.defaultConfig()
-    if (!this.initializeFn) {
-      // TODO move this to the default initializer
-      Object.assign(this.config.objects, _.cloneDeep(this.initConfig.objects || {}))
-    }
-    this.initializeConfigFromConfigs({ others: [], objects: this.config.objects.namespaced, moreNames: [], callInitializers: false })
+    Object.assign(this.config.objects, _.cloneDeep(this.initConfig.objects || {}))
+    await this.initializeConfigFromConfigs({ others: [], objects: this.config.objects.namespaced, moreNames: [], callInitializers: false })
     const map = {}
     for (let i = 0; i < this.configs.length; ++i) {
       map[this.configs[i].uuid] = this.configs[i].uuid
@@ -2031,17 +2008,18 @@ class Config {
     runtime.fs.writeFileSync(fn, JSON.stringify(this.config, 0, 2))
   }
 
-  copy (options = { callInitializers: true }) {
-  }
-
-  copy (options = { callInitializers: true }) {
+  async copy (options = { callInitializers: true }) {
     this.valid()
     const cp = new Config()
     cp.logs = []
     cp.maxDepth = this.maxDepth
     cp.debugLoops = this.debugLoops
     cp.transitoryMode = this.transitoryMode
-    cp.configs = this.configs.map((km) => km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
+    // cp.configs = this.configs.map((km) => await km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
+    cp.configs = []
+    for (const km of this.configs) {
+      cp.configs.push(await km.copy2(Object.assign({}, options, { getCounter: (name) => cp.getCounter(name), callInitializers: false })))
+    }
     cp._uuid = cp.configs[0]._uuid
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
@@ -2062,13 +2040,8 @@ class Config {
     cp.defaultConfig()
     // cp.wasInitialized = false;  // since default config GREG
     cp.resetWasInitialized()
-    if (!this.initializeFn) {
-      // TODO move this to the default initializer
-      Object.assign(cp.config.objects, _.cloneDeep(this.initConfig.objects || {}))
-    }
-    // cp.initializeConfigFromConfigs({ others: [], objects: cp.config.objects.namespaced, moreNames: [], ...options })
-    // cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, { callInitializers: false }))
-    cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, options))
+    Object.assign(cp.config.objects, _.cloneDeep(this.initConfig.objects || {}))
+    await cp.initializeConfigFromConfigs(Object.assign({ others: [], objects: cp.config.objects.namespaced, moreNames: [] }, options))
     const map = {}
     for (let i = 0; i < this.configs.length; ++i) {
       map[this.configs[i].uuid] = cp.configs[i].uuid
@@ -2079,33 +2052,16 @@ class Config {
       // debugger
     }
     if (options.callInitializers) {
-      cp.rebuild(options)
+      await cp.rebuild(options) // in copy
     } else {
-      // this mess is for duplicate into a KM after resetToOne was called
-      /*
-      if (cp._api) {
-        // cp._api.objects = cp.config.objects
-        // cp._api.config = () => (cp instanceof Config) ? cp : cp.config
-        // cp._api.uuid = cp._uuid
-      }
-      */
-
       if (!cp.config.objects) {
         cp.config.objects = { namespaced: {} }
       } else if (!cp.config.objects.namespaced) {
         cp.config.objects.namespaced = {}
       }
       cp.configs.forEach((km) => {
-        // const namespace = km.namespace
         cp.config.objects.namespaced[km._uuid] = {}
       })
-      /*
-      if (cp._uuid == 'concept2') {
-        if (!cp.api.objects.defaultTypesForHierarchy) {
-          debugger
-        }
-      }
-    */
     }
     cp.valid()
     return cp
@@ -2229,41 +2185,7 @@ class Config {
     }
   }
 
-  initializeFromConfigs () {
-    // [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
-    [...this.configs].reverse().forEach(({ config, namespace, uuid }) => {
-      /*
-      let objects = this.get('objects')
-      if (namespace) {
-        objects = {}
-        this.get('objects')['namespaced'][namespace] = objects
-      }
-      */
-      const objects = {}
-      if (config instanceof Config) {
-        this.get('objects').namespaced[config._uuid] = objects
-        /*
-        if (config._api) {
-          // config._api.objects = objects
-          // config._api.config = () => this
-        }
-        */
-        config.initializerFn(setupInitializerFNArgs(this, { testConfig: config, currentConfig: config, objects, namespace, uuid }))
-      } else {
-        this.get('objects').namespaced[this._uuid] = objects
-        /*
-        if (config._api) {
-          // config._api.objects = objects
-          // config._api.config = () => this
-        }
-        */
-        this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, namespace, uuid }))
-      }
-    })
-    this.instances.forEach((instance) => client.loadInstance(this, instance))
-  }
-
-  initialize ({ force = true } = {}) {
+  initialize23 ({ force = true } = {}) {
     if (force || !this.wasInitialized) {
       const objects = this.config.objects.namespaced[this._uuid]
       this.initializerFn(setupInitializerFNArgs(this, { testConfig: this, currentConfig: this, objects, uuid: this._uuid, namespace: '' }))
@@ -2271,7 +2193,7 @@ class Config {
     }
   }
 
-  initializer (fn, options = {}) {
+  async initializer (fn, options = {}) {
     if (options) {
       for (const option of Object.keys(options)) {
         const validOptions = []
@@ -2293,8 +2215,7 @@ class Config {
       currentConfig.wasInitialized = true
       global.transitoryMode = transitoryMode
     }
-    // this.initializeFromConfigs()
-    this.rebuild()
+    await this.rebuild()
   }
 
   nsToString (id) {
@@ -2440,7 +2361,7 @@ class Config {
   }
 
   // rebuild ({ isModule: mainIsModule = false } = {}) {
-  rebuild ({ isModule: mainIsModule } = {}) {
+  async rebuild ({ isModule: mainIsModule } = {}) {
     if (this._stop_auto_rebuild) {
       return
     }
@@ -2608,7 +2529,7 @@ class Config {
         }
         const instance = this.instances.find((instance) => instance.name == name)
         if (instance) {
-          client.loadInstance(this, instance)
+          await client.loadInstance(this, instance)
         }
         this.hierarchy.edges = this.config.hierarchy
       }
@@ -2628,6 +2549,7 @@ class Config {
   //    if undefined namespace applies to first loaded config
   //    if list of name then namespace applied only to those configs
   //    if true then namespace applies to all loaded configs
+  /*
   namespace (moreNames, others) {
     const config = this.copy()
     if (!Array.isArray(moreNames)) {
@@ -2663,6 +2585,7 @@ class Config {
     config.rebuild()
     return config
   }
+  */
 
   setupNamespace (km) {
     let config = km.config
@@ -2681,7 +2604,7 @@ class Config {
 
   // config.initializerFn({ config: this, objects, namespace })
   // this goes through all the configs and sets up this.config
-  initializeConfigFromConfigs ({ others, objects, moreNames, callInitializers = true }) {
+  async initializeConfigFromConfigs ({ others, objects, moreNames, callInitializers = true }) {
     // setup the namespace in the configs
     let first = true
     this.configs.forEach((km) => {
@@ -2924,25 +2847,29 @@ class Config {
     }
   }
 
-  add (...mores) {
-    mores.forEach((km) => {
-      if (km === this) {
-        throw new Error('Cannot add an object to itself.')
+  async add (...createConfigs) {
+    createConfigs.forEach((createConfig, index) => {
+      if (typeof createConfig !== 'function') {
+        throw new Error(`Expected add argument number ${index+1} to be a function that constructs the config.`)
       }
     })
 
-    mores = mores.map((km) => {
-      if (!(km instanceof Config)) {
-        km = new Config(km)
+    const mores = []
+    for (const createConfig of createConfigs) {
+      const more = await createConfig()
+      if (mores.find( (km) => km.name == more.name)) {
+        throw new Error(`Expected add argument number ${index+1} to be a function that constructs the config.`)
       }
-      return km
-    })
-
-    mores.forEach((more) => {
+      if (this === more) {
+        throw new Error('Cannot add an object to itself.')
+      }
+      mores.push(more)
+    }
+    for (let more of mores) {
       this.valid()
       more.valid()
       // copy so i don't have to copy later
-      more = more.copy()
+      more = await more.copy()
       more.server(this._server, this._key, this._queryParams)
 
       const moreConfigs = more.configs.map((km) => km.name || km.uuid)
@@ -2957,9 +2884,6 @@ class Config {
       const moreKMs1 = [new KM({ config: more, getCounter: (name) => this.getCounter(name), uuid: more.uuid, namespace })]
       const moreKMs2 = more.configs.slice(1).map((km) => {
         return km
-        // const cp = km.copy()
-        // cp.namespace = namespace
-        // return cp;
       })
       const moreKMs = moreKMs1.concat(moreKMs2)
       const eqClass = moreKMs.map((km) => km.uuid)
@@ -2973,7 +2897,7 @@ class Config {
           this.configs.push(moreKM)
         }
       }
-      more.resetToOne()
+      await more.resetToOne()
       this.config.eqClasses = this._eqClasses
       // greg
       // setup instances
@@ -2988,8 +2912,8 @@ class Config {
         }
       }
       this.instances = noDups
-    })
-    this.rebuild()
+    }
+    await this.rebuild() // in add(
     this.valid()
     return this
   }
@@ -3145,7 +3069,7 @@ class Config {
   // assumes this is called in reverse order
   addInternalR (more, useOldVersion = true, skipObjects = false, includeNamespaces = true, allowNameToBeNull = false) {
     if (more instanceof Config) {
-      more.initialize({ force: false })
+      more.initialize23({ force: false })
       if (useOldVersion) {
         more = more.config
       } else {

package/src/semantics.js

@@ -312,9 +312,9 @@ class Semantics {
 
   applyToContexts (args, contexts, options) {
     const contextsPrime = []
-    contexts.forEach((context) => {
+    for (const context of contexts) {
       contextsPrime.push(this.applyToContext(args, context, options))
-    })
+    }
     return contextsPrime
   }