Merge pull request #15 from intelequia/preview

Merge from Preview branch: fixes Azure Agents, balance and local permissions file

Author: davidjrh

api/package.json

@@ -38,7 +38,7 @@
     "@aws-sdk/client-s3": "^3.758.0",
     "@aws-sdk/s3-request-presigner": "^3.758.0",
     "@azure/ai-projects": "^1.0.0",
-    "@azure/identity": "^4.7.0",
+    "@azure/identity": "^4.11.0",
     "@azure/search-documents": "^12.0.0",
     "@azure/storage-blob": "^12.27.0",
     "@google/generative-ai": "^0.24.0",

api/server/controllers/azureAgents/helpers.js

@@ -72,56 +72,59 @@ const _listAssistants = async ({ req, res, version, query }) => {
  * @returns {Promise<Array<Assistant>>} A promise that resolves to the response from the `openai.beta.assistants.list` method call.
  */
 const listAllAzureAgents = async ({ req, res, version, query }) => {
-  /** @type {{ azureAgentClient: 'AIProjectsClient' }} */
-  const azureAgentClient = await getOpenAIClient({ req, res, version });
-  const allAzureAgents = [];
-
-  let first_id;
-  let last_id;
-  let afterToken = query.after;
-  let hasMore = true;
-
-  let permissionsNodeName = "azureAgentPermissions";
-  if (global.myCache.get(permissionsNodeName)) {
-    let agents = [];
-
-    for await (const agent of azureAgentClient.listAgents()){
+  const client = await getOpenAIClient({ req, res, version });
+
+  const limit = Number(query?.limit) > 0 ? Number(query.limit) : undefined;
+  const after = query?.after; // continuation token
+  const permissionsNodeName = 'azureAgentPermissions';
+
+  /** @type {any[]} */
+  let agents = [];
+  /** @type {string | undefined} */
+  let nextContinuationToken;
+
+  // If 'after' or 'limit' are provided, use byPage to fetch a single page
+  if (after || limit) {
+    const pageIter = client.listAgents().byPage({
+      maxPageSize: limit ?? 100,
+      continuationToken: after,
+    });
+    const { value: page = [] } = await pageIter.next();
+    agents = [...page];
+    // Azure SDK attaches continuationToken on the page array
+    nextContinuationToken = page && page.continuationToken ? page.continuationToken : undefined;
+  } else {
+    // Otherwise, iterate all agents
+    let count = 0;
+    for await (const agent of client.listAgents()) {
       agents.push(agent);
+      if (limit && ++count >= limit) break;
     }
+  }
 
-    const allowedAzureAgents = await checkGroupPermissions(req.user._id.toString(), agents, permissionsNodeName);
-
-    allowedAzureAgents.forEach((azureAgent) => allAzureAgents.push(azureAgent));
-  } else {
-    while (hasMore) {
-      let agents = [];
-
-      for await (const agent of azureAgentClient.listAgents()){
-        agents.push(agent);
-      }
-
-      allAzureAgents.push(agents);
-      hasMore = body.has_more;
-
-      if (!first_id) {
-        first_id = body.first_id;
-      }
-
-      if (hasMore) {
-        afterToken = body.last_id;
-      } else {
-        last_id = body.last_id;
-      }
-    }
+  // Optional permission filtering
+  if (global.myCache.get(permissionsNodeName)) {
+    agents = await checkGroupPermissions(
+      req.user._id.toString(),
+      agents,
+      permissionsNodeName,
+    );
   }
 
+  // Compute metadata similar to OpenAI-style list responses
+  const first_id = agents[0]?.id;
+  const last_id = agents[agents.length - 1]?.id || nextContinuationToken;
+  const has_more = Boolean(nextContinuationToken);
+
   return {
-    data: allAzureAgents,
+    data: agents,
     body: {
-      data: allAzureAgents,
-      has_more: false,
+      data: agents,
+      has_more,
       first_id,
       last_id,
+      // Use last_id as the token to pass back in `after` for the next page
+      next_after: nextContinuationToken,
     },
   };
 };
@@ -147,13 +150,10 @@ const listAgentsForAzure = async ({ req, res, version, azureConfig = {}, query }
   const groupModelTuples = [];
   const promises = [];
   /** @type {Array<TAzureGroup>} */
-  const groups = [];
 
-  const { groupMap, assistantGroups } = azureConfig;
+  const { groups } = azureConfig;
 
-  for (const groupName of assistantGroups) {
-    const group = groupMap[groupName];
-    groups.push(group);
+  for (const group of groups) {
 
     const currentModelTuples = Object.entries(group?.models);
     groupModelTuples.push(currentModelTuples);
@@ -237,7 +237,7 @@ const fetchAssistants = async ({ req, res, overrideEndpoint }) => {
   /** @type {AssistantListResponse} */
   let body;
 
-  const azureConfig = req.app.locals[EModelEndpoint.azureOpenAI];
+  const azureConfig = req.app.locals[EModelEndpoint.azureAgents];
   body = await listAgentsForAzure({ req, res, version, azureConfig, query });
 
   if (req.user.role === SystemRoles.ADMIN) {

api/server/services/Endpoints/azureAgents/initialize.js

@@ -5,13 +5,11 @@ const {
   EModelEndpoint,
 } = require('librechat-data-provider');
 
-const { DefaultAzureCredential } = require('@azure/identity');
+const { ClientSecretCredential, DefaultAzureCredential } = require('@azure/identity');
 const { isUserProvided } = require('~/server/utils');
 const { truncateText, titleInstruction } = require('~/app/clients/prompts/index');
 
 
-
-
 class Files {
   constructor(client) {
     this._client = client;
@@ -74,16 +72,30 @@ const initializeClient = async ({ req, res, initAppClient = false }) => {
       name: EModelEndpoint.azureAgents,
     });  
   }
-
-
-  const credentials =  new DefaultAzureCredential()
+  // Prefer explicit client credentials from environment; fallback to DefaultAzureCredential
+  const { AZURE_TENANT_ID, AZURE_CLIENT_ID, AZURE_CLIENT_SECRET } = process.env;
+  let credentials;
+  try {
+    if (AZURE_TENANT_ID && AZURE_CLIENT_ID && AZURE_CLIENT_SECRET) {
+      credentials = new ClientSecretCredential(
+        AZURE_TENANT_ID,
+        AZURE_CLIENT_ID,
+        AZURE_CLIENT_SECRET,
+      );
+    } else {
+      credentials = new DefaultAzureCredential();
+    }
+  } catch (e) {
+    console.log('Azure credential initialization failed:', e);
+    throw e;
+  }
 
 
   /** @type {TAzureConfig | undefined} */
   const azureConfig = req.app.locals[EModelEndpoint.azureOpenAI];
 
   const client = new AgentsClient(AZURE_AI_PROJECT_ENDPOINT, credentials);
-
+  
   client.options = {}
 
   if(azureConfig && azureConfig.assistants){

api/utils/intelequia/intelequiaConfigLoader.js

@@ -5,6 +5,10 @@ const { ClientSecretCredential } = require('@azure/identity');
 const { logger } = require('~/config');
 const jwtDecode = require('jsonwebtoken/decode');
 const { load } = require('mime');
+const path = require('path');
+const fs = require('fs');
+
+
 
 /**
  * Manage all permission operations, loads, saves parameters and configure users role
@@ -17,8 +21,8 @@ async function intelequiaConfigLoader() {
   const url = process.env.REMOTE_CONFIG_FILE_URL;
 
   if (url && url != "") {
-    logger.info("[IntelequiaConfigLoader] Loading GraphClient and Permissions files ...")
-    const result = await loadPermissionConfigFiles(url)
+    logger.info(`[IntelequiaConfigLoader] Loading GraphClient and Permissions files from ${url} ...`);
+    const result = await loadPermissionConfigFiles(url);
     const { permissions, functions, assistantAdminRole, agentPermissions, azureAgentPermissions } = result;
 
     global.myCache.set("functions", functions);
@@ -78,9 +82,18 @@ async function loadPermissionConfigFiles(url) {
 
   logger.info(`[validateTools] fetch remote configuration file: Fetching remote configuration file at URL "${url}"`);
   try {
-    const response = await fetch(url);
-    if (response.ok) {
-      return await response.json();
+    if (url.startsWith('http')) {
+      const response = await fetch(url);
+      if (response.ok) {
+        return await response.json();
+      }
+    }
+    else {
+      const filePath = path.join(__dirname, '../../..', url);
+      if (fs.existsSync(filePath)) {
+        return JSON.parse(fs.readFileSync(filePath, 'utf8'));
+      }
+      throw new Error(`[validateTools] fetch remote configuration file: File not found at "${filePath}"`);
     }
   } catch (e) {
     console.log(e)

client/src/components/Nav/AccountSettings.tsx

@@ -16,7 +16,7 @@ function AccountSettings() {
   const { user, isAuthenticated, logout } = useAuthContext();
   const { data: startupConfig } = useGetStartupConfig();
   const balanceQuery = useGetUserBalance({
-    enabled: !!isAuthenticated && startupConfig?.balance?.enabled,
+    enabled: !!isAuthenticated && startupConfig?.balance?.enabled === true,
   });
   const [showSettings, setShowSettings] = useState(false);
   const [showFiles, setShowFiles] = useRecoilState(store.showFiles);

client/src/components/Nav/SettingsTabs/Balance/Balance.tsx

@@ -10,7 +10,7 @@ function Balance() {
   const { data: startupConfig } = useGetStartupConfig();
 
   const balanceQuery = useGetUserBalance({
-    enabled: !!isAuthenticated && !!startupConfig?.balance?.enabled,
+    enabled: !!isAuthenticated && startupConfig?.balance?.enabled === true,
   });
   const balanceData = balanceQuery.data;
 

client/src/hooks/SSE/useSSE.ts

@@ -86,7 +86,7 @@ export default function useSSE(
 
   const { data: startupConfig } = useGetStartupConfig();
   const balanceQuery = useGetUserBalance({
-    enabled: !!isAuthenticated && startupConfig?.balance?.enabled,
+    enabled: !!isAuthenticated && startupConfig?.balance?.enabled === true,
   });
 
   useEffect(() => {

package-lock.json

@@ -876,23 +876,7 @@ export const alternateName = {
 const azureAgentsModels =[
   'gpt-4o-mini',
   'gpt-4o',
-  'gpt-4.5-preview',
-  'gpt-4.5-preview-2025-02-27',
-  'gpt-3.5-turbo',
-  'gpt-3.5-turbo-0125',
-  'gpt-4-turbo',
-  'gpt-4-turbo-2024-04-09',
-  'gpt-4-0125-preview',
-  'gpt-4-turbo-preview',
-  'gpt-4-1106-preview',
-  'gpt-3.5-turbo-1106',
-  'gpt-3.5-turbo-16k-0613',
-  'gpt-3.5-turbo-16k',
-  'gpt-4',
-  'gpt-4-0314',
-  'gpt-4-32k-0314',
-  'gpt-4-0613',
-  'gpt-3.5-turbo-0613',
+  'gpt-4.1',
 ]
 const sharedOpenAIModels = [
   'gpt-4o-mini',