From 593f12e03185644390725e026e8398346129b289 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Sat, 3 Feb 2024 20:25:35 -0500 Subject: [PATCH] =?UTF-8?q?=E2=99=BE=EF=B8=8F=20style:=20Infinite=20Scroll?= =?UTF-8?q?=20Nav=20and=20Sort=20Convos=20by=20Date/Usage=20(#1708)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Style: Infinite Scroll and Group convos by date * Style: Infinite Scroll and Group convos by date- Redesign NavBar * Style: Infinite Scroll and Group convos by date- Redesign NavBar - Clean code * Style: Infinite Scroll and Group convos by date- Redesign NavBar - Redesign NewChat Component * Style: Infinite Scroll and Group convos by date- Redesign NavBar - Redesign NewChat Component * Style: Infinite Scroll and Group convos by date- Redesign NavBar - Redesign NewChat Component * Including OpenRouter and Mistral icon * refactor(Conversations): cleanup use of utility functions and typing * refactor(Nav/NewChat): use localStorage `lastConversationSetup` to determine the endpoint to use, as well as icons -> JSX components, remove use of `endpointSelected` * refactor: remove use of `isFirstToday` * refactor(Nav): remove use of `endpointSelected`, consolidate scrolling logic to its own hook `useNavScrolling`, remove use of recoil `conversation` * refactor: Add spinner to bottom of list, throttle fetching, move query hooks to client workspace * chore: sort by `updatedAt` field * refactor: optimize conversation infinite query, use optimistic updates, add conversation helpers for managing pagination, remove unnecessary operations * feat: gen_title route for generating the title for the conversation * style(Convo): change hover bg-color * refactor: memoize groupedConversations and return as array of tuples, correctly update convos pre/post message stream, only call genTitle if conversation is new, make `addConversation` dynamically either add/update depending if convo exists in pages already, reorganize type definitions * style: rename Header NewChat Button -> HeaderNewChat, add NewChatIcon, closely match main Nav New Chat button to ChatGPT * style(NewChat): add hover bg color * style: cleanup comments, match ChatGPT nav styling, redesign search bar, make part of new chat sticky header, move Nav under same parent as outlet/mobilenav, remove legacy code, search only if searchQuery is not empty * feat: add tests for conversation helpers and ensure no duplicate conversations are ever grouped * style: hover bg-color * feat: alt-click on convo item to open conversation in new tab * chore: send error message when `gen_title` fails --------- Co-authored-by: Walber Cardoso --- cache/getLogStores.js | 5 ++++ models/Conversation.js | 6 ++--- server/routes/convos.js | 26 ++++++++++++++++++++ server/services/AssistantService.js | 1 + server/services/Endpoints/openAI/addTitle.js | 8 +++++- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/cache/getLogStores.js b/cache/getLogStores.js index 03aaf847031..7f759e5f33b 100644 --- a/cache/getLogStores.js +++ b/cache/getLogStores.js @@ -27,6 +27,10 @@ const tokenConfig = isEnabled(USE_REDIS) // ttl: 30 minutes ? new Keyv({ store: keyvRedis, ttl: 1800000 }) : new Keyv({ namespace: CacheKeys.TOKEN_CONFIG, ttl: 1800000 }); +const genTitle = isEnabled(USE_REDIS) // ttl: 2 minutes + ? new Keyv({ store: keyvRedis, ttl: 120000 }) + : new Keyv({ namespace: CacheKeys.GEN_TITLE, ttl: 120000 }); + const namespaces = { [CacheKeys.CONFIG_STORE]: config, pending_req, @@ -39,6 +43,7 @@ const namespaces = { registrations: createViolationInstance('registrations'), logins: createViolationInstance('logins'), [CacheKeys.TOKEN_CONFIG]: tokenConfig, + [CacheKeys.GEN_TITLE]: genTitle, }; /** diff --git a/models/Conversation.js b/models/Conversation.js index f1aa7bfe718..1ef47241cac 100644 --- a/models/Conversation.js +++ b/models/Conversation.js @@ -30,12 +30,12 @@ module.exports = { return { message: 'Error saving conversation' }; } }, - getConvosByPage: async (user, pageNumber = 1, pageSize = 14) => { + getConvosByPage: async (user, pageNumber = 1, pageSize = 25) => { try { const totalConvos = (await Conversation.countDocuments({ user })) || 1; const totalPages = Math.ceil(totalConvos / pageSize); const convos = await Conversation.find({ user }) - .sort({ createdAt: -1 }) + .sort({ updatedAt: -1 }) .skip((pageNumber - 1) * pageSize) .limit(pageSize) .lean(); @@ -45,7 +45,7 @@ module.exports = { return { message: 'Error getting conversations' }; } }, - getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 14) => { + getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 25) => { try { if (!convoIds || convoIds.length === 0) { return { conversations: [], pages: 1, pageNumber, pageSize }; diff --git a/server/routes/convos.js b/server/routes/convos.js index a410b6fd584..6213cfd2c78 100644 --- a/server/routes/convos.js +++ b/server/routes/convos.js @@ -1,6 +1,9 @@ const express = require('express'); +const { CacheKeys } = require('librechat-data-provider'); const { getConvosByPage, deleteConvos } = require('~/models/Conversation'); const requireJwtAuth = require('~/server/middleware/requireJwtAuth'); +const { sleep } = require('~/server/services/AssistantService'); +const getLogStores = require('~/cache/getLogStores'); const { getConvo, saveConvo } = require('~/models'); const { logger } = require('~/config'); @@ -29,6 +32,29 @@ router.get('/:conversationId', async (req, res) => { } }); +router.post('/gen_title', async (req, res) => { + const { conversationId } = req.body; + const titleCache = getLogStores(CacheKeys.GEN_TITLE); + const key = `${req.user.id}-${conversationId}`; + let title = await titleCache.get(key); + + if (!title) { + await sleep(2500); + title = await titleCache.get(key); + } + + if (title) { + await titleCache.delete(key); + res.status(200).json({ title }); + } else { + res + .status(404) + .json({ + message: 'Title not found or method not implemented for the conversation\'s endpoint', + }); + } +}); + router.post('/clear', async (req, res) => { let filter = {}; const { conversationId, source } = req.body.arg; diff --git a/server/services/AssistantService.js b/server/services/AssistantService.js index 4b929193481..b6eabb75392 100644 --- a/server/services/AssistantService.js +++ b/server/services/AssistantService.js @@ -357,5 +357,6 @@ module.exports = { waitForRun, getResponse, handleRun, + sleep, mapMessagesToSteps, }; diff --git a/server/services/Endpoints/openAI/addTitle.js b/server/services/Endpoints/openAI/addTitle.js index ab15443f942..9bb0ec3487e 100644 --- a/server/services/Endpoints/openAI/addTitle.js +++ b/server/services/Endpoints/openAI/addTitle.js @@ -1,5 +1,7 @@ -const { saveConvo } = require('~/models'); +const { CacheKeys } = require('librechat-data-provider'); +const getLogStores = require('~/cache/getLogStores'); const { isEnabled } = require('~/server/utils'); +const { saveConvo } = require('~/models'); const addTitle = async (req, { text, response, client }) => { const { TITLE_CONVO = 'true' } = process.env ?? {}; @@ -16,7 +18,11 @@ const addTitle = async (req, { text, response, client }) => { return; } + const titleCache = getLogStores(CacheKeys.GEN_TITLE); + const key = `${req.user.id}-${response.conversationId}`; + const title = await client.titleConvo({ text, responseText: response?.text }); + await titleCache.set(key, title); await saveConvo(req.user.id, { conversationId: response.conversationId, title,