theprogrammablemind 7.12.7-beta.0 → 7.12.8-beta.0

package/client.js

@@ -81,104 +81,6 @@ const pickObjects = (config, testConfig, getObjects) => {
   return projection
 }
 
-// move ask to the KM's since verbatim is called probably in dialogues?
-const getAsk = (config) => (uuid) => {
-    // if (!uuid) {
-    //  debugger
-    //}
-    return (asks) => {
-    const ask = (ask) => {
-      let oneShot = true // default
-      if (ask.oneShot === false) {
-        oneShot = false
-      }
-
-      const id_q = stableId('semantic')
-      const id_rs = []
-      let wasAsked = false
-      let wasApplied = false
-      const getWasAsked = () => {
-        return wasAsked
-      }
-      const setWasAsked = (value) => {
-        wasAsked = value
-      }
-      const getWasApplied = () => {
-        return wasApplied
-      }
-      const setWasApplied = (value) => {
-        wasApplied = value
-      }
-
-      const semanticsr = ask.semanticsr || []
-      if (semanticsr.length == 0) {
-        semanticsr.push({ match: ask.matchr, apply: ask.applyr })
-      }
-      for (const semantic of semanticsr) {
-        const id_r = stableId('semantic')
-        id_rs.push(id_r)
-        config.addSemantic({
-          uuid,
-          id: id_r,
-          tied_ids: [id_q],
-          oneShot,
-          where: semantic.where || ask.where || where(2),
-          source: 'response',
-          match: (args) => semantic.match(args),
-          apply: (args) => {
-            setWasApplied(true)
-            semantic.apply(args)
-          },
-        })
-      }
-      
-      config.addSemantic({
-        uuid,
-        oneShot,
-        id: id_q,
-        tied_ids: id_rs,
-        where: ask.where,
-        isQuestion: true,  // do one question at a time
-        getWasAsked,
-        getWasApplied,
-        onNevermind: ask.onNevermind,
-        source: 'question',
-        match: ({ context }) => context.marker == 'controlEnd' || context.marker == 'controlBetween',
-        apply: (args) => {
-          let matchq = ask.matchq
-          let applyq = ask.applyq
-          if (!matchq) {
-            let wasAsked = false
-            matchq = () => !wasAsked,
-            applyq = (args) => {
-              wasAsked = true
-              return ask.applyq(args)
-            }
-          }
-          if (matchq(args)) {
-            setWasAsked(true)
-            setWasApplied(false)
-            // args.context.motivationKeep = true
-            args.verbatim(applyq(args))
-            /*
-              args.context.verbatim = applyq(args)
-              args.context.isResponse = true;
-              delete args.context.controlRemove;
-              */
-            args.context.controlKeepMotivation = true
-          }
-          args.context.cascade = true
-        }
-      })
-    }
-    if (!Array.isArray(asks)) {
-      asks = [asks]
-    }
-
-    [...asks].reverse().forEach( (a) => ask(a) )
-  }
-}
-
 const sameJSON = (json1, json2) => {
   const sjson1 = sortJson(json1, { depth: 25 })
   const sjson2 = sortJson(json2, { depth: 25 })
@@ -300,7 +202,6 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
   }
   // for semantics
   args.addAssumedScoped(args, {})
-  config.getAddedArgs(args)
 
   const getAPI = (uuid) => {
     if (config && config.getAPI) {
@@ -312,14 +213,14 @@ const setupArgs = (args, config, logs, hierarchy, uuidForScoping) => {
       return config.getAPIs(uuid)
     }
   }
-  const scopedAsk = getAsk(config)
   args.getUUIDScoped = (uuid) => {
     return {
-      ask: scopedAsk(uuid),
       api: getAPI(uuid),
       apis: getAPIs(uuid)
     }
   }
+  config.getAddedArgs(args)
+
   Object.assign(args, args.getUUIDScoped(uuidForScoping || config.uuid))
   /*
   if (uuidForScoping) {
@@ -1281,7 +1182,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
     console.log('Errors')
     responses.errors.forEach((error) => console.log(`    ${error}`))
   }
-  console.log("KM's loaded", config.configs.map((c) => c.name))
+  console.log("KM's loaded (ordered)", config.configs.map((c) => c.name))
   console.log('This is the global objects from running semantics:\n', config.objects)
   if (!_.isEmpty(responses.learned_contextual_priorities)) {
     console.log('\nThe learned contextual priorties are :\n')
@@ -2270,6 +2171,7 @@ const knowledgeModule = async (...args) => {
 
 module.exports = {
   process: _process,
+  stableId,
   where,
   w,
   // submitBug,

package/index.js

@@ -15,6 +15,7 @@ module.exports = {
   knowledgeModule: client.knowledgeModule,
   ensureTestFile: client.ensureTestFile,
   where: client.where,
+  stableId: client.stableId,
   w: client.w,
   Config,
   Semantics,

package/package.json

@@ -65,6 +65,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.12.7-beta.0",
+  "version": "7.12.8-beta.0",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -1778,7 +1778,16 @@ class Config {
   getAddedArgs (args) {
     for (let addedArgs of this.addedArgss) {
       addedArgs = addedArgs(args)
+      const getUUIDScoped = addedArgs.getUUIDScoped
+      delete addedArgs.getUUIDScoped
       Object.assign(args, addedArgs)
+      if (getUUIDScoped) {
+        const currentGetUUIDScoped = args.getUUIDScoped
+        if (!currentGetUUIDScoped) {
+          debugger
+        }
+        args.getUUIDScoped = (uuid) => Object.assign(currentGetUUIDScoped(uuid), getUUIDScoped(uuid))
+      }
     }
   }
 
@@ -2803,7 +2812,8 @@ class Config {
       more = more.copy()
       more.server(this._server, this._key, this._queryParams)
 
-      this.loadOrder.addList(more.configs.map((km) => km.name || km.uuid))
+      const moreConfigs = more.configs.map((km) => km.name || km.uuid)
+      this.loadOrder.addList(moreConfigs)
 
       // get the new ones
       // remove the dups

package/src/digraph.js

@@ -113,19 +113,31 @@ class Digraph {
   }
 
   minima (nodes) {
-    let minima = new Set(nodes)
-    const ancestors = new Set([])
-    nodes.forEach((node) => {
-      this.ancestors(node).forEach((n) => ancestors.add(n))
-    })
-    ancestors.forEach((n) => minima.delete(n))
-    if (minima.size === 0) {
-      // all unrelated
-      minima = new Set(nodes)
+    nodes = new Set(nodes)
+    const nodeToDescendants = {}
+    for (const node of nodes) {
+      nodeToDescendants[node] = this.descendants(node)
+    }
+    let minima = new Set()
+    for (const node of nodes) {
+      let okay = true
+      for (const key of nodeToDescendants[node]) {
+        if (nodes.has(key)) {
+          if (key in nodeToDescendants && nodeToDescendants[key].has(node)) {
+            continue
+          }
+          okay = false
+          break
+        }
+      }
+      if (okay) {
+        minima.add(node)
+      }
     }
     return minima
   }
 
+  /*
   maxima (nodes) {
     const maxima = new Set(nodes)
     const descendants = new Set([])
@@ -135,14 +147,21 @@ class Digraph {
     descendants.forEach((n) => maxima.delete(n))
     return maxima
   }
+  */
 
   add (child, parent) {
     this._edges.push([child, parent])
   }
 
+  exists(child, parent) {
+    return this._edges.find((edge) => edge[0] == child && edge[1] == parent)
+  }
+
   addList (l) {
     for (let i = 1; i < l.length; ++i) {
-      this._edges.push([l[i - 1], l[i]])
+      if (!this.exists(l[i-1], l[i])) {
+        this._edges.push([l[i - 1], l[i]])
+      }
     }
   }
 

package/src/digraph_internal.js

@@ -81,19 +81,31 @@ class DigraphInternal {
   }
 
   minima (nodes) {
-    let minima = new Set(nodes)
-    const ancestors = new Set([])
-    nodes.forEach((node) => {
-      this.ancestors(node).forEach((n) => ancestors.add(n))
-    })
-    ancestors.forEach((n) => minima.delete(n))
-    if (minima.size === 0) {
-      // all unrelated
-      minima = new Set(nodes)
+    nodes = new Set(nodes)
+    const nodeToDescendants = {}
+    for (const node of nodes) {
+      nodeToDescendants[node] = this.descendants(node)
+    }
+    let minima = new Set()
+    for (const node of nodes) {
+      let okay = true
+      for (const key of nodeToDescendants[node]) {
+        if (nodes.has(key)) {
+          if (key in nodeToDescendants && nodeToDescendants[key].has(node)) {
+            continue
+          }
+          okay = false
+          break
+        }
+      }
+      if (okay) {
+        minima.add(node)
+      }
     }
     return minima
   }
 
+  /*
   maxima (nodes) {
     const maxima = new Set(nodes)
     const descendants = new Set([])
@@ -103,14 +115,21 @@ class DigraphInternal {
     descendants.forEach((n) => maxima.delete(n))
     return maxima
   }
+  */
 
   add (child, parent) {
     this._edges.push([child, parent])
   }
 
+  exists(child, parent) {
+    return this._edges.findIndex((edge) => edge[0] == child && edge[1] == parent) != -1
+  }
+
   addList (l) {
     for (let i = 1; i < l.length; ++i) {
-      this._edges.push([l[i - 1], l[i]])
+      if (!this.exists(l[i-1], l[i])) {
+        this._edges.push([l[i - 1], l[i]])
+      }
     }
   }