theprogrammablemind 9.5.1-beta.30 → 9.5.1-beta.32

package/client.js

@@ -14,7 +14,7 @@ const Lines = require('./lines')
 const flattens = require('./src/flatten')
 const { sortJson, appendNoDups, updateQueries, safeNoDups, stableId, where, suggestAssociationsFix, suggestAssociationsFixFromSummaries, validProps } = require('./src/helpers')
 const runtime = require('./runtime')
-const debug = require('./src/debug')
+const db = require('./src/debug')
 
 const getConfig_getObjectsCheck = (config, testConfig) => {
   let testConfigName = config.name
@@ -45,23 +45,13 @@ const getSuggestionMessage = (suggestion) => {
   return `Try adding this to the associations: { context: ${JSON.stringify(getSuggestion(suggestion))}, choose: <indexOfMainElement> },\n If that does not work look at the logs and check when the operators become wrong during an interation. Deduce the change based on the previous iteration and what operator was applied.`
 }
 
-const getConfig_getContextCheck = (testConfig) => {
-  return (testConfig.checks && testConfig.checks.context) || []
-}
-
 const pickContext = (contextChecks) => (context) => {
   return project2(context, contextChecks)
 }
 
 const pickObjects = (config, testConfig, getObjects) => {
-  /*
-  let testConfigName = config.name
-  if (testConfig.testModuleName) {
-    objects = getObjects(config.config.objects)(config.getConfigs()[testConfig.testModuleName].uuid)
-    testConfigName = testConfig.testModuleName
-  }
-  */
   const checks = getConfig_getObjectsCheck(config, testConfig)
+  const contextChecks = config.getContextChecks()
   const projection = {}
   for (const km in checks) {
     const objects = getObjects(km)
@@ -69,10 +59,19 @@ const pickObjects = (config, testConfig, getObjects) => {
       throw new Error(`In the checks for ${config.name} the KM ${km} does not exist`)
     }
 
-    if (checks[km] && checks[km].find((check) => check.match && check.apply)) {
-      projection[km] = project2(objects, checks[km])
+    if (false) {
+      if (checks[km] && checks[km].find((check) => check.match && check.apply)) {
+        projection[km] = project2(objects, checks[km])
+      } else {
+        projection[km] = project(objects, checks[km])
+      }
     } else {
-      projection[km] = project(objects, checks[km])
+      const lastIndex = contextChecks.length - 1
+      const last = contextChecks[lastIndex]
+      contextChecks[lastIndex] = { match: last.match, apply: () => [...new Set([...(checks[km] || []), ...last.apply()])] }
+
+      // projection[km] = project2(objects, [...checks[km], ...contextChecks])
+      projection[km] = project2(objects, contextChecks)
     }
   }
   return projection
@@ -237,9 +236,10 @@ const doWithRetries = async (n, url, queryParams, data) => {
       body: JSON.stringify(data),
       timeout: 1000 * 60 * 5, // it does not respect this timeout so that's why I have the retries
       headers: {
-        mode: 'no-cors',
+        // mode: 'no-cors',
         'Content-Type': 'application/json'
-      }
+      },
+      credentials: 'same-origin',
     })
     if (result.ok) {
       return JSON.parse(JSON.stringify(await result.json()))
@@ -841,7 +841,7 @@ const defaultInnerProcess = (config, errorHandler, responses) => {
   }
   console.log(responses.trace)
 
-  if (true) {
+  if (false) {
     if (global.beforeObjects) {
       console.log('objects', runtime.jsonDiff.diffString(global.beforeObjects, config.get('objects')))
     } else {
@@ -1327,13 +1327,32 @@ const knowledgeModuleImpl = async ({
       parser.add_argument('-cl', '--checkForLoop', { nargs: '?', help: 'Check for loops in the priorities, Optional argument is list of operator keys to consider. For example [["banana", 0], ["food", 1]]' })
       parser.add_argument('-r', '--reset', { action: 'store_true', help: 'Get the server to bypass the cache and rebuild everything' })
       parser.add_argument('-q', '--query', { help: 'Run the specified query' })
+      parser.add_argument('-f', '--filter', { help: 'for -pd only the data for the knowledge modules that start with this string will be shown' })
       parser.add_argument('-ip ', '--server', { help: 'Server to run against' })
       parser.add_argument('-qp ', '--queryParams', { help: 'Query params for the server call' })
       parser.add_argument('-dt', '--deleteTest', { help: 'Delete the specified query from the tests file.' })
       parser.add_argument('--parenthesized', { action: 'store_true', help: 'Show the generated phrases with parenthesis.' })
       parser.add_argument('-c', '--clean', { help: 'Remove data from the test files. a === association' })
       parser.add_argument('-od', '--objectDiff', { action: 'store_true', help: 'When showing the objects use a colour diff' })
-      parser.add_argument('-p', '--print', { help: 'Print the specified elements c === config, w === words, b === bridges, o === operators d === objects (d for data), h === hierarchy, ha === hierarchy ancestors g === generators, s === semantics, l === load t=tests ordering p === priorities a === associations j === JSON sent to server. for example --print wb' })
+      parser.add_argument('-p', '--print', { help: 
+`Print the specified elements 
+    a === associations 
+    b === bridges, 
+    c === config,
+    cc === test checks,
+    d === objects (d for data), 
+    g === generators, 
+    h === hierarchy, 
+    ha === hierarchy ancestors,
+    j === JSON sent to server, 
+    l === load ordering,
+    o === operators,
+    p === priorities,
+    s === semantics, 
+    t === tests ordering,
+    w === words, 
+ for example --print wb' })
+` })
       parser.add_argument('-s', '--save', { action: 'store_true', help: 'When running with the --query flag this will save the current run to the test file. When running without the --query flag all tests will be run and resaved.' })
       parser.add_argument('-fr', '--failRebuild', { action: 'store_true', help: 'If a rebuild is required fail out.' })
       parser.add_argument('-sd', '--saveDeveloper', { action: 'store_true', help: 'Same as -s but the query will not show up in the info command.' })
@@ -1494,6 +1513,12 @@ const knowledgeModuleImpl = async ({
               counter += 1
             }
           }
+          if (hasArg('cc')) {
+            for (const cc of config.getContextChecks()) {
+              const printable = { ...cc, match: cc.match.toString(), apply: cc.apply.toString() }
+              console.log(JSON.stringify(printable, null, 2))
+            }
+          }
           if (hasArg('c')) {
             const { data } = setupProcessB({ config })
             console.log('Config as sent to server')
@@ -1557,8 +1582,19 @@ const knowledgeModuleImpl = async ({
           }
 
           if (hasArg('d')) {
-            console.log('objects (data) ================')
-            console.log(JSON.stringify(config.config.objects, null, 2))
+            if (args.filter) {
+              console.log(`objects (data) filtered by ${args.filter} ================`)
+              const projection = { namespaced: {} }
+              for (const key of Object.keys(config.config.objects.namespaced)) {
+                if (key.startsWith(args.filter)) {
+                  projection.namespaced[key] = config.config.objects.namespaced[key]
+                }
+              }
+              console.log(JSON.stringify(projection, null, 2))
+            } else {
+              console.log('objects (data) ================')
+              console.log(JSON.stringify(config.config.objects, null, 2))
+            }
           }
 
           if (hasArg('p')) {
@@ -2044,5 +2080,6 @@ module.exports = {
   gs,
   flattens,
   writeTest,
-  getConfigForTest
+  getConfigForTest,
+  debug: db,
 }

package/package.json

@@ -72,6 +72,6 @@
     "scriptjs": "^2.5.9",
     "uuid": "^8.3.2"
   },
-  "version": "9.5.1-beta.30",
+  "version": "9.5.1-beta.32",
   "license": "UNLICENSED"
 }

package/src/config.js

@@ -335,6 +335,8 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
           config.addPriority({ context: [[bridge.id, bridge.level], after], choose: [0] })
         }
       }
+
+      // done in setTestConfig
       if (bridge.check) {
         if (!config.testConfig) {
           config.testConfig = {}
@@ -345,12 +347,15 @@ const handleBridgeProps = (config, bridge, { addFirst, uuid } = {}) => {
         if (!config.testConfig?.checks?.context) {
           config.testConfig.checks.context = []
         }
-        config.testConfig.checks.context.push({
+        config.contextChecksFromBridges.push({
+          'bridge.id': bridge.id,
+          'bridge.check': bridge.check,
           match: ({context}) => context.marker == bridge.id,
           exported: true,
           apply: ({context}) => bridge.check,
         })
       }
+
       if (bridge.after) {
         for (let before of bridge.after) {
           if (typeof before === 'string') {
@@ -1052,7 +1057,27 @@ class Config {
   }
 
   setTestConfig (testConfig) {
-    this.testConfig = testConfig
+    this.testConfig = { ...testConfig }
+    if (!this.testConfig.checks) {
+      this.testConfig.checks = {}
+    }
+    if (!this.testConfig?.checks?.context) {
+      this.testConfig.checks.context = []
+    }
+    this.testConfig.checks.context = this.contextChecksFromBridges.concat(this.testConfig.checks.context)
+    /*
+    const currentTestConfig = testConfig // add bridge has added check.context's
+
+    if (!this.testConfig.checks) {
+      debugger
+      // this.testConfig.checks = 
+    }
+
+    // set during bridge setup
+    if (currentTestConfig.checks?.context) {
+      this.testConfig.checks.context = currentTestConfig.checks.context.concat(this.testConfig.checks.context)
+    }
+    */
   }
 
   getTestConfig () {
@@ -2099,6 +2124,8 @@ class Config {
       config.priorities = config.priorities || []
     }
 
+    this.contextChecksFromBridges = []
+
     this._enable = []
     this._apiKMs = apiKMs
 
@@ -2158,7 +2185,7 @@ class Config {
 
     // set the default server so stuff just works
     // this.server('https://184.67.27.82:3000', '6804954f-e56d-471f-bbb8-08e3c54d9321')
-    this.server('https://thinktelligence.com:3000', '6804954f-e56d-471f-bbb8-08e3c54d9321')
+    this.server('https://thinktelligence.com/entodicton', '6804954f-e56d-471f-bbb8-08e3c54d9321')
 
     this.defaultConfig()
     this.initializerFn = ({ currentConfig }) => {
@@ -2425,6 +2452,7 @@ class Config {
     // update uuid here set the uuid in the objects and add error checking
     cp.initializerFn = this.initializerFn
     cp.terminatorFn = this.terminatorFn
+    cp.contextChecksFromBridges = this.contextChecksFromBridges
     cp._apiKMs = this._apiKMs
     cp._apiConstructor = this._apiConstructor
     if (cp._apiConstructor) {
@@ -2785,19 +2813,37 @@ class Config {
 
   getContextChecks() {
     const allChecks = []
-    for (const name of this.loadOrdering) {
-      const checks = this.kms[name].testConfig?.checks?.context || []
-      for (const check of checks) {
-        if (check.exported) {
-          allChecks.push(check)
+    let defaults = () => []
+    if (this.loadOrdering) {
+      for (const name of this.loadOrdering) {
+        const checks = this.kms[name].testConfig?.checks?.context || []
+        const oldDefaults = defaults
+        for (const check of checks) {
+          if (!check.match) {
+            const oldDefaults = defaults
+            defaults = () => helpers.safeNoDups([...check.apply(), ...oldDefaults()])
+            continue
+          }
+          if (check.exported) {
+            allChecks.push(check)
+          }
         }
       }
     }
     for (const check of this.testConfig?.checks?.context || []) {
+      if (!check.match) {
+        const oldDefaults = defaults
+        defaults = () => [...new Set([...check.apply(), ...oldDefaults()])]
+        continue
+      }
       if (!check.exported) {
         allChecks.push(check)
       }
     }
+    allChecks.push({
+      match: () => true,
+      apply: defaults
+    })
     return allChecks
   }
 

package/src/project2.js

@@ -1,8 +1,26 @@
-function project(source, filters) {
+function areFirstNEqual(arr1, arr2, n) {
+  if (n <= 0) return true;
+  if (arr1.length < n || arr2.length < n) return false;
+
+  for (let i = 0; i < n; i++) {
+    if (arr1[i] !== arr2[i]) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function project(source, filters, path=[]) {
   if (['string', 'number'].includes(typeof source)) {
     return source
   }
-
+  if (Array.isArray(source)) {
+    const result = []
+    for (const value of source) {
+      result.push(project(value, filters, [...path, '*']))
+    }
+    return result
+  }
   function isPlainObject(obj) {
     return Object.prototype.toString.call(obj) === '[object Object]';
   }
@@ -18,7 +36,7 @@ function project(source, filters) {
   const filter = filters.find(f => f.match({ context: source }));
   if (!filter) {
     if (Array.isArray(source)) {
-      return source.map((element) => project(element, filters))
+      return source.map((element) => project(element, filters, [...path, '*']))
     }
     return {};
   }
@@ -29,6 +47,7 @@ function project(source, filters) {
   // update 
   const updatedProperties = []
   for (const property of properties) {
+    // property that contains a list of properties to be checked
     if (property.properties) {
       for (const moreProperty of source[property.properties] || []) {
         updatedProperties.push(moreProperty)
@@ -42,10 +61,34 @@ function project(source, filters) {
   // Build the result object
   const result = {};
   properties.forEach(prop => {
-    if (source.hasOwnProperty(prop)) {
+    if (prop.path && (prop.path.length === path.length + 1) && areFirstNEqual(path, prop.path, path.length) && source.hasOwnProperty(prop.path[path.length])) {
+      const endProp = prop.path[path.length]
+      if (Array.isArray(source[endProp])) {
+        result[endProp] = []
+        for (const key in source[endProp]) {
+          result[endProp].push(project(source[endProp][key], filters, [...path, endProp, key]))
+        }
+      } else {
+        result[endProp] = {}
+        for (const key in source[endProp]) {
+          result[endProp][key] = project(source[endProp][key], filters, [...path, endProp, key])
+        }
+      }
+    } else if (source.hasOwnProperty(prop)) {
       // If the property is an object and not null, recursively project it
       if (typeof source[prop] === 'object' && source[prop] !== null) {
-        result[prop] = project(source[prop], filters);
+        result[prop] = project(source[prop], filters, [...path, prop]);
+      } else {
+        // Copy primitive or null properties directly
+        result[prop] = source[prop];
+      }
+    } else if (prop.property && source.hasOwnProperty(prop.property)) {
+      // If the property is an object and not null, recursively project it
+      if (typeof source[prop.property] === 'object' && source[prop.property] !== null) {
+        result[prop.property] = {}
+        for (const key of prop.check) {
+          result[prop.property][key] = project(source[prop.property][key], filters, [...path, prop.property, key]);
+        }
       } else {
         // Copy primitive or null properties directly
         result[prop] = source[prop];