mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-21 21:50:49 +02:00

* wip: OpenAI Image Generation Tool with customizable options * WIP: First pass OpenAI Image Generation Tool and integrate into existing tools * 🔀 fix: Comment out unused validation for image generation tool parameters * 🔀 refactor: Update primeResources function parameters for better destructuring * feat: Add image_edit resource to EToolResources and update AgentToolResources interface * feat: Enhance file retrieval with tool resource filtering for image editing * refactor: add OpenAI Image Tools for generation and editing, refactor related components, pass current request image attachments as tool resources for editing * refactor: Remove commented-out code and clean up API key retrieval in createOpenAIImageTools function * fix: show message attachments in shared links * fix: Correct parent message retrieval logic for regenerated messages in useChatFunctions * fix: Update primeResources to utilize requestFileSet for image file processing * refactor: Improve description for image generation tool and clarify usage conditions, only provide edit tool if there are images available to edit * chore: Update OpenAI Image Tools icon to use local asset * refactor: Update image generation tool description and logic to prioritize editing tool when files are uploaded * refactor: Enhance image tool descriptions to clarify usage conditions and note potential unavailability of uploaded images * refactor: Update useAttachmentHandler to accept queryClient to update query cache with newly created file * refactor: Add customizable descriptions and prompts for OpenAI image generation and editing tools * chore: Update comments to use JSDoc style for better clarity and consistency * refactor: Rename config variable to clientConfig for clarity and update signal handling in image generation * refactor: Update axios request configuration to include derived signal and baseURL for improved request handling * refactor: Update baseURL environment variable for OpenAI image generation tool configuration * refactor: Enhance axios request configuration with conditional headers and improved clientConfig setup * chore: Update comments for clarity and remove unnecessary lines in OpenAI image tools * refactor: Update description for image generation without files to clarify user instructions * refactor: Simplify target parent message logic for regeneration and resubmission cases * chore: Remove backticks from error messages in image generation and editing functions * refactor: Rename toolResources to toolResourceSet for clarity in file retrieval functions * chore: Remove redundant comments and clean up TODOs in OpenAI image tools * refactor: Rename fileStrategy to appFileStrategy for clarity and improve error handling in image processing * chore: Update react-resizable-panels to version 2.1.8 in package.json and package-lock.json * chore: Ensure required validation for logs and Code of Conduct agreement in bug report template * fix: Update ArtifactPreview to use startupConfig and currentCode from memoized props to prevent unnecessary re-renders * fix: improve robustness of `save & submit` when used from a user-message with existing attachments * fix: add null check for artifact index in CodeEditor to prevent errors, trigger re-render on artifact ID change * fix: standardize default values for artifact properties in Artifact component, avoiding prematurely setting an "empty/default" artifact * fix: reset current artifact ID before setting a new one in ArtifactButton to ensure correct state management * chore: rename `setArtifactId` variable to `setCurrentArtifactId` for consistency * chore: update type annotations in File and S3 CRUD functions for consistency * refactor: improve image handling in OpenAI tools by using image_id references and enhance tool context for image editing * fix: update image_ids schema in image_edit_oai to enforce presence and provide clear guidelines for usage * fix: enhance file fetching logic to ensure user-specific and dimension-validated results * chore: add details on image generation and editing capabilities with various models
351 lines
9.2 KiB
JavaScript
351 lines
9.2 KiB
JavaScript
const mongoose = require('mongoose');
|
|
const { nanoid } = require('nanoid');
|
|
const { Constants } = require('librechat-data-provider');
|
|
const { Conversation } = require('~/models/Conversation');
|
|
const { shareSchema } = require('@librechat/data-schemas');
|
|
const SharedLink = mongoose.model('SharedLink', shareSchema);
|
|
const { getMessages } = require('./Message');
|
|
const logger = require('~/config/winston');
|
|
|
|
class ShareServiceError extends Error {
|
|
constructor(message, code) {
|
|
super(message);
|
|
this.name = 'ShareServiceError';
|
|
this.code = code;
|
|
}
|
|
}
|
|
|
|
const memoizedAnonymizeId = (prefix) => {
|
|
const memo = new Map();
|
|
return (id) => {
|
|
if (!memo.has(id)) {
|
|
memo.set(id, `${prefix}_${nanoid()}`);
|
|
}
|
|
return memo.get(id);
|
|
};
|
|
};
|
|
|
|
const anonymizeConvoId = memoizedAnonymizeId('convo');
|
|
const anonymizeAssistantId = memoizedAnonymizeId('a');
|
|
const anonymizeMessageId = (id) =>
|
|
id === Constants.NO_PARENT ? id : memoizedAnonymizeId('msg')(id);
|
|
|
|
function anonymizeConvo(conversation) {
|
|
if (!conversation) {
|
|
return null;
|
|
}
|
|
|
|
const newConvo = { ...conversation };
|
|
if (newConvo.assistant_id) {
|
|
newConvo.assistant_id = anonymizeAssistantId(newConvo.assistant_id);
|
|
}
|
|
return newConvo;
|
|
}
|
|
|
|
function anonymizeMessages(messages, newConvoId) {
|
|
if (!Array.isArray(messages)) {
|
|
return [];
|
|
}
|
|
|
|
const idMap = new Map();
|
|
return messages.map((message) => {
|
|
const newMessageId = anonymizeMessageId(message.messageId);
|
|
idMap.set(message.messageId, newMessageId);
|
|
|
|
const anonymizedAttachments = message.attachments?.map((attachment) => {
|
|
return {
|
|
...attachment,
|
|
messageId: newMessageId,
|
|
conversationId: newConvoId,
|
|
};
|
|
});
|
|
|
|
return {
|
|
...message,
|
|
messageId: newMessageId,
|
|
parentMessageId:
|
|
idMap.get(message.parentMessageId) || anonymizeMessageId(message.parentMessageId),
|
|
conversationId: newConvoId,
|
|
model: message.model?.startsWith('asst_')
|
|
? anonymizeAssistantId(message.model)
|
|
: message.model,
|
|
attachments: anonymizedAttachments,
|
|
};
|
|
});
|
|
}
|
|
|
|
async function getSharedMessages(shareId) {
|
|
try {
|
|
const share = await SharedLink.findOne({ shareId, isPublic: true })
|
|
.populate({
|
|
path: 'messages',
|
|
select: '-_id -__v -user',
|
|
})
|
|
.select('-_id -__v -user')
|
|
.lean();
|
|
|
|
if (!share?.conversationId || !share.isPublic) {
|
|
return null;
|
|
}
|
|
|
|
const newConvoId = anonymizeConvoId(share.conversationId);
|
|
const result = {
|
|
...share,
|
|
conversationId: newConvoId,
|
|
messages: anonymizeMessages(share.messages, newConvoId),
|
|
};
|
|
|
|
return result;
|
|
} catch (error) {
|
|
logger.error('[getShare] Error getting share link', {
|
|
error: error.message,
|
|
shareId,
|
|
});
|
|
throw new ShareServiceError('Error getting share link', 'SHARE_FETCH_ERROR');
|
|
}
|
|
}
|
|
|
|
async function getSharedLinks(user, pageParam, pageSize, isPublic, sortBy, sortDirection, search) {
|
|
try {
|
|
const query = { user, isPublic };
|
|
|
|
if (pageParam) {
|
|
if (sortDirection === 'desc') {
|
|
query[sortBy] = { $lt: pageParam };
|
|
} else {
|
|
query[sortBy] = { $gt: pageParam };
|
|
}
|
|
}
|
|
|
|
if (search && search.trim()) {
|
|
try {
|
|
const searchResults = await Conversation.meiliSearch(search);
|
|
|
|
if (!searchResults?.hits?.length) {
|
|
return {
|
|
links: [],
|
|
nextCursor: undefined,
|
|
hasNextPage: false,
|
|
};
|
|
}
|
|
|
|
const conversationIds = searchResults.hits.map((hit) => hit.conversationId);
|
|
query['conversationId'] = { $in: conversationIds };
|
|
} catch (searchError) {
|
|
logger.error('[getSharedLinks] Meilisearch error', {
|
|
error: searchError.message,
|
|
user,
|
|
});
|
|
return {
|
|
links: [],
|
|
nextCursor: undefined,
|
|
hasNextPage: false,
|
|
};
|
|
}
|
|
}
|
|
|
|
const sort = {};
|
|
sort[sortBy] = sortDirection === 'desc' ? -1 : 1;
|
|
|
|
if (Array.isArray(query.conversationId)) {
|
|
query.conversationId = { $in: query.conversationId };
|
|
}
|
|
|
|
const sharedLinks = await SharedLink.find(query)
|
|
.sort(sort)
|
|
.limit(pageSize + 1)
|
|
.select('-__v -user')
|
|
.lean();
|
|
|
|
const hasNextPage = sharedLinks.length > pageSize;
|
|
const links = sharedLinks.slice(0, pageSize);
|
|
|
|
const nextCursor = hasNextPage ? links[links.length - 1][sortBy] : undefined;
|
|
|
|
return {
|
|
links: links.map((link) => ({
|
|
shareId: link.shareId,
|
|
title: link?.title || 'Untitled',
|
|
isPublic: link.isPublic,
|
|
createdAt: link.createdAt,
|
|
conversationId: link.conversationId,
|
|
})),
|
|
nextCursor,
|
|
hasNextPage,
|
|
};
|
|
} catch (error) {
|
|
logger.error('[getSharedLinks] Error getting shares', {
|
|
error: error.message,
|
|
user,
|
|
});
|
|
throw new ShareServiceError('Error getting shares', 'SHARES_FETCH_ERROR');
|
|
}
|
|
}
|
|
|
|
async function deleteAllSharedLinks(user) {
|
|
try {
|
|
const result = await SharedLink.deleteMany({ user });
|
|
return {
|
|
message: 'All shared links deleted successfully',
|
|
deletedCount: result.deletedCount,
|
|
};
|
|
} catch (error) {
|
|
logger.error('[deleteAllSharedLinks] Error deleting shared links', {
|
|
error: error.message,
|
|
user,
|
|
});
|
|
throw new ShareServiceError('Error deleting shared links', 'BULK_DELETE_ERROR');
|
|
}
|
|
}
|
|
|
|
async function createSharedLink(user, conversationId) {
|
|
if (!user || !conversationId) {
|
|
throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
|
|
}
|
|
|
|
try {
|
|
const [existingShare, conversationMessages] = await Promise.all([
|
|
SharedLink.findOne({ conversationId, isPublic: true }).select('-_id -__v -user').lean(),
|
|
getMessages({ conversationId }),
|
|
]);
|
|
|
|
if (existingShare && existingShare.isPublic) {
|
|
throw new ShareServiceError('Share already exists', 'SHARE_EXISTS');
|
|
} else if (existingShare) {
|
|
await SharedLink.deleteOne({ conversationId });
|
|
}
|
|
|
|
const conversation = await Conversation.findOne({ conversationId }).lean();
|
|
const title = conversation?.title || 'Untitled';
|
|
|
|
const shareId = nanoid();
|
|
await SharedLink.create({
|
|
shareId,
|
|
conversationId,
|
|
messages: conversationMessages,
|
|
title,
|
|
user,
|
|
});
|
|
|
|
return { shareId, conversationId };
|
|
} catch (error) {
|
|
logger.error('[createSharedLink] Error creating shared link', {
|
|
error: error.message,
|
|
user,
|
|
conversationId,
|
|
});
|
|
throw new ShareServiceError('Error creating shared link', 'SHARE_CREATE_ERROR');
|
|
}
|
|
}
|
|
|
|
async function getSharedLink(user, conversationId) {
|
|
if (!user || !conversationId) {
|
|
throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
|
|
}
|
|
|
|
try {
|
|
const share = await SharedLink.findOne({ conversationId, user, isPublic: true })
|
|
.select('shareId -_id')
|
|
.lean();
|
|
|
|
if (!share) {
|
|
return { shareId: null, success: false };
|
|
}
|
|
|
|
return { shareId: share.shareId, success: true };
|
|
} catch (error) {
|
|
logger.error('[getSharedLink] Error getting shared link', {
|
|
error: error.message,
|
|
user,
|
|
conversationId,
|
|
});
|
|
throw new ShareServiceError('Error getting shared link', 'SHARE_FETCH_ERROR');
|
|
}
|
|
}
|
|
|
|
async function updateSharedLink(user, shareId) {
|
|
if (!user || !shareId) {
|
|
throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
|
|
}
|
|
|
|
try {
|
|
const share = await SharedLink.findOne({ shareId }).select('-_id -__v -user').lean();
|
|
|
|
if (!share) {
|
|
throw new ShareServiceError('Share not found', 'SHARE_NOT_FOUND');
|
|
}
|
|
|
|
const [updatedMessages] = await Promise.all([
|
|
getMessages({ conversationId: share.conversationId }),
|
|
]);
|
|
|
|
const newShareId = nanoid();
|
|
const update = {
|
|
messages: updatedMessages,
|
|
user,
|
|
shareId: newShareId,
|
|
};
|
|
|
|
const updatedShare = await SharedLink.findOneAndUpdate({ shareId, user }, update, {
|
|
new: true,
|
|
upsert: false,
|
|
runValidators: true,
|
|
}).lean();
|
|
|
|
if (!updatedShare) {
|
|
throw new ShareServiceError('Share update failed', 'SHARE_UPDATE_ERROR');
|
|
}
|
|
|
|
anonymizeConvo(updatedShare);
|
|
|
|
return { shareId: newShareId, conversationId: updatedShare.conversationId };
|
|
} catch (error) {
|
|
logger.error('[updateSharedLink] Error updating shared link', {
|
|
error: error.message,
|
|
user,
|
|
shareId,
|
|
});
|
|
throw new ShareServiceError(
|
|
error.code === 'SHARE_UPDATE_ERROR' ? error.message : 'Error updating shared link',
|
|
error.code || 'SHARE_UPDATE_ERROR',
|
|
);
|
|
}
|
|
}
|
|
|
|
async function deleteSharedLink(user, shareId) {
|
|
if (!user || !shareId) {
|
|
throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
|
|
}
|
|
|
|
try {
|
|
const result = await SharedLink.findOneAndDelete({ shareId, user }).lean();
|
|
|
|
if (!result) {
|
|
return null;
|
|
}
|
|
|
|
return {
|
|
success: true,
|
|
shareId,
|
|
message: 'Share deleted successfully',
|
|
};
|
|
} catch (error) {
|
|
logger.error('[deleteSharedLink] Error deleting shared link', {
|
|
error: error.message,
|
|
user,
|
|
shareId,
|
|
});
|
|
throw new ShareServiceError('Error deleting shared link', 'SHARE_DELETE_ERROR');
|
|
}
|
|
}
|
|
|
|
module.exports = {
|
|
SharedLink,
|
|
getSharedLink,
|
|
getSharedLinks,
|
|
createSharedLink,
|
|
updateSharedLink,
|
|
deleteSharedLink,
|
|
getSharedMessages,
|
|
deleteAllSharedLinks,
|
|
};
|