mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-06-22 05:19:20 +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>
209 lines
7.4 KiB
JavaScript
209 lines
7.4 KiB
JavaScript
const { v4: uuidv4 } = require('uuid');
|
|
const {
|
|
logger,
|
|
createFallbackRetentionDate,
|
|
createTempChatExpirationDate,
|
|
} = require('@librechat/data-schemas');
|
|
const {
|
|
EModelEndpoint,
|
|
Constants,
|
|
RetentionMode,
|
|
openAISettings,
|
|
} = require('librechat-data-provider');
|
|
const { bulkIncrementTagCounts, bulkSaveConvos, bulkSaveMessages } = require('~/models');
|
|
const { FALLBACK_MODEL_BY_ENDPOINT } = require('./defaults');
|
|
|
|
/**
|
|
* Factory function for creating an instance of ImportBatchBuilder.
|
|
* @param {string} requestUserId - The ID of the user making the request.
|
|
* @param {object} [interfaceConfig] - Runtime interface config for import retention.
|
|
* @returns {ImportBatchBuilder} - The newly created ImportBatchBuilder instance.
|
|
*/
|
|
function createImportBatchBuilder(requestUserId, interfaceConfig) {
|
|
return new ImportBatchBuilder(requestUserId, interfaceConfig);
|
|
}
|
|
|
|
/**
|
|
* Class for building a batch of conversations and messages and pushing them to DB for Conversation Import functionality
|
|
*/
|
|
class ImportBatchBuilder {
|
|
/**
|
|
* Creates an instance of ImportBatchBuilder.
|
|
* @param {string} requestUserId - The ID of the user making the import request.
|
|
* @param {object} [interfaceConfig] - Runtime interface config for import retention.
|
|
*/
|
|
constructor(requestUserId, interfaceConfig) {
|
|
this.requestUserId = requestUserId;
|
|
this.interfaceConfig = interfaceConfig;
|
|
this.conversations = [];
|
|
this.messages = [];
|
|
this.retentionFields = undefined;
|
|
}
|
|
|
|
getRetentionFields() {
|
|
if (this.retentionFields !== undefined) {
|
|
return this.retentionFields;
|
|
}
|
|
|
|
if (this.interfaceConfig?.retentionMode !== RetentionMode.ALL) {
|
|
this.retentionFields = {};
|
|
return this.retentionFields;
|
|
}
|
|
|
|
try {
|
|
this.retentionFields = {
|
|
isTemporary: false,
|
|
expiredAt: createTempChatExpirationDate(this.interfaceConfig),
|
|
};
|
|
} catch (error) {
|
|
logger.error('[ImportBatchBuilder] Error creating import expiration date:', error);
|
|
this.retentionFields = { isTemporary: false, expiredAt: createFallbackRetentionDate() };
|
|
}
|
|
return this.retentionFields;
|
|
}
|
|
|
|
/**
|
|
* Starts a new conversation in the batch.
|
|
* @param {string} [endpoint=EModelEndpoint.openAI] - The endpoint for the conversation. Defaults to EModelEndpoint.openAI.
|
|
* @returns {void}
|
|
*/
|
|
startConversation(endpoint) {
|
|
// we are simplifying by using a single model for the entire conversation
|
|
this.endpoint = endpoint || EModelEndpoint.openAI;
|
|
this.conversationId = uuidv4();
|
|
this.lastMessageId = Constants.NO_PARENT;
|
|
}
|
|
|
|
/**
|
|
* Adds a user message to the current conversation.
|
|
* @param {string} text - The text of the user message.
|
|
* @returns {object} The saved message object.
|
|
*/
|
|
addUserMessage(text) {
|
|
const message = this.saveMessage({ text, sender: 'user', isCreatedByUser: true });
|
|
return message;
|
|
}
|
|
|
|
/**
|
|
* Adds a GPT message to the current conversation.
|
|
* @param {string} text - The text of the GPT message.
|
|
* @param {string} [model='defaultModel'] - The model used for generating the GPT message. Defaults to 'defaultModel'.
|
|
* @param {string} [sender='GPT-3.5'] - The sender of the GPT message. Defaults to 'GPT-3.5'.
|
|
* @returns {object} The saved message object.
|
|
*/
|
|
addGptMessage(text, model, sender = 'GPT-3.5') {
|
|
const message = this.saveMessage({
|
|
text,
|
|
sender,
|
|
isCreatedByUser: false,
|
|
model: model || openAISettings.model.default,
|
|
});
|
|
return message;
|
|
}
|
|
|
|
/**
|
|
* Finishes the current conversation and adds it to the batch.
|
|
* @param {string} [title='Imported Chat'] - The title of the conversation. Defaults to 'Imported Chat'.
|
|
* @param {Date} [createdAt] - The creation date of the conversation.
|
|
* @param {TConversation} [originalConvo] - The original conversation.
|
|
* @param {string} [defaultModel] - Resolved default model for this endpoint
|
|
* (typically derived from the runtime models config). Used only when
|
|
* originalConvo.model is unset.
|
|
* @returns {{ conversation: TConversation, messages: TMessage[] }} The resulting conversation and messages.
|
|
*/
|
|
finishConversation(title, createdAt, originalConvo = {}, defaultModel) {
|
|
const fallbackModel =
|
|
defaultModel ?? FALLBACK_MODEL_BY_ENDPOINT[this.endpoint] ?? openAISettings.model.default;
|
|
const convo = {
|
|
...originalConvo,
|
|
user: this.requestUserId,
|
|
conversationId: this.conversationId,
|
|
title: title || 'Imported Chat',
|
|
createdAt: createdAt,
|
|
updatedAt: createdAt,
|
|
overrideTimestamp: true,
|
|
endpoint: this.endpoint,
|
|
model: originalConvo.model ?? fallbackModel,
|
|
...this.getRetentionFields(),
|
|
};
|
|
convo._id && delete convo._id;
|
|
this.conversations.push(convo);
|
|
|
|
return { conversation: convo, messages: this.messages };
|
|
}
|
|
|
|
/**
|
|
* Saves the batch of conversations and messages to the DB.
|
|
* Also increments tag counts for any existing tags.
|
|
* @returns {Promise<void>} A promise that resolves when the batch is saved.
|
|
* @throws {Error} If there is an error saving the batch.
|
|
*/
|
|
async saveBatch() {
|
|
try {
|
|
const promises = [];
|
|
promises.push(bulkSaveConvos(this.conversations));
|
|
promises.push(bulkSaveMessages(this.messages, true));
|
|
promises.push(
|
|
bulkIncrementTagCounts(
|
|
this.requestUserId,
|
|
this.conversations.flatMap((convo) => convo.tags),
|
|
),
|
|
);
|
|
await Promise.all(promises);
|
|
logger.debug(
|
|
`user: ${this.requestUserId} | Added ${this.conversations.length} conversations and ${this.messages.length} messages to the DB.`,
|
|
);
|
|
} catch (error) {
|
|
logger.error('Error saving batch', error);
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Saves a message to the current conversation.
|
|
* @param {object} messageDetails - The details of the message.
|
|
* @param {string} messageDetails.text - The text of the message.
|
|
* @param {string} messageDetails.sender - The sender of the message.
|
|
* @param {string} [messageDetails.messageId] - The ID of the current message.
|
|
* @param {boolean} messageDetails.isCreatedByUser - Indicates whether the message is created by the user.
|
|
* @param {string} [messageDetails.model] - The model used for generating the message.
|
|
* @param {string} [messageDetails.endpoint] - The endpoint used for generating the message.
|
|
* @param {string} [messageDetails.parentMessageId=this.lastMessageId] - The ID of the parent message.
|
|
* @param {Partial<TMessage>} messageDetails.rest - Additional properties that may be included in the message.
|
|
* @returns {object} The saved message object.
|
|
*/
|
|
saveMessage({
|
|
text,
|
|
sender,
|
|
isCreatedByUser,
|
|
model,
|
|
messageId,
|
|
parentMessageId = this.lastMessageId,
|
|
endpoint,
|
|
...rest
|
|
}) {
|
|
const newMessageId = messageId ?? uuidv4();
|
|
const message = {
|
|
...rest,
|
|
parentMessageId,
|
|
messageId: newMessageId,
|
|
conversationId: this.conversationId,
|
|
isCreatedByUser: isCreatedByUser,
|
|
model: model || this.model,
|
|
user: this.requestUserId,
|
|
endpoint: endpoint ?? this.endpoint,
|
|
unfinished: false,
|
|
isEdited: false,
|
|
error: false,
|
|
sender,
|
|
text,
|
|
...this.getRetentionFields(),
|
|
};
|
|
message._id && delete message._id;
|
|
this.lastMessageId = newMessageId;
|
|
this.messages.push(message);
|
|
return message;
|
|
}
|
|
}
|
|
|
|
module.exports = { ImportBatchBuilder, createImportBatchBuilder };
|