mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +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
183 lines
5.9 KiB
JavaScript
183 lines
5.9 KiB
JavaScript
const mongoose = require('mongoose');
|
|
const { EToolResources } = require('librechat-data-provider');
|
|
const { fileSchema } = require('@librechat/data-schemas');
|
|
const { logger } = require('~/config');
|
|
|
|
const File = mongoose.model('File', fileSchema);
|
|
|
|
/**
|
|
* Finds a file by its file_id with additional query options.
|
|
* @param {string} file_id - The unique identifier of the file.
|
|
* @param {object} options - Query options for filtering, projection, etc.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the file document or null.
|
|
*/
|
|
const findFileById = async (file_id, options = {}) => {
|
|
return await File.findOne({ file_id, ...options }).lean();
|
|
};
|
|
|
|
/**
|
|
* Retrieves files matching a given filter, sorted by the most recently updated.
|
|
* @param {Object} filter - The filter criteria to apply.
|
|
* @param {Object} [_sortOptions] - Optional sort parameters.
|
|
* @param {Object|String} [selectFields={ text: 0 }] - Fields to include/exclude in the query results.
|
|
* Default excludes the 'text' field.
|
|
* @returns {Promise<Array<MongoFile>>} A promise that resolves to an array of file documents.
|
|
*/
|
|
const getFiles = async (filter, _sortOptions, selectFields = { text: 0 }) => {
|
|
const sortOptions = { updatedAt: -1, ..._sortOptions };
|
|
return await File.find(filter).select(selectFields).sort(sortOptions).lean();
|
|
};
|
|
|
|
/**
|
|
* Retrieves tool files (files that are embedded or have a fileIdentifier) from an array of file IDs
|
|
* @param {string[]} fileIds - Array of file_id strings to search for
|
|
* @param {Set<EToolResources>} toolResourceSet - Optional filter for tool resources
|
|
* @returns {Promise<Array<MongoFile>>} Files that match the criteria
|
|
*/
|
|
const getToolFilesByIds = async (fileIds, toolResourceSet) => {
|
|
if (!fileIds || !fileIds.length) {
|
|
return [];
|
|
}
|
|
|
|
try {
|
|
const filter = {
|
|
file_id: { $in: fileIds },
|
|
};
|
|
|
|
if (toolResourceSet.size) {
|
|
filter.$or = [];
|
|
}
|
|
|
|
if (toolResourceSet.has(EToolResources.file_search)) {
|
|
filter.$or.push({ embedded: true });
|
|
}
|
|
if (toolResourceSet.has(EToolResources.execute_code)) {
|
|
filter.$or.push({ 'metadata.fileIdentifier': { $exists: true } });
|
|
}
|
|
|
|
const selectFields = { text: 0 };
|
|
const sortOptions = { updatedAt: -1 };
|
|
|
|
return await getFiles(filter, sortOptions, selectFields);
|
|
} catch (error) {
|
|
logger.error('[getToolFilesByIds] Error retrieving tool files:', error);
|
|
throw new Error('Error retrieving tool files');
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Creates a new file with a TTL of 1 hour.
|
|
* @param {MongoFile} data - The file data to be created, must contain file_id.
|
|
* @param {boolean} disableTTL - Whether to disable the TTL.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the created file document.
|
|
*/
|
|
const createFile = async (data, disableTTL) => {
|
|
const fileData = {
|
|
...data,
|
|
expiresAt: new Date(Date.now() + 3600 * 1000),
|
|
};
|
|
|
|
if (disableTTL) {
|
|
delete fileData.expiresAt;
|
|
}
|
|
|
|
return await File.findOneAndUpdate({ file_id: data.file_id }, fileData, {
|
|
new: true,
|
|
upsert: true,
|
|
}).lean();
|
|
};
|
|
|
|
/**
|
|
* Updates a file identified by file_id with new data and removes the TTL.
|
|
* @param {MongoFile} data - The data to update, must contain file_id.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the updated file document.
|
|
*/
|
|
const updateFile = async (data) => {
|
|
const { file_id, ...update } = data;
|
|
const updateOperation = {
|
|
$set: update,
|
|
$unset: { expiresAt: '' }, // Remove the expiresAt field to prevent TTL
|
|
};
|
|
return await File.findOneAndUpdate({ file_id }, updateOperation, { new: true }).lean();
|
|
};
|
|
|
|
/**
|
|
* Increments the usage of a file identified by file_id.
|
|
* @param {MongoFile} data - The data to update, must contain file_id and the increment value for usage.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the updated file document.
|
|
*/
|
|
const updateFileUsage = async (data) => {
|
|
const { file_id, inc = 1 } = data;
|
|
const updateOperation = {
|
|
$inc: { usage: inc },
|
|
$unset: { expiresAt: '', temp_file_id: '' },
|
|
};
|
|
return await File.findOneAndUpdate({ file_id }, updateOperation, { new: true }).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes a file identified by file_id.
|
|
* @param {string} file_id - The unique identifier of the file to delete.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the deleted file document or null.
|
|
*/
|
|
const deleteFile = async (file_id) => {
|
|
return await File.findOneAndDelete({ file_id }).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes a file identified by a filter.
|
|
* @param {object} filter - The filter criteria to apply.
|
|
* @returns {Promise<MongoFile>} A promise that resolves to the deleted file document or null.
|
|
*/
|
|
const deleteFileByFilter = async (filter) => {
|
|
return await File.findOneAndDelete(filter).lean();
|
|
};
|
|
|
|
/**
|
|
* Deletes multiple files identified by an array of file_ids.
|
|
* @param {Array<string>} file_ids - The unique identifiers of the files to delete.
|
|
* @returns {Promise<Object>} A promise that resolves to the result of the deletion operation.
|
|
*/
|
|
const deleteFiles = async (file_ids, user) => {
|
|
let deleteQuery = { file_id: { $in: file_ids } };
|
|
if (user) {
|
|
deleteQuery = { user: user };
|
|
}
|
|
return await File.deleteMany(deleteQuery);
|
|
};
|
|
|
|
/**
|
|
* Batch updates files with new signed URLs in MongoDB
|
|
*
|
|
* @param {MongoFile[]} updates - Array of updates in the format { file_id, filepath }
|
|
* @returns {Promise<void>}
|
|
*/
|
|
async function batchUpdateFiles(updates) {
|
|
if (!updates || updates.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const bulkOperations = updates.map((update) => ({
|
|
updateOne: {
|
|
filter: { file_id: update.file_id },
|
|
update: { $set: { filepath: update.filepath } },
|
|
},
|
|
}));
|
|
|
|
const result = await File.bulkWrite(bulkOperations);
|
|
logger.info(`Updated ${result.modifiedCount} files with new S3 URLs`);
|
|
}
|
|
|
|
module.exports = {
|
|
File,
|
|
findFileById,
|
|
getFiles,
|
|
getToolFilesByIds,
|
|
createFile,
|
|
updateFile,
|
|
updateFileUsage,
|
|
deleteFile,
|
|
deleteFiles,
|
|
deleteFileByFilter,
|
|
batchUpdateFiles,
|
|
};
|