mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-05-21 04:25:05 +00:00
Some checks are pending
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Waiting to run
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Waiting to run
GitNexus Index / index (push) Waiting to run
GitNexus Index / post-index (push) Blocked by required conditions
* feat: support data retention for normal chats Add retentionMode config variable supporting "all" and "temporary" values. When "all" is set, data retention applies to all chats, not just temporary ones. Adds isTemporary field to conversations for proper filtering. Adapted to new TS method files in packages/data-schemas since upstream moved models out of api/models/. Based on danny-avila/LibreChat#10532 Co-Authored-By: WhammyLeaf <233105313+WhammyLeaf@users.noreply.github.com> (cherry picked from commit30109e90b0) * feat: extend data retention to files, tool calls, and shared links Add expiredAt field and TTL indexes to file, toolCall, and share schemas. Set expiredAt on tool calls, shared links, and file uploads when retentionMode is "all" or chat is temporary. (cherry picked from commit48973752d3) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix: lint/test (cherry picked from commit310c514e6a) * fix: address code review feedback for data retention PR Critical: - Fix BookmarkMenu crash: restore optional chaining on conversation - Fix migration hazard: backward-compatible sidebar filter that also checks expiredAt for documents without isTemporary field Major: - Add logging to getRetentionExpiry error path, align with tools.js - Add tests for retentionMode: ALL in saveConvo and saveMessage - Fix share route: apply expiredAt for temporary chats too by querying the conversation's isTemporary flag server-side - Add assertions for getRetentionExpiry mocks in process tests Minor: - Fix ChatRoute isTemporaryChat to be strictly boolean via Boolean() - Fix stale test description (expired -> temporary) - Comment out retentionMode default in example yaml - Simplify verbose if/else to isTemporary === true - Add compound index on { user: 1, isTemporary: 1 } - Remove narrating comment from process.spec.js Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> (cherry picked from commit6bad535f90) * chore: fix typescript (cherry picked from commit826527a46b) * fix: lint (cherry picked from commit77817e80ea) * fix: use mockSanitizeArtifactPath in retention test The 'getRetentionExpiry is called with the request object' test referenced an undefined `mockSanitizeFilename` identifier, breaking both lint (no-undef) and the test suite. Use the existing `mockSanitizeArtifactPath` mock that the surrounding tests already use, since `processCodeOutput` calls `sanitizeArtifactPath` (not `sanitizeFilename`) before invoking `getRetentionExpiry`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commit52ea2da66d) * fix: forward isTemporary from client for retention on file uploads and tool calls Server-side `getRetentionExpiry` (file uploads) and the tool-call controller both read `req.body.isTemporary`, but the file upload multipart form and the tool-call payload did not include that field. In `retentionMode: temporary` (default), files uploaded and tool calls created from temporary chats were therefore retained indefinitely. Forward the Recoil `isTemporary` flag in both client paths so the existing server checks can fire correctly. `ToolParams` gains an optional `isTemporary` field. Addresses Codex P1 review feedback on PR #29. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commit7e937df05a) * test: stub store.isTemporary in useFileHandling test mocks Previous commit added `useRecoilValue(store.isTemporary)` to the hook. The test file mocks `~/store` with only `ephemeralAgentByConvoId` and does not stub `useRecoilValue`, so all 7 cases threw "Invalid argument to useRecoilValue: expected an atom or selector but got undefined". Add a stub default export with `isTemporary` and a `useRecoilValue` mock returning `false`. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> (cherry picked from commiteb1609537d) * fix: harden data retention semantics * fix: provide sweep request context for expired files * fix: preserve temporary flags in all-retention updates * fix: honor assistant versions in retention sweeps * fix: retain non-temporary flags in all mode * fix: hide expired retained records * fix: propagate retained conversation expiry * fix: refresh meili retention cutoff * fix: prevent overlapping file sweeps * fix: show legacy retained conversations * fix: index legacy retained records * fix: harden retention cleanup edge cases * fix: count failed file storage sweeps * fix: preserve legacy temporary retention * fix: assign retention sweep worker deterministically * fix: hide expired shared links on reads * fix: prevent retention refresh after parent expiry * fix: break code output retention import cycle * fix: harden retention review findings * fix: ignore expired share duplicates * fix: reject expired retained share creation * fix: harden retention review edge cases * fix: address retention audit findings * fix: enforce expired conversation shares in all retention * fix: scope temporary upload flag to chat files * fix: address retention review findings * fix: address codex retention review findings * fix: tighten missing storage detection * test: remove unused file process spec bindings --------- Co-authored-by: WhammyLeaf <233105313+WhammyLeaf@users.noreply.github.com> Co-authored-by: Aron Gates <aron@muonspace.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
255 lines
10 KiB
JavaScript
255 lines
10 KiB
JavaScript
const path = require('path');
|
|
const OpenAI = require('openai');
|
|
const { v4: uuidv4 } = require('uuid');
|
|
const { ProxyAgent, fetch } = require('undici');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { Tool } = require('@librechat/agents/langchain/tools');
|
|
const {
|
|
getImageBasename,
|
|
extractBaseURL,
|
|
createMinimalRetentionRequest,
|
|
} = require('@librechat/api');
|
|
const { FileContext, ContentTypes } = require('librechat-data-provider');
|
|
|
|
const dalle3JsonSchema = {
|
|
type: 'object',
|
|
properties: {
|
|
prompt: {
|
|
type: 'string',
|
|
maxLength: 4000,
|
|
description:
|
|
'A text description of the desired image, following the rules, up to 4000 characters.',
|
|
},
|
|
style: {
|
|
type: 'string',
|
|
enum: ['vivid', 'natural'],
|
|
description:
|
|
'Must be one of `vivid` or `natural`. `vivid` generates hyper-real and dramatic images, `natural` produces more natural, less hyper-real looking images',
|
|
},
|
|
quality: {
|
|
type: 'string',
|
|
enum: ['hd', 'standard'],
|
|
description: 'The quality of the generated image. Only `hd` and `standard` are supported.',
|
|
},
|
|
size: {
|
|
type: 'string',
|
|
enum: ['1024x1024', '1792x1024', '1024x1792'],
|
|
description:
|
|
'The size of the requested image. Use 1024x1024 (square) as the default, 1792x1024 if the user requests a wide image, and 1024x1792 for full-body portraits. Always include this parameter in the request.',
|
|
},
|
|
},
|
|
required: ['prompt', 'style', 'quality', 'size'],
|
|
};
|
|
|
|
const displayMessage =
|
|
"DALL-E displayed an image. All generated images are already plainly visible, so don't repeat the descriptions in detail. Do not list download links as they are available in the UI already. The user may download the images by clicking on them, but do not mention anything about downloading to the user.";
|
|
class DALLE3 extends Tool {
|
|
constructor(fields = {}) {
|
|
super();
|
|
/** @type {boolean} Used to initialize the Tool without necessary variables. */
|
|
this.override = fields.override ?? false;
|
|
/** @type {boolean} Necessary for output to contain all image metadata. */
|
|
this.returnMetadata = fields.returnMetadata ?? false;
|
|
|
|
this.userId = fields.userId;
|
|
this.tenantId = fields.req?.user?.tenantId;
|
|
this.retentionRequest = createMinimalRetentionRequest(fields.req);
|
|
this.fileStrategy = fields.fileStrategy;
|
|
/** @type {boolean} */
|
|
this.isAgent = fields.isAgent;
|
|
if (this.isAgent) {
|
|
/** Ensures LangChain maps [content, artifact] tuple to ToolMessage fields instead of serializing it into content. */
|
|
this.responseFormat = 'content_and_artifact';
|
|
}
|
|
if (fields.processFileURL) {
|
|
/** @type {processFileURL} Necessary for output to contain all image metadata. */
|
|
this.processFileURL = fields.processFileURL.bind(this);
|
|
}
|
|
|
|
let apiKey = fields.DALLE3_API_KEY ?? fields.DALLE_API_KEY ?? this.getApiKey();
|
|
const config = { apiKey };
|
|
if (process.env.DALLE_REVERSE_PROXY) {
|
|
config.baseURL = extractBaseURL(process.env.DALLE_REVERSE_PROXY);
|
|
}
|
|
|
|
if (process.env.DALLE3_AZURE_API_VERSION && process.env.DALLE3_BASEURL) {
|
|
config.baseURL = process.env.DALLE3_BASEURL;
|
|
config.defaultQuery = { 'api-version': process.env.DALLE3_AZURE_API_VERSION };
|
|
config.defaultHeaders = {
|
|
'api-key': process.env.DALLE3_API_KEY,
|
|
'Content-Type': 'application/json',
|
|
};
|
|
config.apiKey = process.env.DALLE3_API_KEY;
|
|
}
|
|
|
|
if (process.env.PROXY) {
|
|
const proxyAgent = new ProxyAgent(process.env.PROXY);
|
|
config.fetchOptions = {
|
|
dispatcher: proxyAgent,
|
|
};
|
|
}
|
|
|
|
/** @type {OpenAI} */
|
|
this.openai = new OpenAI(config);
|
|
this.name = 'dalle';
|
|
this.description = `Use DALLE to create images from text descriptions.
|
|
- It requires prompts to be in English, detailed, and to specify image type and human features for diversity.
|
|
- Create only one image, without repeating or listing descriptions outside the "prompts" field.
|
|
- Maintains the original intent of the description, with parameters for image style, quality, and size to tailor the output.`;
|
|
this.description_for_model =
|
|
process.env.DALLE3_SYSTEM_PROMPT ??
|
|
`// Whenever a description of an image is given, generate prompts (following these rules), and use dalle to create the image. If the user does not ask for a specific number of images, default to creating 2 prompts to send to dalle that are written to be as diverse as possible. All prompts sent to dalle must abide by the following policies:
|
|
// 1. Prompts must be in English. Translate to English if needed.
|
|
// 2. One image per function call. Create only 1 image per request unless explicitly told to generate more than 1 image.
|
|
// 3. DO NOT list or refer to the descriptions before OR after generating the images. They should ONLY ever be written out ONCE, in the \`"prompts"\` field of the request. You do not need to ask for permission to generate, just do it!
|
|
// 4. Always mention the image type (photo, oil painting, watercolor painting, illustration, cartoon, drawing, vector, render, etc.) at the beginning of the caption. Unless the captions suggests otherwise, make one of the images a photo.
|
|
// 5. Diversify depictions of ALL images with people to always include always DESCENT and GENDER for EACH person using direct terms. Adjust only human descriptions.
|
|
// - EXPLICITLY specify these attributes, not abstractly reference them. The attributes should be specified in a minimal way and should directly describe their physical form.
|
|
// - Your choices should be grounded in reality. For example, all of a given OCCUPATION should not be the same gender or race. Additionally, focus on creating diverse, inclusive, and exploratory scenes via the properties you choose during rewrites. Make choices that may be insightful or unique sometimes.
|
|
// - Use "various" or "diverse" ONLY IF the description refers to groups of more than 3 people. Do not change the number of people requested in the original description.
|
|
// - Don't alter memes, fictional character origins, or unseen people. Maintain the original prompt's intent and prioritize quality.
|
|
// The prompt must intricately describe every part of the image in concrete, objective detail. THINK about what the end goal of the description is, and extrapolate that to what would make satisfying images.
|
|
// All descriptions sent to dalle should be a paragraph of text that is extremely descriptive and detailed. Each should be more than 3 sentences long.
|
|
// - The "vivid" style is HIGHLY preferred, but "natural" is also supported.`;
|
|
this.schema = dalle3JsonSchema;
|
|
}
|
|
|
|
static get jsonSchema() {
|
|
return dalle3JsonSchema;
|
|
}
|
|
|
|
getApiKey() {
|
|
const apiKey = process.env.DALLE3_API_KEY ?? process.env.DALLE_API_KEY ?? '';
|
|
if (!apiKey && !this.override) {
|
|
throw new Error('Missing DALLE_API_KEY environment variable.');
|
|
}
|
|
return apiKey;
|
|
}
|
|
|
|
replaceUnwantedChars(inputString) {
|
|
return inputString
|
|
.replace(/\r\n|\r|\n/g, ' ')
|
|
.replace(/"/g, '')
|
|
.trim();
|
|
}
|
|
|
|
wrapInMarkdown(imageUrl) {
|
|
return ``;
|
|
}
|
|
|
|
returnValue(value) {
|
|
if (this.isAgent === true && typeof value === 'string') {
|
|
return [value, {}];
|
|
} else if (this.isAgent === true && typeof value === 'object') {
|
|
return [displayMessage, value];
|
|
}
|
|
|
|
return value;
|
|
}
|
|
|
|
async _call(data) {
|
|
const { prompt, quality = 'standard', size = '1024x1024', style = 'vivid' } = data;
|
|
if (!prompt) {
|
|
throw new Error('Missing required field: prompt');
|
|
}
|
|
|
|
let resp;
|
|
try {
|
|
resp = await this.openai.images.generate({
|
|
model: 'dall-e-3',
|
|
quality,
|
|
style,
|
|
size,
|
|
prompt: this.replaceUnwantedChars(prompt),
|
|
n: 1,
|
|
});
|
|
} catch (error) {
|
|
logger.error('[DALL-E-3] Problem generating the image:', error);
|
|
return this
|
|
.returnValue(`Something went wrong when trying to generate the image. The DALL-E API may be unavailable:
|
|
Error Message: ${error.message}`);
|
|
}
|
|
|
|
if (!resp) {
|
|
return this.returnValue(
|
|
'Something went wrong when trying to generate the image. The DALL-E API may be unavailable',
|
|
);
|
|
}
|
|
|
|
const theImageUrl = resp.data[0].url;
|
|
|
|
if (!theImageUrl) {
|
|
return this.returnValue(
|
|
'No image URL returned from OpenAI API. There may be a problem with the API or your configuration.',
|
|
);
|
|
}
|
|
|
|
if (this.isAgent) {
|
|
let fetchOptions = {};
|
|
if (process.env.PROXY) {
|
|
const proxyAgent = new ProxyAgent(process.env.PROXY);
|
|
fetchOptions.dispatcher = proxyAgent;
|
|
}
|
|
const imageResponse = await fetch(theImageUrl, fetchOptions);
|
|
const arrayBuffer = await imageResponse.arrayBuffer();
|
|
const base64 = Buffer.from(arrayBuffer).toString('base64');
|
|
const content = [
|
|
{
|
|
type: ContentTypes.IMAGE_URL,
|
|
image_url: {
|
|
url: `data:image/png;base64,${base64}`,
|
|
},
|
|
},
|
|
];
|
|
|
|
const response = [
|
|
{
|
|
type: ContentTypes.TEXT,
|
|
text: displayMessage,
|
|
},
|
|
];
|
|
return [response, { content }];
|
|
}
|
|
|
|
const imageBasename = getImageBasename(theImageUrl);
|
|
const imageExt = path.extname(imageBasename);
|
|
|
|
const extension = imageExt.startsWith('.') ? imageExt.slice(1) : imageExt;
|
|
const imageName = `img-${uuidv4()}.${extension}`;
|
|
|
|
logger.debug('[DALL-E-3]', {
|
|
imageName,
|
|
imageBasename,
|
|
imageExt,
|
|
extension,
|
|
theImageUrl,
|
|
data: resp.data[0],
|
|
});
|
|
|
|
try {
|
|
const result = await this.processFileURL({
|
|
URL: theImageUrl,
|
|
basePath: 'images',
|
|
userId: this.userId,
|
|
fileName: imageName,
|
|
fileStrategy: this.fileStrategy,
|
|
context: FileContext.image_generation,
|
|
tenantId: this.tenantId,
|
|
req: this.retentionRequest,
|
|
});
|
|
|
|
if (this.returnMetadata) {
|
|
this.result = result;
|
|
} else {
|
|
this.result = this.wrapInMarkdown(result.filepath);
|
|
}
|
|
} catch (error) {
|
|
logger.error('Error while saving the image:', error);
|
|
this.result = `Failed to save the image locally. ${error.message}`;
|
|
}
|
|
|
|
return this.returnValue(this.result);
|
|
}
|
|
}
|
|
|
|
module.exports = DALLE3;
|