mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-18 17:30:16 +01:00
adds functionality for waylaidwanderer chatgpt client
This commit is contained in:
parent
5b8c4452cc
commit
500b6c9fa8
7 changed files with 2541 additions and 177 deletions
|
|
@ -2,6 +2,7 @@ const express = require('express');
|
|||
const crypto = require('crypto');
|
||||
const router = express.Router();
|
||||
const { ask, titleConvo } = require('../../app/chatgpt');
|
||||
const { askClient } = require('../../app/chatgpt-client');
|
||||
const { saveMessage, deleteMessages } = require('../../models/Message');
|
||||
const { saveConvo } = require('../../models/Conversation');
|
||||
|
||||
|
|
@ -28,8 +29,9 @@ router.post('/', async (req, res) => {
|
|||
|
||||
try {
|
||||
let i = 0;
|
||||
let tokens = '';
|
||||
const progressCallback = async (partial) => {
|
||||
if (i === 0) {
|
||||
if (i === 0 && typeof partial === 'object') {
|
||||
userMessage.parentMessageId = parentMessageId ? parentMessageId : partial.id;
|
||||
userMessage.conversationId = conversationId ? conversationId : partial.conversationId;
|
||||
await saveMessage(userMessage);
|
||||
|
|
@ -38,21 +40,45 @@ router.post('/', async (req, res) => {
|
|||
);
|
||||
i++;
|
||||
}
|
||||
const data = JSON.stringify({ ...partial, message: true });
|
||||
res.write(`event: message\ndata: ${data}\n\n`);
|
||||
|
||||
if (typeof partial === 'object') {
|
||||
const data = JSON.stringify({ ...partial, message: true });
|
||||
res.write(`event: message\ndata: ${data}\n\n`);
|
||||
} else {
|
||||
tokens += partial;
|
||||
res.write(`event: message\ndata: ${JSON.stringify({ text: tokens, message: true })}\n\n`);
|
||||
}
|
||||
};
|
||||
|
||||
let gptResponse = await ask(text, progressCallback, { parentMessageId, conversationId });
|
||||
let gptResponse = await askClient(text, progressCallback, { parentMessageId, conversationId });
|
||||
|
||||
console.log('CLIENT RESPONSE', gptResponse);
|
||||
|
||||
if (!!parentMessageId) {
|
||||
gptResponse = { ...gptResponse, parentMessageId };
|
||||
} else {
|
||||
gptResponse.title = await titleConvo(text, gptResponse.text);
|
||||
}
|
||||
|
||||
if (!gptResponse.parentMessageId && !parentMessageId) {
|
||||
userMessage.parentMessageId = gptResponse.messageId;
|
||||
gptResponse.parentMessageId = gptResponse.messageId;
|
||||
userMessage.conversationId = gptResponse.conversationId;
|
||||
}
|
||||
|
||||
const response = gptResponse.text || gptResponse.response;
|
||||
|
||||
if (gptResponse.response) {
|
||||
await saveMessage(userMessage);
|
||||
gptResponse.text = gptResponse.response;
|
||||
gptResponse.id = gptResponse.messageId;
|
||||
delete gptResponse.response;
|
||||
}
|
||||
|
||||
if (
|
||||
(gptResponse.text.includes('2023') && !gptResponse.text.trim().includes(' ')) ||
|
||||
gptResponse.text.toLowerCase().includes('no response') ||
|
||||
gptResponse.text.toLowerCase().includes('no answer')
|
||||
(response.includes('2023') && !response.trim().includes(' ')) ||
|
||||
response.toLowerCase().includes('no response') ||
|
||||
response.toLowerCase().includes('no answer')
|
||||
) {
|
||||
res.status(500).write('event: error\ndata: Prompt empty or too short');
|
||||
res.end();
|
||||
|
|
@ -60,6 +86,9 @@ router.post('/', async (req, res) => {
|
|||
}
|
||||
|
||||
gptResponse.sender = 'GPT';
|
||||
|
||||
console.log('gptResponse', gptResponse);
|
||||
|
||||
await saveMessage(gptResponse);
|
||||
await saveConvo(gptResponse);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue