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

refactor: Unify streamId and conversationId handling for improved job management

Browse source 
- Updated ResumableAgentController and AgentController to generate conversationId upfront, ensuring it matches streamId for consistency.
- Simplified job creation and metadata management by removing redundant conversationId updates from callbacks.
- Refactored abortMiddleware and related methods to utilize the unified streamId/conversationId approach, enhancing clarity in job handling.
- Removed deprecated methods from GenerationJobManager and InMemoryJobStore, streamlining the codebase and improving maintainability.
This commit is contained in:
Danny Avila 2025-12-13 17:36:33 -05:00
parent 3a23badf5f
commit 8d34291f6a
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
6 changed files with 33 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

27
api/server/routes/agents/index.js
View file

@ -122,7 +122,8 @@ router.get('/chat/stream/:streamId', async (req, res) => {
router.get('/chat/status/:conversationId', async (req, res) => {
const { conversationId } = req.params;
const job = await GenerationJobManager.getJobByConversation(conversationId);
// streamId === conversationId, so we can use getJob directly
const job = await GenerationJobManager.getJob(conversationId);
if (!job) {
return res.json({ active: false });
@ -132,12 +133,12 @@ router.get('/chat/status/:conversationId', async (req, res) => {
return res.status(403).json({ error: 'Unauthorized' });
}
const info = await GenerationJobManager.getStreamInfo(job.streamId);
const resumeState = await GenerationJobManager.getResumeState(job.streamId);
const info = await GenerationJobManager.getStreamInfo(conversationId);
const resumeState = await GenerationJobManager.getResumeState(conversationId);
res.json({
active: info?.active ?? false,
streamId: job.streamId,
streamId: conversationId,
status: info?.status ?? job.status,
aggregatedContent: info?.aggregatedContent,
createdAt: info?.createdAt ?? job.createdAt,
@ -158,21 +159,9 @@ router.post('/chat/abort', async (req, res) => {
const { streamId, conversationId, abortKey } = req.body;
// Try to find job by streamId first, then by conversationId, then by abortKey
let jobStreamId = streamId;
let job = jobStreamId ? await GenerationJobManager.getJob(jobStreamId) : null;
if (!job && conversationId) {
job = await GenerationJobManager.getJobByConversation(conversationId);
if (job) {
jobStreamId = job.streamId;
}
}
if (!job && abortKey) {
jobStreamId = abortKey.split(':')[0];
job = await GenerationJobManager.getJob(jobStreamId);
}
// streamId === conversationId, so try any of the provided IDs
const jobStreamId = streamId || conversationId || abortKey?.split(':')[0];
const job = jobStreamId ? await GenerationJobManager.getJob(jobStreamId) : null;
logger.debug(`[AgentStream] Computed jobStreamId: ${jobStreamId}`);