@exulu/backend 1.62.1 → 1.63.1

package/dist/index.cjs

@@ -267,6 +267,12 @@ var init_auth = __esm({
               user.role = role;
             }
           }
+          if (user?.team) {
+            const team = await db2.from("teams").select("*").where("id", user?.team).first();
+            if (team) {
+              user.team = team;
+            }
+          }
           if (!user) {
             return {
               error: true,
@@ -637,6 +643,7 @@ var init_check_record_access = __esm({
       const isPublic = record.rights_mode === "public";
       const byUsers = record.rights_mode === "users";
       const byRoles = record.rights_mode === "roles";
+      const byTeams = record.rights_mode === "teams";
       const createdBy = typeof record.created_by === "string" ? record.created_by : record.created_by?.toString();
       const isCreator = user ? createdBy === user.id.toString() : false;
       const isAdmin = user ? user.super_admin : false;
@@ -682,6 +689,23 @@ var init_check_record_access = __esm({
           return true;
         }
       }
+      if (byTeams) {
+        if (!user) {
+          setRecordAccessCache(false);
+          return false;
+        }
+        hasAccess = record.RBAC?.teams?.find((x) => x.id === user.team?.id)?.rights || "none";
+        if (!hasAccess || hasAccess === "none" || hasAccess !== request2) {
+          console.error(
+            `[EXULU] Your current team ${user.team?.name} does not have access to this record, current access type is: ${hasAccess}.`
+          );
+          setRecordAccessCache(false);
+          return false;
+        } else {
+          setRecordAccessCache(true);
+          return true;
+        }
+      }
       setRecordAccessCache(false);
       return false;
     };
@@ -784,6 +808,12 @@ function buildTags(input) {
   if (input.agent_name) {
     candidates.push("agent_name_" + input.agent_name);
   }
+  if (input.team_id) {
+    candidates.push("team_id_" + input.team_id);
+  }
+  if (input.team_name) {
+    candidates.push("team_name_" + input.team_name);
+  }
   console.log("[EXULU] Candidates", candidates);
   const out = [];
   for (const candidate of candidates) {
@@ -881,10 +911,11 @@ async function resolveModel(input) {
       );
     }
     const litellm = getLiteLLMProvider({
-      user: user?.id,
-      role: user?.role?.id,
-      project: project?.id,
-      agent: agent?.id
+      user,
+      role: user?.role,
+      project,
+      agent,
+      team: user?.team
     });
     const languageModel2 = litellm(modelId);
     const syntheticModel = {
@@ -996,17 +1027,24 @@ var init_resolve_model = __esm({
       user,
       role,
       project,
-      agent
+      agent,
+      team
     }) => {
       if (_litellmProvider) return _litellmProvider;
       const host = process.env.LITELLM_HOST ?? "127.0.0.1";
       const port = process.env.LITELLM_PORT ?? "4000";
       const masterKey = process.env.LITELLM_MASTER_KEY;
       const tags = buildTags({
-        user,
-        role,
-        project,
-        agent
+        user_id: user?.id,
+        role_id: role?.id,
+        project_id: project?.id,
+        agent_id: agent?.id,
+        user_name: !user ? void 0 : user.type === "api" ? user.firstname ?? user.email : user.email,
+        role_name: role?.name,
+        project_name: project?.name,
+        agent_name: agent?.name,
+        team_id: team?.id,
+        team_name: team?.name
       });
       if (!masterKey) {
         throw new ResolveModelError(
@@ -3328,7 +3366,7 @@ var init_tool = __esm({
             modelId: agent.model,
             user,
             providers,
-            agent: { id: agent.id },
+            agent,
             rbacBypass: true
           });
           providerapikey = resolved.apiKey;
@@ -3698,6 +3736,16 @@ var init_access_control = __esm({
               });
             });
           }
+          if (user?.team) {
+            const userTeamId = user.team.id;
+            this.orWhere(function() {
+              this.where(`${prefix}rights_mode`, "teams").whereExists(function() {
+                this.select("*").from("rbac").whereRaw(
+                  "rbac.target_resource_id = " + (prefix ? prefix.slice(0, -1) : tableNamePlural) + ".id"
+                ).where("rbac.entity", table.name.singular).where("rbac.access_type", "Team").where("rbac.team_id", userTeamId);
+              });
+            });
+          }
         });
       } catch (error) {
         console.error("Access control error:", error);
@@ -3840,7 +3888,7 @@ var init_vector_methods = __esm({
 });
 
 // ee/schemas.ts
-var feedbackSchema, rolesSchema, statisticsSchema, testCasesSchema, evalSetsSchema, jobResultsSchema, evalRunsSchema, rbacSchema, workflowTemplatesSchema;
+var feedbackSchema, rolesSchema, teamsSchema, statisticsSchema, testCasesSchema, evalSetsSchema, jobResultsSchema, evalRunsSchema, rbacSchema, workflowTemplatesSchema;
 var init_schemas = __esm({
   "ee/schemas.ts"() {
     "use strict";
@@ -3924,6 +3972,26 @@ var init_schemas = __esm({
         }
       ]
     };
+    teamsSchema = {
+      type: "teams",
+      name: {
+        plural: "teams",
+        singular: "team"
+      },
+      fields: [
+        {
+          name: "name",
+          type: "text",
+          index: true,
+          unique: true,
+          required: true
+        },
+        {
+          name: "description",
+          type: "text"
+        }
+      ]
+    };
     statisticsSchema = {
       type: "tracking",
       name: {
@@ -4144,6 +4212,10 @@ var init_schemas = __esm({
           name: "role_id",
           type: "uuid"
         },
+        {
+          name: "team_id",
+          type: "uuid"
+        },
         {
           name: "user_id",
           type: "number"
@@ -4611,6 +4683,10 @@ var init_core_schema = __esm({
         {
           name: "role",
           type: "uuid"
+        },
+        {
+          name: "team",
+          type: "uuid"
         }
       ]
     };
@@ -4889,6 +4965,7 @@ var init_core_schema = __esm({
         }
         if (license["rbac"]) {
           schemas.rolesSchema = () => addCoreFields(rolesSchema);
+          schemas.teamsSchema = () => addCoreFields(teamsSchema);
           schemas.rbacSchema = () => addCoreFields(rbacSchema);
         }
         if (license["evals"]) {
@@ -7779,6 +7856,8 @@ var init_catalog = __esm({
           region: m.model_info?.region ?? null,
           max_tokens: m.model_info?.max_tokens ?? null,
           max_input_tokens: m.model_info?.max_input_tokens ?? null,
+          input_cost_per_million_tokens: m.model_info?.input_cost_per_token * 1e6,
+          output_cost_per_million_tokens: m.model_info?.output_cost_per_token * 1e6,
           active: m.model_info?.active ?? true,
           max_output_tokens: m.model_info?.max_output_tokens ?? null,
           supports_vision: !!m.model_info?.supports_vision,
@@ -7790,8 +7869,18 @@ var init_catalog = __esm({
           supports_edit: !!m.model_info?.supports_edit,
           max_n: typeof m.model_info?.max_n === "number" ? m.model_info.max_n : null
         }));
-        _cache = { expiresAt: Date.now() + CACHE_TTL_MS2, items };
-        return items.filter((m) => m.type !== "speech_to_text" && m.type !== "text_to_speech");
+        const map = /* @__PURE__ */ new Map();
+        for (const item of items) {
+          const key2 = `${item.model_name}-${item.upstream_model}`;
+          if (map.has(key2)) {
+            map.get(key2).tags.push(...item.tags);
+          } else {
+            map.set(key2, item);
+          }
+        }
+        const uniqueItems = Array.from(map.values());
+        _cache = { expiresAt: Date.now() + CACHE_TTL_MS2, items: uniqueItems };
+        return uniqueItems.filter((m) => m.type !== "speech_to_text" && m.type !== "text_to_speech");
       } catch (err) {
         console.error("[EXULU] litellmCatalog: failed to fetch /model/info:", err);
         return [];
@@ -8313,7 +8402,8 @@ var RBACResolver = async (db2, entityName, resourceId, rights_mode) => {
     return {
       type: "public",
       users: [],
-      roles: []
+      roles: [],
+      teams: []
     };
   }
   const rbacRecords = await db2.from("rbac").where({
@@ -8322,13 +8412,16 @@ var RBACResolver = async (db2, 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
   };
 };
 
@@ -9085,7 +9178,8 @@ var handleRBACUpdate = async (db2, entityName, resourceId, rbacData, existingRba
   }
   const {
     users = [],
-    roles = []
+    roles = [],
+    teams = []
     /* projects = [] */
   } = rbacData;
   if (!existingRbacRecords) {
@@ -9096,20 +9190,28 @@ var handleRBACUpdate = async (db2, entityName, resourceId, rbacData, existingRba
   }
   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 db2.from("rbac").whereIn(
       "id",
@@ -9122,6 +9224,12 @@ var handleRBACUpdate = async (db2, entityName, resourceId, rbacData, existingRba
       rolesToRemove.map((r) => r.id)
     ).del();
   }
+  if (teamsToRemove.length > 0) {
+    await db2.from("rbac").whereIn(
+      "id",
+      teamsToRemove.map((r) => r.id)
+    ).del();
+  }
   const recordsToInsert = [];
   usersToCreate.forEach((user) => {
     recordsToInsert.push({
@@ -9145,6 +9253,17 @@ var handleRBACUpdate = async (db2, entityName, resourceId, rbacData, existingRba
       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 db2.from("rbac").insert(recordsToInsert);
   }
@@ -9343,6 +9462,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 db2.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);
@@ -11046,7 +11178,7 @@ var processUiMessagesFlow = async ({
     modelId: agent.model,
     user,
     providers,
-    agent: { id: agent.id }
+    agent
   });
   const providerapikey = resolved.apiKey;
   const resolvedLanguageModel = resolved.languageModel;
@@ -12087,6 +12219,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) => {
@@ -13678,7 +13812,7 @@ var ExuluProvider = class {
           modelId: agent.model,
           user,
           providers,
-          agent: { id: agent.id }
+          agent
         });
         const providerapikey = resolved.apiKey;
         console.log(
@@ -15386,7 +15520,7 @@ var registerOpenAIGatewayRoutes = async (app, providers, tools, contexts, config
           });
           return;
         }
-        let project = null;
+        let project = void 0;
         if (projectName) {
           let projectQuery = db2("projects").select("*");
           projectQuery = applyAccessControl(projectsSchema4(), projectQuery, user);
@@ -15409,8 +15543,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) {
@@ -15587,6 +15721,7 @@ var {
   rbacSchema: rbacSchema2,
   promptLibrarySchema: promptLibrarySchema2,
   contextPresetsSchema: contextPresetsSchema2,
+  teamsSchema: teamsSchema2,
   embedderSettingsSchema: embedderSettingsSchema2,
   promptFavoritesSchema: promptFavoritesSchema2,
   statisticsSchema: statisticsSchema2,
@@ -15636,6 +15771,7 @@ var createExpressRoutes = async (app, providers, tools, contexts, config, evals,
       jobResultsSchema2(),
       promptLibrarySchema2(),
       contextPresetsSchema2(),
+      teamsSchema2(),
       embedderSettingsSchema2(),
       promptFavoritesSchema2(),
       evalRunsSchema2(),
@@ -16022,7 +16158,7 @@ Mood: friendly and intelligent.
           modelId,
           user,
           providers,
-          agent: { id: agent.id }
+          agent
         });
       } catch (err) {
         if (err instanceof ResolveModelError) {
@@ -16283,7 +16419,7 @@ ${customInstructions}` : agent.instructions;
         modelId: agent.model,
         user,
         providers,
-        agent: { id: agent.id }
+        agent
       });
     } catch (err) {
       if (err instanceof ResolveModelError) {
@@ -17095,7 +17231,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(",");
@@ -18140,7 +18278,7 @@ var ExuluMCP = class {
       modelId: agent.model,
       user,
       providers: allProviders,
-      agent: { id: agent.id }
+      agent
     });
     const providerapikey = resolved.apiKey;
     if (!isLiteLLMEnabled()) {
@@ -19386,6 +19524,7 @@ var ExuluEval = class {
 init_resolve_model();
 init_singleton();
 var import_zod14 = require("zod");
+var import_ai14 = require("ai");
 var llmAsJudgeEval = () => {
   if (process.env.REDIS_HOST?.length && process.env.REDIS_PORT?.length) {
     return new ExuluEval({
@@ -19426,27 +19565,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 (0, import_ai14.generateText)({
+          temperature: 0,
+          model: resolved.languageModel,
+          system: "",
           prompt,
-          outputSchema: import_zod14.z.object({
-            score: import_zod14.z.number().min(0).max(100).describe("The score between 0 and 100.")
-          }),
-          languageModel: resolved.languageModel,
-          providerapikey
+          maxRetries: 2,
+          output: import_ai14.Output.object({
+            schema: import_zod14.z.object({
+              score: import_zod14.z.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;
@@ -22853,6 +22992,7 @@ var {
   agentMessagesSchema: agentMessagesSchema3,
   modelsSchema: modelsSchema3,
   rolesSchema: rolesSchema3,
+  teamsSchema: teamsSchema3,
   usersSchema: usersSchema3,
   skillsSchema: skillsSchema3,
   statisticsSchema: statisticsSchema3,
@@ -22895,6 +23035,7 @@ var up = async function(knex) {
     agentMessagesSchema3(),
     modelsSchema3(),
     rolesSchema3(),
+    teamsSchema3(),
     testCasesSchema3(),
     evalSetsSchema3(),
     evalRunsSchema3(),
@@ -23329,9 +23470,20 @@ var initLiteLLMDatabase = async (packageRoot) => {
   }
   const venvBin = (0, import_node_path8.resolve)(packageRoot, "ee/python/.venv/bin");
   const prismaCli = (0, import_node_path8.resolve)(venvBin, "prisma");
+  const venvLibDir = (0, import_node_path8.resolve)(packageRoot, "ee/python/.venv/lib");
+  const pythonVersionDir = (0, import_node_fs7.existsSync)(venvLibDir) ? (0, import_node_fs7.readdirSync)(venvLibDir).find((entry) => /^python3\.\d+$/.test(entry)) : void 0;
+  if (!pythonVersionDir) {
+    warn([
+      `Could not find a python3.* directory under ${venvLibDir}.`,
+      `Run \`npm run python:setup\` to create the venv.`,
+      `Skipping LiteLLM database setup.`
+    ]);
+    return;
+  }
   const litellmProxyDir = (0, import_node_path8.resolve)(
-    packageRoot,
-    "ee/python/.venv/lib/python3.12/site-packages/litellm/proxy"
+    venvLibDir,
+    pythonVersionDir,
+    "site-packages/litellm/proxy"
   );
   const schemaPath = (0, import_node_path8.resolve)(litellmProxyDir, "schema.prisma");
   if (!(0, import_node_fs7.existsSync)(prismaCli)) {
@@ -23922,7 +24074,7 @@ var MarkdownChunker = class {
 init_cjs_shims();
 var fs5 = __toESM(require("fs"), 1);
 var path2 = __toESM(require("path"), 1);
-var import_ai14 = require("ai");
+var import_ai15 = require("ai");
 var import_zod22 = require("zod");
 var import_p_limit = __toESM(require("p-limit"), 1);
 var import_crypto = require("crypto");
@@ -24275,9 +24427,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 (0, import_ai14.generateText)({
+  const result = await (0, import_ai15.generateText)({
     model,
-    output: import_ai14.Output.object({
+    output: import_ai15.Output.object({
       schema: import_zod22.z.object({
         needs_correction: import_zod22.z.boolean(),
         corrected_text: import_zod22.z.string().nullable(),

package/dist/index.d.cts

@@ -24,15 +24,22 @@ type User = {
     favourite_agents?: string[];
     scope_mode?: ApiKeyScopeMode;
     agent_ids?: string[];
-    role: {
-        id: string;
-        name: string;
-        agents: "read" | "write";
-        evals: "read" | "write";
-        workflows: "read" | "write";
-        variables: "read" | "write";
-        users: "read" | "write";
-    };
+    role: UserRole;
+    team?: ExuluTeam;
+};
+type UserRole = {
+    id: string;
+    name: string;
+    agents: "read" | "write";
+    evals: "read" | "write";
+    workflows: "read" | "write";
+    variables: "read" | "write";
+    users: "read" | "write";
+};
+type ExuluTeam = {
+    id: string;
+    name: string;
+    description?: string;
 };
 
 declare function redisClient(): Promise<{
@@ -789,7 +796,7 @@ declare class ExuluProvider {
     get providerName(): string;
     get modelName(): string;
     tool: (instance: string, providers: ExuluProvider[], contexts: ExuluContext[], rerankers: ExuluReranker[]) => Promise<ExuluTool | null>;
-    generateSync: ({ prompt, req, user, session, inputMessages, approvedTools, currentTools, currentSkills, allExuluTools, statistics, toolConfigs, providerapikey, languageModel, contexts, rerankers, exuluConfig, agent, instructions, maxStepCount, onTokenUsage, }: {
+    generateSync: ({ prompt, req, user, session, inputMessages, approvedTools, currentTools, currentSkills, allExuluTools, statistics, toolConfigs, providerapikey, languageModel, contexts, rerankers, exuluConfig, agent, instructions, maxStepCount, onTokenUsage }: {
         prompt?: string;
         user?: User;
         maxStepCount?: number;

package/dist/index.d.ts

@@ -24,15 +24,22 @@ type User = {
     favourite_agents?: string[];
     scope_mode?: ApiKeyScopeMode;
     agent_ids?: string[];
-    role: {
-        id: string;
-        name: string;
-        agents: "read" | "write";
-        evals: "read" | "write";
-        workflows: "read" | "write";
-        variables: "read" | "write";
-        users: "read" | "write";
-    };
+    role: UserRole;
+    team?: ExuluTeam;
+};
+type UserRole = {
+    id: string;
+    name: string;
+    agents: "read" | "write";
+    evals: "read" | "write";
+    workflows: "read" | "write";
+    variables: "read" | "write";
+    users: "read" | "write";
+};
+type ExuluTeam = {
+    id: string;
+    name: string;
+    description?: string;
 };
 
 declare function redisClient(): Promise<{
@@ -789,7 +796,7 @@ declare class ExuluProvider {
     get providerName(): string;
     get modelName(): string;
     tool: (instance: string, providers: ExuluProvider[], contexts: ExuluContext[], rerankers: ExuluReranker[]) => Promise<ExuluTool | null>;
-    generateSync: ({ prompt, req, user, session, inputMessages, approvedTools, currentTools, currentSkills, allExuluTools, statistics, toolConfigs, providerapikey, languageModel, contexts, rerankers, exuluConfig, agent, instructions, maxStepCount, onTokenUsage, }: {
+    generateSync: ({ prompt, req, user, session, inputMessages, approvedTools, currentTools, currentSkills, allExuluTools, statistics, toolConfigs, providerapikey, languageModel, contexts, rerankers, exuluConfig, agent, instructions, maxStepCount, onTokenUsage }: {
         prompt?: string;
         user?: User;
         maxStepCount?: number;