@exulu/backend 1.62.0 → 1.63.0

package/dist/index.js

@@ -53,10 +53,10 @@ import {
   vectorSearch,
   waitForLiteLLMReady,
   withRetry
-} from "./chunk-LYNLQWXC.js";
+} from "./chunk-IZOD2X2F.js";
 import {
   findLiteLLMModel
-} from "./chunk-ILAHW4UT.js";
+} from "./chunk-YCE44CMU.js";
 
 // src/index.ts
 import "dotenv/config";
@@ -504,7 +504,8 @@ var RBACResolver = async (db, entityName, resourceId, rights_mode) => {
     return {
       type: "public",
       users: [],
-      roles: []
+      roles: [],
+      teams: []
     };
   }
   const rbacRecords = await db.from("rbac").where({
@@ -513,13 +514,16 @@ var RBACResolver = async (db, entityName, resourceId, rights_mode) => {
   }).select("*");
   const users = rbacRecords.filter((r) => r.access_type === "User")?.map((r) => ({ id: r.user_id, rights: r.rights }));
   const roles = rbacRecords.filter((r) => r.access_type === "Role")?.map((r) => ({ id: r.role_id, rights: r.rights }));
+  const teams = rbacRecords.filter((r) => r.access_type === "Team")?.map((r) => ({ id: r.team_id, rights: r.rights }));
   let type = rights_mode || "private";
   if (type === "users" && users.length === 0) type = "private";
   if (type === "roles" && roles.length === 0) type = "private";
+  if (type === "teams" && teams.length === 0) type = "private";
   return {
     type,
     users,
-    roles
+    roles,
+    teams
   };
 };
 
@@ -1233,7 +1237,8 @@ var handleRBACUpdate = async (db, entityName, resourceId, rbacData, existingRbac
   }
   const {
     users = [],
-    roles = []
+    roles = [],
+    teams = []
     /* projects = [] */
   } = rbacData;
   if (!existingRbacRecords) {
@@ -1244,20 +1249,28 @@ var handleRBACUpdate = async (db, entityName, resourceId, rbacData, existingRbac
   }
   const newUserRecords = new Set(users.map((u) => `${u.id}:${u.rights}`));
   const newRoleRecords = new Set(roles.map((r) => `${r.id}:${r.rights}`));
+  const newTeamRecords = new Set(teams.map((t) => `${t.id}:${t.rights}`));
   const existingUserRecords = new Set(
     existingRbacRecords.filter((r) => r.access_type === "User").map((r) => `${r.user_id}:${r.rights}`)
   );
   const existingRoleRecords = new Set(
     existingRbacRecords.filter((r) => r.access_type === "Role").map((r) => `${r.role_id}:${r.rights}`)
   );
+  const existingTeamRecords = new Set(
+    existingRbacRecords.filter((r) => r.access_type === "Team").map((r) => `${r.team_id}:${r.rights}`)
+  );
   const usersToCreate = users.filter((u) => !existingUserRecords.has(`${u.id}:${u.rights}`));
   const rolesToCreate = roles.filter((r) => !existingRoleRecords.has(`${r.id}:${r.rights}`));
+  const teamsToCreate = teams.filter((t) => !existingTeamRecords.has(`${t.id}:${t.rights}`));
   const usersToRemove = existingRbacRecords.filter(
     (r) => r.access_type === "User" && !newUserRecords.has(`${r.user_id}:${r.rights}`)
   );
   const rolesToRemove = existingRbacRecords.filter(
     (r) => r.access_type === "Role" && !newRoleRecords.has(`${r.role_id}:${r.rights}`)
   );
+  const teamsToRemove = existingRbacRecords.filter(
+    (r) => r.access_type === "Team" && !newTeamRecords.has(`${r.team_id}:${r.rights}`)
+  );
   if (usersToRemove.length > 0) {
     await db.from("rbac").whereIn(
       "id",
@@ -1270,6 +1283,12 @@ var handleRBACUpdate = async (db, entityName, resourceId, rbacData, existingRbac
       rolesToRemove.map((r) => r.id)
     ).del();
   }
+  if (teamsToRemove.length > 0) {
+    await db.from("rbac").whereIn(
+      "id",
+      teamsToRemove.map((r) => r.id)
+    ).del();
+  }
   const recordsToInsert = [];
   usersToCreate.forEach((user) => {
     recordsToInsert.push({
@@ -1293,6 +1312,17 @@ var handleRBACUpdate = async (db, entityName, resourceId, rbacData, existingRbac
       updatedAt: /* @__PURE__ */ new Date()
     });
   });
+  teamsToCreate.forEach((team) => {
+    recordsToInsert.push({
+      entity: entityName,
+      access_type: "Team",
+      target_resource_id: resourceId,
+      team_id: team.id,
+      rights: team.rights,
+      createdAt: /* @__PURE__ */ new Date(),
+      updatedAt: /* @__PURE__ */ new Date()
+    });
+  });
   if (recordsToInsert.length > 0) {
     await db.from("rbac").insert(recordsToInsert);
   }
@@ -1491,6 +1521,19 @@ function createMutations(table, providers, contexts, rerankers, tools, config) {
         }
         throw new Error("Insufficient role permissions to edit this record");
       }
+      if (record.rights_mode === "teams" && user.team) {
+        const rbacRecord = await db.from("rbac").where({
+          entity: table.name.singular,
+          target_resource_id: id,
+          access_type: "Team",
+          team_id: user.team,
+          rights: "write"
+        }).first();
+        if (rbacRecord) {
+          return true;
+        }
+        throw new Error("Insufficient team permissions to edit this record");
+      }
       throw new Error("Insufficient permissions to edit this record");
     } catch (error) {
       console.error("Write access validation error:", error);
@@ -3177,7 +3220,7 @@ var processUiMessagesFlow = async ({
     modelId: agent.model,
     user,
     providers,
-    agent: { id: agent.id }
+    agent
   });
   const providerapikey = resolved.apiKey;
   const resolvedLanguageModel = resolved.languageModel;
@@ -4209,6 +4252,8 @@ type LiteLLMModel {
   supports_function_calling: Boolean
   supports_pdf_input: Boolean
   supports_audio_input: Boolean
+  input_cost_per_million_tokens: Float
+  output_cost_per_million_tokens: Float
 }
 `;
   resolvers.Query["agentRateLimitUsage"] = async (_, args, context) => {
@@ -4264,7 +4309,7 @@ type LiteLLMModel {
     };
   };
   resolvers.Query["litellmCatalog"] = async () => {
-    const { fetchLiteLLMCatalog } = await import("./catalog-BWE6SLE2.js");
+    const { fetchLiteLLMCatalog } = await import("./catalog-TBSPSN2N.js");
     return fetchLiteLLMCatalog();
   };
   resolvers.Query["workflowSchedule"] = async (_, args, context, info) => {
@@ -5781,7 +5826,7 @@ var ExuluProvider = class {
           modelId: agent.model,
           user,
           providers,
-          agent: { id: agent.id }
+          agent
         });
         const providerapikey = resolved.apiKey;
         console.log(
@@ -7476,7 +7521,7 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
           });
           return;
         }
-        let project = null;
+        let project = void 0;
         if (projectName) {
           let projectQuery = db("projects").select("*");
           projectQuery = applyAccessControl(projectsSchema3(), projectQuery, user);
@@ -7499,8 +7544,8 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
             modelId: agent.model,
             user,
             providers,
-            agent: { id: agent.id },
-            project: project ? { id: project.id } : void 0
+            agent,
+            project
           });
         } catch (err) {
           if (err instanceof ResolveModelError) {
@@ -7672,6 +7717,7 @@ var {
   rbacSchema,
   promptLibrarySchema,
   contextPresetsSchema,
+  teamsSchema,
   embedderSettingsSchema,
   promptFavoritesSchema,
   statisticsSchema,
@@ -7721,6 +7767,7 @@ var createExpressRoutes = async (app, providers, tools, contexts, config, evals,
       jobResultsSchema(),
       promptLibrarySchema(),
       contextPresetsSchema(),
+      teamsSchema(),
       embedderSettingsSchema(),
       promptFavoritesSchema(),
       evalRunsSchema(),
@@ -8107,7 +8154,7 @@ Mood: friendly and intelligent.
           modelId,
           user,
           providers,
-          agent: { id: agent.id }
+          agent
         });
       } catch (err) {
         if (err instanceof ResolveModelError) {
@@ -8368,7 +8415,7 @@ ${customInstructions}` : agent.instructions;
         modelId: agent.model,
         user,
         providers,
-        agent: { id: agent.id }
+        agent
       });
     } catch (err) {
       if (err instanceof ResolveModelError) {
@@ -9180,7 +9227,9 @@ ${style.markdown}` : params.prompt;
       project_id: project?.id,
       user_name: user.email,
       role_name: user.role?.name,
-      project_name: project?.name
+      project_name: project?.name,
+      team_id: user.team?.id,
+      team_name: user.team?.name
     });
     if (tags?.length) {
       upstreamHeaders["x-litellm-tags"] = tags.join(",");
@@ -10217,7 +10266,7 @@ var ExuluMCP = class {
       modelId: agent.model,
       user,
       providers: allProviders,
-      agent: { id: agent.id }
+      agent
     });
     const providerapikey = resolved.apiKey;
     if (!isLiteLLMEnabled()) {
@@ -11449,6 +11498,7 @@ var ExuluEval = class {
 
 // src/templates/evals/index.ts
 import { z as z4 } from "zod";
+import { generateText as generateText5, Output as Output2 } from "ai";
 var llmAsJudgeEval = () => {
   if (process.env.REDIS_HOST?.length && process.env.REDIS_PORT?.length) {
     return new ExuluEval({
@@ -11489,27 +11539,27 @@ var llmAsJudgeEval = () => {
         const resolved = await resolveModel({
           modelId: agent.model,
           providers: exuluApp.get().providers,
-          agent: { id: agent.id },
+          agent,
           rbacBypass: true
         });
-        const providerapikey = resolved.apiKey;
         console.log("[EXULU] prompt", prompt);
-        const response = await provider.generateSync({
-          agent,
-          contexts: [],
-          rerankers: [],
+        const { output } = await generateText5({
+          temperature: 0,
+          model: resolved.languageModel,
+          system: "",
           prompt,
-          outputSchema: z4.object({
-            score: z4.number().min(0).max(100).describe("The score between 0 and 100.")
-          }),
-          languageModel: resolved.languageModel,
-          providerapikey
+          maxRetries: 2,
+          output: Output2.object({
+            schema: z4.object({
+              score: z4.number().min(0).max(100).describe("The score between 0 and 100.")
+            })
+          })
         });
-        console.log("[EXULU] response", response);
-        const score = parseFloat(response.score);
+        console.log("[EXULU] output", output);
+        const score = output.score;
         if (isNaN(score)) {
           throw new Error(
-            `Generated score from llm as a judge eval is not a number: ${response.score}`
+            `Generated score from llm as a judge eval is not a number: ${output.score}`
           );
         }
         return score;
@@ -14634,6 +14684,7 @@ var {
   agentMessagesSchema: agentMessagesSchema2,
   modelsSchema: modelsSchema2,
   rolesSchema: rolesSchema2,
+  teamsSchema: teamsSchema2,
   usersSchema: usersSchema2,
   skillsSchema: skillsSchema2,
   statisticsSchema: statisticsSchema2,
@@ -14676,6 +14727,7 @@ var up = async function(knex) {
     agentMessagesSchema2(),
     modelsSchema2(),
     rolesSchema2(),
+    teamsSchema2(),
     testCasesSchema2(),
     evalSetsSchema2(),
     evalRunsSchema2(),
@@ -15691,7 +15743,7 @@ var MarkdownChunker = class {
 // ee/python/documents/processing/doc_processor.ts
 import * as fs4 from "fs";
 import * as path from "path";
-import { generateText as generateText5, Output as Output2 } from "ai";
+import { generateText as generateText6, Output as Output3 } from "ai";
 import { z as z12 } from "zod";
 import pLimit from "p-limit";
 import { randomUUID as randomUUID6 } from "crypto";
@@ -16041,9 +16093,9 @@ If the page contains a flow-chart, schematic, technical drawing or control board
 
 ### 7. Only populate \`corrected_text\` when \`needs_correction\` is true. If the OCR output is accurate, return \`needs_correction: false\` and \`corrected_content: null\`.
 `;
-  const result = await generateText5({
+  const result = await generateText6({
     model,
-    output: Output2.object({
+    output: Output3.object({
       schema: z12.object({
         needs_correction: z12.boolean(),
         corrected_text: z12.string().nullable(),

package/ee/rbac-resolver.ts

@@ -9,6 +9,7 @@ export const RBACResolver = async (
   type: string;
   users: any[];
   roles: any[];
+  teams: any[];
 }> => {
 
   // If RBAC is not available
@@ -18,7 +19,8 @@ export const RBACResolver = async (
     return {
       type: "public",
       users: [],
-      roles: []
+      roles: [],
+      teams: []
     }
   }
   // Get RBAC records for this resource
@@ -38,14 +40,20 @@ export const RBACResolver = async (
     .filter((r) => r.access_type === "Role")
     ?.map((r) => ({ id: r.role_id, rights: r.rights }));
 
+  const teams = rbacRecords
+    .filter((r) => r.access_type === "Team")
+    ?.map((r) => ({ id: r.team_id, rights: r.rights }));
+
   // Determine the type based on rights_mode or presence of records
   let type = rights_mode || "private";
   if (type === "users" && users.length === 0) type = "private";
   if (type === "roles" && roles.length === 0) type = "private";
+  if (type === "teams" && teams.length === 0) type = "private";
 
   return {
     type,
     users,
     roles,
+    teams,
   };
 };

package/ee/rbac-update.ts

@@ -15,7 +15,7 @@ export const handleRBACUpdate = async (
     return;
   }
   
-  const { users = [], roles = [] /* projects = [] */ } = rbacData;
+  const { users = [], roles = [], teams = [] /* projects = [] */ } = rbacData;
 
   // Get existing RBAC records if not provided
   if (!existingRbacRecords) {
@@ -31,6 +31,7 @@ export const handleRBACUpdate = async (
   // Create sets for comparison
   const newUserRecords = new Set(users.map((u: any) => `${u.id}:${u.rights}`));
   const newRoleRecords = new Set(roles.map((r: any) => `${r.id}:${r.rights}`));
+  const newTeamRecords = new Set(teams.map((t: any) => `${t.id}:${t.rights}`));
   // const newProjectRecords = new Set(projects.map((p: any) => `${p.id}:${p.rights}`));
   const existingUserRecords = new Set(
     existingRbacRecords
@@ -42,10 +43,16 @@ export const handleRBACUpdate = async (
       .filter((r) => r.access_type === "Role")
       .map((r) => `${r.role_id}:${r.rights}`),
   );
+  const existingTeamRecords = new Set(
+    existingRbacRecords
+      .filter((r) => r.access_type === "Team")
+      .map((r) => `${r.team_id}:${r.rights}`),
+  );
 
   // Records to create
   const usersToCreate = users.filter((u: any) => !existingUserRecords.has(`${u.id}:${u.rights}`));
   const rolesToCreate = roles.filter((r: any) => !existingRoleRecords.has(`${r.id}:${r.rights}`));
+  const teamsToCreate = teams.filter((t: any) => !existingTeamRecords.has(`${t.id}:${t.rights}`));
   // const projectsToCreate = projects.filter((p: any) => !existingProjectRecords.has(`${p.id}:${p.rights}`));
 
   // Records to remove
@@ -55,6 +62,9 @@ export const handleRBACUpdate = async (
   const rolesToRemove = existingRbacRecords.filter(
     (r) => r.access_type === "Role" && !newRoleRecords.has(`${r.role_id}:${r.rights}`),
   );
+  const teamsToRemove = existingRbacRecords.filter(
+    (r) => r.access_type === "Team" && !newTeamRecords.has(`${r.team_id}:${r.rights}`),
+  );
   // const projectsToRemove = existingRbacRecords
   //     .filter(r => r.access_type === 'Project' && !newProjectRecords.has(`${r.project_id}:${r.rights}`));
 
@@ -77,6 +87,15 @@ export const handleRBACUpdate = async (
       )
       .del();
   }
+  if (teamsToRemove.length > 0) {
+    await db
+      .from("rbac")
+      .whereIn(
+        "id",
+        teamsToRemove.map((r) => r.id),
+      )
+      .del();
+  }
 
   // Create new records
   const recordsToInsert: any[] = [];
@@ -105,6 +124,18 @@ export const handleRBACUpdate = async (
     });
   });
 
+  teamsToCreate.forEach((team: any) => {
+    recordsToInsert.push({
+      entity: entityName,
+      access_type: "Team",
+      target_resource_id: resourceId,
+      team_id: team.id,
+      rights: team.rights,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    });
+  });
+
   if (recordsToInsert.length > 0) {
     await db.from("rbac").insert(recordsToInsert);
   }

package/ee/schemas.ts

@@ -76,6 +76,27 @@ export const rolesSchema: ExuluTableDefinition = {
     ],
 };
 
+export const teamsSchema: ExuluTableDefinition = {
+    type: "teams",
+    name: {
+        plural: "teams",
+        singular: "team",
+    },
+    fields: [
+        {
+            name: "name",
+            type: "text",
+            index: true,
+            unique: true,
+            required: true,
+        },
+        {
+            name: "description",
+            type: "text",
+        },
+    ],
+};
+
 export const statisticsSchema: ExuluTableDefinition = {
     type: "tracking",
     name: {
@@ -301,6 +322,10 @@ export const rbacSchema: ExuluTableDefinition = {
             name: "role_id",
             type: "uuid",
         },
+        {
+            name: "team_id",
+            type: "uuid",
+        },
         {
             name: "user_id",
             type: "number",

package/ee/workers.ts

@@ -1390,7 +1390,7 @@ export const processUiMessagesFlow = async ({
     modelId: agent.model,
     user,
     providers,
-    agent: { id: agent.id },
+    agent: agent
   });
   const providerapikey = resolved.apiKey;
   const resolvedLanguageModel = resolved.languageModel;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exulu/backend",
   "author": "Qventu Bv.",
-  "version": "1.62.0",
+  "version": "1.63.0",
   "main": "./dist/index.js",
   "private": false,
   "publishConfig": {