Merge branch 'main' into bing-styles

LOCAL_INSTALL.md

@@ -0,0 +1,87 @@
+### Local
+- **Install the prerequisites**
+	- **Download chatgpt-clone**
+		- Download the latest release here: https://github.com/danny-avila/chatgpt-clone/releases/
+		- Or by clicking on the green code button in the top of the page and selecting "Download ZIP"
+		- Or (Recommended if you have Git installed) pull the latest release from the main branch
+		- If you downloaded a zip file, extract the content in "C:/chatgpt-clone/"
+		-**IMPORTANT : If you install the files somewhere else modify the instructions accordingly**
+		
+	- **To enable the Conversation search feature:**
+		-IF YOU DON'T WANT THIS FEATURE YOU CAN SKIP THIS STEP
+		- Download MeileSearch latest release from : https://github.com/meilisearch/meilisearch/releases
+		- Copy it to "C:/chatgpt-clone/"
+		- Rename the file to "meilisearch.exe"
+		- Open it by double clicking on it
+		- Copy the generated Master Key and save it somewhere (You will need it later)
+
+	- **Download and Install Node.js** 
+		- Navigate to https://nodejs.org/en/download and to download the latest Node.js version for your OS (The Node.js installer includes the NPM package manager.)
+		
+	- **Create a MongoDB database**
+		- Navigate to https://www.mongodb.com/ and Sign In or Create an account
+		- Create a new project
+		- Build a Database using the free plan and name the cluster (example: chatgpt-clone)
+		- Use the "Username and Password" method for authentication
+		- Add your current IP to the access list
+		- Then in the Database Deployment tab click on Connect
+		- In "Choose a connection method" select "Connect your application"
+		- Driver = Node.js / Version = 4.1 or later
+		- Copy the connection string and save it somewhere(you will need it later)
+		
+	- **Get your OpenAI API key** here: https://platform.openai.com/account/api-keys and save it somewhere safe (you will need it later)
+	
+	- **Get your Bing Access Token**
+		- Using MS Edge, navigate to bing.com
+		- Make sure you are logged in
+		- Open the DevTools by pressing F12 on your keyboard
+		- Click on the tab "Application" (On the left of the DevTools)
+		- Expand the "Cookies" (Under "Storage")
+		- You need to copy the value of the "_U" cookie, save it somewhere, you will need it later
+		
+- **Create the ".env" File** You will need all your credentials, (API keys, access tokens, and Mongo Connection String, MeileSearch Master Key)
+	- Open "C:/chatgpt-clone/api/.env.example" in a text editor
+	- At this line **MONGO_URI="mongodb://127.0.0.1:27017/chatgpt-clone"**
+		Replace mongodb://127.0.0.1:27017/chatgpt-clone with the MondoDB connection string you saved earlier, **remove "&w=majority" at the end**
+		- It should look something like this: "MONGO_URI="mongodb+srv://username:password@chatgpt-clone.lfbcwz3.mongodb.net/?retryWrites=true" 
+	- At this line **OPENAI_KEY=** you need to add your openai API key 
+	- Add your Bing token to this line **BING_TOKEN=** (needed for BingChat & Sydney)
+	- If you want to enable Search, **SEARCH=TRUE** if you do not want to enable search **SEARCH=FALSE**
+	- Add your previously saved MeiliSearch Master key to this line **MEILI_MASTER_KEY=** (the key is needed if search is enabled even on local install or you may encounter errors)
+	- Save the file as **"C:/chatgpt-clone/api/.env"**
+
+**DO THIS ONCE AFTER EVERY UPDATE**
+- **Run** `npm ci` in the "C:/chatgpt-clone/api" directory
+- **Run** `npm ci` in the "C:/chatgpt-clone/client" directory
+- **Run** `npm run build` in the "C:/chatgpt-clone/client"
+
+**DO THIS EVERY TIME YOU WANT TO START CHATGPT-CLONE**
+- **Run** `"meilisearch --master-key put_your_meilesearch_Master_Key_here"` in the "C:/chatgpt-clone" directory (Only if SEARCH=TRUE)
+- **Run** `npm start` in the "C:/chatgpt-clone/api" directory 
+
+- **Visit** http://localhost:3080 (default port) & enjoy
+
+
+OPTIONAL BUT RECOMMENDED
+- **Make a batch file to automate the starting process**
+	- Open a text editor
+	- Paste the following code in a new document
+	- Put your MeiliSearch master key instead of "your_master_key_goes_here" 
+	- Save the file as "C:/chatgpt-clone/chatgpt-clone.bat"
+	- you can make a shortcut of this batch file and put it anywhere
+
+```
+REM the meilisearch executable needs to be at the root of the chatgpt-clone directory
+
+start "MeiliSearch" cmd /k "meilisearch --master-key your_master_key_goes_here
+
+REM ↑↑↑ meilisearch is the name of the meilisearch executable, put your own master key there  
+
+start "ChatGPT-Clone" cmd /k "cd api && npm start"
+
+REM this batch file goes at the root of the chatgpt-clone directory (C:/chatgpt-clone/)
+```
+
+If you update the chatgpt-clone project files, mannually redo the `npm ci` and `npm run build` steps
+
+To share within network or serve as a public server, set `HOST` to `0.0.0.0` in `.env` file.

README.md

@@ -214,12 +214,8 @@ Currently, this project is only functional with the `text-davinci-003` model.
 - If using MongoDB Atlas, remove `&w=majority` from default connection string.
 
 ### Local
-- **Run npm** ci in both the api and client directories
+### **[In-depth instructions here!](https://github.com/danny-avila/chatgpt-clone/blob/0d4f0f74c04337aaf51b9a3eef898165a7009156/LOCAL_INSTALL.md)** 
-- **Provide** all credentials, (API keys, access tokens, and Mongo Connection String) in api/.env [(see .env example)](api/.env.example)
+- thank you [@fuegovic](https://github.com/fuegovic)!
-- **Run** `npm run build` in /client/ dir, `npm start` in /api/ dir
-- **Visit** http://localhost:3080 (default port) & enjoy
-
-By default, only local machine can access this server. To share within network or serve as a public server, set `HOST` to `0.0.0.0` in `.env` file
 
 ### Docker
 

api/lib/utils/misc.js

@@ -1,6 +1,6 @@
 const cleanUpPrimaryKeyValue = (value) => {
   // For Bing convoId handling
-  return value.replace(/--/g, '-');
+  return value.replace(/--/g, '|');
 };
 
 function replaceSup(text) {

api/lib/utils/reduceHits.js

@@ -1,4 +1,5 @@
 const mergeSort = require('./mergeSort');
+const { cleanUpPrimaryKeyValue } = require('./misc');
 
 function reduceMessages(hits) {
   const counts = {};
@@ -29,15 +30,16 @@ function reduceHits(hits, titles = []) {
   const convos = [...hits, ...titles];
 
   for (const convo of convos) {
-    if (!counts[convo.conversationId]) {
+    const currentId = cleanUpPrimaryKeyValue(convo.conversationId);
-      counts[convo.conversationId] = 1;
+    if (!counts[currentId]) {
+      counts[currentId] = 1;
     } else {
-      counts[convo.conversationId]++;
+      counts[currentId]++;
     }
 
     if (convo.title) {
-      // titleMap[convo.conversationId] = convo._formatted.title;
+      // titleMap[currentId] = convo._formatted.title;
-      titleMap[convo.conversationId] = convo.title;
+      titleMap[currentId] = convo.title;
     }
   }
 

api/models/Conversation.js

@@ -1,6 +1,5 @@
 // const { Conversation } = require('./plugins');
 const Conversation = require('./schema/convoSchema');
-const { cleanUpPrimaryKeyValue } = require('../lib/utils/misc');
 const { getMessages, deleteMessages } = require('./Message');
 
 const getConvo = async (user, conversationId) => {
@@ -90,7 +89,7 @@ module.exports = {
         promises.push(
           Conversation.findOne({
             user,
-            conversationId: cleanUpPrimaryKeyValue(convo.conversationId)
+            conversationId: convo.conversationId,
           }).exec()
         )
       );

api/server/routes/search.js

@@ -15,7 +15,8 @@ router.get('/sync', async function (req, res) {
 
 router.get('/', async function (req, res) {
   try {
-    const user = req?.session?.user?.username;
+    let user = req?.session?.user?.username;
+    user = user ?? null;
     const { q } = req.query;
     const pageNumber = req.query.pageNumber || 1;
     const key = `${user || ''}${q}`;
@@ -50,8 +51,10 @@ router.get('/', async function (req, res) {
       };
     });
     const titles = (await Conversation.meiliSearch(q)).hits;
-    console.log('message hits:', messages.length, 'convo hits:', titles.length);
     const sortedHits = reduceHits(messages, titles);
+    // debugging:
+    // console.log('user:', user, 'message hits:', messages.length, 'convo hits:', titles.length);
+    // console.log('sorted hits:', sortedHits.length);
     const result = await getConvosQueried(user, sortedHits, pageNumber);
 
     const activeMessages = [];

client/src/components/Messages/Content/Content.jsx

@@ -8,8 +8,8 @@ import rehypeRaw from 'rehype-raw'
 import CodeBlock from './CodeBlock';
 import { langSubset } from '~/utils/languages';
 
-const Content = React.memo(({ content, isCreatedByUser = false }) => {
+const Content = React.memo(({ content, isCreatedByUser = true }) => {
-  const rehypePlugins = [
+  let rehypePlugins = [
     [rehypeKatex, { output: 'mathml' }],
     [
       rehypeHighlight,
@@ -20,12 +20,15 @@ const Content = React.memo(({ content, isCreatedByUser = false }) => {
       }
     ],
     [rehypeRaw],
-  ]
+  ];
+
+  rehypePlugins = isCreatedByUser ? rehypePlugins.slice(0, -1) : rehypePlugins;
+
   return (
     <>
       <ReactMarkdown
         remarkPlugins={[remarkGfm, [remarkMath, { singleDollarTextMath: false }]]}
-        rehypePlugins={isCreatedByUser ? rehypePlugins.slice(-1) : rehypePlugins}
+        rehypePlugins={rehypePlugins}
         linkTarget="_new"
         components={{
           code,

docker-compose.yml

@@ -34,6 +34,8 @@ services:
       - ./api:/api
       - /api/node_modules
   mongodb:
+    ports:
+      - 27018:27017
     image: mongo
     restart: always
     container_name: mongodb