theprogrammablemind_4wp 9.1.1-beta.9 → 9.2.0-beta.0

package/client.js

@@ -1161,7 +1161,7 @@ const checkTemplate = (template) => {
   if (template.checks) {
     throw new Error("The 'checks' property should be in the 'test' property not the 'template' property")
   }
-  validProps([ 'fragments', 'configs' ], template.template, 'template.template')
+  validProps(['fragments', 'configs'], template.template, 'template.template')
 }
 
 const checkTest = (testConfig) => {
@@ -1186,6 +1186,7 @@ const knowledgeModuleImpl = async ({
   initializer,
   terminator,
   multiApiInitializer,
+  sendObjectsToServer,
 
   module: moduleFromJSFile,
   description,
@@ -1236,14 +1237,17 @@ const knowledgeModuleImpl = async ({
   }
 
   const createConfig = async () => {
-    const config = new Config(configStruct, moduleFromJSFile, _process)
+    const config = new Config(configStruct, moduleFromJSFile, _process, apiKMs)
+    if (sendObjectsToServer) {
+      config.setSendObjectsToServer()
+    }
     setupConfig(config)
     config.expect_template = !!template
     config.setTerminator(terminator)
     config.stop_auto_rebuild()
     await config.add(...(includes || []))
     if (api) {
-      config.setApi(api, apiKMs)
+      config.setApi(api)
     }
     if (multiApiInitializer) {
       await config.setMultiApi(multiApiInitializer)

package/index.js

@@ -6,6 +6,7 @@ const Digraph = require('./src/digraph')
 const client = require('./client')
 const flattens = require('./src/flatten')
 const unflatten = require('./src/unflatten')
+const debug = require('./src/debug')
 
 module.exports = {
   process: client.process,
@@ -26,5 +27,6 @@ module.exports = {
   Digraph,
   flattens: flattens.flattens,
   flatten: flattens.flatten,
-  unflatten: unflatten.unflatten
+  unflatten: unflatten.unflatten,
+  debug
 }

package/package.json

@@ -69,6 +69,6 @@
     "sort-json": "^2.0.0",
     "uuid": "^8.3.2"
   },
-  "version": "9.1.1-beta.9",
+  "version": "9.2.0-beta.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -473,7 +473,7 @@ const handleCalculatedProps = (baseConfig, moreConfig, { addFirst, uuid } = {})
   if (moreConfig.bridges) {
     moreConfig.bridges = moreConfig.bridges.map((bridge) => {
       bridge = { ...bridge }
-      const valid = ['after', 'before', 'bridge', 'development', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
+      const valid = ['after', 'associations', 'before', 'bridge', 'development', 'return_type_selector', 'evaluator', 'evaluators', 'generatorp', 'generatorr', 'generatorpr', 'generators', 'operator', 'id', 'convolution', 'inverted', 'isA', 'children', 'parents',
         'level', 'optional', 'selector', 'semantic', 'semantics', 'words', /Bridge$/, 'localHierarchy', 'levelSpecificHierarchy', 'where', 'uuid']
       helpers.validProps(valid, bridge, 'bridge')
       handleBridgeProps(baseConfig, bridge, { addFirst, uuid })
@@ -576,6 +576,10 @@ const addWord = (config, uuid) => ({ word, id, initial }) => {
 
 const normalizeConfig = (config) => {
   if (config) {
+    if (!config.objects) {
+      config.objects = { namespaced: {}, }
+    }
+
     for (const bag of bags) {
       if (config[bag]) {
         config[bag] = config[bag].map(normalizeGenerator)
@@ -865,6 +869,7 @@ class Config {
   async fixtures () {
     if (this.testConfig?.fixtures) {
       const args = {}
+      args.uuid = this._uuid
       configHelpers.setupArgs(args, this)
       return this.testConfig.fixtures(args)
     }
@@ -893,7 +898,7 @@ class Config {
 
   getPseudoConfig (uuid, config) {
     return {
-      description: 'this is a pseudo config that has limited functionality due to being available in the initializer function context',
+      description: 'this is a pseudo config that has limited functionality due to being available in the initializer and fixtures function context',
       addAssociation: (...args) => this.addAssociation(...args),
       addAssociations: (...args) => this.addAssociations(...args),
       addBridge: (...args) => this.addBridge(...args, uuid),
@@ -961,7 +966,7 @@ class Config {
       },
       objects: {
         // this is where the namespaced configs have their objects
-        namespaced: {}
+        namespaced: {},
       },
       description: '',
       words: {
@@ -1325,6 +1330,11 @@ class Config {
 
   toData (data) {
     Object.assign(data, this.config)
+    // greg99 delete data.objects
+    data.objects = {...this.config.objects}
+    if (!this.sendObjectsToServer) {
+      delete data.objects.namespaced
+    }
     config_toServer(data)
   }
 
@@ -1766,7 +1776,7 @@ class Config {
       if (!config.objects) {
         config.objects = {
           namespaced: {
-          }
+          },
         }
       }
 
@@ -1919,11 +1929,15 @@ class Config {
   }
 
   // configs = [ { config, namespace } ... ]
-  constructor (config, module, clientProcess) {
+  constructor (config, module, clientProcess, apiKMs) {
     if (config instanceof Config) {
       throw new Error('Excepted the config argument to be a hash not a Config object')
     }
 
+    if (!apiKMs) {
+      apiKMs = []
+    }
+
     if (config) {
       validConfigProps(config)
 
@@ -1937,6 +1951,8 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this._apiKMs = apiKMs
+
     this.clientProcess = clientProcess
     this.maxDepth = 20 // for generators and semantics
     this.debugLoops = false // for generators and semantics
@@ -1945,7 +1961,7 @@ class Config {
     this.resetDelta()
 
     this.addedArgss = []
-    const isProcess = require.main === module
+    let isProcess = require.main === module
     if (global.theprogrammablemind && config) {
       if (global.theprogrammablemind.loadForTesting[config.name]) {
         isProcess = true
@@ -1992,6 +2008,7 @@ class Config {
     this.wasInitialized = false
     this.configs = []
     this._api = undefined
+    this.sendObjectsToServer = false
     this._namespace = []
     this._eqClasses = []
     // this._uuid = uuidv4()
@@ -2016,6 +2033,10 @@ class Config {
     debugConfigProps(this.config)
   }
 
+  setSendObjectsToServer() {
+    this.sendObjectsToServer = true
+  }
+
   addArgs (moreArgs) {
     this.addedArgss.push(moreArgs)
   }
@@ -2083,7 +2104,28 @@ class Config {
     this.resetDelta(cacheKey)
   }
 
+  // use this to set the api if you only want to partially override the KM api
+  apiBase (name) {
+    if (this._api && this._api.multiApi) {
+      throw new Error('This is intended to be used to instantiate a new class based on the existing API.')
+    } else {
+      if (name) {
+        if (this.name == name) {
+          return this._api.constructor
+        } else {
+          return this.getConfig(name)._api.constructor
+        }
+      } else {
+        return this._api.constructor
+      }
+    }
+  }
+
   get api () {
+    if (this._stop_auto_rebuild) {
+      throw new Error('The API cannot be accessed until the auto rebuild is restarted')
+    }
+
     if (this._api && this._api.multiApi) {
       return this._api.api(this._api)
     } else {
@@ -2106,16 +2148,25 @@ class Config {
   }
 
   // constructors is a constructor
-  async setApi (constructor, apiKMs) {
-    if (!apiKMs) {
-      apiKMs = [this.name]
-    }
+  async setApi (constructor) {
     if (typeof constructor !== 'function') {
       throw new Error(`Expected the argument to be an API constructor for ${this.name}.`)
     }
     const value = constructor()
-    if (!value.initialize) {
-      throw new Error(`Expected the API to have an initialize function for ${this.name}.`)
+    if (this._apiKMs.length > 0) {
+      for (const name of this._apiKMs) {
+        const api = value[name]
+        if (!api) {
+          throw new Error(`The API for ${this.name} is not being provided by the API constructor.`)
+        }
+        if (!api.initialize) {
+          throw new Error(`Expected the API for ${this.name} to have an initialize function.`)
+        }
+      }
+    } else {
+      if (!value.initialize) {
+        throw new Error(`Expected the API to have an initialize function for ${this.name}.`)
+      }
     }
 
     if (this._api && this._api.multiApi) {
@@ -2128,14 +2179,13 @@ class Config {
         return api
       }
     } else {
-      this._api = value
       this._apiConstructor = constructor
-      this._apiKMs = apiKMs
-      for (const name of this._apiKMs) {
-        if (this.name == name) {
-          continue
+      if (this._apiKMs.length > 0) {
+        for (const name of this._apiKMs) {
+          this.km(name)._api = value[name]
         }
-        this.km(name).setApi(() => this._api)
+      } else {
+        this._api = value
       }
       await this.rebuild()
     }
@@ -2204,10 +2254,21 @@ class Config {
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
     cp.terminatorFn = this.terminatorFn
-    if (this._apiConstructor) {
-      cp._api = this._apiConstructor(cp)
-      cp._apiConstructor = this._apiConstructor
-      cp._apiKMs = this._apiKMs
+    cp._apiKMs = this._apiKMs
+    cp._apiConstructor = this._apiConstructor
+    if (cp._apiConstructor) {
+      if (this._apiKMs.length > 0) {
+        const apis = cp._apiConstructor(cp)
+        for (const name of this._apiKMs) {
+          if (name == this.name) {
+            cp._api = apis[name]
+          } else {
+            cp.km(name)._api = apis[name]
+          }
+        }
+      } else {
+        cp._api = cp._apiConstructor(cp)
+      }
     }
     cp._namespace = this._namespace
     cp._eqClasses = this._eqClasses
@@ -2222,6 +2283,7 @@ class Config {
     cp.testConfig = this.testConfig
     cp._server = this._server
     cp.hierarchy = new DigraphInternal(this.config.hierarchy)
+    cp.sendObjectsToServer = this.sendObjectsToServer
 
     cp.initConfig = _.cloneDeep(this.initConfig)
     cp.defaultConfig()
@@ -2239,7 +2301,9 @@ class Config {
       await cp.rebuild(options) // in copy
     } else {
       if (!cp.config.objects) {
-        cp.config.objects = { namespaced: {} }
+        cp.config.objects = { 
+          namespaced: {},
+        }
       } else if (!cp.config.objects.namespaced) {
         cp.config.objects.namespaced = {}
       }
@@ -2587,7 +2651,9 @@ class Config {
     const initAfterApis = []
     this.configs.forEach((km) => {
       const namespace = km.namespace
-      this.config.objects.namespaced[km._uuid] = {}
+      this.config.objects.namespaced[km._uuid] = {
+        km: km._uuid
+      }
       const namespacedObjects = this.config.objects.namespaced[km._uuid]
       this.setupNamespace(km)
       // const aw = (word, def) => this.addWord(word, def)

package/src/configHelpers.js

@@ -85,6 +85,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
     args.objects = config.get('objects')
     args.getObjects = getObjects(args.objects)
   }
+  if (args.uuid) {
+    args.objects = args.getObjects(args.uuid)
+  }
   if (!hierarchy) {
     hierarchy = config.hierarchy
   }
@@ -133,6 +136,9 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       return config.getGenerators(logs).apply(addAssumed(args, a, { paraphrase: false, isResponse: true }), { ...c, paraphrase: false, isResponse: true })
     }
     args.e = (c) => {
+      if (!c) {
+        return
+      }
       return config.getEvaluator(args.s, args.calls, logs, c)
     }
     args.gs = gs(args.g)
@@ -249,7 +255,7 @@ const setupContexts = (rawContexts) => {
   let first = true
   const contexts = []
   contexts.push({ marker: 'controlStart', controlRemove: true })
-  let previous;
+  let previous
   for (const context of rawContexts) {
     if (first) {
       first = false
@@ -337,9 +343,9 @@ const processContextsB = async ({ config, hierarchy, semantics, generators, json
       if (contextPrime.controlRemove) {
         continue
       }
-      let paraphrases = []
-      let paraphrasesParenthesized = []
-      let generatedParenthesized = []
+      const paraphrases = []
+      const paraphrasesParenthesized = []
+      const generatedParenthesized = []
       if (forTemplate) {
         // noop
       } else {