Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-20 02:10:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: original changes

Browse source
This commit is contained in:
Danny Avila 2025-05-30 04:28:22 -04:00
parent fa9177180f
commit f9c0e9853f
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
83 changed files with 413 additions and 505 deletions
Download patch file Download diff file Expand all files Collapse all files

27
api/models/Message.js
View file

@ -1,6 +1,5 @@
const { z } = require('zod');
const { logger } = require('~/config');
const db = require('~/lib/db/connectDb');
const { Message, logger } = require('@librechat/data-schemas');
const idSchema = z.string().uuid();
/**
@ -67,7 +66,7 @@ async function saveMessage(req, params, metadata) {
logger.info(`---\`saveMessage\` context: ${metadata?.context}`);
update.tokenCount = 0;
}
const message = await db.models.Message.findOneAndUpdate(
const message = await Message.findOneAndUpdate(
{ messageId: params.messageId, user: req.user.id },
update,
{ upsert: true, new: true },
@ -85,7 +84,7 @@ async function saveMessage(req, params, metadata) {
try {
// Try to find the existing message with this ID
const existingMessage = await db.models.Message.findOne({
const existingMessage = await Message.findOne({
messageId: params.messageId,
user: req.user.id,
});
@ -138,7 +137,7 @@ async function bulkSaveMessages(messages, overrideTimestamp = false) {
upsert: true,
},
}));
const result = await db.models.Message.bulkWrite(bulkOps);
const result = await Message.bulkWrite(bulkOps);
return result;
} catch (err) {
logger.error('Error saving messages in bulk:', err);
@ -180,7 +179,7 @@ async function recordMessage({
...rest,
};
return await db.models.Message.findOneAndUpdate({ user, messageId }, message, {
return await Message.findOneAndUpdate({ user, messageId }, message, {
upsert: true,
new: true,
});
@ -204,7 +203,7 @@ async function recordMessage({
*/
async function updateMessageText(req, { messageId, text }) {
try {
await db.models?.Message.updateOne({ messageId, user: req.user.id }, { text });
await Message.updateOne({ messageId, user: req.user.id }, { text });
} catch (err) {
logger.error('Error updating message text:', err);
throw err;
@ -232,7 +231,7 @@ async function updateMessageText(req, { messageId, text }) {
async function updateMessage(req, message, metadata) {
try {
const { messageId, ...update } = message;
const updatedMessage = await db.models.Message.findOneAndUpdate(
const updatedMessage = await Message.findOneAndUpdate(
{ messageId, user: req.user.id },
update,
{
@ -276,10 +275,10 @@ async function updateMessage(req, message, metadata) {
*/
async function deleteMessagesSince(req, { messageId, conversationId }) {
try {
const message = await db.models.Message.findOne({ messageId, user: req.user.id }).lean();
const message = await Message.findOne({ messageId, user: req.user.id }).lean();
if (message) {
const query = db.models.Message.find({ conversationId, user: req.user.id });
const query = Message.find({ conversationId, user: req.user.id });
return await query.deleteMany({
createdAt: { $gt: message.createdAt },
});
@ -303,10 +302,10 @@ async function deleteMessagesSince(req, { messageId, conversationId }) {
async function getMessages(filter, select) {
try {
if (select) {
return await db.models.Message.find(filter).select(select).sort({ createdAt: 1 }).lean();
return await Message.find(filter).select(select).sort({ createdAt: 1 }).lean();
}
return await db.models.Message.find(filter).sort({ createdAt: 1 }).lean();
return await Message.find(filter).sort({ createdAt: 1 }).lean();
} catch (err) {
logger.error('Error getting messages:', err);
throw err;
@ -323,7 +322,7 @@ async function getMessages(filter, select) {
*/
async function getMessage({ user, messageId }) {
try {
return await db.models.Message.findOne({
return await Message.findOne({
user,
messageId,
}).lean();
@ -344,7 +343,7 @@ async function getMessage({ user, messageId }) {
*/
async function deleteMessages(filter) {
try {
return await db.models.Message.deleteMany(filter);
return await Message.deleteMany(filter);
} catch (err) {
logger.error('Error deleting messages:', err);
throw err;