From 0103b4b08a6ee1339569d7d4af16beaaac0228ed Mon Sep 17 00:00:00 2001
From: Danny Avila <danny@librechat.ai>
Date: Fri, 13 Jun 2025 18:17:25 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=B9=20chore:=20Cleanup=20base64=20Hand?=
 =?UTF-8?q?ling=20for=20Azure=20Mistral=20OCR=20(#7892)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧹 chore: Remove Comments and Cleanup base64 handling for Azure Mistral OCR

* chore: Remove unnecessary await from MCP instructions formatting in AgentClient

* ci: Update document_url regex in MistralOCR tests to support PDF format
---
 api/server/controllers/agents/client.js     |  2 +-
 packages/api/src/files/mistral/crud.spec.ts |  2 +-
 packages/api/src/files/mistral/crud.ts      | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/api/server/controllers/agents/client.js b/api/server/controllers/agents/client.js
index be64d5a0e..41e457e5b 100644
--- a/api/server/controllers/agents/client.js
+++ b/api/server/controllers/agents/client.js
@@ -330,7 +330,7 @@ class AgentClient extends BaseClient {
 
     if (mcpServers.length > 0) {
       try {
-        const mcpInstructions = await getMCPManager().formatInstructionsForContext(mcpServers);
+        const mcpInstructions = getMCPManager().formatInstructionsForContext(mcpServers);
         if (mcpInstructions) {
           systemContent = [systemContent, mcpInstructions].filter(Boolean).join('\n\n');
           logger.debug('[AgentClient] Injected MCP instructions for servers:', mcpServers);
diff --git a/packages/api/src/files/mistral/crud.spec.ts b/packages/api/src/files/mistral/crud.spec.ts
index 173c60edf..309e5565b 100644
--- a/packages/api/src/files/mistral/crud.spec.ts
+++ b/packages/api/src/files/mistral/crud.spec.ts
@@ -1421,7 +1421,7 @@ describe('MistralOCR Service', () => {
         expect.objectContaining({
           document: expect.objectContaining({
             type: 'document_url',
-            document_url: expect.stringMatching(/^data:image\/jpeg;base64,/),
+            document_url: expect.stringMatching(/^data:application\/pdf;base64,/),
           }),
         }),
         expect.any(Object),
diff --git a/packages/api/src/files/mistral/crud.ts b/packages/api/src/files/mistral/crud.ts
index 200cc8519..1d3645988 100644
--- a/packages/api/src/files/mistral/crud.ts
+++ b/packages/api/src/files/mistral/crud.ts
@@ -208,7 +208,6 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
   const apiKeyConfig = ocrConfig?.apiKey || '';
   const baseURLConfig = ocrConfig?.baseURL || '';
 
-  // If both are hardcoded, return them directly
   if (!needsEnvLoad(apiKeyConfig) && !needsEnvLoad(baseURLConfig)) {
     return {
       apiKey: apiKeyConfig,
@@ -216,7 +215,6 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
     };
   }
 
-  // Build auth fields array
   const authFields: string[] = [];
 
   if (needsEnvLoad(baseURLConfig)) {
@@ -227,14 +225,12 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
     authFields.push(getEnvVarName(apiKeyConfig, 'OCR_API_KEY'));
   }
 
-  // Load auth values
   const authValues = await context.loadAuthValues({
     userId: context.req.user?.id || '',
     authFields,
     optional: new Set(['OCR_BASEURL']),
   });
 
-  // Resolve each value
   const apiKey = await resolveConfigValue(apiKeyConfig, 'OCR_API_KEY', authValues);
   const baseURL = await resolveConfigValue(
     baseURLConfig,
@@ -335,7 +331,6 @@ export const uploadMistralOCR = async (context: OCRContext): Promise<MistralOCRU
     const { apiKey, baseURL } = await loadAuthConfig(context);
     const model = getModelConfig(context.req.app.locals?.ocr);
 
-    // Upload file
     const mistralFile = await uploadDocumentToMistral({
       filePath: context.file.path,
       fileName: context.file.originalname,
@@ -343,14 +338,12 @@ export const uploadMistralOCR = async (context: OCRContext): Promise<MistralOCRU
       baseURL,
     });
 
-    // Get signed URL
     const signedUrlResponse = await getSignedUrl({
       apiKey,
       baseURL,
       fileId: mistralFile.id,
     });
 
-    // Perform OCR
     const documentType = getDocumentType(context.file);
     const ocrResult = await performOCR({
       apiKey,
@@ -394,21 +387,20 @@ export const uploadAzureMistralOCR = async (
     const { apiKey, baseURL } = await loadAuthConfig(context);
     const model = getModelConfig(context.req.app.locals?.ocr);
 
-    // Read file as base64
     const buffer = fs.readFileSync(context.file.path);
     const base64 = buffer.toString('base64');
+    /** Uses actual mimetype of the file, 'image/jpeg' as fallback since it seems to be accepted regardless of mismatch */
+    const base64Prefix = `data:${context.file.mimetype || 'image/jpeg'};base64,`;
 
-    // Perform OCR directly with base64
     const documentType = getDocumentType(context.file);
     const ocrResult = await performOCR({
       apiKey,
       baseURL,
       model,
-      url: `data:image/jpeg;base64,${base64}`,
+      url: `${base64Prefix}${base64}`,
       documentType,
     });
 
-    // Process result
     const { text, images } = processOCRResult(ocrResult);
 
     return {