theprogrammablemind 7.6.0-beta.7 → 7.6.0-beta.8

package/client.js

@@ -173,18 +173,23 @@ const setupArgs = (args, config, logs, hierarchy) => {
   args.theDebugger = {
     breakOnSemantics: (value) => args.breakOnSemantics = value
   }
-  args.s = (c) => config.getSemantics(logs).apply(args, c)
-  args.g = (c) => config.getGenerators(logs).apply(args, c)
-  args.gp = (c) => config.getGenerators(logs).apply({...args, assumed: {paraphrase: true, isResponse: false, response: false}}, c, {paraphrase: true, isResponse: false, response: false})
-  args.gr = (c) => config.getGenerators(logs).apply({...args, assumed: {paraphrase: false, isResponse: true}}, { ...c, paraphrase: false, isResponse: true })
   if (!logs) {
     debugger
   }
-  args.e = (c) => config.getEvaluator(args.s, args.calls, logs, c)
   args.log = (message) => logs.push(message)
-  args.gs = gs(args.g)
-  args.gsp = gs(args.gp)
-  args.gsr = gs(args.gr)
+
+  args.addAssumedScoped = (args, assumed) => {
+    args.s = (c) => config.getSemantics(logs).apply(args, c)
+    args.g = (c) => config.getGenerators(logs).apply(args, c)
+    args.gp = (c) => config.getGenerators(logs).apply({...args, assumed: {paraphrase: true, isResponse: false, response: false}}, c, {paraphrase: true, isResponse: false, response: false})
+    args.gr = (c) => config.getGenerators(logs).apply({...args, assumed: {paraphrase: false, isResponse: true}}, { ...c, paraphrase: false, isResponse: true })
+    args.e = (c) => config.getEvaluator(args.s, args.calls, logs, c)
+    args.gs = gs(args.g)
+    args.gsp = gs(args.gp)
+    args.gsr = gs(args.gr)
+  }
+  // for semantics
+  args.addAssumedScoped(args, {})
   config.getAddedArgs(args)
 }
 
@@ -462,8 +467,8 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
       }
       // assumed = { paraphrase: true, response: false };
       assumed = { paraphrase: true, isResponse: false, response: false };
-      args.g = (c) => config.getGenerators(json.logs).apply({...args, assumed}, c, assumed)
-      args.gs = gs(args.g)
+      // args.g = (c) => config.getGenerators(json.logs).apply({...args, assumed}, c, assumed)
+      // args.gs = gs(args.g)
       if (generateParenthesized) {
         config.parenthesized = false
       }
@@ -474,8 +479,8 @@ const processContextsB = ({ config, hierarchy, semantics, generators, json, isTe
         paraphrasesParenthesized = config.getGenerators(json.logs).apply({...args, assumed}, contextPrime, assumed)
         config.parenthesized = false
       }
-      args.g = (c) => config.getGenerators(json.logs).apply(args, c)
-      args.gs = gs(args.g)
+      // args.g = (c) => config.getGenerators(json.logs).apply(args, c)
+      // args.gs = gs(args.g)
       contextsPrime.push(contextPrime)
       generatedPrime.push(generated)
       paraphrasesPrime.push(paraphrases)

package/package.json

@@ -64,6 +64,6 @@
     "json-stable-stringify": "^1.0.1",
     "node-fetch": "^2.6.1"
   },
-  "version": "7.6.0-beta.7",
+  "version": "7.6.0-beta.8",
   "license": "ISC"
 }

package/src/generators.js

@@ -73,7 +73,8 @@ class Generator {
     return matches
   }
 
-  apply (baseArgs, objects, g, gs, context, hierarchy, config, response, log, options = {}) {
+  // apply (baseArgs, objects, g, gs, context, hierarchy, config, response, log, options = {}) {
+  apply (baseArgs, objects, context, hierarchy, config, response, log, options = {}) {
     if (!log) {
       throw new Error('generators.apply argument log is required')
     }
@@ -103,12 +104,12 @@ class Generator {
             log, 
             global: 
             objects, 
-            g, 
+            // g, 
             n, 
             hierarchy, 
             context, 
             uuid: this.uuid, 
-            gs, 
+            // gs, 
             config, 
             response, 
             api: this.getAPI(config), 
@@ -179,6 +180,9 @@ class Generators {
     const hierarchy = args.hierarchy
     const response = args.response
 
+    
+    // args = { ...args, ...args.getAssumedScoped(assumed) }
+    args.addAssumedScoped(args, assumed) 
     context = Object.assign({}, context, args.assumed)
     let generated = ''
     let applied = false
@@ -186,23 +190,15 @@ class Generators {
     for (let igenerator = 0; igenerator < this.generators.length; ++igenerator) {
       const generator = this.generators[igenerator]
       if (generator.matches(args, objects, context, hierarchy, config, options)) {
-        const g = (context, options) => {
-          const r = this.apply(args, context, Object.assign({}, ((options||{}).assumed || {}), assumed), options)
-          if (Array.isArray(r)) {
-            return r.join(' ')
-          } else {
-            return r
-          }
-        }
         const log = (message) => { this.logs.push(message) }
         // this.logs.push(`Generators: applied ${generator.toString()}\n to\n ${JSON.stringify(context)}`)
         let errorMessage = 'The apply function did not return a value'
         try {
-          generated= generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
+          generated= generator.apply(args, objects, context, hierarchy, config, response, log)
         } catch( e ) {
           // the next if handle this
           generated = null
-          e.retryCall = () => generator.apply(args, objects, g, args.gs, context, hierarchy, config, response, log)
+          e.retryCall = () => generator.apply(args, objects, context, hierarchy, config, response, log)
           const help = 'The error has a retryCall property that will recall the function that failed.'
           if (e.stack && e.message) {
             const info = `${generator.notes ? generator.notes : ''}${generator.where ? generator.where : ''}`