mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-22 03:10:15 +01:00
997f1f6a21
* refactor: move endpoint initialization methods to typescript * refactor: move agent init to packages/api - Introduced `initialize.ts` for agent initialization, including file processing and tool loading. - Updated `resources.ts` to allow optional appConfig parameter. - Enhanced endpoint configuration handling in various initialization files to support model parameters. - Added new artifacts and prompts for React component generation. - Refactored existing code to improve type safety and maintainability. * refactor: streamline endpoint initialization and enhance type safety - Updated initialization functions across various endpoints to use a consistent request structure, replacing `unknown` types with `ServerResponse`. - Simplified request handling by directly extracting keys from the request body. - Improved type safety by ensuring user IDs are safely accessed with optional chaining. - Removed unnecessary parameters and streamlined model options handling for better clarity and maintainability. * refactor: moved ModelService and extractBaseURL to packages/api - Added comprehensive tests for the models fetching functionality, covering scenarios for OpenAI, Anthropic, Google, and Ollama models. - Updated existing endpoint index to include the new models module. - Enhanced utility functions for URL extraction and model data processing. - Improved type safety and error handling across the models fetching logic. * refactor: consolidate utility functions and remove unused files - Merged `deriveBaseURL` and `extractBaseURL` into the `@librechat/api` module for better organization. - Removed redundant utility files and their associated tests to streamline the codebase. - Updated imports across various client files to utilize the new consolidated functions. - Enhanced overall maintainability by reducing the number of utility modules. * refactor: replace ModelService references with direct imports from @librechat/api and remove ModelService file * refactor: move encrypt/decrypt methods and key db methods to data-schemas, use `getProviderConfig` from `@librechat/api` * chore: remove unused 'res' from options in AgentClient * refactor: file model imports and methods - Updated imports in various controllers and services to use the unified file model from '~/models' instead of '~/models/File'. - Consolidated file-related methods into a new file methods module in the data-schemas package. - Added comprehensive tests for file methods including creation, retrieval, updating, and deletion. - Enhanced the initializeAgent function to accept dependency injection for file-related methods. - Improved error handling and logging in file methods. * refactor: streamline database method references in agent initialization * refactor: enhance file method tests and update type references to IMongoFile * refactor: consolidate database method imports in agent client and initialization * chore: remove redundant import of initializeAgent from @librechat/api * refactor: move checkUserKeyExpiry utility to @librechat/api and update references across endpoints * refactor: move updateUserPlugins logic to user.ts and simplify UserController * refactor: update imports for user key management and remove UserService * refactor: remove unused Anthropics and Bedrock endpoint files and clean up imports * refactor: consolidate and update encryption imports across various files to use @librechat/data-schemas * chore: update file model mock to use unified import from '~/models' * chore: import order * refactor: remove migrated to TS agent.js file and its associated logic from the endpoints * chore: add reusable function to extract imports from source code in unused-packages workflow * chore: enhance unused-packages workflow to include @librechat/api dependencies and improve dependency extraction * chore: improve dependency extraction in unused-packages workflow with enhanced error handling and debugging output * chore: add detailed debugging output to unused-packages workflow for better visibility into unused dependencies and exclusion lists * chore: refine subpath handling in unused-packages workflow to correctly process scoped and non-scoped package imports * chore: clean up unused debug output in unused-packages workflow and reorganize type imports in initialize.ts
102 lines
3 KiB
TypeScript
102 lines
3 KiB
TypeScript
import { logger } from '@librechat/data-schemas';
|
|
import { CohereConstants } from 'librechat-data-provider';
|
|
|
|
/**
|
|
* Extracts a valid OpenAI baseURL from a given string, matching "url/v1," followed by an optional suffix.
|
|
* The suffix can be one of several predefined values (e.g., 'openai', 'azure-openai', etc.),
|
|
* accommodating different proxy patterns like Cloudflare, LiteLLM, etc.
|
|
* Returns the original URL if no valid pattern is found.
|
|
*
|
|
* Examples:
|
|
* - `https://open.ai/v1/chat` -> `https://open.ai/v1`
|
|
* - `https://open.ai/v1/chat/completions` -> `https://open.ai/v1`
|
|
* - `https://gateway.ai.cloudflare.com/v1/account/gateway/azure-openai/completions` -> `https://gateway.ai.cloudflare.com/v1/account/gateway/azure-openai`
|
|
* - `https://open.ai/v1/hi/openai` -> `https://open.ai/v1/hi/openai`
|
|
* - `https://api.example.com/v1/replicate` -> `https://api.example.com/v1/replicate`
|
|
*
|
|
* @param url - The URL to be processed.
|
|
* @returns The matched pattern or input if no match is found.
|
|
*/
|
|
export function extractBaseURL(url: string): string | null | undefined {
|
|
if (!url || typeof url !== 'string') {
|
|
return undefined;
|
|
}
|
|
|
|
if (url.startsWith(CohereConstants.API_URL)) {
|
|
return null;
|
|
}
|
|
|
|
if (!url.includes('/v1')) {
|
|
return url;
|
|
}
|
|
|
|
const v1Index = url.indexOf('/v1');
|
|
let baseUrl = url.substring(0, v1Index + 3);
|
|
|
|
const openai = 'openai';
|
|
const suffixes = [
|
|
'azure-openai',
|
|
openai,
|
|
'aws-bedrock',
|
|
'anthropic',
|
|
'cohere',
|
|
'deepseek',
|
|
'google-ai-studio',
|
|
'google-vertex-ai',
|
|
'grok',
|
|
'groq',
|
|
'mistral',
|
|
'openrouter',
|
|
'perplexity-ai',
|
|
'replicate',
|
|
'huggingface',
|
|
'workers-ai',
|
|
'aws-bedrock',
|
|
];
|
|
const suffixUsed = suffixes.find((suffix) => url.includes(`/${suffix}`));
|
|
|
|
if (suffixUsed === 'azure-openai') {
|
|
return url.split(/\/(chat|completion)/)[0];
|
|
}
|
|
|
|
const openaiIndex = url.indexOf(`/${openai}`, v1Index + 3);
|
|
const suffixIndex =
|
|
suffixUsed === openai ? openaiIndex : url.indexOf(`/${suffixUsed}`, v1Index + 3);
|
|
|
|
if (openaiIndex === v1Index + 3) {
|
|
const nextSlashIndex = url.indexOf('/', openaiIndex + 7);
|
|
if (nextSlashIndex === -1) {
|
|
baseUrl = url.substring(0, openaiIndex + 7);
|
|
} else {
|
|
baseUrl = url.substring(0, nextSlashIndex);
|
|
}
|
|
} else if (suffixIndex > 0) {
|
|
baseUrl = url.substring(0, suffixIndex + (suffixUsed?.length ?? 0) + 1);
|
|
}
|
|
|
|
return baseUrl;
|
|
}
|
|
|
|
/**
|
|
* Extracts the base URL (protocol + hostname + port) from the provided URL.
|
|
* Used primarily for Ollama endpoints to derive the host.
|
|
* @param fullURL - The full URL.
|
|
* @returns The base URL (protocol://hostname:port).
|
|
*/
|
|
export function deriveBaseURL(fullURL: string): string {
|
|
try {
|
|
const parsedUrl = new URL(fullURL);
|
|
const protocol = parsedUrl.protocol;
|
|
const hostname = parsedUrl.hostname;
|
|
const port = parsedUrl.port;
|
|
|
|
if (!protocol || !hostname) {
|
|
return fullURL;
|
|
}
|
|
|
|
return `${protocol}//${hostname}${port ? `:${port}` : ''}`;
|
|
} catch (error) {
|
|
logger.error('Failed to derive base URL', error);
|
|
return fullURL;
|
|
}
|
|
}
|