Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🔍 refactor: OCR Fully Optional with Defaults for "Upload as Text" (#9856)

Danny Avila4b5b46604cb1
diff --git a/api/server/services/AppService.js b/api/server/services/AppService.js
index 5c5bf186e0..49f9e324fb 100644
--- a/api/server/services/AppService.js
+++ b/api/server/services/AppService.js
@@ -1,16 +1,12 @@
+const { FileSources, EModelEndpoint, getConfigDefaults } = require('librechat-data-provider');
const {
isEnabled,
+ loadOCRConfig,
loadMemoryConfig,
agentsConfigSetup,
loadWebSearchConfig,
loadDefaultInterface,
} = require('@librechat/api');
-const {
- FileSources,
- loadOCRConfig,
- EModelEndpoint,
- getConfigDefaults,
-} = require('librechat-data-provider');
const {
checkWebSearchConfig,
checkVariables,
diff --git a/api/server/services/AppService.spec.js b/api/server/services/AppService.spec.js
index 6243164ed4..1b540c96c0 100644
--- a/api/server/services/AppService.spec.js
+++ b/api/server/services/AppService.spec.js
@@ -142,7 +142,6 @@ describe('AppService', () => {
turnstileConfig: mockedTurnstileConfig,
modelSpecs: undefined,
paths: expect.anything(),
- ocr: expect.anything(),
imageOutputType: expect.any(String),
fileConfig: undefined,
secureImageLinks: undefined,
diff --git a/api/server/services/Files/process.js b/api/server/services/Files/process.js
index 367e7bf348..c8221a6de5 100644
--- a/api/server/services/Files/process.js
+++ b/api/server/services/Files/process.js
@@ -594,10 +594,9 @@ const processAgentFileUpload = async ({ req, res, metadata }) => {
const fileConfig = mergeFileConfig(appConfig.fileConfig);
- const shouldUseOCR = fileConfig.checkType(
- file.mimetype,
- fileConfig.ocr?.supportedMimeTypes || [],
- );
+ const shouldUseOCR =
+ appConfig?.ocr != null &&
+ fileConfig.checkType(file.mimetype, fileConfig.ocr?.supportedMimeTypes || []);
if (shouldUseOCR && !(await checkCapability(req, AgentCapabilities.ocr))) {
throw new Error('OCR capability is not enabled for Agents');
@@ -626,7 +625,7 @@ const processAgentFileUpload = async ({ req, res, metadata }) => {
);
if (!shouldUseText) {
- throw new Error(`File type ${file.mimetype} is not supported for OCR or text parsing`);
+ throw new Error(`File type ${file.mimetype} is not supported for text parsing.`);
}
const { text, bytes } = await parseText({ req, file, file_id });
diff --git a/packages/api/src/files/index.ts b/packages/api/src/files/index.ts
index fa156f15f1..49e5bb4151 100644
--- a/packages/api/src/files/index.ts
+++ b/packages/api/src/files/index.ts
@@ -1,4 +1,5 @@
-export * from './mistral/crud';
export * from './audio';
-export * from './text';
+export * from './mistral/crud';
+export * from './ocr';
export * from './parse';
+export * from './text';
diff --git a/packages/api/src/files/mistral/crud.ts b/packages/api/src/files/mistral/crud.ts
index e0ef69ab31..fefe4a4675 100644
--- a/packages/api/src/files/mistral/crud.ts
+++ b/packages/api/src/files/mistral/crud.ts
@@ -303,7 +303,7 @@ async function loadAuthConfig(context: OCRContext): Promise<AuthConfig> {
/**
* Gets the model configuration
*/
-function getModelConfig(ocrConfig: TCustomConfig['ocr']): string {
+function getModelConfig(ocrConfig?: TCustomConfig['ocr']): string {
const modelConfig = ocrConfig?.mistralModel || '';
if (!modelConfig.trim()) {
diff --git a/packages/data-provider/src/ocr.ts b/packages/api/src/files/ocr.ts
similarity index 51%
rename from packages/data-provider/src/ocr.ts
rename to packages/api/src/files/ocr.ts
index cfde43025b..02060a858f 100644
--- a/packages/data-provider/src/ocr.ts
+++ b/packages/api/src/files/ocr.ts
@@ -1,7 +1,8 @@
-import type { TCustomConfig } from '../src/config';
-import { OCRStrategy } from '../src/config';
+import { OCRStrategy } from 'librechat-data-provider';
+import type { TCustomConfig } from 'librechat-data-provider';
-export function loadOCRConfig(config: TCustomConfig['ocr']): TCustomConfig['ocr'] {
+export function loadOCRConfig(config?: TCustomConfig['ocr']): TCustomConfig['ocr'] | undefined {
+ if (!config) return;
const baseURL = config?.baseURL ?? '';
const apiKey = config?.apiKey ?? '';
const mistralModel = config?.mistralModel ?? '';
diff --git a/packages/data-provider/src/file-config.ts b/packages/data-provider/src/file-config.ts
index f6ede89ae2..d43308373f 100644
--- a/packages/data-provider/src/file-config.ts
+++ b/packages/data-provider/src/file-config.ts
@@ -133,7 +133,7 @@ export const defaultOCRMimeTypes = [
/^application\/epub\+zip$/,
];
-export const defaultTextMimeTypes = [textMimeTypes];
+export const defaultTextMimeTypes = [/^[\w.-]+\/[\w.-]+$/];
export const defaultSTTMimeTypes = [audioMimeTypes];
diff --git a/packages/data-provider/src/index.ts b/packages/data-provider/src/index.ts
index 3f51d34c4e..f96f6b0249 100644
--- a/packages/data-provider/src/index.ts
+++ b/packages/data-provider/src/index.ts
@@ -9,7 +9,6 @@ export * from './messages';
export * from './artifacts';
/* schema helpers */
export * from './parsers';
-export * from './ocr';
/* custom/dynamic configurations */
export * from './generate';
export * from './models';