json-object-editor 0.10.425 → 0.10.430

package/server/app-config.js

@@ -28,7 +28,7 @@ var apps = function(){
     var default_schemas = JOE.webconfig.default_schemas;
     return{
         joe:{
-            title:'Platform',
+            title:'JOE Platform',
             info:'This is the master Data Model Management System (DMMS) admin page. It has access to all of your schemas and datasets.',
             description:'JOE is the Json Object Editor. The Platform app has access to all your schemas and datasets.',
             plugins:['auth.js','formBuilder.js','reportbuilder.js','callbackTester.js','memberRegistry.js','awsConnect.js','notifier.js','calendar.js','inventory.js','money.js'],

package/server/init.js

@@ -62,7 +62,7 @@ var app = function(config){
 
             });
         }
-        ['Apps','Schemas','Mongo','MySQL','Comments'].map(function(m){
+        ['Apps','Schemas','Mongo','MySQL','Comments','Utils'].map(function(m){
             initializeModule(m);
         });
         //initializeModule('Apps');

package/server/modules/Apps.js

@@ -495,7 +495,8 @@ function Apps(){
         return app;
     }
     this.loadPlugin = function(p){
-        logit(moduleName+'loading plugin '+p);
+        //logit(moduleName+'loading plugin '+p);
+        console.log(JOE.Utils.color('[plugin]', 'plugin'), 'loaded: '+p);
         var plugin;
         if(p.indexOf('.js') == -1){p+= '.js';}
         try{

package/server/modules/Server.js

@@ -16,6 +16,9 @@ var os = require('os');
 const $J = require('./UniversalShorthand');
 var rd = require('renderizer')({templatesDir:path.resolve(JOE.joedir,JOE.webconfig.templatesDir)});
 
+function coloredLog(message) {
+    console.log(JOE.Utils.color('[server]', 'module'), message);
+  }
 var authBool = JOE.isAuthorized = function(req,res){
     var users = (JOE.Data && JOE.Data.user) || [];
 
@@ -140,7 +143,23 @@ server.get(['/API/user/:method'],auth,function(req,res,next){
                 res.jsonp({logout:true});
                 return next();
             break;
-
+            case 'apps':
+                logit('getting apps for '+req.User.name);
+                userApps = [];
+                if (req.User.apps && req.User.apps.length) {
+                    req.User.apps.map(function (app) {
+                        if (JOE.Apps.cache[app]) {
+                            userApps.push({
+                                name: app,
+                                title: JOE.Apps.cache[app].title,
+                                description: JOE.Apps.cache[app].description
+                            });
+                        }
+                    });
+                } 
+                res.jsonp({userApps});
+                return;//return next();
+            break;
         }
     }
 
@@ -711,12 +730,17 @@ server.get(['/JOE/','/JOE/:appname'],auth,function(req,res,next){
             }
 
             //var collections = [];
-
+            let uappsObj = [];
+            USER.apps.map(a=>{
+                let aa = Apps[a]||{};
+                uappsObj.push({name:a,title:aa.title,description:aa.description});
+            });
             var payload = {
                 APPNAME:currentApp.title || appname,
                 APPINFO:JSON.stringify(stringFunctions(currentApp)),
                 APPS:apps.join(','),
                 USERAPPS:(USER.apps||apps||[]).join(','),
+                USERAPPSOBJ:JSON.stringify(uappsObj),
                 webconfig:JOE.webconfig,
                 settings:settings,
                 JOEPATH:JOE.webconfig.joepath,
@@ -761,21 +785,21 @@ server.get(['/RENDER/:contentType/:templateName'],function(req,res){
 
 JOE.webDir = webDir = JOE.appDir+'/'+JOE.webconfig.webDir+'/';
 JOE.Utils.setupFileFolder(webDir,'web');
-
+    coloredLog('listening on '+JOE.webconfig.port);
 
 
 server.use('/',express.static(JOE.webDir));
 
 http.listen(JOE.webconfig.port,function(){
     //console.log('joe listening on '+JOE.webconfig.port);
-    console.log(JOE.Utils.color('[server]','module')+' on '+JOE.webconfig.port);
+    coloredLog('using webDir: '+JOE.webDir);
 });
 JOE.httpServer = http;
 var httpsPort = JOE.webconfig.httpsPort;
 if(httpsPort){
     var httpsServer = https.Server({key: JOE.Pem.serviceKey, cert: JOE.Pem.certificate}, server);
     httpsServer.listen(httpsPort);
-    console.log(JOE.Utils.color('[server]','module')+' https on '+httpsPort);
+    coloredLog(' https on '+httpsPort);
     JOE.httpsServer = httpsServer;
     // pem.createCertificate({selfSigned:true}, function(err, keys){
     //     if(err){

package/server/modules/UniversalShorthand.js

@@ -21,8 +21,7 @@ function UniversalShorthand(){
             if(items){
                 callback && callback(items);
                 return items;
-            }
-             
+            }  
         }
         this.schema = function(schemaname,callback){
             self._usages.schema++;

package/server/modules/Utils.js

@@ -174,6 +174,68 @@ var utils = function(){
             }
             return finalItems;
         }
+        this.flattenObject = function(id, options = {}) {
+            const { recursive = true, depth = 1, visited = new Set() } = options;
+        
+            let object = null;
+            
+            if (id) {
+                object = $J.get(id);
+            } 
+            
+            if (!object) return null;
+        
+            const flattened = {};
+            const currentId = object._id || object.id;
+            if (currentId) visited.add(currentId);
+        
+            for (const [field, val] of Object.entries(object)) {
+                if (val === undefined || val === null) continue;
+                if (field == '_id'){
+                    flattened[field] = val;
+                    continue;
+                }
+                if(field == 'password'){
+                    flattened[field] = '********';
+                    continue;
+                    
+                }
+                if(field =="status"){
+                    flattened[field]  = $J.get(val);
+                    continue
+                }
+                if (typeof val === 'string' && $c.isCuid(val) && recursive && depth > 0) {
+                    if (!visited.has(val)) {
+                        const expanded = JOE.Utils.flattenObject(val, {
+                            recursive,
+                            depth: depth - 1,
+                            visited: new Set(visited)
+                        });
+                        flattened[field] = expanded || val;
+                    } else {
+                        flattened[field] = val;
+                    }
+                }
+                else if (Array.isArray(val) && val.every(v => typeof v === 'string' && $c.isCuid(v)) && recursive && depth > 0) {
+                    flattened[field] = val.map(refId => {
+                        if (!visited.has(refId)) {
+                            const expanded = JOE.Utils.flattenObject(refId, {
+                                recursive,
+                                depth: depth - 1,
+                                visited: new Set(visited)
+                            });
+                            return expanded || refId;
+                        }
+                        return refId;
+                    });
+                }
+                else {
+                    flattened[field] = val;
+                }
+            }
+        
+            return flattened;
+        };
 
     return this;
 };

package/server/schemas/ai_conversation.js

@@ -1,5 +1,6 @@
 var schema = {
   title: "Ai Conversation | ${name}",
+  display:'Ai Convo',
   info: "Tracks AI conversations across users, assistants, and external members, storing only summaries for performance.",
   methods:{
     chatSpawner:async function(object_id){
@@ -13,11 +14,22 @@ var schema = {
         "info",
 
       { section_start: "participants", display: "Participants", collapsed: false },
-        { name: "user", type: "objectReference", values: "user", display: "JOE User" },
+        { name: "user", type: "select", values: "user", display: "JOE User", comment: "Select the JOE user who initiated this conversation.",width:'50%'},
+        
+        {name:'assistant',type:"select",values:'ai_assistant',display:'AI Assistant',width:'50%',
+          comment:'Select the AI assistant to use for this conversation.',default:function(){
+            try{
+              var defAi = Ai.getDefaultAssistant();
+              return defAi._id;
+            }catch(e){
+              console.log('Error getting default assistant',e);
+            }
+          },
+        },
         { name: "members", type: "objectReference", values: "members", display: "External Members"},
-        { name: "assistants", type: "group", cssClass:"ai-options", template:function(ass,curObj){
-          return `${ass.name} ||  ${curObj.name}`;
-        }, values: function() { return _joe.getDataset('ai_assistant'); }, display: "Assistants", cols:2 },
+        // { name: "assistants", type: "group", cssClass:"ai-options", template:function(ass,curObj){
+        //   return `${ass.name} ||  ${curObj.name}`;
+        // }, values: function() { return _joe.getDataset('ai_assistant'); }, display: "Assistants", cols:2 },
       { section_end: "participants" },
 
       { section_start: "thread", display: "Thread", collapsed: true },
@@ -28,18 +40,11 @@ var schema = {
         { name: "summary", type: "wysiwyg", display: "Conversation Summary", height: "300px", comment: "Auto-generated after key points or closing." },
       { section_end: "summary" },
 
-      { section_start: "linked", display: "Linked Objects", collapsed: true },
-        { name: "linked_objects", type: "objectlist", display: "Linked Objects", fields: [
-            { name: "schema", type: "text", display: "Schema" },
-            { name: "object_id", type: "text", display: "Object ID" }
-          ]
-        },
-      { section_end: "linked" },
       
       { section_start: "system", collapsed: true },
         "_id",
         "created",
-        "updated",
+        "joeUpdated",
         "itemtype",
       { section_end: "system" },
 
@@ -49,7 +54,7 @@ var schema = {
         {
           name: "openChat",
           type: "button",
-          display: "Open Chat",
+          display: "Continue Conversation",
           icon:"ai_assistant",
           onclick2:function(object){
               if (!object || !object._id) return '';
@@ -59,14 +64,18 @@ var schema = {
             if (!object || !object._id) return '';
             return `_joe.schemas.ai_conversation.methods.chatSpawner('${object._id}');`;
         },
+        
         },
+        {name:'context_objects',type:"objectReference", locked:true,values:function(obj,prop){
+          return JOE.getData();
+        }},
       { sidebar_end: "right" },
 
     ];
   },
 
   idprop: "_id",
-  sorter: ["-created"],
+  sorter: ["!created"],
 };
 
 module.exports = schema;

package/server/schemas/ai_tool.js

@@ -0,0 +1,84 @@
+// Joe AI Tool Schema
+// This schema defines reusable tools for OpenAI Assistants and Chat Completions.
+// Each tool includes a JSON schema for function calling and an executable code block.
+
+var schema = {
+  title: "Ai Tool | ${name}",
+  display: "Ai Tool",
+  info: "Reusable Ai tool function for OpenAI tool calling and local execution.",
+  //menuicon: `<svg viewBox="0 0 24 24"><path d="M3 6h18M3 12h18M3 18h18"/></svg>`,
+
+  listView: {
+    title: '<joe-title>${name}</joe-title><joe-subtitle>${info}</joe-subtitle>',
+    listWindowTitle: 'Ai Tools'
+  },
+  methods:{
+    updateToolProperties:function(propObj){
+        //get the current tool properties as json
+        // set the tool_properties.name to the passed current objects tool_id
+        let rawProps = _jco(true).tool_properties ||"{}";
+        var toolProperties = eval('('+rawProps+')')||{};
+            toolProperties.name = propObj.name;
+        _joe.Fields.set('tool_properties',JSON.stringify(toolProperties,'\n','\t'));
+
+    }
+  },
+  fields: function() {
+    return [
+      "name",
+      "info",        // Unique identifier
+      "description", // Short tool description
+      {name:'tool_id', type:'text', display:'Tool ID', comment:'Unique identifier for the tool. Used in OpenAI function calling.',onblur:"_joe.schemas.ai_tool.methods.updateToolProperties({name:this.value});"},
+      { section_start: "schema", display: "OpenAI Tool Schema" },
+      {
+        name: "tool_properties",
+        type: "code",
+        display: "Tool Properties (OpenAI format)",
+        height: "300px",
+        comment:
+          `<div>Define the tool funcitonal properties as used in OpenAI tool calling.</div>
+           <pre>{
+    "type": "function",
+    "name": "get_weather",
+    "description": "Get current temperature for provided coordinates in celsius.",
+    "parameters": {
+        "type": "object",
+        "properties": {
+            "latitude": { "type": "number" },
+            "longitude": { "type": "number" }
+        },
+        "required": ["latitude", "longitude"],
+        "additionalProperties": false
+    },
+    "strict": true
+}</pre>`
+      },
+      { section_end: "schema" },
+
+      { section_start: "execution", display: "Server Execution" },
+      {
+        name: "server_code",
+        type: "code",
+        display: "Code to Execute (Node.js async)",
+        height: "300px",
+        comment: "Use `args` as input. Return a string, object, or promise.<br/>e.g. <code>return await joe.search(args.dataset, args.query);</code>"
+      },
+      { section_end: "execution" },
+
+      { section_start: "meta", collapsed: true },
+      "tags",
+      "datasets",
+      { section_end: "meta" },
+
+      { section_start: "system", collapsed: true },
+      "_id",
+      "created",
+      "itemtype",
+      { section_end: "system" }
+    ];
+  },
+
+  idprop: "_id"
+};
+
+module.exports = schema;