diff --git a/app/chatgpt.js b/app/chatgpt.js index 4c230e0190..bd27976288 100644 --- a/app/chatgpt.js +++ b/app/chatgpt.js @@ -22,7 +22,7 @@ const ask = async (question, progressCallback, convo) => { return res; }; -const titleConversation = async (message, response) => { +const titleConvo = async (message, response) => { const configuration = new Configuration({ apiKey: process.env.OPENAI_KEY }); @@ -31,8 +31,8 @@ const titleConversation = async (message, response) => { model: 'text-davinci-002', prompt: `Write a short title in title case, ideally in 5 words or less, and do not refer to the user or GPT, that summarizes this conversation:\nUser:"${message}"\nGPT:"${response}"\nTitle: ` }); - console.log(completion.data.choices[0].text); + return completion.data.choices[0].text.replace(/\n/g, ''); }; -module.exports = { ask, titleConversation }; +module.exports = { ask, titleConvo }; diff --git a/index.js b/index.js index 382d7a0e19..6b09d493e2 100644 --- a/index.js +++ b/index.js @@ -1,19 +1,18 @@ import React from 'react'; -// import reactDom from 'react-dom'; ---> deprecated import { createRoot } from 'react-dom/client'; import { Provider } from 'react-redux'; import { store } from './src/store'; -import App from './src/App'; import { ThemeProvider } from './src/hooks/ThemeContext'; +import App from './src/App'; import './src/style.css'; const container = document.getElementById('root'); -const root = createRoot(container); // createRoot(container!) if you use TypeScript -// reactDom.render(, document.getElementById('root')); +const root = createRoot(container); + root.render( -); +); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0d2a121aab..2ee8d314c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,6 @@ "cors": "^2.8.5", "crypto-browserify": "^3.12.0", "dotenv": "^16.0.3", - "eventsource": "^2.0.2", "keyv": "^4.5.2", "mongoose": "^6.9.0", "openai": "^3.1.0", @@ -10020,14 +10019,6 @@ "node": ">=0.8.x" } }, - "node_modules/eventsource": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", - "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==", - "engines": { - "node": ">=12.0.0" - } - }, "node_modules/eventsource-parser": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-0.0.5.tgz", @@ -27460,11 +27451,6 @@ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true }, - "eventsource": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-2.0.2.tgz", - "integrity": "sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==" - }, "eventsource-parser": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/eventsource-parser/-/eventsource-parser-0.0.5.tgz", diff --git a/package.json b/package.json index 3525b27baf..7ddb83087f 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,6 @@ "cors": "^2.8.5", "crypto-browserify": "^3.12.0", "dotenv": "^16.0.3", - "eventsource": "^2.0.2", "keyv": "^4.5.2", "mongoose": "^6.9.0", "openai": "^3.1.0", diff --git a/server/routes/ask.js b/server/routes/ask.js index 5ee288e589..bc246e7bfb 100644 --- a/server/routes/ask.js +++ b/server/routes/ask.js @@ -1,7 +1,7 @@ const express = require('express'); const crypto = require('crypto'); const router = express.Router(); -const { ask, titleConversation } = require('../../app/chatgpt'); +const { ask, titleConvo } = require('../../app/chatgpt'); const { saveMessage, deleteMessages } = require('../../models/Message'); const { saveConvo } = require('../../models/Conversation'); @@ -16,7 +16,7 @@ router.post('/', async (req, res) => { const userMessageId = crypto.randomUUID(); let userMessage = { id: userMessageId, sender: 'User', text }; - console.log('initial ask log', userMessage); + console.log('ask log', userMessage); res.writeHead(200, { Connection: 'keep-alive', @@ -46,7 +46,7 @@ router.post('/', async (req, res) => { if (!!parentMessageId) { gptResponse = { ...gptResponse, parentMessageId }; } else { - gptResponse.title = await titleConversation(text, gptResponse.text); + gptResponse.title = await titleConvo(text, gptResponse.text); } if (