reset packages and uninstall unused dep.

Code refactoring

.dockerignore

@@ -0,0 +1,2 @@
+**/node_modules
+**/.env

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: [danny-avila]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -2,6 +2,7 @@
 
 # Logs
 data-node
+meili_data
 logs
 *.log
 
@@ -33,6 +34,7 @@ client/public/main.js.LICENSE.txt
 # Deployed apps should consider commenting these lines out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules/
+meili_data/
 api/node_modules/
 client/node_modules/
 bower_components/
@@ -47,7 +49,6 @@ bower_components/
 .env
 cache.json
 api/data/
-.eslintrc.js
 owner.yml
 archive
 .vscode/settings.json

Dockerfile

@@ -0,0 +1,35 @@
+FROM node:19-alpine AS react-client
+WORKDIR /client
+# copy package.json into the container at /client
+COPY /client/package*.json /client/
+# install dependencies
+RUN npm ci
+# Copy the current directory contents into the container at /client
+COPY /client/ /client/
+# Build webpack artifacts
+RUN npm run build
+
+FROM node:19-alpine AS node-api
+WORKDIR /api
+# copy package.json into the container at /api
+COPY /api/package*.json /api/
+# install dependencies
+RUN npm ci
+# Copy the current directory contents into the container at /api
+COPY /api/ /api/
+# Copy the client side code
+COPY --from=react-client /client/public /client/public
+# Make port 3080 available to the world outside this container
+EXPOSE 3080
+# Expose the server to 0.0.0.0
+ENV HOST=0.0.0.0
+# Run the app when the container launches
+CMD ["npm", "start"]
+
+# Optional: for client with nginx routing
+FROM nginx:stable-alpine AS nginx-client
+WORKDIR /usr/share/nginx/html
+COPY --from=react-client /client/public /usr/share/nginx/html
+# Add your nginx.conf
+COPY /client/nginx.conf /etc/nginx/conf.d/default.conf
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

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

@@ -1,13 +1,93 @@
-# ChatGPT Clone #
-https://user-images.githubusercontent.com/110412045/223754183-8b7f45ce-6517-4bd5-9b39-c624745bf399.mp4
+<p align="center">
+  <a href="https://discord.gg/sDfH4MwDWJ">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://user-images.githubusercontent.com/110412045/228325485-9d3e618f-a980-44fe-89e9-d6d39164680e.png">
+      <img src="https://user-images.githubusercontent.com/110412045/228325485-9d3e618f-a980-44fe-89e9-d6d39164680e.png" height="128">
+    </picture>
+    <h1 align="center">ChatGPT Clone</h1>
+  </a>
+</p>
+
+<p align="center">
+  <a aria-label="Join the community on Discord" href="https://discord.gg/sDfH4MwDWJ">
+    <img alt="" src="https://img.shields.io/badge/Join%20the%20community-blueviolet.svg?style=for-the-badge&logo=DISCORD&labelColor=000000&logoWidth=20">
+  </a>
+  <a aria-label="Sponsors" href="#sponsors">
+    <img alt="" src="https://img.shields.io/badge/SPONSORS-brightgreen.svg?style=for-the-badge&labelColor=000000&logoWidth=20">
+  </a>
+</p>
 
 ## All AI Conversations under One Roof. ##
-  Assistant AIs are the future and OpenAI revolutionized this movement with ChatGPT. While numerous methods exist to integrate them, this app commemorates the original styling of ChatGPT, with the ability to integrate any current/future AI models, while improving upon original client features, such as conversation search and prompt templates (currently WIP).
+  Assistant AIs are the future and OpenAI revolutionized this movement with ChatGPT. While numerous UIs exist, this app commemorates the original styling of ChatGPT, with the ability to integrate any current/future AI models, while integrating and improving upon original client features, such as conversation/message search and prompt templates (currently WIP). Through this clone, you can avoid ChatGPT Plus in favor of free or pay-per-call APIs. I will soon deploy a demo of this app. Feel free to contribute, clone, or fork. Currently dockerized.
+  
+  <div align="center">
+  <video src="https://user-images.githubusercontent.com/110412045/223754183-8b7f45ce-6517-4bd5-9b39-c624745bf399.mp4" width=400/>
+</div>
+
+## Sponsors
+
+  Sponsored by <a href="https://github.com/DavidDev1334"><b>@DavidDev1334</b></a>
 
-  This project was started early in Feb '23, anticipating the release of the official ChatGPT API from OpenAI, and now uses it. Through this clone, you can avoid ChatGPT Plus in favor of free or pay-per-call APIs. I will soon deploy a demo of this app. Feel free to contribute, clone, or fork. Currently dockerized.
 
 ## Updates
 <details open>
+<summary><strong>2023-03-23</strong></summary>
+
+
+
+**Released [v0.1.0](https://github.com/danny-avila/chatgpt-clone/releases/tag/v0.1.0)**, **searching messages/conversations is live!** Up next is more custom parameters for customGpt's. Join the discord server for more immediate assistance and update: **[community discord server](https://discord.gg/NGaa9RPCft)**
+
+</details>
+
+<details>
+<summary><strong>Previous Updates</strong></summary>
+  
+<details>
+<summary><strong>2023-03-22</strong></summary>
+
+
+
+**Released [v0.0.6](https://github.com/danny-avila/chatgpt-clone/releases/tag/v0.0.6)**, the latest stable release before **Searching messages** goes live tomorrow. See exact updates to date in the tag link. By request, there is now also a **[community discord server](https://discord.gg/NGaa9RPCft)**
+
+</details>
+<details>
+<summary><strong>2023-03-20</strong></summary>
+
+
+
+**Searching messages** is almost here as I test more of its functionality. There've been a lot of great features requested and great contributions and I will work on some soon, namely, further customizing the custom gpt params with sliders similar to the OpenAI playground, and including the custom params and system messages available to Bing.
+
+The above features are next and then I will have to focus on building the **test environment.** I would **greatly appreciate** help in this area with any test environment you're familiar with (mocha, chai, jest, playwright, puppeteer). This is to aid in the velocity of contributing and to save time I spend debugging.
+
+On that note, I had to switch the default branch due to some breaking changes that haven't been straight forward to debug, mainly related to node-chat-gpt the main dependency of the project. Thankfully, my working branch, now switched to default as main, is working as expected.
+
+</details>
+<details>
+<summary><strong>2023-03-16</strong></summary>
+
+
+
+[Latest release (v0.0.4)](https://github.com/danny-avila/chatgpt-clone/releases/tag/v0.0.4) includes Resubmitting messages & Branching messages, which mirrors official ChatGPT feature of editing a sent message, that then branches the conversation into separate message paths (works only with ChatGPT)
+
+Full details and [example here](https://github.com/danny-avila/chatgpt-clone/releases/tag/v0.0.4). Message search is on the docket
+
+</details>
+<details>
+<summary><strong>2023-03-12</strong></summary>
+
+
+
+
+Really thankful for all the issues reported and contributions made, the project's features and improvements have accelerated as result. Honorable mention is [wtlyu](https://github.com/wtlyu) for contributing a lot of mindful code, namely hostname configuration and mobile styling. I will upload images on next release for faster docker setup, and starting updating them simultaneously with this repo.
+
+
+
+Many improvements across the board, the biggest is being able to start conversations simultaneously (again thanks to [wtlyu](https://github.com/wtlyu) for bringing it to my attention), as you can switch conversations or start a new chat without any response streaming from a prior one, as the backend will still process/save client responses. Just watch out for any rate limiting from OpenAI/Microsoft if this is done excessively.
+
+
+Adding support for conversation search is next! Thank you [mysticaltech](https://github.com/mysticaltech) for bringing up a method I can use for this.
+</details>
+<details>
 <summary><strong>2023-03-09</strong></summary>
 Released v.0.0.2
 
@@ -16,8 +96,6 @@ Adds Sydney (jailbroken Bing AI) to the model menu. Thank you [DavesDevFails](ht
 
 I've re-enabled the ChatGPT browser client (free version) since it might be working for most people, it no longer works for me. Sydney is the best free route anyway.
 </details>
-
-<details>
 <details>
 <summary><strong>2023-03-07</strong></summary>
 Due to increased interest in the repo, I've dockerized the app as of this update for quick setup! See setup instructions below. I realize this still takes some time with installing docker dependencies, so it's on the roadmap to have a deployed demo. Besides this, I've made major improvements for a lot of the existing features across the board, mainly UI/UX.
@@ -25,8 +103,6 @@ Due to increased interest in the repo, I've dockerized the app as of this update
 
 Also worth noting, the method to access the Free Version is no longer working, so I've removed it from model selection until further notice.
 </details>
-<summary><strong>Previous Updates</strong></summary>
-
 <details>
 <summary><strong>2023-03-04</strong></summary>
 Custom prompt prefixing and labeling is now supported through the official API. This nets some interesting results when you need ChatGPT for specific uses or entertainment. Select 'CustomGPT' in the model menu to configure this, and you can choose to save the configuration or reference it by conversation. Model selection will change by conversation.
@@ -55,21 +131,28 @@ Currently, this project is only functional with the `text-davinci-003` model.
 </details>
 
 # Table of Contents
-   * [Roadmap](#roadmap)
-   * [Features](#features)
-   * [Tech Stack](#tech-stack)
-   * [Getting Started](#getting-started)
-      * [Prerequisites](#prerequisites)
-      * [Usage](#usage)
-         * [Local (npm)](#npm)
-         * [Docker](#docker)
-         * [Access Tokens](#access-tokens)
-         * [Updating](#updating)
-   * [Use Cases](#use-cases)
-   * [Origin](#origin)
-   * [Caveats](#caveats)
-   * [Contributing](#contributing)
-   * [License](#license)
+- [ChatGPT Clone](#chatgpt-clone)
+  - [All AI Conversations under One Roof.](#all-ai-conversations-under-one-roof)
+  - [Updates](#updates)
+- [Table of Contents](#table-of-contents)
+  - [Roadmap](#roadmap)
+    - [Features](#features)
+    - [Tech Stack](#tech-stack)
+  - [Getting Started](#getting-started)
+    - [Prerequisites](#prerequisites)
+  - [Usage](#usage)
+    - [Local](#local)
+    - [Docker](#docker)
+    - [Access Tokens](#access-tokens)
+    - [Proxy](#proxy)
+    - [User System](#user-system)
+    - [Updating](#updating)
+  - [Use Cases](#use-cases)
+  - [Origin](#origin)
+  - [Caveats](#caveats)
+    - [Regarding use of Official ChatGPT API](#regarding-use-of-official-chatgpt-api)
+  - [Contributing](#contributing)
+  - [License](#license)
 
 ## Roadmap
 
@@ -77,7 +160,10 @@ Currently, this project is only functional with the `text-davinci-003` model.
 
 >  This is a work in progress. I'm building this in public. FYI there is still a lot of tech debt to cleanup. You can follow the progress here or on my [Linkedin](https://www.linkedin.com/in/danny-avila).
 
-Here are my recently completed and planned features:
+
+
+<details>
+<summary><strong>Here are my recently completed and planned features:</strong></summary>
 
 - [x] Persistent conversation
 - [x] Rename, delete conversations
@@ -89,35 +175,48 @@ Here are my recently completed and planned features:
 - [x] Customize prompt prefix/label (custom ChatGPT using official API)
 - [x] Server convo pagination (limit fetch and load more with 'show more' button)
 - [x] Config file for easy startup (docker compose)
-- [ ] Bing AI Styling (for suggested responses, convo end, etc.) - **In progress**
+- [x] Mobile styling (thanks to [wtlyu](https://github.com/wtlyu))
+- [x] Resubmit/edit sent messages (thanks to [wtlyu](https://github.com/wtlyu))
+- [ ] Message Search
+- [ ] Custom params for ChatGPT API (temp, top_p, presence_penalty)
+- [ ] Bing AI Styling (params, suggested responses, convo end, etc.) - **In progress**
 - [ ] Add warning before clearing convos
 - [ ] Build test suite for CI/CD
-- [ ] Conversation Search (by title)
-- [ ] Resubmit/edit sent messages
-- [ ] Semantic Search Option (requires more tokens)
 - [ ] Prompt Templates/Search
 - [ ] Refactor/clean up code (tech debt)
 - [ ] Optional use of local storage for credentials
-- [ ] Mobile styling (half-finished)
 - [ ] Deploy demo
 
+</details>
+
 ### Features
 
 - Response streaming identical to ChatGPT through server-sent events
 - UI from original ChatGPT, including Dark mode
 - AI model selection (official ChatGPT API, BingAI, ChatGPT Free)
 - Create and Save custom ChatGPTs*
+- Edit and Resubmit messages just like the official site (with conversation branching)
+- Search all messages/conversations - [see details here](https://github.com/danny-avila/chatgpt-clone/releases/tag/v0.1.0)
 
-^* ChatGPT can be 'customized' by setting a system message or prompt prefix and alternate 'role' to the API request
+^* ChatGPT can be 'customized' by setting a system message or prompt prefix and alternate 'role' to the API request^
 
 [More info here](https://platform.openai.com/docs/guides/chat/instructing-chat-models). Here's an [example from this app.]()
 
 ### Tech Stack
 
-- Utilizes [node-chatgpt-api](https://github.com/waylaidwanderer/node-chatgpt-api)
+
+<details>
+<summary><strong>This project uses:</strong></summary>
+
+
+
+- [node-chatgpt-api](https://github.com/waylaidwanderer/node-chatgpt-api)
 - No React boilerplate/toolchain/clone tutorials, created from scratch with react@latest
 - Use of Tailwind CSS and [shadcn/ui](https://github.com/shadcn/ui) components
 - Docker, useSWR, Redux, Express, MongoDB, [Keyv](https://www.npmjs.com/package/keyv)
+</details>
+
+
 
 ## Getting Started
 
@@ -125,6 +224,7 @@ Here are my recently completed and planned features:
 - npm
 - Node.js >= 19.0.0
 - MongoDB installed or [MongoDB Atlas](https://account.mongodb.com/account/login) (required if not using Docker)
+    - MongoDB does not support older ARM CPUs like those found in Raspberry Pis. However, you can make it work by setting MongoDB's version to mongo:4.4.18 in docker-compose.yml, the most recent version compatible with
 - [Docker (optional)](https://www.docker.com/get-started/)
 - [OpenAI API key](https://platform.openai.com/account/api-keys)
 - BingAI, ChatGPT access tokens (optional, free AIs)
@@ -138,34 +238,20 @@ Here are my recently completed and planned features:
 - If using MongoDB Atlas, remove `&w=majority` from default connection string.
 
 ### Local
-- **Run npm** install in both the api and client directories
-- **Provide** all credentials, (API keys, access tokens, and Mongo Connection String) in api/.env [(see .env example)](api/.env.example)
-- **Run** `npm run build` in /client/ dir, `npm start` in /api/ dir
-- **Visit** http://localhost:3080 (default port) & enjoy
+### **[In-depth instructions here!](https://github.com/danny-avila/chatgpt-clone/blob/0d4f0f74c04337aaf51b9a3eef898165a7009156/LOCAL_INSTALL.md)** 
+- thank you [@fuegovic](https://github.com/fuegovic)!
 
 ### Docker
 
 - **Provide** all credentials, (API keys, access tokens, and Mongo Connection String) in [docker-compose.yml](docker-compose.yml) under api service
-- **Build images** in both /api/ and /client/ directories (will eventually share through docker hub)
-    - `api/`
-    ```bash
-    docker build -t node-api .
-    ```
-    - `client/`
-    ```bash
-    docker build -t react-client .
-    ```
-- **Run** `docker-compose build` in project root dir and then `docker-compose up` to start the app
+- **Run** `docker-compose up` to start the app
+- Note: MongoDB does not support older ARM CPUs like those found in Raspberry Pis. However, you can make it work by setting MongoDB's version to mongo:4.4.18 in docker-compose.yml, the most recent version compatible with
 
 ### Access Tokens
 
 <details>
 <summary><strong>ChatGPT Free Instructions</strong></summary>
 
-
-**This has been disabled as is no longer working as of 3-07-23**
-
-
 To get your Access token For ChatGPT 'Free Version', login to chat.openai.com, then visit https://chat.openai.com/api/auth/session.
 
 
@@ -180,11 +266,89 @@ The Bing Access Token is the "_U" cookie from bing.com. Use dev tools or an exte
 **Note:** Specific error handling and styling for this model is still in progress.
 </details>
 
+### Proxy
+
+If your server cannot connect to the chatGPT API server by some reason, (eg in China). You can set a environment variable `PROXY`. This will be transmitted to `node-chatgpt-api` interface.
+
+**Warning:** `PROXY` is not `reverseProxyUrl` in `node-chatgpt-api`
+
+<details>
+<summary><strong>Set up proxy in local environment </strong></summary>
+
+Here is two ways to set proxy.
+- Option 1: system level environment
+`export PROXY="http://127.0.0.1:7890"`
+- Option 2: set in .env file
+`PROXY="http://127.0.0.1:7890"`
+
+**Change `http://127.0.0.1:7890` to your proxy server**
+</details>
+
+<details>
+<summary><strong>Set up proxy in docker environment </strong></summary>
+
+set in docker-compose.yml file, under services - api - environment
+
+```
+    api:
+        ...
+        environment:
+                ...
+                - "PROXY=http://127.0.0.1:7890"
+                # add this line ↑
+```
+
+**Change `http://127.0.0.1:7890` to your proxy server**
+
+</details>
+
+### User System
+
+By default, there is no user system enabled, so anyone can access your server.
+
+**This project is not designed to provide a complete and full-featured user system.** It's not high priority task and might never be provided.
+
+[wtlyu](https://github.com/wtlyu) provide a sample user system structure, that you can implement your own user system. It's simple and not a ready-for-use edition. 
+
+(If you want to implement your user system, open this ↓)
+
+<details>
+<summary><strong>Implement your own user system </strong></summary>
+
+To enable the user system, set `ENABLE_USER_SYSTEM=1` in your `.env` file.
+
+The sample structure is simple. It provide three basic endpoint:
+
+1. `/auth/login` will redirect to your own login url. In the sample code, it's `/auth/your_login_page`.
+2. `/auth/logout` will redirect to your own logout url. In the sample code, it's `/auth/your_login_page/logout`.
+3. `/api/me` will return the userinfo: `{ username, display }`.
+   1. `username` will be used in db, used to distinguish between users.
+   2. `display` will be displayed in UI.
+
+The only one thing that drive user system work is `req.session.user`. Once it's set, the client will be trusted. Set to `null` if logout.
+
+Please refer to `/api/server/routes/authYourLogin.js` file. It's very clear and simple to tell you how to implement your user system.
+
+Or you can ask chatGPT to write the code for you, here is one example to connect LDAP:
+
+```
+Please write me an express module, that serve the login and logout endpoint as a router. The login and logout uri is '/' and '/logout'. Once loginned, save display name and username in session.user, as {display, username}. Then redirect to '/'. Please write the code using express and other lib, and storage any server configuration in a config variable. I want the user to be connected to my LDAP server.
+```
+
+</details>
+
+
 ### Updating
+
 - As the project is still a work-in-progress, you should pull the latest and run the steps over. Reset your browser cache/clear site data.
 
 ## Use Cases ##
 
+
+
+<details>
+<summary><strong> Why use this project? </strong></summary>
+
   - One stop shop for all conversational AIs, with the added bonus of searching past conversations.
   - Using the official API, you'd have to generate 7.5 million words to expense the same cost as ChatGPT Plus ($20).
   - ChatGPT/Google Bard/Bing AI conversations are lost in space or
@@ -200,10 +364,12 @@ The Bing Access Token is the "_U" cookie from bing.com. Use dev tools or an exte
   - **ChatGPT Free is down.**
 
     ![use case example](./images/use_case.png "GPT is down! Plus is too expensive!")
+    
+    </details>
 
 
 ## Origin ##
-  This project was originally created as a Minimum Viable Product (or MVP) for the [@HackReactor](https://github.com/hackreactor/) Bootcamp. It was built with OpenAI response streaming and most of the UI completed in under 20 hours. During the end of that time, I had most of the UI and basic functionality done. This was created without using any boilerplates or templates, including create-react-app and other toolchains. I didn't follow any 'un-official chatgpt' video tutorials, and simply referenced the official site for the UI. The purpose of the exercise was to learn setting up a full stack project from scratch. Please feel free to give feedback, suggestions, or fork the project for your own use.
+    This project was started early in Feb '23, anticipating the release of the official ChatGPT API from OpenAI, which is now used. It was originally created as a Minimum Viable Product (or MVP) for the [@HackReactor](https://github.com/hackreactor/) Bootcamp. It was built with OpenAI response streaming and most of the UI completed in under 20 hours. During the end of that time, I had most of the UI and basic functionality done. This was created without using any boilerplates or templates, including create-react-app and other toolchains. I didn't follow any 'un-official chatgpt' video tutorials, and simply referenced the official site for the UI. The purpose of the exercise was to learn setting up a full stack project from scratch. Please feel free to give feedback, suggestions, or fork the project for your own use.
 
 
 ## Caveats
@@ -218,7 +384,12 @@ This means my implementation or the underlying model may not behave exactly the
   - This works in a similar way to ChatGPT, except I'm pretty sure they have some additional way of retrieving context from earlier messages when needed (which can probably be achieved with embeddings, but I consider that out-of-scope for now).
 
 ## Contributing
-If you'd like to contribute, please create a pull request with a detailed description of your changes.
+
+Contributions and suggestions welcome! Bug reports and fixes are welcome!
+
+For new features, components, or extensions, please open an issue and discuss before sending a PR. 
+
+- Join the [Discord community](https://discord.gg/NGaa9RPCft)
 
 ## License
 This project is licensed under the MIT License.

api/.dockerignore

@@ -1,2 +0,0 @@
-/node_modules
-.env

api/.env.example

@@ -1,7 +1,70 @@
-OPENAI_KEY=
+# Server configuration. 
+# The server will listen to localhost:3080 request by default. You can set the target ip as you want.
+# If you want this server can be used outside your local machine, for example to share with other 
+# machine or expose this from a docker container, set HOST=0.0.0.0 or your external ip interface.
+#
+# Tips: HOST=0.0.0.0 means listening on all interface. It's not a real ip. Use localhost:port rather
+# than 0.0.0.0:port to open it.
+HOST=localhost 
 PORT=3080
 NODE_ENV=development
+
+# Change this to proxy any API request. It's useful if your machine have difficulty calling the original API server.
+# PROXY="http://YOUR_PROXY_SERVER"
+
 # Change this to your MongoDB URI if different and I recommend appending chatgpt-clone
 MONGO_URI="mongodb://127.0.0.1:27017/chatgpt-clone"
-CHATGPT_TOKEN=""
-BING_TOKEN=""
+
+# API key configuration.
+# Leave blank if you don't want them.
+OPENAI_KEY=
+
+# Default ChatGPT API Model, options: 'gpt-4', 'text-davinci-003', 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301'
+# you will have errors if you don't have access to a model like 'gpt-4', defaults to turbo if left empty/excluded.
+DEFAULT_API_GPT=gpt-3.5-turbo
+
+# _U Cookies Value from bing.com
+BING_TOKEN=
+
+# ChatGPT Browser Client (free but use at your own risk)
+# Access token from https://chat.openai.com/api/auth/session
+# Exposes your access token to a 3rd party
+CHATGPT_TOKEN=
+# If you have access to other models on the official site, you can use them here.
+# Defaults to 'text-davinci-002-render-sha' if left empty.
+# options: gpt-4, text-davinci-002-render, text-davinci-002-render-paid, or text-davinci-002-render-sha
+# You cannot use a model that your account does not have access to. You can check 
+# which ones you have access to by opening DevTools and going to the Network tab. 
+# Refresh the page and look at the response body for https://chat.openai.com/backend-api/models.
+BROWSER_MODEL=
+
+# ENABLING SEARCH MESSAGES/CONVOS
+# Requires installation of free self-hosted Meilisearch or Paid Remote Plan (Remote not tested)
+# The easiest setup for this is through docker-compose, which takes care of it for you.
+# SEARCH=TRUE
+SEARCH=TRUE
+
+# REQUIRED FOR SEARCH: MeiliSearch Host, mainly for api server to connect to the search server.
+# must replace '0.0.0.0' with 'meilisearch' if serving meilisearch with docker-compose
+# MEILI_HOST='http://meilisearch:7700' # <-- docker-compose (should already be setup on docker-compose.yml)
+MEILI_HOST='http://0.0.0.0:7700' # <-- local/remote
+
+# REQUIRED FOR SEARCH: MeiliSearch HTTP Address, mainly for docker-compose to expose the search server.
+# must replace '0.0.0.0' with 'meilisearch' if serving meilisearch with docker-compose
+# MEILI_HTTP_ADDR='meilisearch:7700'  # <-- docker-compose (should already be setup on docker-compose.yml)
+MEILI_HTTP_ADDR='0.0.0.0:7700'  # <-- local/remote
+
+# REQUIRED FOR SEARCH: In production env., needs a secure key, feel free to generate your own.
+# This master key must be at least 16 bytes, composed of valid UTF-8 characters.
+# Meilisearch will throw an error and refuse to launch if no master key is provided or if it is under 16 bytes, 
+# Meilisearch will suggest a secure autogenerated master key.
+# Using docker, it seems recognized as production so use a secure key.
+# MEILI_MASTER_KEY=                                           # <-- empty/insecure key works for local/remote
+MEILI_MASTER_KEY=JKMW-hGc7v_D1FkJVdbRSDNFLZcUv3S75yrxXP0SmcU # <-- ready made secure key for docker-compose
+
+
+# User System
+# global enable/disable the sample user system.
+# this is not a ready to use user system.
+# dont't use it, unless you can write your own code.
+# ENABLE_USER_SYSTEM=  # <-- make sure you don't comment this back in if you're not using your own user system

api/.eslintrc.js

@@ -0,0 +1,39 @@
+module.exports = {
+  env: {
+    es2021: true,
+    node: true
+  },
+  extends: ['eslint:recommended'],
+  overrides: [],
+  parserOptions: {
+    ecmaVersion: 'latest',
+    sourceType: 'module'
+  },
+  rules: {
+    indent: ['error', 2, { SwitchCase: 1 }],
+    'max-len': [
+      'error',
+      {
+        code: 150,
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true,
+        ignoreComments: true
+      }
+    ],
+    'linebreak-style': 0,
+    'arrow-parens': [2, 'as-needed', { requireForBlockBody: true }],
+    // 'no-plusplus': ['error', { allowForLoopAfterthoughts: true }],
+    'no-console': 'off',
+    'import/extensions': 'off',
+    'no-use-before-define': [
+      'error',
+      {
+        functions: false
+      }
+    ],
+    'no-promise-executor-return': 'off',
+    'no-param-reassign': 'off',
+    'no-continue': 'off',
+    'no-restricted-syntax': 'off'
+  }
+};

api/.prettierrc

@@ -0,0 +1,22 @@
+{
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "htmlWhitespaceSensitivity": "css",
+  "insertPragma": false,
+  "singleAttributePerLine": true,
+  "bracketSameLine": false,
+  "jsxBracketSameLine": false,
+  "jsxSingleQuote": false,
+  "printWidth": 110,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "useTabs": false,
+  "vueIndentScriptAndStyle": false,
+  "parser": "babel"
+}

api/Dockerfile

@@ -1,14 +0,0 @@
-FROM node:19-alpine
-WORKDIR /api
-# copy package.json into the container at /api
-COPY package*.json /api/
-# install dependencies
-RUN npm install
-# Copy the current directory contents into the container at /api
-COPY . /api/
-# Make port 3080 available to the world outside this container
-EXPOSE 3080
-# Run the app when the container launches
-CMD ["npm", "start"]
-
-# docker build -t node-api .

api/app/chatgpt-browser.js

@@ -1,33 +0,0 @@
-require('dotenv').config();
-const { KeyvFile } = require('keyv-file');
-
-const clientOptions = {
-  // Warning: This will expose your access token to a third party. Consider the risks before using this.
-  reverseProxyUrl: 'https://chatgpt.duti.tech/api/conversation',
-  // Access token from https://chat.openai.com/api/auth/session
-  accessToken: process.env.CHATGPT_TOKEN,
-  // debug: true
-};
-
-const browserClient = async ({ text, progressCallback, convo }) => {
-  const { ChatGPTBrowserClient } = await import('@waylaidwanderer/chatgpt-api');
-
-  const store = {
-    store: new KeyvFile({ filename: './data/cache.json' })
-  };
-
-  const client = new ChatGPTBrowserClient(clientOptions, store);
-
-  let options = {
-    onProgress: async (partialRes) => await progressCallback(partialRes)
-  };
-
-  if (!!convo.parentMessageId && !!convo.conversationId) {
-    options = { ...options, ...convo };
-  }
-
-  const res = await client.sendMessage(text, options);
-  return res;
-};
-
-module.exports = { browserClient };

api/app/chatgpt.js

@@ -1,38 +0,0 @@
-require('dotenv').config();
-const Keyv = require('keyv');
-const { Configuration, OpenAIApi } = require('openai');
-const messageStore = new Keyv(process.env.MONGODB_URI, { namespace: 'chatgpt' });
-
-const ask = async (question, progressCallback, convo) => {
-  const { ChatGPTAPI } = await import('chatgpt');
-  const api = new ChatGPTAPI({ apiKey: process.env.OPENAI_KEY, messageStore });
-  let options = {
-    onProgress: async (partialRes) => {
-      if (partialRes.text.length > 0) {
-        await progressCallback(partialRes);
-      }
-    }
-  };
-
-  if (!!convo.parentMessageId && !!convo.conversationId) {
-    options = { ...options, ...convo };
-  }
-
-  const res = await api.sendMessage(question, options);
-  return res;
-};
-
-const titleConvo = async (message, response, model) => {
-  const configuration = new Configuration({
-    apiKey: process.env.OPENAI_KEY
-  });
-  const openai = new OpenAIApi(configuration);
-  const completion = await openai.createCompletion({
-    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 ${model}, that summarizes this conversation:\nUser:"${message}"\n${model}:"${response}"\nTitle: `
-  });
-
-  return completion.data.choices[0].text.replace(/\n/g, '');
-};
-
-module.exports = { ask, titleConvo };

api/app/clients/bingai.js

@@ -1,8 +1,8 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 
-const askBing = async ({ text, progressCallback, convo }) => {
-  const { BingAIClient } = (await import('@waylaidwanderer/chatgpt-api'));
+const askBing = async ({ text, onProgress, convo }) => {
+  const { BingAIClient } = await import('@waylaidwanderer/chatgpt-api');
 
   const bingAIClient = new BingAIClient({
     // "_U" cookie from bing.com
@@ -10,19 +10,26 @@ const askBing = async ({ text, progressCallback, convo }) => {
     // If the above doesn't work, provide all your cookies as a string instead
     // cookies: '',
     debug: false,
-    cache: { store: new KeyvFile({ filename: './data/cache.json' }) }
+    cache: { store: new KeyvFile({ filename: './data/cache.json' }) },
+    proxy: process.env.PROXY || null
   });
 
-  let options = {
-    onProgress: async (partialRes) => await progressCallback(partialRes),
-  };
-
+  let options = { onProgress };
   if (convo) {
     options = { ...options, ...convo };
   }
 
-  const res = await bingAIClient.sendMessage(text, options
-  );
+  if (options?.jailbreakConversationId == 'false') {
+    options.jailbreakConversationId = false;
+  }
+
+  if (convo.toneStyle) {
+    options.toneStyle = convo.toneStyle;
+  }
+
+  console.log('bing options', options);
+
+  const res = await bingAIClient.sendMessage(text, options);
 
   return res;
 

api/app/clients/chatgpt-browser.js

@@ -0,0 +1,45 @@
+require('dotenv').config();
+const { KeyvFile } = require('keyv-file');
+const set = new Set(["gpt-4", "text-davinci-002-render", "text-davinci-002-render-paid", "text-davinci-002-render-sha"]);
+
+const clientOptions = {
+  // Warning: This will expose your access token to a third party. Consider the risks before using this.
+  reverseProxyUrl: 'https://bypass.duti.tech/api/conversation',
+  // Access token from https://chat.openai.com/api/auth/session
+  accessToken: process.env.CHATGPT_TOKEN,
+  // debug: true
+  proxy: process.env.PROXY || null,
+};
+
+// You can check which models you have access to by opening DevTools and going to the Network tab. 
+// Refresh the page and look at the response body for https://chat.openai.com/backend-api/models.
+if (set.has(process.env.BROWSER_MODEL)) {
+  clientOptions.model = process.env.BROWSER_MODEL;
+}
+
+const browserClient = async ({ text, onProgress, convo, abortController }) => {
+  const { ChatGPTBrowserClient } = await import('@waylaidwanderer/chatgpt-api');
+
+  const store = {
+    store: new KeyvFile({ filename: './data/cache.json' })
+  };
+
+  const client = new ChatGPTBrowserClient(clientOptions, store);
+  let options = { onProgress, abortController };
+
+  if (!!convo.parentMessageId && !!convo.conversationId) {
+    options = { ...options, ...convo };
+  }
+
+  console.log('gptBrowser options', options, clientOptions);
+
+  /* will error if given a convoId at the start */
+  if (convo.parentMessageId.startsWith('0000')) {
+    delete options.conversationId;
+  }
+
+  const res = await client.sendMessage(text, options);
+  return res;
+};
+
+module.exports = { browserClient };

api/app/clients/chatgpt-client.js

@@ -1,24 +1,27 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
+const set = new Set(['gpt-4', 'text-davinci-003', 'gpt-3.5-turbo', 'gpt-3.5-turbo-0301']);
 
 const clientOptions = {
   modelOptions: {
     model: 'gpt-3.5-turbo'
   },
+  proxy: process.env.PROXY || null,
   debug: false
 };
 
-const askClient = async ({ text, progressCallback, convo }) => {
+if (set.has(process.env.DEFAULT_API_GPT)) {
+  clientOptions.modelOptions.model = process.env.DEFAULT_API_GPT;
+}
+
+const askClient = async ({ text, onProgress, convo, abortController }) => {
   const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
   const store = {
     store: new KeyvFile({ filename: './data/cache.json' })
   };
 
   const client = new ChatGPTClient(process.env.OPENAI_KEY, clientOptions, store);
-
-  let options = {
-    onProgress: async (partialRes) => await progressCallback(partialRes)
-  };
+  let options = { onProgress, abortController };
 
   if (!!convo.parentMessageId && !!convo.conversationId) {
     options = { ...options, ...convo };

api/app/clients/chatgpt-custom.js

@@ -5,10 +5,11 @@ const clientOptions = {
   modelOptions: {
     model: 'gpt-3.5-turbo'
   },
+  proxy: process.env.PROXY || null,
   debug: false
 };
 
-const customClient = async ({ text, progressCallback, convo, promptPrefix, chatGptLabel }) => {
+const customClient = async ({ text, onProgress, convo, promptPrefix, chatGptLabel, abortController }) => {
   const ChatGPTClient = (await import('@waylaidwanderer/chatgpt-api')).default;
   const store = {
     store: new KeyvFile({ filename: './data/cache.json' })
@@ -16,16 +17,13 @@ const customClient = async ({ text, progressCallback, convo, promptPrefix, chatG
 
   clientOptions.chatGptLabel = chatGptLabel;
 
-  if (promptPrefix.length > 0) {
+  if (promptPrefix?.length > 0) {
     clientOptions.promptPrefix = promptPrefix;
   }
 
   const client = new ChatGPTClient(process.env.OPENAI_KEY, clientOptions, store);
 
-  let options = {
-    onProgress: async (partialRes) => await progressCallback(partialRes)
-  };
-
+  let options = { onProgress, abortController };
   if (!!convo.parentMessageId && !!convo.conversationId) {
     options = { ...options, ...convo };
   }

api/app/clients/sydney.js

@@ -1,7 +1,7 @@
 require('dotenv').config();
 const { KeyvFile } = require('keyv-file');
 
-const askSydney = async ({ text, progressCallback, convo }) => {
+const askSydney = async ({ text, onProgress, convo }) => {
   const { BingAIClient } = (await import('@waylaidwanderer/chatgpt-api'));
 
   const sydneyClient = new BingAIClient({
@@ -15,13 +15,17 @@ const askSydney = async ({ text, progressCallback, convo }) => {
 
   let options = {
     jailbreakConversationId: true,
-    onProgress: async (partialRes) => await progressCallback(partialRes),
+    onProgress,
   };
 
-  if (convo.parentMessageId) {
+  if (convo.jailbreakConversationId) {
     options = { ...options, jailbreakConversationId: convo.jailbreakConversationId, parentMessageId: convo.parentMessageId };
   }
 
+  if (convo.toneStyle) {
+    options.toneStyle = convo.toneStyle;
+  }
+
   console.log('sydney options', options);
 
   const res = await sydneyClient.sendMessage(text, options

api/app/detectCode.js

@@ -1,54 +0,0 @@
-const { ModelOperations } = require('@vscode/vscode-languagedetection');
-const codeRegex = /(```[\s\S]*?```)/g;
-const languageMatch = /```(\w+)/;
-
-const detectCode = async (text) => {
-  try {
-    if (!text.match(codeRegex)) {
-      // console.log('disqualified for non-code match')
-      return text;
-    }
-
-    if (text.match(languageMatch)) {
-      // console.log('disqualified for language match')
-      return text;
-    }
-
-    // console.log('qualified for code match');
-    const modelOperations = new ModelOperations();
-    const regexSplit = (await import('./regexSplit.mjs')).default;
-    const parts = regexSplit(text, codeRegex);
-
-    const output = parts.map(async (part) => {
-      if (part.match(codeRegex)) {
-        const code = part.slice(3, -3);
-        const language = await modelOperations.runModel(code);
-        return part.replace(/^```/, `\`\`\`${language[0].languageId}`);
-      } else {
-        // return i > 0 ? '\n' + part : part;
-        return part;
-      }
-    });
-
-    return (await Promise.all(output)).join('');
-  } catch (e) {
-    console.log('Error in detectCode function\n', e);
-    return text;
-  }
-};
-
-// const example3 = {
-//   text: "By default, the function generates an 8-character password with uppercase and lowercase letters and digits, but no special characters.\n\nTo use this function, simply call it with the desired arguments. For example:\n\n```\n>>> generate_password()\n'wE5pUxV7'\n>>> generate_password(length=12, special_chars=True)\n'M4v&^gJ*8#qH'\n>>> generate_password(uppercase=False, digits=False)\n'zajyprxr'\n``` \n\nNote that the randomness is used to select characters from the available character sets, but the resulting password is always deterministic given the same inputs. This makes the function useful for generating secure passwords that meet specific requirements."
-// };
-
-// const example4 = {
-//   text: 'here\'s a cool function:\n```\nimport random\nimport string\n\ndef generate_password(length=8, uppercase=True, lowercase=True, digits=True, special_chars=False):\n    """Generate a random password with specified requirements.\n\n    Args:\n        length (int): The length of the password. Default is 8.\n        uppercase (bool): Whether to include uppercase letters. Default is True.\n        lowercase (bool): Whether to include lowercase letters. Default is True.\n        digits (bool): Whether to include digits. Default is True.\n        special_chars (bool): Whether to include special characters. Default is False.\n\n    Returns:\n        str: A random password with the specified requirements.\n    """\n    # Define character sets to use in password generation\n    chars = ""\n    if uppercase:\n        chars += string.ascii_uppercase\n    if lowercase:\n        chars += string.ascii_lowercase\n    if digits:\n        chars += string.digits\n    if special_chars:\n        chars += string.punctuation\n\n    # Generate the password\n    password = "".join(random.choice(chars) for _ in range(length))\n    return password\n```\n\nThis function takes several arguments'
-// };
-
-// write an immediately invoked function to test this
-// (async () => {
-//   const result = await detectCode(example3.text);
-//   console.log(result);
-// })();
-
-module.exports = detectCode;

api/app/index.js

@@ -1,12 +1,11 @@
-const { askClient } = require('./chatgpt-client');
-const { browserClient } = require('./chatgpt-browser');
-const customClient = require('./chatgpt-custom');
-const { askBing } = require('./bingai');
-const { askSydney } = require('./sydney');
+const { askClient } = require('./clients/chatgpt-client');
+const { browserClient } = require('./clients/chatgpt-browser');
+const { askBing } = require('./clients/bingai');
+const { askSydney } = require('./clients/sydney');
+const customClient = require('./clients/chatgpt-custom');
 const titleConvo = require('./titleConvo');
-const getCitations = require('./getCitations');
-const citeText = require('./citeText');
-const detectCode = require('./detectCode');
+const getCitations = require('../lib/parse/getCitations');
+const citeText = require('../lib/parse/citeText');
 
 module.exports = {
   askClient,
@@ -17,5 +16,4 @@ module.exports = {
   titleConvo,
   getCitations,
   citeText,
-  detectCode
-};
+};

api/app/regexSplit.mjs

@@ -1,46 +0,0 @@
-const primaryRegex = /```([^`\n]*?)\n([\s\S]*?)\n```/g;
-const secondaryRegex = /```([^`\n]*?)\n?([\s\S]*?)\n?```/g;
-
-const unenclosedCodeTest = (text) => {
-  let workingText = text;
-  // if (workingText.startsWith('<') || (!workingText.startsWith('`') && workingText.match(/```/g)?.length === 1)) {
-  //   workingText = `\`\`\`${workingText}`
-  // }
-
-  return workingText.trim();
-};
-
-export default function regexSplit(string) {
-  let matches = [...string.matchAll(primaryRegex)];
-
-  if (!matches[0]) {
-    matches = [...string.matchAll(secondaryRegex)];
-  }
-
-  const output = [matches[0].input.slice(0, matches[0].index)];
-
-  // console.log(matches);
-
-  for (let i = 0; i < matches.length; i++) {
-    const [fullMatch, language, code] = matches[i];
-    // const formattedCode = code.replace(/`+/g, '\\`');
-    output.push(`\`\`\`${language}\n${code}\n\`\`\``);
-    if (i < matches.length - 1) {
-      let nextText = string.slice(matches[i].index + fullMatch.length, matches[i + 1].index);
-      nextText = unenclosedCodeTest(nextText);
-      output.push(nextText);
-    } else {
-      const lastMatch = matches[matches.length - 1][0];
-      // console.log(lastMatch);
-      // console.log(matches[0].input.split(lastMatch));
-      let rest = matches[0].input.split(lastMatch)[1]
-
-      if (rest) {
-        rest = unenclosedCodeTest(rest);
-        output.push(rest);
-      }
-    }
-  }
-
-  return output;
-}

api/app/titleConvo.js

@@ -1,24 +1,75 @@
 const { Configuration, OpenAIApi } = require('openai');
+const _ = require('lodash');
 
-const titleConvo = async ({ message, response, model }) => {
-  const configuration = new Configuration({
-    apiKey: process.env.OPENAI_KEY
-  });
-  const openai = new OpenAIApi(configuration);
-  const completion = await openai.createChatCompletion({
-    model: 'gpt-3.5-turbo',
-    messages: [
-      {
-        role: 'system',
-        content:
-          'You are a title-generator with one job: titling the conversation provided by a user in title case.'
-      },
-      { role: 'user', content: `In 5 words or less, summarize the conversation below with a title in title case. Don't refer to the participants of the conversation by name. Do not include punctuation or quotation marks. Your response should be in title case, exclusively containing the title. Conversation:\n\nUser: "${message}"\n\n${model}: "${response}"\n\nTitle: ` },
-    ]
-  });
+const proxyEnvToAxiosProxy = proxyString => {
+  if (!proxyString) return null;
 
-  //eslint-disable-next-line
-  return completion.data.choices[0].message.content.replace(/["\.]/g, '');
+  const regex = /^([^:]+):\/\/(?:([^:@]*):?([^:@]*)@)?([^:]+)(?::(\d+))?/;
+  const [, protocol, username, password, host, port] = proxyString.match(regex);
+  const proxyConfig = {
+    protocol,
+    host,
+    port: port ? parseInt(port) : undefined,
+    auth: username && password ? { username, password } : undefined
+  };
+
+  return proxyConfig;
 };
 
-module.exports = titleConvo;
+const titleConvo = async ({ model, text, response }) => {
+  let title = 'New Chat';
+  const messages = [
+    {
+      role: 'system',
+      content:
+        // `You are a title-generator with one job: giving a conversation, detect the language and titling the conversation provided by a user, using the same language. The requirement are: 1. If possible, generate in 5 words or less, 2. Using title case, 3. must give the title using the language as the user said. 4. Don't refer to the participants of the conversation. 5. Do not include punctuation or quotation marks. 6. Your response should be in title case, exclusively containing the title. 7. don't say anything except the title.
+        `Detect user language and write in the same language an extremely concise title for this conversation, which you must accurately detect. Write in the detected language. Title in 5 Words or Less. No Punctuation/Quotation. All first letters of every word should be capitalized and complete only the title in User Language only.
+
+||>User:
+"${text}"
+||>Response:
+"${JSON.stringify(response?.text)}"
+
+||>Title:`
+    }
+    // {
+    //   role: 'user',
+    //   content: `User:\n "${text}"\n\n${model}: \n"${JSON.stringify(response?.text)}"\n\n`
+    // }
+  ];
+
+  // console.log('Title Prompt', messages[0]);
+
+  const request = {
+    model: 'gpt-3.5-turbo',
+    messages,
+    temperature: 0,
+    presence_penalty: 0,
+    frequency_penalty: 0
+  };
+
+  // console.log('REQUEST', request);
+
+  try {
+    const configuration = new Configuration({
+      apiKey: process.env.OPENAI_KEY
+    });
+    const openai = new OpenAIApi(configuration);
+    const completion = await openai.createChatCompletion(request, {
+      proxy: proxyEnvToAxiosProxy(process.env.PROXY || null)
+    });
+
+    //eslint-disable-next-line
+    title = completion.data.choices[0].message.content.replace(/["\.]/g, '');
+  } catch (e) {
+    console.error(e);
+    console.log('There was an issue generating title, see error above');
+  }
+
+  console.log('CONVERSATION TITLE', title);
+  return title;
+};
+
+const throttledTitleConvo = _.throttle(titleConvo, 1000);
+
+module.exports = throttledTitleConvo;

api/lib/db/connectDb.js

@@ -17,7 +17,7 @@ if (!cached) {
   cached = global.mongoose = { conn: null, promise: null };
 }
 
-async function dbConnect() {
+async function connectDb() {
   if (cached.conn) {
     return cached.conn;
   }
@@ -41,4 +41,4 @@ async function dbConnect() {
   return cached.conn;
 }
 
-module.exports = dbConnect;
+module.exports = connectDb;

api/lib/db/indexSync.js

@@ -0,0 +1,70 @@
+const mongoose = require('mongoose');
+const Conversation = mongoose.models.Conversation;
+const Message = mongoose.models.Message;
+const { MeiliSearch } = require('meilisearch');
+let currentTimeout = null;
+
+// eslint-disable-next-line no-unused-vars
+async function indexSync(req, res, next) {
+  try {
+    if (!process.env.MEILI_HOST || !process.env.MEILI_MASTER_KEY || !process.env.SEARCH) {
+      throw new Error('Meilisearch not configured, search will be disabled.');
+    }
+
+    const client = new MeiliSearch({
+      host: process.env.MEILI_HOST,
+      apiKey: process.env.MEILI_MASTER_KEY
+    });
+
+    const { status } = await client.health();
+    // console.log(`Meilisearch: ${status}`);
+    const result = status === 'available' && !!process.env.SEARCH;
+
+    if (!result) {
+      throw new Error('Meilisearch not available');
+    }
+
+    const messageCount = await Message.countDocuments();
+    const convoCount = await Conversation.countDocuments();
+    const messages = await client.index('messages').getStats();
+    const convos = await client.index('convos').getStats();
+    const messagesIndexed = messages.numberOfDocuments;
+    const convosIndexed = convos.numberOfDocuments;
+
+    console.log(`There are ${messageCount} messages in the database, ${messagesIndexed} indexed`);
+    console.log(`There are ${convoCount} convos in the database, ${convosIndexed} indexed`);
+
+    if (messageCount !== messagesIndexed) {
+      console.log('Messages out of sync, indexing');
+      await Message.syncWithMeili();
+    }
+
+    if (convoCount !== convosIndexed) {
+      console.log('Convos out of sync, indexing');
+      await Conversation.syncWithMeili();
+    }
+  } catch (err) {
+    // console.log('in index sync');
+    if (err.message.includes('not found')) {
+      console.log('Creating indices...');
+      currentTimeout = setTimeout(async () => {
+        try {
+          await Message.syncWithMeili();
+          await Conversation.syncWithMeili();
+        } catch (err) {
+          console.error('Trouble creating indices, try restarting the server.');
+        }
+      }, 750);
+    } else {
+      console.error(err);
+      // res.status(500).json({ error: 'Server error' });
+    }
+  }
+}
+
+process.on('exit', () => {
+  console.log('Clearing sync timeouts before exiting...');
+  clearTimeout(currentTimeout);
+});
+
+module.exports = indexSync;

api/lib/db/migrateDb.js

@@ -0,0 +1,63 @@
+const mongoose = require('mongoose');
+const { Conversation, } = require('../../models/Conversation');
+const { getMessages, } = require('../../models/');
+
+async function migrateDb() {
+  try {
+    const conversations = await Conversation.find({ model: null }).exec();
+
+    if (!conversations || conversations.length === 0)
+      return { message: '[Migrate] No conversations to migrate' };
+
+    for (let convo of conversations) {
+      const messages = await getMessages({
+        conversationId: convo.conversationId,
+        messageId: { $exists: false }
+      });
+
+      let model;
+      let oldId;
+      const promises = [];
+      messages.forEach((message, i) => {
+        const msgObj = message.toObject();
+        const newId = msgObj.id;
+        if (i === 0) {
+          message.parentMessageId = '00000000-0000-0000-0000-000000000000';
+        } else {
+          message.parentMessageId = oldId;
+        }
+
+        oldId = newId;
+        message.messageId = newId;
+        if (message.sender.toLowerCase() !== 'user' && !model) {
+          model = message.sender.toLowerCase();
+        }
+
+        if (message.sender.toLowerCase() === 'user') {
+          message.isCreatedByUser = true;
+        }
+        
+        promises.push(message.save());
+      });
+      await Promise.all(promises);
+
+      await Conversation.findOneAndUpdate(
+        { conversationId: convo.conversationId },
+        { model },
+        { new: true }
+      ).exec();
+    }
+
+    try {
+      await mongoose.connection.db.collection('messages').dropIndex('id_1');
+    } catch (error) {
+      console.log("[Migrate] Index doesn't exist or already dropped");
+    }
+  } catch (error) {
+    console.log(error);
+    return { message: '[Migrate] Error migrating conversations' };
+  }
+}
+
+
+module.exports = migrateDb;

api/lib/parse/citeText.js

@@ -1,4 +1,4 @@
-const citationRegex = /\[\^\d+?\^]/g;
+const citationRegex = /\[\^\d+?\^\]/g;
 
 const citeText = (res, noLinks = false) => {
   let result = res.text || res;
@@ -8,6 +8,7 @@ const citeText = (res, noLinks = false) => {
   if (noLinks) {
     citations.forEach((citation) => {
       const digit = citation.match(/\d+?/g)[0];
+      // result = result.replaceAll(citation, `<sup>[${digit}](#)  </sup>`);
       result = result.replaceAll(citation, `<sup>[${digit}](#)  </sup>`);
     });
 
@@ -20,7 +21,8 @@ const citeText = (res, noLinks = false) => {
 
   citations.forEach((citation) => {
     const digit = citation.match(/\d+?/g)[0];
-    result = result.replaceAll(citation, `<sup>[${digit}](${sources[digit - 1]})  </sup>`);
+    result = result.replaceAll(citation, `<sup>[${digit}](${sources[digit - 1]}) </sup>`);
+    // result = result.replaceAll(citation, `<sup>[${digit}](${sources[digit - 1]})  </sup>`);
   });
 
   return result;

api/lib/utils/mergeSort.js

@@ -0,0 +1,29 @@
+function mergeSort(arr, compareFn) {
+  if (arr.length <= 1) {
+    return arr;
+  }
+  
+  const mid = Math.floor(arr.length / 2);
+  const leftArr = arr.slice(0, mid);
+  const rightArr = arr.slice(mid);
+  
+  return merge(mergeSort(leftArr, compareFn), mergeSort(rightArr, compareFn), compareFn);
+}
+
+function merge(leftArr, rightArr, compareFn) {
+  const result = [];
+  let leftIndex = 0;
+  let rightIndex = 0;
+  
+  while (leftIndex < leftArr.length && rightIndex < rightArr.length) {
+    if (compareFn(leftArr[leftIndex], rightArr[rightIndex]) < 0) {
+      result.push(leftArr[leftIndex++]);
+    } else {
+      result.push(rightArr[rightIndex++]);
+    }
+  }
+  
+  return result.concat(leftArr.slice(leftIndex)).concat(rightArr.slice(rightIndex));
+}
+
+module.exports = mergeSort;

api/lib/utils/misc.js

@@ -0,0 +1,15 @@
+const cleanUpPrimaryKeyValue = (value) => {
+  // For Bing convoId handling
+  return value.replace(/--/g, '|');
+};
+
+function replaceSup(text) {
+  if (!text.includes('<sup>')) return text;
+  const replacedText = text.replace(/<sup>/g, '^').replace(/\s+<\/sup>/g, '^');
+  return replacedText;
+}
+
+module.exports = {
+  cleanUpPrimaryKeyValue,
+  replaceSup
+};

api/lib/utils/reduceHits.js

@@ -0,0 +1,59 @@
+const mergeSort = require('./mergeSort');
+const { cleanUpPrimaryKeyValue } = require('./misc');
+
+function reduceMessages(hits) {
+  const counts = {};
+
+  for (const hit of hits) {
+    if (!counts[hit.conversationId]) {
+      counts[hit.conversationId] = 1;
+    } else {
+      counts[hit.conversationId]++;
+    }
+  }
+
+  const result = [];
+
+  for (const [conversationId, count] of Object.entries(counts)) {
+    result.push({
+      conversationId,
+      count
+    });
+  }
+
+  return mergeSort(result, (a, b) => b.count - a.count);
+}
+
+function reduceHits(hits, titles = []) {
+  const counts = {};
+  const titleMap = {};
+  const convos = [...hits, ...titles];
+
+  for (const convo of convos) {
+    const currentId = cleanUpPrimaryKeyValue(convo.conversationId);
+    if (!counts[currentId]) {
+      counts[currentId] = 1;
+    } else {
+      counts[currentId]++;
+    }
+
+    if (convo.title) {
+      // titleMap[currentId] = convo._formatted.title;
+      titleMap[currentId] = convo.title;
+    }
+  }
+
+  const result = [];
+
+  for (const [conversationId, count] of Object.entries(counts)) {
+    result.push({
+      conversationId,
+      count,
+      title: titleMap[conversationId] ? titleMap[conversationId] : null
+    });
+  }
+
+  return mergeSort(result, (a, b) => b.count - a.count);
+}
+
+module.exports = { reduceMessages, reduceHits };

api/models/Config.js

@@ -0,0 +1,84 @@
+const mongoose = require('mongoose');
+const major = [0, 0];
+const minor = [0, 0];
+const patch = [0, 5];
+
+const configSchema = mongoose.Schema(
+  {
+    tag: {
+      type: String,
+      required: true,
+      validate: {
+        validator: function (tag) {
+          const [part1, part2, part3] = tag.replace('v', '').split('.').map(Number);
+
+          // Check if all parts are numbers
+          if (isNaN(part1) || isNaN(part2) || isNaN(part3)) {
+            return false;
+          }
+
+          // Check if all parts are within their respective ranges
+          if (part1 < major[0] || part1 > major[1]) {
+            return false;
+          }
+          if (part2 < minor[0] || part2 > minor[1]) {
+            return false;
+          }
+          if (part3 < patch[0] || part3 > patch[1]) {
+            return false;
+          }
+          return true;
+        },
+        message: 'Invalid tag value'
+      }
+    },
+    searchEnabled: {
+      type: Boolean,
+      default: false
+    },
+    usersEnabled: {
+      type: Boolean,
+      default: false
+    },
+    startupCounts: {
+      type: Number,
+      default: 0
+    }
+  },
+  { timestamps: true }
+);
+
+// Instance method
+configSchema.methods.incrementCount = function () {
+  this.startupCounts += 1;
+};
+
+// Static methods
+configSchema.statics.findByTag = async function (tag) {
+  return await this.findOne({ tag });
+};
+
+configSchema.statics.updateByTag = async function (tag, update) {
+  return await this.findOneAndUpdate({ tag }, update, { new: true });
+};
+
+const Config = mongoose.models.Config || mongoose.model('Config', configSchema);
+
+module.exports = {
+  getConfigs: async (filter) => {
+    try {
+      return await Config.find(filter).exec();
+    } catch (error) {
+      console.error(error);
+      return { config: 'Error getting configs' };
+    }
+  },
+  deleteConfigs: async (filter) => {
+    try {
+      return await Config.deleteMany(filter).exec();
+    } catch (error) {
+      console.error(error);
+      return { config: 'Error deleting configs' };
+    }
+  }
+};

api/models/Conversation.js

@@ -1,55 +1,10 @@
-const mongoose = require('mongoose');
+// const { Conversation } = require('./plugins');
+const Conversation = require('./schema/convoSchema');
 const { getMessages, deleteMessages } = require('./Message');
 
-const convoSchema = mongoose.Schema({
-  conversationId: {
-    type: String,
-    unique: true,
-    required: true
-  },
-  parentMessageId: {
-    type: String,
-    required: true
-  },
-  title: {
-    type: String,
-    default: 'New conversation'
-  },
-  jailbreakConversationId: {
-    type: String
-  },
-  conversationSignature: {
-    type: String
-  },
-  clientId: {
-    type: String
-  },
-  invocationId: {
-    type: String
-  },
-  chatGptLabel: {
-    type: String
-  },
-  promptPrefix: {
-    type: String
-  },
-  model: {
-    type: String
-  },
-  suggestions: [{ type: String }],
-  messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }],
-  created: {
-    type: Date,
-    default: Date.now
-  }
-});
-
-const Conversation =
-  mongoose.models.Conversation || mongoose.model('Conversation', convoSchema);
-
-const getConvo = async (conversationId) => {
+const getConvo = async (user, conversationId) => {
   try {
-    return await Conversation.findOne({ conversationId }).exec();
+    return await Conversation.findOne({ user, conversationId }).exec();
   } catch (error) {
     console.log(error);
     return { message: 'Error getting single conversation' };
@@ -57,16 +12,29 @@ const getConvo = async (conversationId) => {
 };
 
 module.exports = {
-  saveConvo: async ({ conversationId, title, ...convo }) => {
+  Conversation,
+  saveConvo: async (user, { conversationId, newConversationId, title, ...convo }) => {
     try {
       const messages = await getMessages({ conversationId });
       const update = { ...convo, messages };
       if (title) {
         update.title = title;
+        update.user = user;
+      }
+      if (newConversationId) {
+        update.conversationId = newConversationId;
+      }
+      if (!update.jailbreakConversationId) {
+        update.jailbreakConversationId = null;
+      }
+      if (update.model !== 'chatgptCustom' && update.chatGptLabel && update.promptPrefix) {
+        console.log('Validation error: resetting chatgptCustom fields', update);
+        update.chatGptLabel = null;
+        update.promptPrefix = null;
       }
 
       return await Conversation.findOneAndUpdate(
-        { conversationId },
+        { conversationId: conversationId, user },
         { $set: update },
         { new: true, upsert: true }
       ).exec();
@@ -75,9 +43,15 @@ module.exports = {
       return { message: 'Error saving conversation' };
     }
   },
-  updateConvo: async ({ conversationId, ...update }) => {
+  updateConvo: async (user, { conversationId, oldConvoId, ...update }) => {
     try {
-      return await Conversation.findOneAndUpdate({ conversationId }, update, {
+      let convoId = conversationId;
+      if (oldConvoId) {
+        convoId = oldConvoId;
+        update.conversationId = conversationId;
+      }
+
+      return await Conversation.findOneAndUpdate({ conversationId: convoId, user }, update, {
         new: true
       }).exec();
     } catch (error) {
@@ -85,38 +59,100 @@ module.exports = {
       return { message: 'Error updating conversation' };
     }
   },
-  // getConvos: async () => await Conversation.find({}).sort({ created: -1 }).exec(),
-  getConvos: async (pageNumber = 1, pageSize = 12) => {
+  getConvosByPage: async (user, pageNumber = 1, pageSize = 12) => {
     try {
-      const skip = (pageNumber - 1) * pageSize;
-      // const limit = pageNumber * pageSize;
-
-      const conversations = await Conversation.find({})
-        .sort({ created: -1 })
-        .skip(skip)
-        // .limit(limit)
+      const totalConvos = (await Conversation.countDocuments({ user })) || 1;
+      const totalPages = Math.ceil(totalConvos / pageSize);
+      const convos = await Conversation.find({ user })
+        .sort({ createdAt: -1, created: -1 })
+        .skip((pageNumber - 1) * pageSize)
         .limit(pageSize)
         .exec();
 
-      return conversations;
+      return { conversations: convos, pages: totalPages, pageNumber, pageSize };
     } catch (error) {
       console.log(error);
       return { message: 'Error getting conversations' };
     }
   },
-  getConvo,
-  getConvoTitle: async (conversationId) => {
+  getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 12) => {
     try {
-      const convo = await getConvo(conversationId);
-      return convo.title;
+      if (!convoIds || convoIds.length === 0) {
+        return { conversations: [], pages: 1, pageNumber, pageSize };
+      }
+
+      const cache = {};
+      const convoMap = {};
+      const promises = [];
+      // will handle a syncing solution soon
+      const deletedConvoIds = [];
+
+      convoIds.forEach(convo =>
+        promises.push(
+          Conversation.findOne({
+            user,
+            conversationId: convo.conversationId
+          }).exec()
+        )
+      );
+
+      const results = (await Promise.all(promises)).filter((convo, i) => {
+        if (!convo) {
+          deletedConvoIds.push(convoIds[i].conversationId);
+          return false;
+        } else {
+          const page = Math.floor(i / pageSize) + 1;
+          if (!cache[page]) {
+            cache[page] = [];
+          }
+          cache[page].push(convo);
+          convoMap[convo.conversationId] = convo;
+          return true;
+        }
+      });
+
+      // const startIndex = (pageNumber - 1) * pageSize;
+      // const convos = results.slice(startIndex, startIndex + pageSize);
+      const totalPages = Math.ceil(results.length / pageSize);
+      cache.pages = totalPages;
+      cache.pageSize = pageSize;
+      return {
+        cache,
+        conversations: cache[pageNumber] || [],
+        pages: totalPages || 1,
+        pageNumber,
+        pageSize,
+        // will handle a syncing solution soon
+        filter: new Set(deletedConvoIds),
+        convoMap
+      };
+    } catch (error) {
+      console.log(error);
+      return { message: 'Error fetching conversations' };
+    }
+  },
+  getConvo,
+  /* chore: this method is not properly error handled */
+  getConvoTitle: async (user, conversationId) => {
+    try {
+      const convo = await getConvo(user, conversationId);
+      /* ChatGPT Browser was triggering error here due to convo being saved later */
+      if (convo && !convo.title) {
+        return null;
+      } else {
+        // TypeError: Cannot read properties of null (reading 'title')
+        return convo?.title || 'New Chat';
+      }
     } catch (error) {
       console.log(error);
       return { message: 'Error getting conversation title' };
     }
   },
-  deleteConvos: async (filter) => {
-    let deleteCount = await Conversation.deleteMany(filter).exec();
-    deleteCount.messages = await deleteMessages(filter);
+  deleteConvos: async (user, filter) => {
+    let toRemove = await Conversation.find({...filter, user}).select('conversationId')
+    const ids = toRemove.map(instance => instance.conversationId);
+    let deleteCount = await Conversation.deleteMany({...filter, user}).exec();
+    deleteCount.messages = await deleteMessages({conversationId: {$in: ids}});
     return deleteCount;
   }
 };

api/models/CustomGpt.js

@@ -12,20 +12,20 @@ const customGptSchema = mongoose.Schema({
     type: String,
     required: true
   },
-  created: {
-    type: Date,
-    default: Date.now
-  }
-});
+  user: {
+    type: String
+  },
+}, { timestamps: true });
 
 const CustomGpt = mongoose.models.CustomGpt || mongoose.model('CustomGpt', customGptSchema);
 
-const createCustomGpt = async ({ chatGptLabel, promptPrefix, value }) => {
+const createCustomGpt = async ({ chatGptLabel, promptPrefix, value, user }) => {
   try {
     await CustomGpt.create({
       chatGptLabel,
       promptPrefix,
-      value
+      value,
+      user
     });
     return { chatGptLabel, promptPrefix, value };
   } catch (error) {
@@ -35,22 +35,22 @@ const createCustomGpt = async ({ chatGptLabel, promptPrefix, value }) => {
 };
 
 module.exports = {
-  getCustomGpts: async (filter) => {
+  getCustomGpts: async (user, filter) => {
     try {
-      return await CustomGpt.find(filter).exec();
+      return await CustomGpt.find({ ...filter, user }).exec();
     } catch (error) {
       console.error(error);
       return { customGpt: 'Error getting customGpts' };
     }
   },
-  updateCustomGpt: async ({ value, ...update }) => {
+  updateCustomGpt: async (user, { value, ...update }) => {
     try {
-      const customGpt = await CustomGpt.findOne({ value }).exec();
+      const customGpt = await CustomGpt.findOne({ value, user }).exec();
 
       if (!customGpt) {
-        return await createCustomGpt({ value, ...update });
+        return await createCustomGpt({ value, ...update, user });
       } else {
-        return await CustomGpt.findOneAndUpdate({ value }, update, {
+        return await CustomGpt.findOneAndUpdate({ value, user }, update, {
           new: true,
           upsert: true
         }).exec();
@@ -60,9 +60,9 @@ module.exports = {
       return { message: 'Error updating customGpt' };
     }
   },
-  updateByLabel: async ({ prevLabel, ...update }) => {
+  updateByLabel: async (user, { prevLabel, ...update }) => {
     try {
-      return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel }, update, {
+      return await CustomGpt.findOneAndUpdate({ chatGptLabel: prevLabel, user }, update, {
         new: true,
         upsert: true
       }).exec();
@@ -71,9 +71,9 @@ module.exports = {
       return { message: 'Error updating customGpt' };
     }
   },
-  deleteCustomGpts: async (filter) => {
+  deleteCustomGpts: async (user, filter) => {
     try {
-      return await CustomGpt.deleteMany(filter).exec();
+      return await CustomGpt.deleteMany({ ...filter, user }).exec();
     } catch (error) {
       console.error(error);
       return { customGpt: 'Error deleting customGpts' };

api/models/Message.js

@@ -1,64 +1,53 @@
-const mongoose = require('mongoose');
-
-const messageSchema = mongoose.Schema({
-  id: {
-    type: String,
-    unique: true,
-    required: true
-  },
-  conversationId: {
-    type: String,
-    required: true
-  },
-  conversationSignature: {
-    type: String,
-    // required: true
-  },
-  clientId: {
-    type: String,
-  },
-  invocationId: {
-    type: String,
-  },
-  parentMessageId: {
-    type: String,
-    // required: true
-  },
-  sender: {
-    type: String,
-    required: true
-  },
-  text: {
-    type: String,
-    required: true
-  },
-  created: {
-    type: Date,
-    default: Date.now
-  }
-});
-
-const Message = mongoose.models.Message || mongoose.model('Message', messageSchema);
-
+const Message = require('./schema/messageSchema');
 module.exports = {
-  saveMessage: async ({ id, conversationId, parentMessageId, sender, text }) => {
+  Message,
+  saveMessage: async ({ messageId, conversationId, parentMessageId, sender, text, isCreatedByUser=false, error }) => {
     try {
-      await Message.create({
-        id,
+      await Message.findOneAndUpdate({ messageId }, {
         conversationId,
         parentMessageId,
         sender,
-        text
-      });
-      return { id, conversationId, parentMessageId, sender, text };
+        text,
+        isCreatedByUser,
+        error
+      }, { upsert: true, new: true });
+      return { messageId, conversationId, parentMessageId, sender, text, isCreatedByUser };
     } catch (error) {
       console.error(error);
       return { message: 'Error saving message' };
     }
   },
+  saveBingMessage: async ({ messageId, oldMessageId = messageId, conversationId, parentMessageId, sender, text, isCreatedByUser=false, error }) => {
+    try {
+      await Message.findOneAndUpdate({ messageId: oldMessageId }, {
+        messageId,
+        conversationId,
+        parentMessageId,
+        sender,
+        text,
+        isCreatedByUser,
+        error
+      }, { upsert: true, new: true });
+      return { messageId, conversationId, parentMessageId, sender, text, isCreatedByUser };
+    } catch (error) {
+      console.error(error);
+      return { message: 'Error saving message' };
+    }
+  },
+  deleteMessagesSince: async ({ messageId, conversationId }) => {
+    try {
+      const message = await Message.findOne({ messageId }).exec()
+
+      if (message) 
+        return await Message.find({ conversationId }).deleteMany({ createdAt: { $gt: message.createdAt } }).exec();
+    } catch (error) {
+      console.error(error);
+      return { message: 'Error deleting messages' };
+    }
+  },
   getMessages: async (filter) => {
     try {
-      return await Message.find(filter).exec()
+      return await Message.find(filter).sort({createdAt: 1}).exec()
     } catch (error) {
       console.error(error);
       return { message: 'Error getting messages' };

api/models/Prompt.js

@@ -12,11 +12,7 @@ const promptSchema = mongoose.Schema({
   category: {
     type: String,
   },
-  created: {
-    type: Date,
-    default: Date.now
-  }
-});
+}, { timestamps: true });
 
 const Prompt = mongoose.models.Prompt || mongoose.model('Prompt', promptSchema);
 

api/models/index.js

@@ -1,13 +1,17 @@
-const { saveMessage, deleteMessages } = require('./Message');
+const { getMessages, saveMessage, saveBingMessage, deleteMessagesSince, deleteMessages } = require('./Message');
 const { getCustomGpts, updateCustomGpt, updateByLabel, deleteCustomGpts } = require('./CustomGpt');
-const { getConvoTitle, getConvo, saveConvo } = require('./Conversation');
+const { getConvoTitle, getConvo, saveConvo, updateConvo } = require('./Conversation');
 
 module.exports = {
+  getMessages,
   saveMessage,
+  saveBingMessage,
+  deleteMessagesSince,
   deleteMessages,
   getConvoTitle,
   getConvo,
   saveConvo,
+  updateConvo,
   getCustomGpts,
   updateCustomGpt,
   updateByLabel,

api/models/plugins/mongoMeili.js

@@ -0,0 +1,211 @@
+const mongoose = require('mongoose');
+const { MeiliSearch } = require('meilisearch');
+const { cleanUpPrimaryKeyValue } = require('../../lib/utils/misc');
+const _ = require('lodash');
+
+const validateOptions = function (options) {
+  const requiredKeys = ['host', 'apiKey', 'indexName'];
+  requiredKeys.forEach((key) => {
+    if (!options[key]) throw new Error(`Missing mongoMeili Option: ${key}`);
+  });
+};
+
+const createMeiliMongooseModel = function ({ index, indexName, client, attributesToIndex }) {
+  // console.log('attributesToIndex', attributesToIndex);
+  const primaryKey = attributesToIndex[0];
+  // MeiliMongooseModel is of type Mongoose.Model
+  class MeiliMongooseModel {
+    // Clear Meili index
+    static async clearMeiliIndex() {
+      await index.delete();
+      // await index.deleteAllDocuments();
+      await this.collection.updateMany(
+        { _meiliIndex: true },
+        { $set: { _meiliIndex: false } }
+      );
+    }
+
+    static async resetIndex() {
+      await this.clearMeiliIndex();
+      await client.createIndex(indexName, { primaryKey });
+    }
+    // Clear Meili index
+    // Push a mongoDB collection to Meili index
+    static async syncWithMeili() {
+      await this.resetIndex();
+      // const docs = await this.find();
+      const docs = await this.find({ _meiliIndex: { $in: [null, false] } });
+      console.log('docs', docs.length);
+      await Promise.all(
+        docs.map(function (doc) {
+          return doc.addObjectToMeili();
+        })
+      );
+    }
+
+    // Set one or more settings of the meili index
+    static async setMeiliIndexSettings(settings) {
+      return await index.updateSettings(settings);
+    }
+
+    // Search the index
+    static async meiliSearch(q, params, populate) {
+      const data = await index.search(q, params);
+
+      // Populate hits with content from mongodb
+      if (populate) {
+        // Find objects into mongodb matching `objectID` from Meili search
+        const query = {};
+        // query[primaryKey] = { $in: _.map(data.hits, primaryKey) };
+        query[primaryKey] = _.map(data.hits, hit => cleanUpPrimaryKeyValue(hit[primaryKey]));
+        // console.log('query', query);
+        const hitsFromMongoose = await this.find(
+          query,
+          _.reduce(
+            this.schema.obj,
+            function (results, value, key) {
+              return { ...results, [key]: 1 };
+            },
+            { _id: 1 }
+          ),
+        );
+
+        // Add additional data from mongodb into Meili search hits
+        const populatedHits = data.hits.map(function (hit) {
+          const query = {};
+          query[primaryKey] = hit[primaryKey];
+          const originalHit = _.find(hitsFromMongoose, query);
+
+          return {
+            ...(originalHit ? originalHit.toJSON() : {}),
+            ...hit
+          };
+        });
+        data.hits = populatedHits;
+      }
+
+      return data;
+    }
+
+    // Push new document to Meili
+    async addObjectToMeili() {
+      const object = _.pick(this.toJSON(), attributesToIndex);
+      // NOTE: MeiliSearch does not allow | in primary key, so we replace it with - for Bing convoIds
+      // object.conversationId = object.conversationId.replace(/\|/g, '-');
+      if (object.conversationId && object.conversationId.includes('|')) {
+        object.conversationId = object.conversationId.replace(/\|/g, '--');
+      }
+
+      try {
+        // console.log('Adding document to Meili', object);
+        await index.addDocuments([object]);
+      } catch (error) {
+        // console.log('Error adding document to Meili');
+        // console.error(error);
+      }
+
+      await this.collection.updateMany({ _id: this._id }, { $set: { _meiliIndex: true } });
+    }
+
+    // Update an existing document in Meili
+    async updateObjectToMeili() {
+      const object = _.pick(this.toJSON(), attributesToIndex);
+      await index.updateDocuments([object]);
+    }
+
+    // Delete a document from Meili
+    async deleteObjectFromMeili() {
+      await index.deleteDocument(this._id);
+    }
+
+    // * schema.post('save')
+    postSaveHook() {
+      if (this._meiliIndex) {
+        this.updateObjectToMeili();
+      } else {
+        this.addObjectToMeili();
+      }
+    }
+
+    // * schema.post('update')
+    postUpdateHook() {
+      if (this._meiliIndex) {
+        this.updateObjectToMeili();
+      }
+    }
+
+    // * schema.post('remove')
+    postRemoveHook() {
+      if (this._meiliIndex) {
+        this.deleteObjectFromMeili();
+      }
+    }
+  }
+
+  return MeiliMongooseModel;
+};
+
+module.exports = function mongoMeili(schema, options) {
+  // Vaidate Options for mongoMeili
+  validateOptions(options);
+
+  // Add meiliIndex to schema
+  schema.add({
+    _meiliIndex: {
+      type: Boolean,
+      required: false,
+      select: false,
+      default: false
+    }
+  });
+
+  const { host, apiKey, indexName, primaryKey } = options;
+
+  // Setup MeiliSearch Client
+  const client = new MeiliSearch({ host, apiKey });
+
+  // Asynchronously create the index
+  client.createIndex(indexName, { primaryKey });
+
+  // Setup the index to search for this schema
+  const index = client.index(indexName);
+
+  const attributesToIndex = [
+    ..._.reduce(
+      schema.obj,
+      function (results, value, key) {
+        return value.meiliIndex ? [...results, key] : results;
+        // }, []), '_id'];
+      },
+      []
+    )
+  ];
+
+  schema.loadClass(createMeiliMongooseModel({ index, indexName, client, attributesToIndex }));
+
+  // Register hooks
+  schema.post('save', function (doc) {
+    doc.postSaveHook();
+  });
+  schema.post('update', function (doc) {
+    doc.postUpdateHook();
+  });
+  schema.post('remove', function (doc) {
+    doc.postRemoveHook();
+  });
+  schema.post('deleteMany', function () {
+    // console.log('deleteMany hook', doc);
+    if (Object.prototype.hasOwnProperty.call(schema.obj, 'messages')) {
+      console.log('Syncing convos...');
+      mongoose.model('Conversation').syncWithMeili();
+    } 
+    
+    if (Object.prototype.hasOwnProperty.call(schema.obj, 'messageId')) {
+      console.log('Syncing messages...');
+      mongoose.model('Message').syncWithMeili();
+    }
+  });
+  schema.post('findOneAndUpdate', function (doc) {
+    doc.postSaveHook();
+  });
+};

api/models/schema/convoSchema.js

@@ -0,0 +1,71 @@
+const mongoose = require('mongoose');
+const mongoMeili = require('../plugins/mongoMeili');
+const convoSchema = mongoose.Schema(
+  {
+    conversationId: {
+      type: String,
+      unique: true,
+      required: true,
+      index: true,
+      meiliIndex: true
+    },
+    parentMessageId: {
+      type: String,
+      required: true
+    },
+    title: {
+      type: String,
+      default: 'New Chat',
+      meiliIndex: true
+    },
+    jailbreakConversationId: {
+      type: String,
+      default: null
+    },
+    conversationSignature: {
+      type: String,
+      default: null
+    },
+    clientId: {
+      type: String
+    },
+    invocationId: {
+      type: String
+    },
+    toneStyle: {
+      type: String,
+      default: null
+    },
+    chatGptLabel: {
+      type: String,
+      default: null
+    },
+    promptPrefix: {
+      type: String,
+      default: null
+    },
+    model: {
+      type: String,
+      required: true
+    },
+    user: {
+      type: String
+    },
+    suggestions: [{ type: String }],
+    messages: [{ type: mongoose.Schema.Types.ObjectId, ref: 'Message' }]
+  },
+  { timestamps: true }
+);
+
+if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
+  convoSchema.plugin(mongoMeili, {
+    host: process.env.MEILI_HOST,
+    apiKey: process.env.MEILI_MASTER_KEY,
+    indexName: 'convos', // Will get created automatically if it doesn't exist already
+    primaryKey: 'conversationId'
+  });
+}
+
+const Conversation = mongoose.models.Conversation || mongoose.model('Conversation', convoSchema);
+
+module.exports = Conversation;

api/models/schema/messageSchema.js

@@ -0,0 +1,71 @@
+const mongoose = require('mongoose');
+const mongoMeili = require('../plugins/mongoMeili');
+const messageSchema = mongoose.Schema(
+  {
+    messageId: {
+      type: String,
+      unique: true,
+      required: true,
+      index: true,
+      meiliIndex: true
+    },
+    conversationId: {
+      type: String,
+      required: true,
+      meiliIndex: true
+    },
+    conversationSignature: {
+      type: String
+      // required: true
+    },
+    clientId: {
+      type: String
+    },
+    invocationId: {
+      type: String
+    },
+    parentMessageId: {
+      type: String
+      // required: true
+    },
+    sender: {
+      type: String,
+      required: true,
+      meiliIndex: true
+    },
+    text: {
+      type: String,
+      required: true,
+      meiliIndex: true
+    },
+    isCreatedByUser: {
+      type: Boolean,
+      required: true,
+      default: false
+    },
+    error: {
+      type: Boolean,
+      default: false
+    },
+    _meiliIndex: {
+      type: Boolean,
+      required: false,
+      select: false,
+      default: false
+    }
+  },
+  { timestamps: true }
+);
+
+if (process.env.MEILI_HOST && process.env.MEILI_MASTER_KEY) {
+  messageSchema.plugin(mongoMeili, {
+    host: process.env.MEILI_HOST,
+    apiKey: process.env.MEILI_MASTER_KEY,
+    indexName: 'messages',
+    primaryKey: 'messageId'
+  });
+}
+
+const Message = mongoose.models.Message || mongoose.model('Message', messageSchema);
+
+module.exports = Message;

api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-clone",
-  "version": "1.0.0",
+  "version": "0.2.0",
   "description": "",
   "main": "server/index.js",
   "scripts": {
@@ -20,15 +20,22 @@
   "homepage": "https://github.com/danny-avila/chatgpt-clone#readme",
   "dependencies": {
     "@keyv/mongo": "^2.1.8",
-    "@vscode/vscode-languagedetection": "^1.0.22",
-    "@waylaidwanderer/chatgpt-api": "^1.28.2",
+    "@waylaidwanderer/chatgpt-api": "^1.33.1",
+    "axios": "^1.3.4",
     "cors": "^2.8.5",
+    "crypto": "^1.0.1",
     "dotenv": "^16.0.3",
+    "eslint": "^8.36.0",
     "express": "^4.18.2",
+    "express-session": "^1.17.3",
+    "html": "^1.0.0",
     "keyv": "^4.5.2",
     "keyv-file": "^0.2.0",
+    "lodash": "^4.17.21",
+    "meilisearch": "^0.31.1",
     "mongoose": "^6.9.0",
-    "openai": "^3.1.0"
+    "openai": "^3.1.0",
+    "sanitize": "^2.1.2"
   },
   "devDependencies": {
     "nodemon": "^2.0.20",

api/server/controllers/errorController.js

@@ -0,0 +1,33 @@
+//handle duplicates
+const handleDuplicateKeyError = (err, res) => {
+  const field = Object.keys(err.keyValue);
+  const code = 409;
+  const error = `An document with that ${field} already exists.`;
+  console.log('congrats you hit the duped keys error');
+  res.status(code).send({ messages: error, fields: field });
+};
+
+//handle validation errors
+const handleValidationError = (err, res) => {
+  console.log('congrats you hit the validation middleware');
+  let errors = Object.values(err.errors).map(el => el.message);
+  let fields = Object.values(err.errors).map(el => el.path);
+  let code = 400;
+  if (errors.length > 1) {
+    const formattedErrors = errors.join(' ');
+    res.status(code).send({ messages: formattedErrors, fields: fields });
+  } else {
+    res.status(code).send({ messages: errors, fields: fields });
+  }
+};
+
+// eslint-disable-next-line no-unused-vars
+module.exports = (err, req, res, next) => {
+  try {
+    console.log('congrats you hit the error middleware');
+    if (err.name === 'ValidationError') return (err = handleValidationError(err, res));
+    if (err.code && err.code == 11000) return (err = handleDuplicateKeyError(err, res));
+  } catch (err) {
+    res.status(500).send('An unknown error occurred.');
+  }
+};

api/server/index.js

@@ -1,28 +1,98 @@
 const express = require('express');
-const dbConnect = require('../models/dbConnect');
+const session = require('express-session');
+const connectDb = require('../lib/db/connectDb');
+const migrateDb = require('../lib/db/migrateDb');
+const indexSync = require('../lib/db/indexSync');
 const path = require('path');
 const cors = require('cors');
 const routes = require('./routes');
-const app = express();
+const errorController = require('./controllers/errorController');
+
 const port = process.env.PORT || 3080;
+const host = process.env.HOST || 'localhost';
+const userSystemEnabled = process.env.ENABLE_USER_SYSTEM || false;
 const projectPath = path.join(__dirname, '..', '..', 'client');
-dbConnect().then(() => console.log('Connected to MongoDB'));
 
-app.use(cors());
-app.use(express.json());
-app.use(express.static(path.join(projectPath, 'public')));
+(async () => {
+  await connectDb();
+  console.log('Connected to MongoDB');
+  await migrateDb();
+  await indexSync();
 
-app.get('/', function (req, res) {
-  console.log(path.join(projectPath, 'public', 'index.html'));
-  res.sendFile(path.join(projectPath, 'public', 'index.html'));
+  const app = express();
+  app.use(errorController);
+  app.use(cors());
+  app.use(express.json());
+  app.use(express.static(path.join(projectPath, 'public')));
+  app.set('trust proxy', 1); // trust first proxy
+  app.use(
+    session({
+      secret: 'chatgpt-clone-random-secrect',
+      resave: false,
+      saveUninitialized: true,
+      cookie: { maxAge: 7 * 24 * 60 * 60 * 1000 } // 7 days
+    })
+  );
+
+  /* chore: potential redirect error here, can only comment out this block; 
+    comment back in if using auth routes i guess */
+  // app.get('/', routes.authenticatedOrRedirect, function (req, res) {
+  //   console.log(path.join(projectPath, 'public', 'index.html'));
+  //   res.sendFile(path.join(projectPath, 'public', 'index.html'));
+  // });
+
+  app.get('/api/me', function (req, res) {
+    if (userSystemEnabled) {
+      const user = req?.session?.user;
+
+      if (user) res.send(JSON.stringify({ username: user?.username, display: user?.display }));
+      else res.send(JSON.stringify(null));
+    } else {
+      res.send(JSON.stringify({ username: 'anonymous_user', display: 'Anonymous User' }));
+    }
+  });
+
+  app.use('/api/search', routes.authenticatedOr401, routes.search);
+  app.use('/api/ask', routes.authenticatedOr401, routes.ask);
+  app.use('/api/messages', routes.authenticatedOr401, routes.messages);
+  app.use('/api/convos', routes.authenticatedOr401, routes.convos);
+  app.use('/api/customGpts', routes.authenticatedOr401, routes.customGpts);
+  app.use('/api/prompts', routes.authenticatedOr401, routes.prompts);
+  app.use('/auth', routes.auth);
+
+  app.get('/api/models', function (req, res) {
+    const hasOpenAI = !!process.env.OPENAI_KEY;
+    const hasChatGpt = !!process.env.CHATGPT_TOKEN;
+    const hasBing = !!process.env.BING_TOKEN;
+
+    res.send(JSON.stringify({ hasOpenAI, hasChatGpt, hasBing }));
+  });
+
+  app.get('/*', routes.authenticatedOrRedirect, function (req, res) {
+    res.sendFile(path.join(projectPath, 'public', 'index.html'));
+  });
+
+  app.listen(port, host, () => {
+    if (host == '0.0.0.0')
+      console.log(
+        `Server listening on all interface at port ${port}. Use http://localhost:${port} to access it`
+      );
+    else console.log(`Server listening at http://${host == '0.0.0.0' ? 'localhost' : host}:${port}`);
+  });
+})();
+
+let messageCount = 0;
+process.on('uncaughtException', err => {
+  if (!err.message.includes('fetch failed')) {
+    console.error('There was an uncaught error:', err.message);
+  }
+
+  if (err.message.includes('fetch failed')) {
+    if (messageCount === 0) {
+      console.error('Meilisearch error, search will be disabled');
+      messageCount++;
+    }
+  } else {
+    process.exit(1);
+  }
 });
-
-app.use('/api/ask', routes.ask);
-app.use('/api/messages', routes.messages);
-app.use('/api/convos', routes.convos);
-app.use('/api/customGpts', routes.customGpts);
-app.use('/api/prompts', routes.prompts);
-
-app.listen(port, () => {
-  console.log(`Server listening at http://localhost:${port}`);
-});

api/server/routes/ask.js

@@ -3,55 +3,66 @@ const crypto = require('crypto');
 const router = express.Router();
 const askBing = require('./askBing');
 const askSydney = require('./askSydney');
-const {
-  titleConvo,
-  askClient,
-  browserClient,
-  customClient,
-  detectCode
-} = require('../../app/');
-const { getConvo, saveMessage, deleteMessages, saveConvo } = require('../../models');
-const { handleError, sendMessage } = require('./handlers');
+const { titleConvo, askClient, browserClient, customClient } = require('../../app/');
+const { saveMessage, getConvoTitle, saveConvo, updateConvo } = require('../../models');
+const { handleError, sendMessage, createOnProgress, handleText } = require('./handlers');
 
 router.use('/bing', askBing);
 router.use('/sydney', askSydney);
 
 router.post('/', async (req, res) => {
-  let { model, text, parentMessageId, conversationId, chatGptLabel, promptPrefix } = req.body;
-  if (!text.trim().includes(' ') && text.length < 5) {
-    return handleError(res, 'Prompt empty or too short');
-  }
+  const {
+    model,
+    text,
+    overrideParentMessageId = null,
+    parentMessageId,
+    conversationId: oldConversationId,
+    ...convo
+  } = req.body;
+  if (text.length === 0) return handleError(res, { text: 'Prompt empty or too short' });
 
+  const conversationId = oldConversationId || crypto.randomUUID();
   const userMessageId = crypto.randomUUID();
-  let userMessage = { id: userMessageId, sender: 'User', text };
-
+  const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000';
+  const userMessage = {
+    messageId: userMessageId,
+    sender: 'User',
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    isCreatedByUser: true
+  };
   console.log('ask log', {
     model,
     ...userMessage,
-    parentMessageId,
-    conversationId,
-    chatGptLabel,
-    promptPrefix
+    ...convo
   });
 
-  let client;
-
-  if (model === 'chatgpt') {
-    client = askClient;
-  } else if (model === 'chatgptCustom') {
-    client = customClient;
-  } else {
-    client = browserClient;
+  if (!overrideParentMessageId) {
+    await saveMessage(userMessage);
+    await saveConvo(req?.session?.user?.username, { ...userMessage, model, ...convo });
   }
 
-  if (model === 'chatgptCustom' && !chatGptLabel && conversationId) {
-    const convo = await getConvo({ conversationId });
-    if (convo) {
-      console.log('found convo for custom gpt', { convo })
-      chatGptLabel = convo.chatGptLabel;
-      promptPrefix = convo.promptPrefix;
-    }
-  }
+  return await ask({ userMessage, model, convo, preSendRequest: true, overrideParentMessageId, req, res });
+});
+
+const ask = async ({
+  userMessage,
+  overrideParentMessageId = null,
+  model,
+  convo,
+  preSendRequest = true,
+  req,
+  res
+}) => {
+  const {
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    messageId: userMessageId
+  } = userMessage;
+
+  const client = model === 'chatgpt' ? askClient : model === 'chatgptCustom' ? customClient : browserClient;
 
   res.writeHead(200, {
     Connection: 'keep-alive',
@@ -61,93 +72,77 @@ router.post('/', async (req, res) => {
     'X-Accel-Buffering': 'no'
   });
 
+  if (preSendRequest) sendMessage(res, { message: userMessage, created: true });
+
   try {
-    let i = 0;
-    let tokens = '';
-    const progressCallback = async (partial) => {
-      if (i === 0 && typeof partial === 'object') {
-        userMessage.parentMessageId = parentMessageId ? parentMessageId : partial.id;
-        userMessage.conversationId = conversationId ? conversationId : partial.conversationId;
-        await saveMessage(userMessage);
-        sendMessage(res, { ...partial, initial: true });
-        i++;
-      }
-
-      if (typeof partial === 'object') {
-        sendMessage(res, { ...partial, message: true });
-      } else {
-        tokens += partial === text ? '' : partial;
-        if (tokens.includes('[DONE]')) {
-          tokens = tokens.replace('[DONE]', '');
-        }
-
-        // tokens = await detectCode(tokens);
-        sendMessage(res, { text: tokens, message: true, initial: i === 0 ? true : false });
-        i++;
-      }
-    };
-
+    const progressCallback = createOnProgress();
+    const abortController = new AbortController();
+    res.on('close', () => abortController.abort());
     let gptResponse = await client({
       text,
-      progressCallback,
-      convo: {
-        parentMessageId,
-        conversationId
-      },
-      chatGptLabel,
-      promptPrefix
+      onProgress: progressCallback.call(null, model, { res, text }),
+      convo: { parentMessageId: userParentMessageId, conversationId, ...convo },
+      ...convo,
+      abortController
     });
 
+    gptResponse.text = gptResponse.response;
     console.log('CLIENT RESPONSE', gptResponse);
 
     if (!gptResponse.parentMessageId) {
-      gptResponse.text = gptResponse.response;
-      gptResponse.id = gptResponse.messageId;
-      gptResponse.parentMessageId = gptResponse.messageId;
-      userMessage.parentMessageId = parentMessageId ? parentMessageId : gptResponse.messageId;
-      userMessage.conversationId = conversationId
-        ? conversationId
-        : gptResponse.conversationId;
-      await saveMessage(userMessage);
+      gptResponse.parentMessageId = overrideParentMessageId || userMessageId;
       delete gptResponse.response;
     }
 
-    if (
-      (gptResponse.text.includes('2023') && !gptResponse.text.trim().includes(' ')) ||
-      gptResponse.text.toLowerCase().includes('no response') ||
-      gptResponse.text.toLowerCase().includes('no answer')
-    ) {
-      return handleError(res, 'Prompt empty or too short');
+    gptResponse.sender = model === 'chatgptCustom' ? convo.chatGptLabel : model;
+    gptResponse.model = model;
+    gptResponse.text = await handleText(gptResponse);
+    if (convo.chatGptLabel?.length > 0 && model === 'chatgptCustom') {
+      gptResponse.chatGptLabel = convo.chatGptLabel;
     }
 
-    if (!parentMessageId) {
-      gptResponse.title = await titleConvo({
-        model,
-        message: text,
-        response: JSON.stringify(gptResponse.text)
-      });
-    }
-    gptResponse.sender = model === 'chatgptCustom' ? chatGptLabel : model;
-    gptResponse.final = true;
-    gptResponse.text = await detectCode(gptResponse.text);
-
-    if (chatGptLabel?.length > 0 && model === 'chatgptCustom') {
-      gptResponse.chatGptLabel = chatGptLabel;
+    if (convo.promptPrefix?.length > 0 && model === 'chatgptCustom') {
+      gptResponse.promptPrefix = convo.promptPrefix;
     }
 
-    if (promptPrefix?.length > 0 && model === 'chatgptCustom') {
-      gptResponse.promptPrefix = promptPrefix;
+    gptResponse.parentMessageId = overrideParentMessageId || userMessageId;
+
+    if (model === 'chatgptBrowser' && userParentMessageId.startsWith('000')) {
+      await saveMessage({ ...userMessage, conversationId: gptResponse.conversationId });
     }
 
     await saveMessage(gptResponse);
-    await saveConvo(gptResponse);
-    sendMessage(res, gptResponse);
+    await updateConvo(req?.session?.user?.username, {
+      ...gptResponse,
+      oldConvoId: model === 'chatgptBrowser' && conversationId
+    });
+    sendMessage(res, {
+      title: await getConvoTitle(req?.session?.user?.username, conversationId),
+      final: true,
+      requestMessage: userMessage,
+      responseMessage: gptResponse
+    });
     res.end();
+
+    if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
+      const title = await titleConvo({ model, text, response: gptResponse });
+      await updateConvo(req?.session?.user?.username, {
+        conversationId: model === 'chatgptBrowser' ? gptResponse.conversationId : conversationId,
+        title
+      });
+    }
   } catch (error) {
-    console.log(error);
-    await deleteMessages({ id: userMessageId });
-    handleError(res, error.message);
+    const errorMessage = {
+      messageId: crypto.randomUUID(),
+      sender: model,
+      conversationId,
+      parentMessageId: overrideParentMessageId || userMessageId,
+      error: true,
+      text: error.message
+    };
+    await saveMessage(errorMessage);
+    handleError(res, errorMessage);
   }
-});
+};
 
 module.exports = router;

api/server/routes/askBing.js

@@ -1,21 +1,76 @@
 const express = require('express');
 const crypto = require('crypto');
 const router = express.Router();
-const { titleConvo, getCitations, citeText, askBing } = require('../../app/');
-const { saveMessage, deleteMessages, saveConvo } = require('../../models');
-const { handleError, sendMessage } = require('./handlers');
-const citationRegex = /\[\^\d+?\^]/g;
+const { titleConvo, askBing } = require('../../app/');
+const { saveBingMessage, getConvoTitle, saveConvo } = require('../../models');
+const { handleError, sendMessage, createOnProgress, handleText } = require('./handlers');
 
 router.post('/', async (req, res) => {
-  const { model, text, ...convo } = req.body;
-  if (!text.trim().includes(' ') && text.length < 5) {
-    return handleError(res, 'Prompt empty or too short');
+  const {
+    model,
+    text,
+    overrideParentMessageId=null,
+    parentMessageId,
+    conversationId: oldConversationId,
+    ...convo
+  } = req.body;
+  if (text.length === 0) {
+    return handleError(res, { text: 'Prompt empty or too short' });
   }
 
-  const userMessageId = crypto.randomUUID();
-  let userMessage = { id: userMessageId, sender: 'User', text };
+  const conversationId = oldConversationId || crypto.randomUUID();
+  const isNewConversation = !oldConversationId;
 
-  console.log('ask log', { model, ...userMessage, ...convo });
+  const userMessageId = convo.messageId;
+  const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000';
+  let userMessage = {
+    messageId: userMessageId,
+    sender: 'User',
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    isCreatedByUser: true
+  };
+
+  console.log('ask log', {
+    model,
+    ...convo,
+    ...userMessage
+  });
+
+  if (!overrideParentMessageId) {
+    await saveBingMessage(userMessage);
+    await saveConvo(req?.session?.user?.username, { model, ...convo, ...userMessage });
+  }
+
+  return await ask({
+    isNewConversation,
+    userMessage,
+    model,
+    convo,
+    preSendRequest: true,
+    overrideParentMessageId,
+    req,
+    res
+  });
+});
+
+const ask = async ({
+  isNewConversation,
+  overrideParentMessageId = null,
+  userMessage,
+  model,
+  convo,
+  preSendRequest = true,
+  req,
+  res
+}) => {
+  let {
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    messageId: userMessageId
+  } = userMessage;
 
   res.writeHead(200, {
     Connection: 'keep-alive',
@@ -25,62 +80,111 @@ router.post('/', async (req, res) => {
     'X-Accel-Buffering': 'no'
   });
 
+  if (preSendRequest) sendMessage(res, { message: userMessage, created: true });
+
   try {
-    let tokens = '';
-    const progressCallback = async (partial) => {
-      tokens += partial === text ? '' : partial;
-      // tokens = appendCode(tokens);
-      tokens = citeText(tokens, true);
-      sendMessage(res, { text: tokens, message: true });
-    };
+    const progressCallback = createOnProgress();
+
+    const abortController = new AbortController();
+    res.on('close', () => {
+      console.log('The client has disconnected.');
+      // 执行其他操作
+      abortController.abort();
+    })
 
     let response = await askBing({
       text,
-      progressCallback,
-      convo
+      onProgress: progressCallback.call(null, model, {
+        res,
+        text,
+        parentMessageId: overrideParentMessageId || userMessageId
+      }),
+      convo: {
+        ...convo,
+        parentMessageId: userParentMessageId,
+        conversationId
+      },
+      abortController
     });
 
-    console.log('BING RESPONSE');
+    console.log('BING RESPONSE', response);
     // console.dir(response, { depth: null });
-    const hasCitations = response.response.match(citationRegex)?.length > 0;
 
     userMessage.conversationSignature =
       convo.conversationSignature || response.conversationSignature;
-    userMessage.conversationId = convo.conversationId || response.conversationId;
+    userMessage.conversationId = response.conversationId || conversationId;
     userMessage.invocationId = response.invocationId;
-    await saveMessage(userMessage);
+    userMessage.messageId = response.details.requestId || userMessageId;
+    if (!overrideParentMessageId)
+      await saveBingMessage({ oldMessageId: userMessageId, ...userMessage });
 
-    if (!convo.conversationSignature) {
-      response.title = await titleConvo({
-        model,
-        message: text,
-        response: JSON.stringify(response.response)
-      });
-    }
+    // Bing API will not use our conversationId at the first time,
+    // so change the placeholder conversationId to the real one.
+    // Attition: the api will also create new conversationId while using invalid userMessage.parentMessageId,
+    // but in this situation, don't change the conversationId, but create new convo.
+    if (conversationId != userMessage.conversationId && isNewConversation)
+      await saveConvo(
+        req?.session?.user?.username,
+        {
+          conversationId: conversationId,
+          newConversationId: userMessage.conversationId
+        }
+      );
+    conversationId = userMessage.conversationId;
 
-    response.text = response.response;
-    delete response.response;
-    response.id = response.details.messageId;
+    response.text = response.response || response.details.spokenText || '**Bing refused to answer.**';
+    // delete response.response;
+    // response.id = response.details.messageId;
     response.suggestions =
       response.details.suggestedResponses &&
       response.details.suggestedResponses.map((s) => s.text);
     response.sender = model;
-    response.final = true;
+    // response.final = true;
 
-    const links = getCitations(response);
-    response.text =
-      citeText(response) +
-      (links?.length > 0 && hasCitations ? `\n<small>${links}</small>` : '');
+    response.messageId = response.details.messageId;
+    // override the parentMessageId, for the regeneration.
+    response.parentMessageId =
+      overrideParentMessageId || response.details.requestId || userMessageId;
 
-    await saveMessage(response);
-    await saveConvo(response);
-    sendMessage(res, response);
+    response.text = await handleText(response, true);
+    await saveBingMessage(response);
+    await saveConvo(req?.session?.user?.username, { model, chatGptLabel: null, promptPrefix: null, ...convo,  ...response });
+
+    sendMessage(res, {
+      title: await getConvoTitle(req?.session?.user?.username, conversationId),
+      final: true,
+      requestMessage: userMessage,
+      responseMessage: response
+    });
     res.end();
+
+    if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
+      const title = await titleConvo({ model, text, response });
+
+      await saveConvo(
+        req?.session?.user?.username,
+        {
+          ...convo,
+          ...response,
+          conversationId,
+          title
+        }
+      );
+    }
   } catch (error) {
     console.log(error);
-    await deleteMessages({ id: userMessageId });
-    handleError(res, error.message);
+    // await deleteMessages({ messageId: userMessageId });
+    const errorMessage = {
+      messageId: crypto.randomUUID(),
+      sender: model,
+      conversationId,
+      parentMessageId: overrideParentMessageId || userMessageId,
+      error: true,
+      text: error.message
+    };
+    await saveBingMessage(errorMessage);
+    handleError(res, errorMessage);
   }
-});
+};
 
-module.exports = router;
+module.exports = router;

api/server/routes/askSydney.js

@@ -1,21 +1,76 @@
 const express = require('express');
 const crypto = require('crypto');
 const router = express.Router();
-const { titleConvo, getCitations, citeText, askSydney } = require('../../app/');
-const { saveMessage, deleteMessages, saveConvo, getConvoTitle } = require('../../models');
-const { handleError, sendMessage } = require('./handlers');
-const citationRegex = /\[\^\d+?\^]/g;
+const { titleConvo, askSydney } = require('../../app/');
+const { saveBingMessage, saveConvo, updateConvo, getConvoTitle } = require('../../models');
+const { handleError, sendMessage, createOnProgress, handleText } = require('./handlers');
 
 router.post('/', async (req, res) => {
-  const { model, text, ...convo } = req.body;
-  if (!text.trim().includes(' ') && text.length < 5) {
-    return handleError(res, 'Prompt empty or too short');
+  const {
+    model,
+    text,
+    overrideParentMessageId=null,
+    parentMessageId,
+    conversationId: oldConversationId,
+    ...convo
+  } = req.body;
+  if (text.length === 0) {
+    return handleError(res, { text: 'Prompt empty or too short' });
   }
 
-  const userMessageId = crypto.randomUUID();
-  let userMessage = { id: userMessageId, sender: 'User', text };
+  const conversationId = oldConversationId || crypto.randomUUID();
+  const isNewConversation = !oldConversationId;
 
-  console.log('ask log', { model, ...userMessage, ...convo });
+  const userMessageId = convo.messageId;
+  const userParentMessageId = parentMessageId || '00000000-0000-0000-0000-000000000000';
+  let userMessage = {
+    messageId: userMessageId,
+    sender: 'User',
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    isCreatedByUser: true
+  };
+
+  console.log('ask log', {
+    model,
+    ...convo,
+    ...userMessage
+  });
+
+  if (!overrideParentMessageId) {
+    await saveBingMessage(userMessage);
+    await saveConvo(req?.session?.user?.username, { model, ...convo, ...userMessage });
+  }
+
+  return await ask({
+    isNewConversation,
+    userMessage,
+    model,
+    convo,
+    preSendRequest: true,
+    overrideParentMessageId,
+    req,
+    res
+  });
+});
+
+const ask = async ({
+  isNewConversation,
+  overrideParentMessageId = null,
+  userMessage,
+  model,
+  convo,
+  preSendRequest = true,
+  req,
+  res
+}) => {
+  let {
+    text,
+    parentMessageId: userParentMessageId,
+    conversationId,
+    messageId: userMessageId
+  } = userMessage;
 
   res.writeHead(200, {
     Connection: 'keep-alive',
@@ -25,72 +80,119 @@ router.post('/', async (req, res) => {
     'X-Accel-Buffering': 'no'
   });
 
+  if (preSendRequest) sendMessage(res, { message: userMessage, created: true });
+
   try {
-    let tokens = '';
-    const progressCallback = async (partial) => {
-      tokens += partial === text ? '' : partial;
-      // tokens = appendCode(tokens);
-      tokens = citeText(tokens, true);
-      sendMessage(res, { text: tokens, message: true });
-    };
+    const progressCallback = createOnProgress();
+
+    const abortController = new AbortController();
+    res.on('close', () => {
+      console.log('The client has disconnected.');
+      // 执行其他操作
+      abortController.abort();
+    })
 
     let response = await askSydney({
       text,
-      progressCallback,
-      convo
+      onProgress: progressCallback.call(null, model, {
+        res,
+        text,
+        parentMessageId: overrideParentMessageId || userMessageId
+      }),
+      convo: {
+        ...convo,
+        parentMessageId: userParentMessageId,
+        conversationId
+      },
+      abortController
     });
 
-    console.log('SYDNEY RESPONSE');
-    console.log(response.response);
+    console.log('SYDNEY RESPONSE', response);
     // console.dir(response, { depth: null });
-    const hasCitations = response.response.match(citationRegex)?.length > 0;
+
+    userMessage.conversationSignature =
+      convo.conversationSignature || response.conversationSignature;
+    userMessage.conversationId = response.conversationId || conversationId;
+    userMessage.invocationId = response.invocationId;
+    // Unlike gpt and bing, Sydney will never accept our given userMessage.messageId, it will generate its own one.
+    userMessage.messageId = response.parentMessageId || userMessageId;
 
     // Save sydney response
-    response.id = response.messageId;
-    // response.parentMessageId = convo.parentMessageId ? convo.parentMessageId : response.messageId;
-    response.parentMessageId = response.messageId;
+    // response.id = response.messageId;
     response.invocationId = convo.invocationId ? convo.invocationId + 1 : 1;
-    response.title = convo.jailbreakConversationId
-      ? await getConvoTitle(convo.conversationId)
-      : await titleConvo({
-          model,
-          message: text,
-          response: JSON.stringify(response.response)
-        });
-    response.conversationId = convo.conversationId
-      ? convo.conversationId
-      : crypto.randomUUID();
+    response.conversationId = conversationId ? conversationId : crypto.randomUUID();
     response.conversationSignature = convo.conversationSignature
       ? convo.conversationSignature
       : crypto.randomUUID();
-    response.text = response.response;
-    delete response.response;
+    response.text = response.response || response.details.spokenText || '**Bing refused to answer.**';
+    // delete response.response;
     response.suggestions =
       response.details.suggestedResponses &&
       response.details.suggestedResponses.map((s) => s.text);
     response.sender = model;
-    response.final = true;
+    // response.final = true;
 
-    const links = getCitations(response);
-    response.text =
-      citeText(response) +
-      (links?.length > 0 && hasCitations ? `\n<small>${links}</small>` : '');
+    // override the parentMessageId, for the regeneration.
+    response.parentMessageId =
+      overrideParentMessageId || response.parentMessageId || userMessageId;
 
     // Save user message
-    userMessage.conversationId = response.conversationId;
-    userMessage.parentMessageId = response.parentMessageId;
-    await saveMessage(userMessage);
+    userMessage.conversationId = response.conversationId || conversationId;
+    if (!overrideParentMessageId)
+      await saveBingMessage({ oldMessageId: userMessageId, ...userMessage });
 
+    // Bing API will not use our conversationId at the first time,
+    // so change the placeholder conversationId to the real one.
+    // Attition: the api will also create new conversationId while using invalid userMessage.parentMessageId,
+    // but in this situation, don't change the conversationId, but create new convo.
+    if (conversationId != userMessage.conversationId && isNewConversation)
+      await updateConvo(
+        req?.session?.user?.username,
+        {
+          conversationId: conversationId,
+          newConversationId: userMessage.conversationId
+        }
+      );
+    conversationId = userMessage.conversationId;
+
+    response.text = await handleText(response, true);
     // Save sydney response & convo, then send
-    await saveMessage(response);
-    await saveConvo(response);
-    sendMessage(res, response);
+    await saveBingMessage(response);
+    await updateConvo(req?.session?.user?.username, { model, chatGptLabel: null, promptPrefix: null, ...convo, ...response });
+    
+    sendMessage(res, {
+      title: await getConvoTitle(req?.session?.user?.username, conversationId),
+      final: true,
+      requestMessage: userMessage,
+      responseMessage: response
+    });
     res.end();
+
+    if (userParentMessageId == '00000000-0000-0000-0000-000000000000') {
+      const title = await titleConvo({ model, text, response });
+
+      await updateConvo(
+        req?.session?.user?.username,
+        {
+          conversationId,
+          title
+        }
+      );
+    }
   } catch (error) {
     console.log(error);
-    await deleteMessages({ id: userMessageId });
-    handleError(res, error.message);
+    // await deleteMessages({ messageId: userMessageId });
+    const errorMessage = {
+      messageId: crypto.randomUUID(),
+      sender: model,
+      conversationId,
+      parentMessageId: overrideParentMessageId || userMessageId,
+      error: true,
+      text: error.message
+    };
+    await saveBingMessage(errorMessage);
+    handleError(res, errorMessage);
   }
-});
+};
 
 module.exports = router;

api/server/routes/auth.js

@@ -0,0 +1,57 @@
+const express = require('express');
+const router = express.Router();
+const authYourLogin = require('./authYourLogin');
+const userSystemEnabled = !!process.env.ENABLE_USER_SYSTEM || false;
+
+router.get('/login', function (req, res) {
+  if (userSystemEnabled) {
+    res.redirect('/auth/your_login_page');
+  } else {
+    res.redirect('/');
+  }
+});
+
+router.get('/logout', function (req, res) {
+  // clear the session
+  req.session.user = null;
+
+  req.session.save(function () {
+    if (userSystemEnabled) {
+      res.redirect('/auth/your_login_page/logout');
+    } else {
+      res.redirect('/');
+    }
+  });
+});
+
+const authenticatedOr401 = (req, res, next) => {
+  if (userSystemEnabled) {
+    const user = req?.session?.user;
+
+    if (user) {
+      next();
+    } else {
+      res.status(401).end();
+    }
+  } else {
+    next();
+  }
+};
+
+const authenticatedOrRedirect = (req, res, next) => {
+  if (userSystemEnabled) {
+    const user = req?.session?.user;
+
+    if (user) {
+      next();
+    } else {
+      res.redirect('/auth/login').end();
+    }
+  } else next();
+};
+
+if (userSystemEnabled) {
+  router.use('/your_login_page', authYourLogin);
+}
+
+module.exports = { router, authenticatedOr401, authenticatedOrRedirect };

api/server/routes/authYourLogin.js

@@ -0,0 +1,44 @@
+const express = require('express');
+const router = express.Router();
+
+// WARNING!
+// THIS IS NOT A READY TO USE USER SYSTEM
+// PLEASE IMPLEMENT YOUR OWN USER SYSTEM
+
+const userSystemEnabled = process.env.ENABLE_USER_SYSTEM || false;
+
+// Logout
+router.get('/logout', (req, res) => {
+  // Do anything you want
+  console.warn('logout not implemented!');
+
+  // finish
+  res.redirect('/');
+});
+
+// Login
+router.get('/', async (req, res) => {
+  // Do anything you want
+  console.warn('login not implemented! Automatic passed as sample user');
+
+  // save the user info into session
+  // username will be used in db
+  // display will be used in UI
+  if (userSystemEnabled) {
+    req.session.user = {
+      username: null, // was 'sample_user', but would break previous relationship with previous conversations before v0.1.0
+      display: 'Sample User'
+    };
+  }
+
+  req.session.save(function (error) {
+    if (error) {
+      console.log(error);
+      res.send(`<h1>Login Failed. An error occurred. Please see the server logs for details.</h1>`);
+    } else {
+      res.redirect('/');
+    }
+  });
+});
+
+module.exports = router;

api/server/routes/convos.js

@@ -1,21 +1,38 @@
 const express = require('express');
 const router = express.Router();
-const { getConvos, deleteConvos, updateConvo } = require('../../models/Conversation');
+const { titleConvo } = require('../../app/');
+const { getConvo, saveConvo, getConvoTitle } = require('../../models');
+const { getConvosByPage, deleteConvos, updateConvo } = require('../../models/Conversation');
+const { getMessages } = require('../../models/Message');
 
 router.get('/', async (req, res) => {
   const pageNumber = req.query.pageNumber || 1;
-  res.status(200).send(await getConvos(pageNumber));
+  res.status(200).send(await getConvosByPage(req?.session?.user?.username, pageNumber));
+});
+
+router.get('/:conversationId', async (req, res) => {
+  const { conversationId } = req.params;
+  const convo = await getConvo(req?.session?.user?.username, conversationId);
+
+  if (convo) res.status(200).send(convo.toObject());
+  else res.status(404).end();
 });
 
 router.post('/clear', async (req, res) => {
   let filter = {};
-  const { conversationId } = req.body.arg;
+  const { conversationId, source } = req.body.arg;
   if (conversationId) {
     filter = { conversationId };
   }
 
+  console.log('source:', source);
+
+  if (source === 'button' && !conversationId) {
+    return res.status(200).send('No conversationId provided');
+  }
+
   try {
-    const dbResponse = await deleteConvos(filter);
+    const dbResponse = await deleteConvos(req?.session?.user?.username, filter);
     res.status(201).send(dbResponse);
   } catch (error) {
     console.error(error);
@@ -27,7 +44,7 @@ router.post('/update', async (req, res) => {
   const update = req.body.arg;
 
   try {
-    const dbResponse = await updateConvo(update);
+    const dbResponse = await updateConvo(req?.session?.user?.username, update);
     res.status(201).send(dbResponse);
   } catch (error) {
     console.error(error);

api/server/routes/customGpts.js

@@ -1,9 +1,14 @@
 const express = require('express');
 const router = express.Router();
-const { getCustomGpts, updateCustomGpt, updateByLabel, deleteCustomGpts } = require('../../models');
+const {
+  getCustomGpts,
+  updateCustomGpt,
+  updateByLabel,
+  deleteCustomGpts
+} = require('../../models');
 
 router.get('/', async (req, res) => {
-  const models = (await getCustomGpts()).map(model => {
+  const models = (await getCustomGpts(req?.session?.user?.username)).map((model) => {
     model = model.toObject();
     model._id = model._id.toString();
     return model;
@@ -15,8 +20,14 @@ router.post('/delete', async (req, res) => {
   const { arg } = req.body;
 
   try {
-    const dbResponse = await deleteCustomGpts(arg);
-    res.status(201).send(dbResponse);
+    await deleteCustomGpts(req?.session?.user?.username, arg);
+    const models = (await getCustomGpts(req?.session?.user?.username)).map((model) => {
+      model = model.toObject();
+      model._id = model._id.toString();
+      return model;
+    });
+    res.status(201).send(models);
+    // res.status(201).send(dbResponse);
   } catch (error) {
     console.error(error);
     res.status(500).send(error);
@@ -45,7 +56,7 @@ router.post('/', async (req, res) => {
   }
 
   try {
-    const dbResponse = await setter(update);
+    const dbResponse = await setter(req?.session?.user?.username, update);
     res.status(201).send(dbResponse);
   } catch (error) {
     console.error(error);

api/server/routes/handlers.js

@@ -1,5 +1,12 @@
-const handleError = (res, errorMessage) => {
-  res.status(500).write(`event: error\ndata: ${errorMessage}`);
+const _ = require('lodash');
+const citationRegex = /\[\^\d+?\^]/g;
+const backtick = /(?<!`)[`](?!`)/g;
+// const singleBacktick = /(?<!`)[`](?!`)/;
+const cursorDefault = '<span className="result-streaming">█</span>';
+const { getCitations, citeText } = require('../../app/');
+
+const handleError = (res, message) => {
+  res.write(`event: error\ndata: ${JSON.stringify(message)}\n\n`);
   res.end();
 };
 
@@ -10,4 +17,80 @@ const sendMessage = (res, message) => {
   res.write(`event: message\ndata: ${JSON.stringify(message)}\n\n`);
 };
 
-module.exports = { handleError, sendMessage };
+const createOnProgress = () => {
+  let i = 0;
+  let code = '';
+  let tokens = '';
+  let precode = '';
+  let blockCount = 0;
+  let codeBlock = false;
+  let cursor = cursorDefault;
+
+  const progressCallback = async (partial, { res, text, bing = false, ...rest }) => {
+    let chunk = partial === text ? '' : partial;
+    tokens += chunk;
+    precode += chunk;
+    tokens = tokens.replaceAll('[DONE]', '');
+
+    if (codeBlock) {
+      code += chunk;
+    }
+
+    if (precode.includes('```') && codeBlock) {
+      codeBlock = false;
+      cursor = cursorDefault;
+      precode = precode.replace(/```/g, '');
+      code = '';
+    }
+
+    if (precode.includes('```') && code === '') {
+      precode = precode.replace(/```/g, '');
+      codeBlock = true;
+      blockCount++;
+      cursor = blockCount > 1 ? '█\n\n```' : '█\n\n';
+    }
+
+    const backticks = precode.match(backtick);
+    if (backticks && !codeBlock && cursor === cursorDefault) {
+      precode = precode.replace(backtick, '');
+      cursor = '█';
+    }
+
+    if (tokens.match(/^\n/)) {
+      tokens = tokens.replace(/^\n/, '');
+    }
+
+    if (bing) {
+      tokens = citeText(tokens, true);
+    }
+
+    sendMessage(res, { text: tokens + cursor, message: true, initial: i === 0, ...rest });
+    i++;
+  };
+
+  const onProgress = (model, opts) => {
+    const bingModels = new Set(['bingai', 'sydney']);
+    return _.partialRight(progressCallback, { ...opts, bing: bingModels.has(model) });
+  };
+
+  return onProgress;
+};
+
+const handleText = async (response, bing = false) => {
+  let { text } = response;
+  // text = await detectCode(text);
+  response.text = text;
+
+  if (bing) {
+    // const hasCitations = response.response.match(citationRegex)?.length > 0;
+    const links = getCitations(response);
+    if (response.text.match(citationRegex)?.length > 0) {
+      text = citeText(response);
+    }
+    text += links?.length > 0 ? `\n<small>${links}</small>` : '';
+  }
+
+  return text;
+};
+
+module.exports = { handleError, sendMessage, createOnProgress, handleText };

api/server/routes/index.js

@@ -2,6 +2,8 @@ const ask = require('./ask');
 const messages = require('./messages');
 const convos = require('./convos');
 const customGpts = require('./customGpts');
-const prompts = require('./prompts');
+const prompts = require('./prompts'); 
+const search = require('./search');
+const { router: auth, authenticatedOr401, authenticatedOrRedirect } = require('./auth');
 
-module.exports = { ask, messages, convos, customGpts, prompts };
+module.exports = { search, ask, messages, convos, customGpts, prompts, auth, authenticatedOr401, authenticatedOrRedirect };

api/server/routes/search.js

@@ -0,0 +1,123 @@
+const express = require('express');
+const router = express.Router();
+const { MeiliSearch } = require('meilisearch');
+const { Message } = require('../../models/Message');
+const { Conversation, getConvosQueried } = require('../../models/Conversation');
+const { reduceHits } = require('../../lib/utils/reduceHits');
+const { cleanUpPrimaryKeyValue } = require('../../lib/utils/misc');
+const cache = new Map();
+
+router.get('/sync', async function (req, res) {
+  await Message.syncWithMeili();
+  await Conversation.syncWithMeili();
+  res.send('synced');
+});
+
+router.get('/', async function (req, res) {
+  try {
+    let user = req?.session?.user?.username;
+    user = user ?? null;
+    const { q } = req.query;
+    const pageNumber = req.query.pageNumber || 1;
+    const key = `${user || ''}${q}`;
+
+    if (cache.has(key)) {
+      console.log('cache hit', key);
+      const cached = cache.get(key);
+      const { pages, pageSize, messages } = cached;
+      res.status(200).send({ conversations: cached[pageNumber], pages, pageNumber, pageSize, messages });
+      return;
+    } else {
+      cache.clear();
+    }
+
+    // const message = await Message.meiliSearch(q);
+    const messages = (
+      await Message.meiliSearch(
+        q,
+        {
+          attributesToHighlight: ['text'],
+          highlightPreTag: '**',
+          highlightPostTag: '**'
+        },
+        true
+      )
+    ).hits.map(message => {
+      const { _formatted, ...rest } = message;
+      return {
+        ...rest,
+        searchResult: true,
+        text: _formatted.text
+      };
+    });
+    const titles = (await Conversation.meiliSearch(q)).hits;
+    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 = [];
+    for (let i = 0; i < messages.length; i++) {
+      let message = messages[i];
+      if (message.conversationId.includes('--')) {
+        message.conversationId = cleanUpPrimaryKeyValue(message.conversationId);
+      }
+      if (result.convoMap[message.conversationId] && !message.error) {
+        const convo = result.convoMap[message.conversationId];
+        const { title, chatGptLabel, model } = convo;
+        message = { ...message, ...{ title, chatGptLabel, model } };
+        activeMessages.push(message);
+      }
+    }
+    result.messages = activeMessages;
+    if (result.cache) {
+      result.cache.messages = activeMessages;
+      cache.set(key, result.cache);
+      delete result.cache;
+    }
+    delete result.convoMap;
+    // for debugging
+    // console.log(result, messages.length);
+    res.status(200).send(result);
+  } catch (error) {
+    console.log(error);
+    res.status(500).send({ message: 'Error searching' });
+  }
+});
+
+router.get('/clear', async function (req, res) {
+  await Message.resetIndex();
+  res.send('cleared');
+});
+
+router.get('/test', async function (req, res) {
+  const { q } = req.query;
+  const messages = (await Message.meiliSearch(q, { attributesToHighlight: ['text'] }, true)).hits.map(
+    message => {
+      const { _formatted, ...rest } = message;
+      return { ...rest, searchResult: true, text: _formatted.text };
+    }
+  );
+  res.send(messages);
+});
+
+router.get('/enable', async function (req, res) {
+  let result = false;
+  try {
+    const client = new MeiliSearch({
+      host: process.env.MEILI_HOST,
+      apiKey: process.env.MEILI_MASTER_KEY
+    });
+
+    const { status } = await client.health();
+    // console.log(`Meilisearch: ${status}`);
+    result = status === 'available' && !!process.env.SEARCH;
+    return res.send(result);
+  } catch (error) {
+    // console.error(error);
+    return res.send(false);
+  }
+});
+
+module.exports = router;

client/.dockerignore

@@ -1,2 +0,0 @@
-/node_modules
-.env

client/.eslintrc.js

@@ -0,0 +1,30 @@
+module.exports = {
+  "env": {
+      "browser": true,
+      "es2021": true,
+      "node": true,
+      "commonjs": true,
+      "es6": true,
+  },
+  "extends": [
+      "eslint:recommended",
+      "plugin:react/recommended",
+      "plugin:react-hooks/recommended"
+  ],
+  "overrides": [
+  ],
+  "parserOptions": {
+      "ecmaFeatures": {
+          "jsx": true
+      },
+      "ecmaVersion": "latest",
+      "sourceType": "module"
+  },
+  "plugins": [
+      "react"
+  ],
+  "rules": {
+      'react/prop-types': ['off'],
+      'react/display-name': ['off'],
+  }
+}

client/.prettierrc

@@ -0,0 +1,22 @@
+{
+  "arrowParens": "avoid",
+  "bracketSpacing": true,
+  "endOfLine": "lf",
+  "htmlWhitespaceSensitivity": "css",
+  "insertPragma": false,
+  "singleAttributePerLine": true,
+  "bracketSameLine": false,
+  "jsxBracketSameLine": false,
+  "jsxSingleQuote": false,
+  "printWidth": 110,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "useTabs": false,
+  "vueIndentScriptAndStyle": false,
+  "parser": "babel"
+}

client/Dockerfile

@@ -1,22 +0,0 @@
-# Stage 1
-FROM node:19-alpine as builder
-WORKDIR /client
-# copy package.json into the container at /client
-COPY package*.json /client/
-# install dependencies
-RUN npm install
-# Copy the current directory contents into the container at /client
-COPY . /client/
-# Build webpack artifacts
-RUN npm run build
-
-# Stage 2
-FROM nginx:stable-alpine
-WORKDIR /usr/share/nginx/html
-RUN rm -rf ./*
-COPY --from=builder /client/public /usr/share/nginx/html
-# Add your nginx.conf
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-ENTRYPOINT ["nginx", "-g", "daemon off;"]
-
-# docker build -t react-client .

client/index.js

@@ -1,18 +1,21 @@
 import React from 'react';
 import { createRoot } from 'react-dom/client';
-import { Provider } from 'react-redux';
-import { store } from './src/store';
+// import { Provider } from 'react-redux';
+// import { store } from './src/store';
+import { RecoilRoot } from 'recoil';
+
 import { ThemeProvider } from './src/hooks/ThemeContext';
 import App from './src/App';
 import './src/style.css';
+import './src/mobile.css';
 
 const container = document.getElementById('root');
 const root = createRoot(container);
 
 root.render(
-  <Provider store={store}>
+  <RecoilRoot>
     <ThemeProvider>
       <App />
     </ThemeProvider>
-  </Provider>
-);
+  </RecoilRoot>
+);

client/nginx.conf

@@ -2,14 +2,14 @@ server {
   listen 80;
   server_name localhost;
 
-  location / {
-    # Serve your React app
-    root /usr/share/nginx/html;
-    index index.html;
-  }
-
   location /api {
     # Proxy requests to the API service
     proxy_pass http://api:3080/api;
   }
+
+  location / {
+    # Serve your React app
+    root /usr/share/nginx/html;
+    try_files $uri $uri/ /index.html;
+  }
 }

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-clone",
-  "version": "1.0.0",
+  "version": "0.2.0",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -23,24 +23,38 @@
     "@radix-ui/react-dialog": "^1.0.2",
     "@radix-ui/react-dropdown-menu": "^2.0.2",
     "@radix-ui/react-label": "^2.0.0",
-    "@radix-ui/react-tabs": "^1.0.2",
-    "@reduxjs/toolkit": "^1.9.2",
+    "@radix-ui/react-tabs": "^1.0.3",
+    "@types/jest": "^29.5.0",
+    "@types/node": "^18.15.10",
+    "@types/react": "^18.0.30",
+    "@types/react-dom": "^18.0.11",
     "axios": "^1.3.4",
     "class-variance-authority": "^0.4.0",
     "clsx": "^1.2.1",
     "crypto-browserify": "^3.12.0",
-    "highlight.js": "^11.7.0",
+    "lodash": "^4.17.21",
     "lucide-react": "^0.113.0",
-    "markdown-to-jsx": "^7.1.9",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-redux": "^8.0.5",
+    "react-lazy-load": "^4.0.1",
+    "react-markdown": "^8.0.6",
+    "react-router-dom": "^6.9.0",
+    "react-string-replace": "^1.1.0",
     "react-textarea-autosize": "^8.4.0",
     "react-transition-group": "^4.4.5",
+    "recoil": "^0.7.7",
+    "rehype-highlight": "^6.0.0",
+    "rehype-katex": "^6.0.2",
+    "rehype-raw": "^6.1.1",
+    "remark-gfm": "^3.0.1",
+    "remark-math": "^5.1.1",
+    "remark-supersub": "^1.0.0",
     "swr": "^2.0.3",
     "tailwind-merge": "^1.9.1",
     "tailwindcss-animate": "^1.0.5",
-    "url": "^0.11.0"
+    "tailwindcss-radix": "^2.8.0",
+    "url": "^0.11.0",
+    "uuidv4": "^6.2.13"
   },
   "devDependencies": {
     "@babel/cli": "^7.20.7",

client/public/index.html

@@ -2,6 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
+    <meta name="theme-color" content="#343541">
     <title>ChatGPT Clone</title>
     <link
       rel="shortcut icon"
@@ -25,7 +26,7 @@
     />
     <script
       defer
-      src="main.js"
+      src="/main.js"
     ></script>
   </head>
   <body>
@@ -33,7 +34,7 @@
 
     <script
       type="text/javascript"
-      src="main.js"
+      src="/main.js"
     ></script>
   </body>
 </html>

client/src/App.jsx

@@ -1,35 +1,91 @@
-import React from 'react';
-import Messages from './components/Messages';
-import Landing from './components/Main/Landing';
-import TextChat from './components/Main/TextChat';
-import Nav from './components/Nav';
-import MobileNav from './components/Nav/MobileNav';
-import useDocumentTitle from '~/hooks/useDocumentTitle';
-import { useSelector } from 'react-redux';
+import React, { useEffect, useState } from 'react';
+import { createBrowserRouter, RouterProvider, Navigate } from 'react-router-dom';
+import Root from './routes/Root';
+import Chat from './routes/Chat';
+import Search from './routes/Search';
+import store from './store';
+import userAuth from './utils/userAuth';
+import { useRecoilState, useSetRecoilState } from 'recoil';
+
+import axios from 'axios';
+
+const router = createBrowserRouter([
+  {
+    path: '/',
+    element: <Root />,
+    children: [
+      {
+        index: true,
+        element: (
+          <Navigate
+            to="/chat/new"
+            replace={true}
+          />
+        )
+      },
+      {
+        path: 'chat/:conversationId?',
+        element: <Chat />
+      },
+      {
+        path: 'search/:query?',
+        element: <Search />
+      }
+    ]
+  }
+]);
 
 const App = () => {
-  const { messages } = useSelector((state) => state.messages);
-  const { title } = useSelector((state) => state.convo);
-  useDocumentTitle(title);
+  const [user, setUser] = useRecoilState(store.user);
+  const setIsSearchEnabled = useSetRecoilState(store.isSearchEnabled);
+  const setModelsFilter = useSetRecoilState(store.modelsFilter);
 
-  return (
-    <div className="flex h-screen">
-      <Nav />
-      <div className="flex h-full w-full flex-1 flex-col bg-gray-50 md:pl-[260px]">
-        <div className="transition-width relative flex h-full w-full flex-1 flex-col items-stretch overflow-hidden bg-white dark:bg-gray-800">
-          <MobileNav />
-          {messages.length === 0 ? (
-            <Landing title={title} />
-          ) : (
-            <Messages
-              messages={messages}
-            />
-          )}
-          <TextChat messages={messages} />
-        </div>
+  useEffect(() => {
+    // fetch if seatch enabled
+    axios
+      .get('/api/search/enable', {
+        timeout: 1000,
+        withCredentials: true
+      })
+      .then(res => {
+        setIsSearchEnabled(res.data);
+      });
+
+    // fetch user
+    userAuth()
+      .then(user => setUser(user))
+      .catch(err => console.log(err));
+
+    // fetch models
+    axios
+      .get('/api/models', {
+        timeout: 1000,
+        withCredentials: true
+      })
+      .then(({ data }) => {
+        const filter = {
+          chatgpt: data?.hasOpenAI,
+          chatgptCustom: data?.hasOpenAI,
+          bingai: data?.hasBing,
+          sydney: data?.hasBing,
+          chatgptBrowser: data?.hasChatGpt
+        };
+        setModelsFilter(filter);
+      })
+      .catch(error => {
+        console.error(error);
+        console.log('Not login!');
+        window.location.href = '/auth/login';
+      });
+  }, []);
+
+  if (user)
+    return (
+      <div>
+        <RouterProvider router={router} />
       </div>
-    </div>
-  );
+    );
+  else return <div className="flex h-screen"></div>;
 };
 
 export default App;

client/src/components/Conversations/Conversation.jsx

@@ -1,111 +1,154 @@
 import React, { useState, useRef } from 'react';
+import { useRecoilState, useResetRecoilState, useSetRecoilState } from 'recoil';
+
 import RenameButton from './RenameButton';
 import DeleteButton from './DeleteButton';
-import { useSelector, useDispatch } from 'react-redux';
-import { setConversation } from '~/store/convoSlice';
-import { setCustomGpt, setModel, setCustomModel } from '~/store/submitSlice';
-import { setMessages } from '~/store/messageSlice';
-import { setText } from '~/store/textSlice';
-import manualSWR from '~/utils/fetchers';
 import ConvoIcon from '../svg/ConvoIcon';
+import manualSWR from '~/utils/fetchers';
+
+import store from '~/store';
+
+export default function Conversation({ conversation, retainView }) {
+  const [currentConversation, setCurrentConversation] = useRecoilState(store.conversation);
+  const setMessages = useSetRecoilState(store.messages);
+  const setSubmission = useSetRecoilState(store.submission);
+  const resetLatestMessage = useResetRecoilState(store.latestMessage);
+
+  const { refreshConversations } = store.useConversations();
+  const { switchToConversation } = store.useConversation();
 
-export default function Conversation({
-  id,
-  parentMessageId,
-  conversationId,
-  title = 'New conversation',
-  bingData,
-  chatGptLabel = null,
-  promptPrefix = null
-}) {
   const [renaming, setRenaming] = useState(false);
   const [titleInput, setTitleInput] = useState(title);
-  const { modelMap } = useSelector((state) => state.models);
   const inputRef = useRef(null);
-  const dispatch = useDispatch();
-  const { trigger } = manualSWR(`http://localhost:3080/api/messages/${id}`, 'get');
-  const rename = manualSWR(`http://localhost:3080/api/convos/update`, 'post');
+
+  const {
+    model,
+    parentMessageId,
+    conversationId,
+    title,
+    chatGptLabel = null,
+    promptPrefix = null,
+    jailbreakConversationId,
+    conversationSignature,
+    clientId,
+    invocationId,
+    toneStyle
+  } = conversation;
+
+  const rename = manualSWR(`/api/convos/update`, 'post');
+
+  const bingData = conversationSignature
+    ? {
+        jailbreakConversationId: jailbreakConversationId,
+        conversationSignature: conversationSignature,
+        parentMessageId: parentMessageId || null,
+        clientId: clientId,
+        invocationId: invocationId,
+        toneStyle: toneStyle
+      }
+    : null;
 
   const clickHandler = async () => {
-    if (conversationId === id) {
+    if (currentConversation?.conversationId === conversationId) {
       return;
     }
 
-    const convo = { title, error: false, conversationId: id, chatGptLabel, promptPrefix };
+    // stop existing submission
+    setSubmission(null);
 
-    if (bingData) {
-      const {
-        parentMessageId,
-        conversationSignature,
-        jailbreakConversationId,
-        clientId,
-        invocationId
-      } = bingData;
-      dispatch(
-        setConversation({
-          ...convo,
-          parentMessageId,
-          jailbreakConversationId,
-          conversationSignature,
-          clientId,
-          invocationId
-        })
-      );
-    } else {
-      dispatch(
-        setConversation({
-          ...convo,
-          parentMessageId,
-          jailbreakConversationId: null,
-          conversationSignature: null,
-          clientId: null,
-          invocationId: null
-        })
-      );
-    }
-    const data = await trigger();
+    // set conversation to the new conversation
+    switchToConversation(conversation);
 
-    if (chatGptLabel) {
-      dispatch(setModel('chatgptCustom'));
-    } else {
-      dispatch(setModel(data[1].sender));
-    }
+    // if (!stopStream) {
+    //   dispatch(setStopStream(true));
+    //   dispatch(setSubmission({}));
+    // }
+    // dispatch(setEmptyMessage());
 
-    if (modelMap[data[1].sender.toLowerCase()]) {
-      console.log('sender', data[1].sender);
-      dispatch(setCustomModel(data[1].sender.toLowerCase()));
-    } else {
-      dispatch(setCustomModel(null));
-    }
+    // const convo = { title, error: false, conversationId: id, chatGptLabel, promptPrefix };
 
-    dispatch(setMessages(data));
-    dispatch(setCustomGpt(convo));
-    dispatch(setText(''));
+    // if (bingData) {
+    //   const {
+    //     parentMessageId,
+    //     conversationSignature,
+    //     jailbreakConversationId,
+    //     clientId,
+    //     invocationId,
+    //     toneStyle
+    //   } = bingData;
+    //   dispatch(
+    //     setConversation({
+    //       ...convo,
+    //       parentMessageId,
+    //       jailbreakConversationId,
+    //       conversationSignature,
+    //       clientId,
+    //       invocationId,
+    //       toneStyle,
+    //       latestMessage: null
+    //     })
+    //   );
+    // } else {
+    //   dispatch(
+    //     setConversation({
+    //       ...convo,
+    //       parentMessageId,
+    //       jailbreakConversationId: null,
+    //       conversationSignature: null,
+    //       clientId: null,
+    //       invocationId: null,
+    //       toneStyle: null,
+    //       latestMessage: null
+    //     })
+    //   );
+    // }
+    // const data = await trigger();
+
+    // if (chatGptLabel) {
+    //   dispatch(setModel('chatgptCustom'));
+    //   dispatch(setCustomModel(chatGptLabel.toLowerCase()));
+    // } else {
+    //   dispatch(setModel(model));
+    //   dispatch(setCustomModel(null));
+    // }
+
+    // dispatch(setMessages(data));
+    // dispatch(setCustomGpt(convo));
+    // dispatch(setText(''));
+    // dispatch(setStopStream(false));
   };
 
-  const renameHandler = (e) => {
+  const renameHandler = e => {
     e.preventDefault();
+    setTitleInput(title);
     setRenaming(true);
     setTimeout(() => {
       inputRef.current.focus();
     }, 25);
   };
 
-  const cancelHandler = (e) => {
+  const cancelHandler = e => {
     e.preventDefault();
     setRenaming(false);
   };
 
-  const onRename = (e) => {
+  const onRename = e => {
     e.preventDefault();
     setRenaming(false);
     if (titleInput === title) {
       return;
     }
-    rename.trigger({ conversationId, title: titleInput });
+    rename.trigger({ conversationId, title: titleInput }).then(() => {
+      refreshConversations();
+      if (conversationId == currentConversation?.conversationId)
+        setCurrentConversation(prevState => ({
+          ...prevState,
+          title: titleInput
+        }));
+    });
   };
 
-  const handleKeyDown = (e) => {
+  const handleKeyDown = e => {
     if (e.key === 'Enter') {
       onRename(e);
     }
@@ -116,7 +159,7 @@ export default function Conversation({
       'animate-flash group relative flex cursor-pointer items-center gap-3 break-all rounded-md bg-gray-800 py-3 px-3 pr-14 hover:bg-gray-800'
   };
 
-  if (conversationId !== id) {
+  if (currentConversation?.conversationId !== conversationId) {
     aProps.className =
       'group relative flex cursor-pointer items-center gap-3 break-all rounded-md py-3 px-3 hover:bg-[#2A2B32] hover:pr-4';
   }
@@ -134,26 +177,27 @@ export default function Conversation({
             type="text"
             className="m-0 mr-0 w-full border border-blue-500 bg-transparent p-0 text-sm leading-tight outline-none"
             value={titleInput}
-            onChange={(e) => setTitleInput(e.target.value)}
+            onChange={e => setTitleInput(e.target.value)}
             onBlur={onRename}
             onKeyDown={handleKeyDown}
           />
         ) : (
-          titleInput
+          title
         )}
       </div>
-      {conversationId === id ? (
+      {currentConversation?.conversationId === conversationId ? (
         <div className="visible absolute right-1 z-10 flex text-gray-300">
           <RenameButton
-            conversationId={id}
+            conversationId={conversationId}
             renaming={renaming}
             renameHandler={renameHandler}
             onRename={onRename}
           />
           <DeleteButton
-            conversationId={id}
+            conversationId={conversationId}
             renaming={renaming}
             cancelHandler={cancelHandler}
+            retainView={retainView}
           />
         </div>
       ) : (

client/src/components/Conversations/DeleteButton.jsx

@@ -2,23 +2,21 @@ import React from 'react';
 import TrashIcon from '../svg/TrashIcon';
 import CrossIcon from '../svg/CrossIcon';
 import manualSWR from '~/utils/fetchers';
-import { useDispatch } from 'react-redux';
-import { setNewConvo, removeConvo } from '~/store/convoSlice';
-import { setMessages } from '~/store/messageSlice';
+import { useRecoilValue } from 'recoil';
 
-export default function DeleteButton({ conversationId, renaming, cancelHandler }) {
-  const dispatch = useDispatch();
-  const { trigger } = manualSWR(
-    `http://localhost:3080/api/convos/clear`,
-    'post',
-    () => {
-      dispatch(setMessages([]));
-      dispatch(removeConvo(conversationId));
-      dispatch(setNewConvo());
-    }
-  );
+import store from '~/store';
 
-  const clickHandler = () => trigger({ conversationId });
+export default function DeleteButton({ conversationId, renaming, cancelHandler, retainView }) {
+  const currentConversation = useRecoilValue(store.conversation) || {};
+  const { newConversation } = store.useConversation();
+  const { refreshConversations } = store.useConversations();
+  const { trigger } = manualSWR(`/api/convos/clear`, 'post', () => {
+    if (currentConversation?.conversationId == conversationId) newConversation();
+    refreshConversations();
+    retainView();
+  });
+
+  const clickHandler = () => trigger({ conversationId, source: 'button' });
   const handler = renaming ? cancelHandler : clickHandler;
 
   return (
@@ -26,7 +24,7 @@ export default function DeleteButton({ conversationId, renaming, cancelHandler }
       className="p-1 hover:text-white"
       onClick={handler}
     >
-      { renaming ? <CrossIcon/> : <TrashIcon />}
+      {renaming ? <CrossIcon /> : <TrashIcon />}
     </button>
   );
 }

client/src/components/Conversations/Pages.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+
+export default function Pages({ pageNumber, pages, nextPage, previousPage }) {
+  const clickHandler = func => async e => {
+    e.preventDefault();
+    await func();
+  };
+
+  return pageNumber == 1 && pages == 1 ? null : (
+    <div className="m-auto mt-4 mb-2 flex items-center justify-center gap-2">
+      <button
+        onClick={clickHandler(previousPage)}
+        className={
+          'btn btn-small bg-transition m-auto flex gap-2 transition hover:bg-gray-800 disabled:text-gray-300 dark:text-white dark:disabled:text-gray-400' +
+          (pageNumber <= 1 ? ' hidden-visibility' : '')
+        }
+        disabled={pageNumber <= 1}
+      >
+        &lt;&lt;
+      </button>
+      <span className="flex-none text-gray-400">
+        {pageNumber} / {pages}
+      </span>
+      <button
+        onClick={clickHandler(nextPage)}
+        className={
+          'btn btn-small bg-transition m-auto flex gap-2 transition hover:bg-gray-800 disabled:text-gray-300 dark:text-white dark:disabled:text-gray-400' +
+          (pageNumber >= pages ? ' hidden-visibility' : '')
+        }
+        disabled={pageNumber >= pages}
+      >
+        &gt;&gt;
+      </button>
+    </div>
+  );
+}

client/src/components/Conversations/index.jsx

@@ -1,48 +1,20 @@
 import React from 'react';
 import Conversation from './Conversation';
 
-export default function Conversations({ conversations, conversationId, showMore }) {
-  const clickHandler = async (e) => {
-    e.preventDefault();
-    await showMore();
-  };
-
+export default function Conversations({ conversations, conversationId, moveToTop }) {
   return (
     <>
       {conversations &&
         conversations.length > 0 &&
-        conversations.map((convo) => {
-          const bingData = convo.conversationSignature
-            ? {
-                jailbreakConversationId: convo.jailbreakConversationId,
-                conversationSignature: convo.conversationSignature,
-                parentMessageId: convo.parentMessageId || null,
-                clientId: convo.clientId,
-                invocationId: convo.invocationId
-              }
-            : null;
-
+        conversations.map(convo => {
           return (
             <Conversation
               key={convo.conversationId}
-              id={convo.conversationId}
-              parentMessageId={convo.parentMessageId}
-              title={convo.title}
-              conversationId={conversationId}
-              chatGptLabel={convo.chatGptLabel}
-              promptPrefix={convo.promptPrefix}
-              bingData={bingData}
+              conversation={convo}
+              retainView={moveToTop}
             />
           );
         })}
-      {conversations && conversations.length >= 12 && conversations.length % 12 === 0 && (
-        <button
-          onClick={clickHandler}
-          className="btn btn-dark btn-small m-auto mb-2 flex justify-center gap-2"
-        >
-          Show more
-        </button>
-      )}
     </>
   );
 }

client/src/components/Input/AdjustToneButton.jsx

@@ -0,0 +1,32 @@
+import React from 'react';
+export default function AdjustButton({ onClick }) {
+  const clickHandler = e => {
+    e.preventDefault();
+    onClick();
+  };
+  return (
+    <button
+      onClick={clickHandler}
+      className="group absolute bottom-11 -right-11 flex h-[100%] w-[50px] items-center justify-center bg-transparent p-1 text-gray-500 md:bottom-0"
+    >
+      <div className="m-1 mr-0 rounded-md p-2 pt-[10px] pb-[10px] group-hover:bg-gray-100 group-disabled:hover:bg-transparent dark:group-hover:bg-gray-900 dark:group-hover:text-gray-400 dark:group-disabled:hover:bg-transparent">
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          fill="none"
+          viewBox="0 0 24 24"
+          height="1em"
+          width="1em"
+          strokeWidth="2"
+          stroke="currentColor"
+          className="mr-1 h-4 w-4"
+        >
+          <path
+            strokeLinecap="round"
+            strokeLinejoin="round"
+            d="M10.5 6h9.75M10.5 6a1.5 1.5 0 11-3 0m3 0a1.5 1.5 0 10-3 0M3.75 6H7.5m3 12h9.75m-9.75 0a1.5 1.5 0 01-3 0m3 0a1.5 1.5 0 00-3 0m-3.75 0H7.5m9-6h3.75m-3.75 0a1.5 1.5 0 01-3 0m3 0a1.5 1.5 0 00-3 0m-9.75 0h9.75"
+          />
+        </svg>
+      </div>
+    </button>
+  );
+}

client/src/components/Input/BingStyles.jsx

@@ -0,0 +1,69 @@
+import React, { useState, useEffect, forwardRef } from 'react';
+import { Tabs, TabsList, TabsTrigger } from '../ui/Tabs.tsx';
+import { useRecoilValue, useRecoilState } from 'recoil';
+// import { setConversation } from '~/store/convoSlice';
+
+import store from '~/store';
+
+function BingStyles(props, ref) {
+  const [value, setValue] = useState('fast');
+
+  const [conversation, setConversation] = useRecoilState(store.conversation) || {};
+  const { model, conversationId } = conversation;
+  const messages = useRecoilValue(store.messages);
+
+  const isBing = model === 'bingai' || model === 'sydney';
+  useEffect(() => {
+    if ((model === 'bingai' && !conversationId) || model === 'sydney') {
+      setConversation(prevState => ({ ...prevState, toneStyle: value }));
+    }
+  }, [conversationId, model, value]);
+
+  const show = isBing && (!conversationId || messages?.length === 0 || props.show);
+  const defaultClasses = 'p-2 rounded-md min-w-[75px] font-normal bg-white/[.60] dark:bg-gray-700 text-black text-xs';
+  const defaultSelected = defaultClasses + 'font-medium data-[state=active]:text-white text-xs';
+
+  const selectedClass = val => val + '-tab ' + defaultSelected;
+
+  const changeHandler = value => {
+    setValue(value);
+    setConversation(prevState => ({ ...prevState, toneStyle: value }));
+  };
+  return (
+    <Tabs
+      defaultValue={value}
+      className={`bing-styles mb-1 shadow-md ${show ? 'show' : ''}`}
+      onValueChange={changeHandler}
+      ref={ref}
+    >
+      <TabsList className="bg-white/[.60] dark:bg-gray-700">
+        <TabsTrigger
+          value="creative"
+          className={`${value === 'creative' ? selectedClass(value) : defaultClasses}`}
+        >
+          {'Creative'}
+        </TabsTrigger>
+        <TabsTrigger
+          value="fast"
+          className={`${value === 'fast' ? selectedClass(value) : defaultClasses}`}
+        >
+          {'Fast'}
+        </TabsTrigger>
+        <TabsTrigger
+          value="balanced"
+          className={`${value === 'balanced' ? selectedClass(value) : defaultClasses}`}
+        >
+          {'Balanced'}
+        </TabsTrigger>
+        <TabsTrigger
+          value="precise"
+          className={`${value === 'precise' ? selectedClass(value) : defaultClasses}`}
+        >
+          {'Precise'}
+        </TabsTrigger>
+      </TabsList>
+    </Tabs>
+  );
+}
+
+export default forwardRef(BingStyles);

client/src/components/Input/Footer.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 export default function Footer() {
   return (
-    <div className="px-3 pt-2 pb-3 text-center text-xs text-black/50 dark:text-white/50 md:px-4 md:pt-3 md:pb-6">
+    <div className="hidden md:block px-3 pt-2 pb-1 text-center text-xs text-black/50 dark:text-white/50 md:px-4 md:pt-3 md:pb-4">
       <a
         href="https://github.com/danny-avila/chatgpt-clone"
         target="_blank"

client/src/components/Input/Models/MenuItems.jsx

@@ -4,12 +4,12 @@ import ModelItem from './ModelItem';
 export default function MenuItems({ models, onSelect }) {
   return (
     <>
-      {models.map((modelItem, i) => (
+      {models.map(modelItem => (
         <ModelItem
-          key={i}
-          modelName={modelItem.name}
+          key={modelItem._id}
           value={modelItem.value}
           onSelect={onSelect}
+          model={modelItem}
         />
       ))}
     </>

client/src/components/Input/Models/ModelDialog.jsx

@@ -1,12 +1,9 @@
 import React, { useState, useRef } from 'react';
 import TextareaAutosize from 'react-textarea-autosize';
-import { useSelector, useDispatch } from 'react-redux';
-import { setModel, setCustomGpt } from '~/store/submitSlice';
-import { setNewConvo } from '~/store/convoSlice';
 import manualSWR from '~/utils/fetchers';
-import { Button } from '../ui/Button.tsx';
-import { Input } from '../ui/Input.tsx';
-import { Label } from '../ui/Label.tsx';
+import { Button } from '../../ui/Button.tsx';
+import { Input } from '../../ui/Input.tsx';
+import { Label } from '../../ui/Label.tsx';
 
 import {
   DialogClose,
@@ -15,33 +12,39 @@ import {
   DialogFooter,
   DialogHeader,
   DialogTitle
-} from '../ui/Dialog.tsx';
+} from '../../ui/Dialog.tsx';
+
+import store from '~/store';
 
 export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
-  const dispatch = useDispatch();
-  const { modelMap, initial } = useSelector((state) => state.models);
+  const { newConversation } = store.useConversation();
+
   const [chatGptLabel, setChatGptLabel] = useState('');
   const [promptPrefix, setPromptPrefix] = useState('');
   const [saveText, setSaveText] = useState('Save');
   const [required, setRequired] = useState(false);
   const inputRef = useRef(null);
-  const updateCustomGpt = manualSWR(`http://localhost:3080/api/customGpts/`, 'post');
+  const updateCustomGpt = manualSWR(`/api/customGpts/`, 'post');
 
-  const submitHandler = (e) => {
+  const selectHandler = e => {
     if (chatGptLabel.length === 0) {
       e.preventDefault();
       setRequired(true);
       inputRef.current.focus();
       return;
     }
-    dispatch(setCustomGpt({ chatGptLabel, promptPrefix }));
-    dispatch(setModel('chatgptCustom'));
+
     handleSaveState(chatGptLabel.toLowerCase());
+
     // Set new conversation
-    dispatch(setNewConvo());
+    newConversation({
+      model: 'chatgptCustom',
+      chatGptLabel,
+      promptPrefix
+    });
   };
 
-  const saveHandler = (e) => {
+  const saveHandler = e => {
     e.preventDefault();
     setModelSave(true);
     const value = chatGptLabel.toLowerCase();
@@ -55,26 +58,30 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
     updateCustomGpt.trigger({ value, chatGptLabel, promptPrefix });
 
     mutate();
-    setSaveText((prev) => prev + 'd!');
+    setSaveText(prev => prev + 'd!');
     setTimeout(() => {
       setSaveText('Save');
     }, 2500);
 
-    dispatch(setCustomGpt({ chatGptLabel, promptPrefix }));
-    dispatch(setModel('chatgptCustom'));
-    // dispatch(setDisabled(false));
+    // dispatch(setCustomGpt({ chatGptLabel, promptPrefix }));
+    newConversation({
+      model: 'chatgptCustom',
+      chatGptLabel,
+      promptPrefix
+    });
   };
 
-  if (
-    chatGptLabel !== 'chatgptCustom' &&
-    modelMap[chatGptLabel.toLowerCase()] &&
-    !initial[chatGptLabel.toLowerCase()] &&
-    saveText === 'Save'
-  ) {
-    setSaveText('Update');
-  } else if (!modelMap[chatGptLabel.toLowerCase()] && saveText === 'Update') {
-    setSaveText('Save');
-  }
+  // Commented by wtlyu
+  // if (
+  //   chatGptLabel !== 'chatgptCustom' &&
+  //   modelMap[chatGptLabel.toLowerCase()] &&
+  //   !initial[chatGptLabel.toLowerCase()] &&
+  //   saveText === 'Save'
+  // ) {
+  //   setSaveText('Update');
+  // } else if (!modelMap[chatGptLabel.toLowerCase()] && saveText === 'Update') {
+  //   setSaveText('Save');
+  // }
 
   const requiredProp = required ? { required: true } : {};
 
@@ -83,8 +90,7 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
       <DialogHeader>
         <DialogTitle className="text-gray-800 dark:text-white">Customize ChatGPT</DialogTitle>
         <DialogDescription className="text-gray-600 dark:text-gray-300">
-          Note: important instructions are often better placed in your message rather than the
-          prefix.{' '}
+          Note: important instructions are often better placed in your message rather than the prefix.{' '}
           <a
             href="https://platform.openai.com/docs/guides/chat/instructing-chat-models"
             target="_blank"
@@ -106,7 +112,7 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
             id="chatGptLabel"
             value={chatGptLabel}
             ref={inputRef}
-            onChange={(e) => setChatGptLabel(e.target.value)}
+            onChange={e => setChatGptLabel(e.target.value)}
             placeholder="Set a custom name for ChatGPT"
             className=" col-span-3 shadow-[0_0_10px_rgba(0,0,0,0.10)] outline-none placeholder:text-gray-400 invalid:border-red-400 invalid:text-red-600 invalid:placeholder-red-600 invalid:placeholder-opacity-70 invalid:ring-opacity-10 focus:ring-0 focus:invalid:border-red-400 focus:invalid:ring-red-300 dark:border-none dark:bg-gray-700
               dark:text-gray-50 dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] dark:invalid:border-red-600 dark:invalid:text-red-300 dark:invalid:placeholder-opacity-80 dark:focus:border-none  dark:focus:border-transparent dark:focus:outline-none dark:focus:ring-0 dark:focus:ring-gray-400 dark:focus:ring-offset-0 dark:focus:invalid:ring-red-600 dark:focus:invalid:ring-opacity-50"
@@ -123,9 +129,9 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
           <TextareaAutosize
             id="promptPrefix"
             value={promptPrefix}
-            onChange={(e) => setPromptPrefix(e.target.value)}
+            onChange={e => setPromptPrefix(e.target.value)}
             placeholder="Set custom instructions. Defaults to: 'You are ChatGPT, a large language model trained by OpenAI.'"
-            className="col-span-3 flex h-20 w-full resize-none rounded-md border border-gray-300 bg-transparent py-2 px-3 text-sm shadow-[0_0_10px_rgba(0,0,0,0.10)] outline-none placeholder:text-gray-400 focus:outline-none focus:ring-gray-400 focus:ring-opacity-20 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-none dark:bg-gray-700 dark:text-gray-50 dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] dark:focus:border-none dark:focus:border-transparent dark:focus:outline-none dark:focus:ring-0 dark:focus:ring-gray-400 dark:focus:ring-offset-0"
+            className="col-span-3 flex h-20 max-h-52 w-full resize-none rounded-md border border-gray-300 bg-transparent py-2 px-3 text-sm shadow-[0_0_10px_rgba(0,0,0,0.10)] outline-none placeholder:text-gray-400 focus:outline-none focus:ring-gray-400 focus:ring-opacity-20 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:border-none dark:bg-gray-700 dark:text-gray-50 dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] dark:focus:border-none dark:focus:border-transparent dark:focus:outline-none dark:focus:ring-0 dark:focus:ring-gray-400 dark:focus:ring-offset-0"
           />
         </div>
       </div>
@@ -139,10 +145,10 @@ export default function ModelDialog({ mutate, setModelSave, handleSaveState }) {
           {saveText}
         </Button>
         <DialogClose
-          onClick={submitHandler}
+          onClick={selectHandler}
           className="inline-flex h-10 items-center justify-center rounded-md border-none bg-gray-900 py-2 px-4 text-sm font-semibold text-white transition-colors hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-gray-400 focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 dark:bg-gray-100 dark:text-gray-900 dark:hover:bg-gray-200 dark:focus:ring-gray-400 dark:focus:ring-offset-gray-900"
         >
-          Submit
+          Select
         </DialogClose>
       </DialogFooter>
     </DialogContent>

client/src/components/Input/Models/ModelItem.jsx

@@ -0,0 +1,180 @@
+import React, { useState, useRef } from 'react';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+import { DropdownMenuRadioItem } from '../../ui/DropdownMenu.tsx';
+import { Circle } from 'lucide-react';
+import { DialogTrigger } from '../../ui/Dialog.tsx';
+import RenameButton from '../../Conversations/RenameButton';
+import TrashIcon from '../../svg/TrashIcon';
+import manualSWR from '~/utils/fetchers';
+import { getIconOfModel } from '~/utils';
+
+import store from '~/store';
+
+export default function ModelItem({ model: _model, value, onSelect }) {
+  const { name, model, _id: id, chatGptLabel = null, promptPrefix = null } = _model;
+  const setCustomGPTModels = useSetRecoilState(store.customGPTModels);
+  const currentConversation = useRecoilValue(store.conversation) || {};
+
+  const [isHovering, setIsHovering] = useState(false);
+  const [renaming, setRenaming] = useState(false);
+  const [currentName, setCurrentName] = useState(name);
+  const [modelInput, setModelInput] = useState(name);
+  const inputRef = useRef(null);
+  const rename = manualSWR(`/api/customGpts`, 'post', res => {});
+  const deleteCustom = manualSWR(`/api/customGpts/delete`, 'post', res => {
+    const fetchedModels = res.data.map(modelItem => ({
+      ...modelItem,
+      name: modelItem.chatGptLabel,
+      model: 'chatgptCustom'
+    }));
+
+    setCustomGPTModels(fetchedModels);
+  });
+
+  const icon = getIconOfModel({
+    size: 20,
+    sender: chatGptLabel || model,
+    isCreatedByUser: false,
+    model,
+    chatGptLabel,
+    promptPrefix,
+    error: false,
+    className: 'mr-2'
+  });
+
+  if (model !== 'chatgptCustom')
+    // regular model
+    return (
+      <DropdownMenuRadioItem
+        value={value}
+        className="dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800"
+      >
+        {icon}
+        {name}
+        {model === 'chatgpt' && <sup>$</sup>}
+      </DropdownMenuRadioItem>
+    );
+  else if (model === 'chatgptCustom' && chatGptLabel === null && promptPrefix === null)
+    // base chatgptCustom model, click to add new chatgptCustom.
+    return (
+      <DialogTrigger className="w-full">
+        <DropdownMenuRadioItem
+          value={value}
+          className="dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800"
+        >
+          {icon}
+          {name}
+          <sup>$</sup>
+        </DropdownMenuRadioItem>
+      </DialogTrigger>
+    );
+
+  // else: a chatgptCustom model
+  const handleMouseOver = () => {
+    setIsHovering(true);
+  };
+
+  const handleMouseOut = () => {
+    setIsHovering(false);
+  };
+
+  const renameHandler = e => {
+    e.preventDefault();
+    e.stopPropagation();
+    setRenaming(true);
+    setTimeout(() => {
+      inputRef.current.focus();
+    }, 25);
+  };
+
+  const onRename = e => {
+    e.preventDefault();
+    setRenaming(false);
+    if (modelInput === name) {
+      return;
+    }
+    rename.trigger({
+      prevLabel: currentName,
+      chatGptLabel: modelInput,
+      value: modelInput.toLowerCase()
+    });
+    setCurrentName(modelInput);
+  };
+
+  const onDelete = async e => {
+    e.preventDefault();
+    await deleteCustom.trigger({ _id: id });
+    onSelect('chatgpt');
+  };
+
+  const handleKeyDown = e => {
+    if (e.key === 'Enter') {
+      onRename(e);
+    }
+  };
+
+  const buttonClass = {
+    className:
+      'invisible group-hover:visible z-50 rounded-md m-0 text-gray-400 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'
+  };
+
+  const itemClass = {
+    className:
+      'relative flex group cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none hover:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:hover:bg-slate-700 dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800'
+  };
+
+  return (
+    <span
+      value={value}
+      className={itemClass.className}
+      onClick={e => {
+        if (isHovering) {
+          return;
+        }
+        onSelect('chatgptCustom', value);
+      }}
+    >
+      {currentConversation?.chatGptLabel === value && (
+        <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+          <Circle className="h-2 w-2 fill-current" />
+        </span>
+      )}
+
+      {icon}
+
+      {renaming === true ? (
+        <input
+          ref={inputRef}
+          key={id}
+          type="text"
+          className="pointer-events-auto z-50 m-0 mr-2 w-3/4 border border-blue-500 bg-transparent p-0 text-sm leading-tight outline-none"
+          value={modelInput}
+          onClick={e => e.stopPropagation()}
+          onChange={e => setModelInput(e.target.value)}
+          // onBlur={onRename}
+          onKeyDown={handleKeyDown}
+        />
+      ) : (
+        <div className=" overflow-hidden">{modelInput}</div>
+      )}
+
+      {value === 'chatgpt' && <sup>$</sup>}
+      <RenameButton
+        twcss={`ml-auto mr-2 ${buttonClass.className}`}
+        onRename={onRename}
+        renaming={renaming}
+        onMouseOver={handleMouseOver}
+        onMouseOut={handleMouseOut}
+        renameHandler={renameHandler}
+      />
+      <button
+        {...buttonClass}
+        onMouseOver={handleMouseOver}
+        onMouseOut={handleMouseOut}
+        onClick={onDelete}
+      >
+        <TrashIcon />
+      </button>
+    </span>
+  );
+}

client/src/components/Input/Models/ModelMenu.jsx

@@ -0,0 +1,205 @@
+import React, { useState, useEffect } from 'react';
+import { useRecoilValue, useSetRecoilState } from 'recoil';
+import axios from 'axios';
+import ModelDialog from './ModelDialog';
+import MenuItems from './MenuItems';
+import { swr } from '~/utils/fetchers';
+import { getIconOfModel } from '~/utils';
+
+import { Button } from '../../ui/Button.tsx';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuLabel,
+  DropdownMenuRadioGroup,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from '../../ui/DropdownMenu.tsx';
+import { Dialog } from '../../ui/Dialog.tsx';
+
+import store from '~/store';
+
+export default function ModelMenu() {
+  const [modelSave, setModelSave] = useState(false);
+  const [menuOpen, setMenuOpen] = useState(false);
+
+  const models = useRecoilValue(store.models);
+  const availableModels = useRecoilValue(store.availableModels);
+  const setCustomGPTModels = useSetRecoilState(store.customGPTModels);
+
+  const conversation = useRecoilValue(store.conversation) || {};
+  const { model, promptPrefix, chatGptLabel, conversationId } = conversation;
+  const { newConversation } = store.useConversation();
+
+  // fetch the list of saved chatgptCustom
+  const { data, isLoading, mutate } = swr(`/api/customGpts`, res => {
+    const fetchedModels = res.map(modelItem => ({
+      ...modelItem,
+      name: modelItem.chatGptLabel,
+      model: 'chatgptCustom'
+    }));
+
+    setCustomGPTModels(fetchedModels);
+  });
+
+  // useEffect(() => {
+  //   mutate();
+  //   try {
+  //     const lastSelected = JSON.parse(localStorage.getItem('model'));
+
+  //     if (lastSelected === 'chatgptCustom') {
+  //       return;
+  //     } else if (initial[lastSelected]) {
+  //       dispatch(setModel(lastSelected));
+  //     }
+  //   } catch (err) {
+  //     console.log(err);
+  //   }
+
+  //   // eslint-disable-next-line react-hooks/exhaustive-deps
+  // }, []);
+
+  // update the default model when availableModels changes
+  // typically, availableModels changes => modelsFilter or customGPTModels changes
+  useEffect(() => {
+    if (conversationId == 'new') {
+      newConversation();
+    }
+  }, [availableModels]);
+
+  // save selected model to localstoreage
+  useEffect(() => {
+    if (model) localStorage.setItem('model', JSON.stringify({ model, chatGptLabel, promptPrefix }));
+  }, [model]);
+
+  // set the current model
+  const onChange = (newModel, value = null) => {
+    setMenuOpen(false);
+
+    if (!newModel) {
+      return;
+    } else if (newModel === model && value === chatGptLabel) {
+      // bypass if not changed
+      return;
+    } else if (newModel === 'chatgptCustom' && value === null) {
+      // return;
+    } else if (newModel !== 'chatgptCustom') {
+      newConversation({
+        model: newModel,
+        chatGptLabel: null,
+        promptPrefix: null
+      });
+    } else if (newModel === 'chatgptCustom') {
+      const targetModel = models.find(element => element.value == value);
+      if (targetModel) {
+        const chatGptLabel = targetModel?.chatGptLabel;
+        const promptPrefix = targetModel?.promptPrefix;
+        newConversation({
+          model: newModel,
+          chatGptLabel,
+          promptPrefix
+        });
+      }
+    }
+  };
+
+  const onOpenChange = open => {
+    mutate();
+    if (!open) {
+      setModelSave(false);
+    }
+  };
+
+  const handleSaveState = value => {
+    if (!modelSave) {
+      return;
+    }
+
+    setCustomGPTModels(value);
+    setModelSave(false);
+  };
+
+  const defaultColorProps = [
+    'text-gray-500',
+    'hover:bg-gray-100',
+    'hover:bg-opacity-20',
+    'disabled:hover:bg-transparent',
+    'dark:data-[state=open]:bg-gray-800',
+    'dark:hover:bg-opacity-20',
+    'dark:hover:bg-gray-900',
+    'dark:hover:text-gray-400',
+    'dark:disabled:hover:bg-transparent'
+  ];
+
+  const chatgptColorProps = [
+    'text-green-700',
+    'data-[state=open]:bg-green-100',
+    'dark:text-emerald-300',
+    'hover:bg-green-100',
+    'disabled:hover:bg-transparent',
+    'dark:data-[state=open]:bg-green-900',
+    'dark:hover:bg-opacity-50',
+    'dark:hover:bg-green-900',
+    'dark:hover:text-gray-100',
+    'dark:disabled:hover:bg-transparent'
+  ];
+
+  const colorProps = model === 'chatgpt' ? chatgptColorProps : defaultColorProps;
+  const icon = getIconOfModel({
+    size: 32,
+    sender: chatGptLabel || model,
+    isCreatedByUser: false,
+    model,
+    chatGptLabel,
+    promptPrefix,
+    error: false,
+    button: true
+  });
+
+  return (
+    <Dialog onOpenChange={onOpenChange}>
+      <DropdownMenu
+        open={menuOpen}
+        onOpenChange={setMenuOpen}
+      >
+        <DropdownMenuTrigger asChild>
+          <Button
+            variant="outline"
+            // style={{backgroundColor: 'rgb(16, 163, 127)'}}
+            className={`absolute top-[0.25px] mb-0 ml-1 items-center rounded-md border-0 p-1 outline-none md:ml-0 ${colorProps.join(
+              ' '
+            )} focus:ring-0 focus:ring-offset-0 disabled:top-[0.25px] dark:data-[state=open]:bg-opacity-50 md:top-1 md:left-1 md:pl-1 md:disabled:top-1`}
+          >
+            {icon}
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent
+          className="w-56 dark:bg-gray-700"
+          onCloseAutoFocus={event => event.preventDefault()}
+        >
+          <DropdownMenuLabel className="dark:text-gray-300">Select a Model</DropdownMenuLabel>
+          <DropdownMenuSeparator />
+          <DropdownMenuRadioGroup
+            value={chatGptLabel || model}
+            onValueChange={onChange}
+            className="overflow-y-auto"
+          >
+            {availableModels.length ? (
+              <MenuItems
+                models={availableModels}
+                onSelect={onChange}
+              />
+            ) : (
+              <DropdownMenuLabel className="dark:text-gray-300">No model available.</DropdownMenuLabel>
+            )}
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <ModelDialog
+        mutate={mutate}
+        setModelSave={setModelSave}
+        handleSaveState={handleSaveState}
+      />
+    </Dialog>
+  );
+}

client/src/components/Input/RowButton.jsx

@@ -0,0 +1,16 @@
+import React from 'react';
+
+export default function RowButton({ onClick, children, text, className }) {
+  return (
+    <button
+      onClick={onClick}
+      className={`input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border ${className}`}
+      type="button"
+    >
+      {children}
+      <span className="hidden md:block">{text}</span> 
+      {/* <RegenerateIcon />
+<span className="hidden md:block">Regenerate response</span> */}
+    </button>
+  );
+}

client/src/components/Input/SubmitButton.jsx

@@ -0,0 +1,67 @@
+import React from 'react';
+
+export default function SubmitButton({ submitMessage, disabled, isSubmitting }) {
+  const clickHandler = e => {
+    e.preventDefault();
+    submitMessage();
+  };
+
+  if (isSubmitting) {
+    return (
+      <button
+        className="absolute bottom-0 right-1 h-[100%] w-[40px] rounded-md p-1 text-gray-500 hover:bg-gray-100 disabled:hover:bg-transparent dark:hover:bg-gray-900 dark:hover:text-gray-400 dark:disabled:hover:bg-transparent md:right-2"
+        disabled
+      >
+        <div className="text-2xl">
+          <span style={{ maxWidth: 5.5, display: 'inline-grid' }}>·</span>
+          <span
+            className="blink"
+            style={{ maxWidth: 5.5, display: 'inline-grid' }}
+          >
+            ·
+          </span>
+          <span
+            className="blink2"
+            style={{ maxWidth: 5.5, display: 'inline-grid' }}
+          >
+            ·
+          </span>
+        </div>
+      </button>
+    );
+  }
+  return (
+    <button
+      onClick={clickHandler}
+      disabled={disabled}
+      className="group absolute bottom-0 right-0 flex h-[100%] w-[50px] items-center justify-center bg-transparent p-1 text-gray-500"
+    >
+      <div className="m-1 mr-0 rounded-md p-2 pt-[10px] pb-[10px] group-hover:bg-gray-100 group-disabled:hover:bg-transparent dark:group-hover:bg-gray-900 dark:group-hover:text-gray-400 dark:group-disabled:hover:bg-transparent">
+        <svg
+          stroke="currentColor"
+          fill="none"
+          strokeWidth="2"
+          viewBox="0 0 24 24"
+          strokeLinecap="round"
+          strokeLinejoin="round"
+          className="mr-1 h-4 w-4 "
+          height="1em"
+          width="1em"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <line
+            x1="22"
+            y1="2"
+            x2="11"
+            y2="13"
+          />
+          <polygon points="22 2 15 22 11 13 2 9 22 2" />
+        </svg>
+      </div>
+    </button>
+  );
+}
+
+{
+  /* <div class="text-2xl"><span class="">·</span><span class="">·</span><span class="invisible">·</span></div> */
+}

client/src/components/Input/index.jsx

@@ -0,0 +1,201 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { useRecoilValue, useRecoilState } from 'recoil';
+import SubmitButton from './SubmitButton';
+import AdjustToneButton from './AdjustToneButton';
+import BingStyles from './BingStyles';
+import ModelMenu from './Models/ModelMenu';
+import Footer from './Footer';
+import TextareaAutosize from 'react-textarea-autosize';
+import RegenerateIcon from '../svg/RegenerateIcon';
+import StopGeneratingIcon from '../svg/StopGeneratingIcon';
+import { useMessageHandler } from '../../utils/handleSubmit';
+
+import store from '~/store';
+
+export default function TextChat({ isSearchView = false }) {
+  const inputRef = useRef(null);
+  const isComposing = useRef(false);
+
+  const conversation = useRecoilValue(store.conversation);
+  const latestMessage = useRecoilValue(store.latestMessage);
+  const messages = useRecoilValue(store.messages);
+  const [text, setText] = useRecoilState(store.text);
+  // const [text, setText] = useState('');
+
+  const isSubmitting = useRecoilValue(store.isSubmitting);
+
+  // TODO: do we need this?
+  const disabled = false;
+
+  const { ask, regenerate, stopGenerating } = useMessageHandler();
+
+  const bingStylesRef = useRef(null);
+  const [showBingToneSetting, setShowBingToneSetting] = useState(false);
+
+  const isNotAppendable = latestMessage?.cancelled || latestMessage?.error;
+
+  // auto focus to input, when enter a conversation.
+  useEffect(() => {
+    if (conversation?.conversationId !== 'search') inputRef.current?.focus();
+    setText('');
+  }, [conversation?.conversationId]);
+
+  // controls the height of Bing tone style tabs
+  useEffect(() => {
+    if (!inputRef.current) {
+      return; // wait for the ref to be available
+    }
+
+    const resizeObserver = new ResizeObserver(() => {
+      const newHeight = inputRef.current.clientHeight;
+      if (newHeight >= 24) {
+        // 24 is the default height of the input
+        bingStylesRef.current.style.bottom = 15 + newHeight + 'px';
+      }
+    });
+    resizeObserver.observe(inputRef.current);
+    return () => resizeObserver.disconnect();
+  }, [inputRef]);
+
+  const submitMessage = () => {
+    ask({ text });
+    setText('');
+  };
+
+  const handleRegenerate = () => {
+    if (latestMessage && !latestMessage?.isCreatedByUser) regenerate(latestMessage);
+  };
+
+  const handleStopGenerating = () => {
+    stopGenerating();
+  };
+
+  const handleKeyDown = e => {
+    if (e.key === 'Enter' && !e.shiftKey) {
+      e.preventDefault();
+    }
+
+    if (e.key === 'Enter' && !e.shiftKey) {
+      if (!isComposing?.current) submitMessage();
+    }
+  };
+
+  const handleKeyUp = e => {
+    if (e.keyCode === 8 && e.target.value.trim() === '') {
+      setText(e.target.value);
+    }
+
+    if (e.key === 'Enter' && e.shiftKey) {
+      return console.log('Enter + Shift');
+    }
+
+    if (isSubmitting) {
+      return;
+    }
+  };
+
+  const handleCompositionStart = () => {
+    isComposing.current = true;
+  };
+
+  const handleCompositionEnd = () => {
+    isComposing.current = false;
+  };
+
+  const changeHandler = e => {
+    const { value } = e.target;
+
+    setText(value);
+  };
+
+  const getPlaceholderText = () => {
+    if (isSearchView) {
+      return 'Click a message title to open its conversation.';
+    }
+
+    if (disabled) {
+      return 'Choose another model or customize GPT again';
+    }
+
+    if (isNotAppendable) {
+      return 'Edit your message or Regenerate.';
+    }
+
+    return '';
+  };
+
+  const handleBingToneSetting = () => {
+    setShowBingToneSetting(show => !show);
+  };
+
+  if (isSearchView) return <></>;
+
+  return (
+    <>
+      <div className="input-panel md:bg-vert-light-gradient dark:md:bg-vert-dark-gradient fixed bottom-0 left-0 w-full border-t bg-white py-2 dark:border-white/20 dark:bg-gray-800 md:absolute md:border-t-0 md:border-transparent md:bg-transparent md:dark:border-transparent md:dark:bg-transparent">
+        <form className="stretch mx-2 flex flex-row gap-3 last:mb-2 md:pt-2 md:last:mb-6 lg:mx-auto lg:max-w-3xl lg:pt-6">
+          <div className="relative flex h-full flex-1 md:flex-col">
+            <span className="order-last ml-1 flex justify-center gap-0 md:order-none md:m-auto md:mb-2 md:w-full md:gap-2">
+              <BingStyles
+                ref={bingStylesRef}
+                show={showBingToneSetting}
+              />
+              {isSubmitting ? (
+                <button
+                  onClick={handleStopGenerating}
+                  className="input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border"
+                  type="button"
+                >
+                  <StopGeneratingIcon />
+                  <span className="hidden md:block">Stop generating</span>
+                </button>
+              ) : latestMessage && !latestMessage?.isCreatedByUser ? (
+                <button
+                  onClick={handleRegenerate}
+                  className="input-panel-button btn btn-neutral flex justify-center gap-2 border-0 md:border"
+                  type="button"
+                >
+                  <RegenerateIcon />
+                  <span className="hidden md:block">Regenerate response</span>
+                </button>
+              ) : null}
+            </span>
+            <div
+              className={`relative flex flex-grow flex-col rounded-md border border-black/10 ${
+                disabled ? 'bg-gray-100' : 'bg-white'
+              } py-2 shadow-[0_0_10px_rgba(0,0,0,0.10)] dark:border-gray-900/50 ${
+                disabled ? 'dark:bg-gray-900' : 'dark:bg-gray-700'
+              } dark:text-white dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] md:py-3 md:pl-4`}
+            >
+              <ModelMenu />
+              <TextareaAutosize
+                tabIndex="0"
+                autoFocus
+                ref={inputRef}
+                // style={{maxHeight: '200px', height: '24px', overflowY: 'hidden'}}
+                rows="1"
+                value={disabled || isNotAppendable ? '' : text}
+                onKeyUp={handleKeyUp}
+                onKeyDown={handleKeyDown}
+                onChange={changeHandler}
+                onCompositionStart={handleCompositionStart}
+                onCompositionEnd={handleCompositionEnd}
+                placeholder={getPlaceholderText()}
+                disabled={disabled || isNotAppendable}
+                className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-12 pr-8 leading-6 placeholder:text-sm placeholder:text-gray-600 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent dark:placeholder:text-gray-500 md:pl-8"
+              />
+              <SubmitButton
+                submitMessage={submitMessage}
+                disabled={disabled || isNotAppendable}
+              />
+              {messages?.length && conversation?.model === 'sydney' ? (
+                <AdjustToneButton onClick={handleBingToneSetting} />
+              ) : null}
+            </div>
+          </div>
+        </form>
+        <Footer />
+      </div>
+    </>
+  );
+}

client/src/components/Main/Regenerate.jsx

@@ -1,35 +0,0 @@
-import React from 'react';
-import RegenerateIcon from '../svg/RegenerateIcon';
-
-export default function Regenerate({ submitMessage, tryAgain, errorMessage }) {
-  const clickHandler = (e) => {
-    e.preventDefault();
-    submitMessage();
-  };
-
-  return (
-    <>
-      <span className="mb-2 block flex justify-center text-xs text-black dark:text-white/50 md:mb-2">
-        There was an error generating a response
-      </span>
-      <span className="m-auto flex justify-center">
-        {!errorMessage.includes('short') && (
-          <button
-            onClick={clickHandler}
-            className="btn btn-primary m-auto flex justify-center gap-2"
-          >
-            <RegenerateIcon />
-            Regenerate response
-          </button>
-        )}
-        <button
-          onClick={tryAgain}
-          className="btn btn-neutral flex justify-center gap-2 border-0 md:border"
-        >
-          <RegenerateIcon />
-          Try another message
-        </button>
-      </span>
-    </>
-  );
-}

client/src/components/Main/SubmitButton.jsx

@@ -1,54 +0,0 @@
-import React from 'react';
-import { useSelector } from 'react-redux';
-
-export default function SubmitButton({ submitMessage }) {
-  const { isSubmitting, disabled } = useSelector((state) => state.submit);
-  const clickHandler = (e) => {
-    e.preventDefault();
-    submitMessage();
-  };
-
-  if (isSubmitting) {
-    return (
-      <button className="absolute bottom-1.5 right-1 rounded-md p-1 text-gray-500 hover:bg-gray-100 disabled:bottom-0.5 disabled:hover:bg-transparent dark:hover:bg-gray-900 dark:hover:text-gray-400 dark:disabled:hover:bg-transparent md:bottom-2.5 md:right-2 md:disabled:bottom-1">
-        <div className="text-2xl">
-          <span >·</span>
-          <span className="blink">·</span>
-          <span className="blink2">·</span>
-        </div>
-      </button>
-    );
-  }
-  return (
-    <button
-      onClick={clickHandler}
-      disabled={disabled}
-      className="absolute bottom-1.5 right-1 rounded-md p-1 text-gray-500 hover:bg-gray-100 disabled:hover:bg-transparent dark:hover:bg-gray-900 dark:hover:text-gray-400 dark:disabled:hover:bg-transparent md:bottom-2.5 md:right-2"
-    >
-      <svg
-        stroke="currentColor"
-        fill="none"
-        strokeWidth="2"
-        viewBox="0 0 24 24"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        className="mr-1 h-4 w-4"
-        height="1em"
-        width="1em"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <line
-          x1="22"
-          y1="2"
-          x2="11"
-          y2="13"
-        />
-        <polygon points="22 2 15 22 11 13 2 9 22 2" />
-      </svg>
-    </button>
-  );
-}
-
-{
-  /* <div class="text-2xl"><span class="">·</span><span class="">·</span><span class="invisible">·</span></div> */
-}

client/src/components/Main/TextChat.jsx

@@ -1,220 +0,0 @@
-import React, { useState } from 'react';
-import SubmitButton from './SubmitButton';
-import Regenerate from './Regenerate';
-import ModelMenu from '../Models/ModelMenu';
-import Footer from './Footer';
-import TextareaAutosize from 'react-textarea-autosize';
-import handleSubmit from '~/utils/handleSubmit';
-import { useSelector, useDispatch } from 'react-redux';
-import { setConversation, setError } from '~/store/convoSlice';
-import { setMessages } from '~/store/messageSlice';
-import { setSubmitState } from '~/store/submitSlice';
-import { setText } from '~/store/textSlice';
-
-export default function TextChat({ messages }) {
-  const [errorMessage, setErrorMessage] = useState('');
-  const dispatch = useDispatch();
-  const convo = useSelector((state) => state.convo);
-  const { initial } = useSelector((state) => state.models);
-  const { isSubmitting, disabled, model, chatGptLabel, promptPrefix } = useSelector(
-    (state) => state.submit
-  );
-  const { text } = useSelector((state) => state.text);
-  const { error } = convo;
-  const isCustomModel = model === 'chatgptCustom' || !initial[model];
-
-  const submitMessage = () => {
-    if (error) {
-      dispatch(setError(false));
-    }
-
-    if (!!isSubmitting || text.trim() === '') {
-      return;
-    }
-    dispatch(setSubmitState(true));
-    const message = text.trim();
-    const currentMsg = { sender: 'User', text: message, current: true };
-    const sender = model === 'chatgptCustom' ? chatGptLabel : model;
-    const initialResponse = { sender, text: '' };
-    dispatch(setMessages([...messages, currentMsg, initialResponse]));
-    dispatch(setText(''));
-    const messageHandler = (data) => {
-      dispatch(setMessages([...messages, currentMsg, { sender, text: data }]));
-    };
-    const convoHandler = (data) => {
-      dispatch(
-        setMessages([...messages, currentMsg, { sender, text: data.text || data.response }])
-      );
-
-      const isBing = model === 'bingai' || model === 'sydney';
-
-      if (
-        !isBing &&
-        convo.conversationId === null &&
-        convo.parentMessageId === null
-      ) {
-        const { title, conversationId, id } = data;
-        dispatch(
-          setConversation({
-            title,
-            conversationId,
-            parentMessageId: id,
-            jailbreakConversationId: null,
-            conversationSignature: null,
-            clientId: null,
-            invocationId: null,
-            chatGptLabel: model === isCustomModel ? chatGptLabel : null,
-            promptPrefix: model === isCustomModel ? promptPrefix : null
-          })
-        );
-      } else if (
-        model === 'bingai' &&
-        convo.conversationId === null &&
-        convo.invocationId === null
-      ) {
-        console.log('Bing data:', data)
-        const {
-          title,
-          conversationSignature,
-          clientId,
-          conversationId,
-          invocationId
-        } = data;
-        dispatch(
-          setConversation({
-            title,
-            parentMessageId: null,
-            conversationSignature,
-            clientId,
-            conversationId,
-            invocationId,
-          })
-        );
-      } else if (model === 'sydney') {
-        const {
-          title,
-          jailbreakConversationId,
-          parentMessageId,
-          conversationSignature,
-          clientId,
-          conversationId,
-          invocationId
-        } = data;
-        dispatch(
-          setConversation({
-            title,
-            jailbreakConversationId,
-            parentMessageId,
-            conversationSignature,
-            clientId,
-            conversationId,
-            invocationId,
-          })
-        );
-      }
-
-      dispatch(setSubmitState(false));
-    };
-
-    const errorHandler = (event) => {
-      console.log('Error:', event);
-      const errorResponse = {
-        ...initialResponse,
-        text: `An error occurred. Please try again in a few moments.\n\nError message: ${event.data}`,
-        error: true
-      };
-      setErrorMessage(event.data);
-      dispatch(setSubmitState(false));
-      dispatch(setMessages([...messages.slice(0, -2), currentMsg, errorResponse]));
-      dispatch(setText(message));
-      dispatch(setError(true));
-      return;
-    };
-    const submission = {
-      model,
-      text: message,
-      convo,
-      messageHandler,
-      convoHandler,
-      errorHandler,
-      chatGptLabel,
-      promptPrefix
-    };
-    console.log('User Input:', message);
-    handleSubmit(submission);
-  };
-
-  const handleKeyDown = (e) => {
-    if (e.key === 'Enter' && !e.shiftKey) {
-      e.preventDefault();
-    }
-  };
-
-  const handleKeyUp = (e) => {
-    if (e.key === 'Enter' && e.shiftKey) {
-      return console.log('Enter + Shift');
-    }
-
-    if (isSubmitting) {
-      return;
-    }
-
-    if (e.key === 'Enter' && !e.shiftKey) {
-      submitMessage();
-    }
-  };
-
-  const changeHandler = (e) => {
-    const { value } = e.target;
-    if (isSubmitting && (value === '' || value === '\n')) {
-      return;
-    }
-    dispatch(setText(value));
-  };
-
-  const tryAgain = (e) => {
-    e.preventDefault();
-    dispatch(setError(false));
-  };
-
-  return (
-    <div className="md:bg-vert-light-gradient dark:md:bg-vert-dark-gradient absolute bottom-0 left-0 w-full border-t bg-white dark:border-white/20 dark:bg-gray-800 md:border-t-0 md:border-transparent md:!bg-transparent md:dark:border-transparent">
-      <form className="stretch mx-2 flex flex-row gap-3 pt-2 last:mb-2 md:last:mb-6 lg:mx-auto lg:max-w-3xl lg:pt-6">
-        <div className="relative flex h-full flex-1 md:flex-col">
-          <div className="ml-1 mt-1.5 flex justify-center gap-0 md:m-auto md:mb-2 md:w-full md:gap-2" />
-          {error ? (
-            <Regenerate
-              submitMessage={submitMessage}
-              tryAgain={tryAgain}
-              errorMessage={errorMessage}
-            />
-          ) : (
-            <div
-              className={`relative flex w-full flex-grow flex-col rounded-md border border-black/10 ${
-                disabled ? 'bg-gray-100' : 'bg-white'
-              } py-2 shadow-[0_0_10px_rgba(0,0,0,0.10)] dark:border-gray-900/50 ${
-                disabled ? 'dark:bg-gray-900' : 'dark:bg-gray-700'
-              } dark:text-white dark:shadow-[0_0_15px_rgba(0,0,0,0.10)] md:py-3 md:pl-4`}
-            >
-              <ModelMenu />
-              <TextareaAutosize
-                tabIndex="0"
-                // style={{maxHeight: '200px', height: '24px', overflowY: 'hidden'}}
-                rows="1"
-                value={text}
-                onKeyUp={handleKeyUp}
-                onKeyDown={handleKeyDown}
-                onChange={changeHandler}
-                placeholder={disabled ? 'Choose another model or customize GPT again' : ''}
-                disabled={disabled}
-                className="m-0 h-auto max-h-52 resize-none overflow-auto border-0 bg-transparent p-0 pl-9 pr-8 leading-6 focus:outline-none focus:ring-0 focus-visible:ring-0 dark:bg-transparent md:pl-8"
-              />
-              <SubmitButton submitMessage={submitMessage} />
-            </div>
-          )}
-        </div>
-      </form>
-      <Footer />
-    </div>
-  );
-}

client/src/components/MessageHandler/index.jsx

@@ -0,0 +1,274 @@
+import React, { useEffect, useRef, useState } from 'react';
+import { useRecoilState, useResetRecoilState, useSetRecoilState } from 'recoil';
+import { SSE } from '~/utils/sse';
+import { useMessageHandler } from '../../utils/handleSubmit';
+import createPayload from '~/utils/createPayload';
+
+import store from '~/store';
+
+export default function MessageHandler({ messages }) {
+  const [submission, setSubmission] = useRecoilState(store.submission);
+  const [isSubmitting, setIsSubmitting] = useRecoilState(store.isSubmitting);
+  const setMessages = useSetRecoilState(store.messages);
+  const setConversation = useSetRecoilState(store.conversation);
+  const resetLatestMessage = useResetRecoilState(store.latestMessage);
+
+  const { refreshConversations } = store.useConversations();
+
+  const messageHandler = (data, submission) => {
+    const { messages, message, initialResponse, isRegenerate = false } = submission;
+
+    if (isRegenerate)
+      setMessages([
+        ...messages,
+        {
+          ...initialResponse,
+          text: data,
+          parentMessageId: message?.overrideParentMessageId,
+          messageId: message?.overrideParentMessageId + '_',
+          submitting: true
+        }
+      ]);
+    else
+      setMessages([
+        ...messages,
+        message,
+        {
+          ...initialResponse,
+          text: data,
+          parentMessageId: message?.messageId,
+          messageId: message?.messageId + '_',
+          submitting: true
+        }
+      ]);
+  };
+
+  const cancelHandler = (data, submission) => {
+    const { messages, message, initialResponse, isRegenerate = false } = submission;
+
+    if (isRegenerate)
+      setMessages([
+        ...messages,
+        {
+          ...initialResponse,
+          text: data,
+          parentMessageId: message?.overrideParentMessageId,
+          messageId: message?.overrideParentMessageId + '_',
+          cancelled: true
+        }
+      ]);
+    else
+      setMessages([
+        ...messages,
+        message,
+        {
+          ...initialResponse,
+          text: data,
+          parentMessageId: message?.messageId,
+          messageId: message?.messageId + '_',
+          cancelled: true
+        }
+      ]);
+  };
+
+  const createdHandler = (data, submission) => {
+    const { messages, message, initialResponse, isRegenerate = false } = submission;
+
+    if (isRegenerate)
+      setMessages([
+        ...messages,
+        {
+          ...initialResponse,
+          parentMessageId: message?.overrideParentMessageId,
+          messageId: message?.overrideParentMessageId + '_',
+          submitting: true
+        }
+      ]);
+    else
+      setMessages([
+        ...messages,
+        message,
+        {
+          ...initialResponse,
+          parentMessageId: message?.messageId,
+          messageId: message?.messageId + '_',
+          submitting: true
+        }
+      ]);
+
+    const { conversationId } = message;
+    setConversation(prevState => ({
+      ...prevState,
+      conversationId
+    }));
+    resetLatestMessage();
+  };
+
+  const finalHandler = (data, submission) => {
+    const { conversation, messages, message, initialResponse, isRegenerate = false } = submission;
+
+    const { requestMessage, responseMessage } = data;
+    const { conversationId } = requestMessage;
+
+    // update the messages
+    if (isRegenerate) setMessages([...messages, responseMessage]);
+    else setMessages([...messages, requestMessage, responseMessage]);
+    setIsSubmitting(false);
+
+    // refresh title
+    if (requestMessage.parentMessageId == '00000000-0000-0000-0000-000000000000') {
+      setTimeout(() => {
+        refreshConversations();
+      }, 2000);
+
+      // in case it takes too long.
+      setTimeout(() => {
+        refreshConversations();
+      }, 5000);
+    }
+
+    const { model, chatGptLabel, promptPrefix } = conversation;
+    const isBing = model === 'bingai' || model === 'sydney';
+
+    if (!isBing) {
+      const { title } = data;
+      const { conversationId } = responseMessage;
+      setConversation(prevState => ({
+        ...prevState,
+        title,
+        conversationId,
+        jailbreakConversationId: null,
+        conversationSignature: null,
+        clientId: null,
+        invocationId: null,
+        chatGptLabel,
+        promptPrefix,
+        latestMessage: null
+      }));
+    } else if (model === 'bingai') {
+      const { title } = data;
+      const { conversationSignature, clientId, conversationId, invocationId } = responseMessage;
+      setConversation(prevState => ({
+        ...prevState,
+        title,
+        conversationId,
+        jailbreakConversationId: null,
+        conversationSignature,
+        clientId,
+        invocationId,
+        chatGptLabel,
+        promptPrefix,
+        latestMessage: null
+      }));
+    } else if (model === 'sydney') {
+      const { title } = data;
+      const {
+        jailbreakConversationId,
+        parentMessageId,
+        conversationSignature,
+        clientId,
+        conversationId,
+        invocationId
+      } = responseMessage;
+      setConversation(prevState => ({
+        ...prevState,
+        title,
+        conversationId,
+        jailbreakConversationId,
+        conversationSignature,
+        clientId,
+        invocationId,
+        chatGptLabel,
+        promptPrefix,
+        latestMessage: null
+      }));
+    }
+  };
+
+  const errorHandler = (data, submission) => {
+    const { conversation, messages, message, initialResponse, isRegenerate = false } = submission;
+
+    console.log('Error:', data);
+    const errorResponse = {
+      ...data,
+      error: true,
+      parentMessageId: message?.messageId
+    };
+    setIsSubmitting(false);
+    setMessages([...messages, message, errorResponse]);
+    return;
+  };
+
+  useEffect(() => {
+    if (submission === null) return;
+    if (Object.keys(submission).length === 0) return;
+
+    const { messages, initialResponse, isRegenerate = false } = submission;
+    let { message } = submission;
+
+    const { server, payload } = createPayload(submission);
+
+    const events = new SSE(server, {
+      payload: JSON.stringify(payload),
+      headers: { 'Content-Type': 'application/json' }
+    });
+
+    let latestResponseText = '';
+    events.onmessage = e => {
+      const data = JSON.parse(e.data);
+
+      if (data.final) {
+        finalHandler(data, { ...submission, message });
+        console.log('final', data);
+      }
+      if (data.created) {
+        message = {
+          ...data.message,
+          model: message?.model,
+          chatGptLabel: message?.chatGptLabel,
+          promptPrefix: message?.promptPrefix,
+          overrideParentMessageId: message?.overrideParentMessageId
+        };
+        createdHandler(data, { ...submission, message });
+        console.log('created', message);
+      } else {
+        let text = data.text || data.response;
+        if (data.initial) console.log(data);
+
+        if (data.message) {
+          latestResponseText = text;
+          messageHandler(text, { ...submission, message });
+        }
+        // console.log('dataStream', data);
+      }
+    };
+
+    events.onopen = () => console.log('connection is opened');
+
+    events.oncancel = e => cancelHandler(latestResponseText, { ...submission, message });
+
+    events.onerror = function (e) {
+      console.log('error in opening conn.');
+      events.close();
+
+      const data = JSON.parse(e.data);
+
+      errorHandler(data, { ...submission, message });
+    };
+
+    setIsSubmitting(true);
+    events.stream();
+
+    return () => {
+      const isCancelled = events.readyState <= 1;
+      events.close();
+      if (isCancelled) {
+        const e = new Event('cancel');
+        events.dispatchEvent(e);
+      }
+      setIsSubmitting(false);
+    };
+  }, [submission]);
+
+  return null;
+}

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

@@ -0,0 +1,57 @@
+import React, { useRef, useState } from 'react';
+import Clipboard from '~/components/svg/Clipboard';
+import CheckMark from '~/components/svg/CheckMark';
+
+const CodeBlock = ({ lang, codeChildren }) => {
+  const codeRef = useRef(null);
+
+  return (
+    <div className="rounded-md bg-black">
+      <CodeBar
+        lang={lang}
+        codeRef={codeRef}
+      />
+      <div className="overflow-y-auto p-4">
+        <code
+          ref={codeRef}
+          className={`hljs !whitespace-pre language-${lang}`}
+        >
+          {codeChildren}
+        </code>
+      </div>
+    </div>
+  );
+};
+
+const CodeBar = React.memo(({ lang, codeRef }) => {
+  const [isCopied, setIsCopied] = useState(false);
+  return (
+    <div className="relative flex items-center rounded-tl-md rounded-tr-md bg-gray-800 px-4 py-2 font-sans text-xs text-gray-200">
+      <span className="">{lang}</span>
+      <button
+        className="ml-auto flex gap-2"
+        onClick={async () => {
+          const codeString = codeRef.current?.textContent;
+          if (codeString)
+            navigator.clipboard.writeText(codeString).then(() => {
+              setIsCopied(true);
+              setTimeout(() => setIsCopied(false), 3000);
+            });
+        }}
+      >
+        {isCopied ? (
+          <>
+            <CheckMark />
+            Copied!
+          </>
+        ) : (
+          <>
+            <Clipboard />
+            Copy code
+          </>
+        )}
+      </button>
+    </div>
+  );
+});
+export default CodeBlock;

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

@@ -0,0 +1,88 @@
+import React from 'react';
+import ReactMarkdown from 'react-markdown';
+import rehypeKatex from 'rehype-katex';
+import rehypeHighlight from 'rehype-highlight';
+import remarkMath from 'remark-math';
+import remarkGfm from 'remark-gfm';
+import rehypeRaw from 'rehype-raw'
+import CodeBlock from './CodeBlock';
+import { langSubset } from '~/utils/languages';
+
+const Content = React.memo(({ content }) => {
+  let rehypePlugins = [
+    [rehypeKatex, { output: 'mathml' }],
+    [
+      rehypeHighlight,
+      {
+        detect: true,
+        ignoreMissing: true,
+        subset: langSubset
+      }
+    ],
+    [rehypeRaw],
+  ];
+
+  return (
+    <ReactMarkdown
+      remarkPlugins={[remarkGfm, [remarkMath, { singleDollarTextMath: false }]]}
+      rehypePlugins={rehypePlugins}
+      linkTarget="_new"
+      components={{
+        code,
+        p,
+        // em,
+      }}
+    >
+      {content}
+    </ReactMarkdown>
+  );
+});
+
+const code = React.memo((props) => {
+  const { inline, className, children } = props;
+  const match = /language-(\w+)/.exec(className || '');
+  const lang = match && match[1];
+
+  if (inline) {
+    return <code className={className}>{children}</code>;
+  } else {
+    return (
+      <CodeBlock
+        lang={lang || 'text'}
+        codeChildren={children}
+      />
+    );
+  }
+});
+
+const p = React.memo((props) => {
+  return <p className="whitespace-pre-wrap mb-2">{props?.children}</p>;
+});
+
+// const blinker = ({ node }) => {
+//   if (node.type === 'text' && node.value === '█') {
+//     return <span className="result-streaming">{node.value}</span>;
+//   }
+
+//   return null;
+// };
+
+// const em = React.memo(({ node, ...props }) => {
+//   if (
+//     props.children[0] &&
+//     typeof props.children[0] === 'string' &&
+//     props.children[0].startsWith('^')
+//   ) {
+//     return <sup>{props.children[0].substring(1)}</sup>;
+//   }
+//   if (
+//     props.children[0] &&
+//     typeof props.children[0] === 'string' &&
+//     props.children[0].startsWith('~')
+//   ) {
+//     return <sub>{props.children[0].substring(1)}</sub>;
+//   }
+//   return <i {...props} />;
+// });
+
+export default Content;

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

@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function SubRow({ children, classes = '', subclasses = '', onClick }) {
+  return (
+    <div className={`flex justify-between ${classes}`} onClick={onClick}>
+      <div className={`flex items-center justify-center gap-1 self-center pt-2 text-xs ${subclasses}`}>{children}</div>
+    </div>
+  );
+}

client/src/components/Messages/Embed.jsx

@@ -1,35 +0,0 @@
-import React, { useState } from 'react';
-import Clipboard from '../svg/Clipboard';
-import CheckMark from '../svg/CheckMark';
-
-export default function Embed({ children, language = '', code, matched }) {
-  const [buttonText, setButtonText] = useState('Copy code');
-  const isClicked = buttonText === 'Copy code';
-
-  const clickHandler = () => {
-    navigator.clipboard.writeText(code.trim());
-    setButtonText('Copied!');
-    setTimeout(() => {
-      setButtonText('Copy code');
-    }, 3000);
-  };
-
-  return (
-    <pre>
-      <div className="mb-4 rounded-md bg-black">
-        <div className="relative flex items-center rounded-tl-md rounded-tr-md bg-gray-800 px-4 py-2 font-sans text-xs text-gray-200">
-          <span className="">{language === 'javascript' && !matched ? '' : language}</span>
-          <button
-            className="ml-auto flex gap-2"
-            onClick={clickHandler}
-            disabled={!isClicked}
-          >
-            {isClicked ? <Clipboard /> : <CheckMark />}
-            {buttonText}
-          </button>
-        </div>
-        <div className="overflow-y-auto p-4">{children}</div>
-      </div>
-    </pre>
-  );
-}

client/src/components/Messages/Highlight.jsx

@@ -1,16 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import hljs from 'highlight.js';
-
-export default function Highlight({language, code}) {
-  const [highlightedCode, setHighlightedCode] = useState(code);
-
-  useEffect(() => {
-    setHighlightedCode(hljs.highlight(code, { language }).value);
-  }, [code, language]);
-
-  return (
-    <pre>
-      <code className={`language-${language}`} dangerouslySetInnerHTML={{__html: highlightedCode}}/>
-    </pre>
-  );
-}

client/src/components/Messages/HoverButtons.jsx

@@ -2,18 +2,24 @@ import React from 'react';
 // import Clipboard from '../svg/Clipboard';
 import EditIcon from '../svg/EditIcon';
 
-export default function HoverButtons({ user }) {
-  return (
+export default function HoverButtons({ visible, onClick, model }) {
+  const isBing = model === 'bingai';
+  const enabled = !isBing;
 
-      <div className="visible mt-2 flex justify-center gap-3 self-end text-gray-400 md:gap-4 lg:absolute lg:top-0 lg:right-0 lg:mt-0 lg:translate-x-full lg:gap-1 lg:self-center lg:pl-2">
-        {user && (
-          <button className="rounded-md p-1 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400">
+  return (
+    <div className="visible mt-2 flex justify-center gap-3 self-end text-gray-400 md:gap-4 lg:absolute lg:top-0 lg:right-0 lg:mt-0 lg:translate-x-full lg:gap-1 lg:self-center lg:pl-2">
+      {(visible&&enabled)?(
+        <>
+          <button className="resubmit-edit-button rounded-md p-1 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400 md:invisible md:group-hover:visible" 
+            onClick={onClick}>
+            {/* <button className="rounded-md p-1 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400"> */}
             <EditIcon />
           </button>
-        )}
-        {/* <button className="rounded-md p-1 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400">
+        </>
+      ):null}
+      {/* <button className="rounded-md p-1 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-400 dark:hover:bg-gray-700 dark:hover:text-gray-200 disabled:dark:hover:text-gray-400">
           <Clipboard />
         </button> */}
-      </div>
+    </div>
   );
-}
+}

client/src/components/Messages/Message.jsx

@@ -1,28 +1,68 @@
-import React, { useState, useEffect } from 'react';
-import TextWrapper from './TextWrapper';
-import { useSelector } from 'react-redux';
-import GPTIcon from '../svg/GPTIcon';
-import BingIcon from '../svg/BingIcon';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
+import { useRecoilValue, useSetRecoilState, useResetRecoilState } from 'recoil';
+import SubRow from './Content/SubRow';
+import Content from './Content/Content';
+import MultiMessage from './MultiMessage';
 import HoverButtons from './HoverButtons';
+import SiblingSwitch from './SiblingSwitch';
+import { fetchById } from '~/utils/fetchers';
+import { getIconOfModel } from '~/utils';
+import { useMessageHandler } from '~/utils/handleSubmit';
+
+import store from '~/store';
 
 export default function Message({
-  sender,
-  text,
-  last = false,
-  error = false,
-  scrollToBottom
+  conversation,
+  message,
+  scrollToBottom,
+  currentEditId,
+  setCurrentEditId,
+  siblingIdx,
+  siblingCount,
+  setSiblingIdx
 }) {
-  const { isSubmitting } = useSelector((state) => state.submit);
+  const isSubmitting = useRecoilValue(store.isSubmitting);
+  const setLatestMessage = useSetRecoilState(store.latestMessage);
+  const { model, chatGptLabel, promptPrefix } = conversation;
   const [abortScroll, setAbort] = useState(false);
-  const [isHovering, setIsHovering] = useState(false);
-  const notUser = sender.toLowerCase() !== 'user';
-  const blinker = isSubmitting && last && notUser;
+  const {
+    sender,
+    text,
+    searchResult,
+    isCreatedByUser,
+    error,
+    submitting,
+    model: messageModel,
+    chatGptLabel: messageChatGptLabel,
+    searchResult: isSearchResult
+  } = message;
+  const textEditor = useRef(null);
+  const last = !message?.children?.length;
+  const edit = message.messageId == currentEditId;
+  const { ask } = useMessageHandler();
+  const { switchToConversation } = store.useConversation();
+  const blinker = submitting && isSubmitting;
+  const generateCursor = useCallback(() => {
+    if (!blinker) {
+      return '';
+    }
+
+    return <span className="result-streaming">█</span>;
+  }, [blinker]);
 
   useEffect(() => {
     if (blinker && !abortScroll) {
       scrollToBottom();
     }
-  }, [isSubmitting, text, blinker, scrollToBottom, abortScroll]);
+  }, [isSubmitting, blinker, text, scrollToBottom]);
+
+  useEffect(() => {
+    if (last) {
+      setLatestMessage({ ...message });
+    }
+  }, [last, message]);
+
+  const enterEdit = cancel => setCurrentEditId(cancel ? -1 : message.messageId);
 
   const handleWheel = () => {
     if (blinker) {
@@ -32,88 +72,154 @@ export default function Message({
     }
   };
 
-  const handleMouseOver = () => {
-    setIsHovering(true);
-  };
-
-  const handleMouseOut = () => {
-    setIsHovering(false);
-  };
-
   const props = {
     className:
       'w-full border-b border-black/10 dark:border-gray-900/50 text-gray-800 bg-white dark:text-gray-100 group dark:bg-gray-800'
   };
 
-  const bgColors = {
-    chatgpt: 'rgb(16, 163, 127)',
-    chatgptBrowser: 'rgb(25, 207, 207)',
-    bingai: '',
-    sydney: '',
-  };
+  const icon = getIconOfModel({
+    sender,
+    isCreatedByUser,
+    model: isSearchResult ? messageModel : model,
+    searchResult,
+    chatGptLabel: isSearchResult ? messageChatGptLabel : chatGptLabel,
+    promptPrefix,
+    error
+  });
 
-  const isBing = sender === 'bingai' || sender === 'sydney';
-
-  let icon = `${sender}:`;
-  let backgroundColor = bgColors[sender];
-
-  if (notUser) {
+  if (!isCreatedByUser)
     props.className =
       'w-full border-b border-black/10 bg-gray-50 dark:border-gray-900/50 text-gray-800 dark:text-gray-100 group bg-gray-100 dark:bg-[#444654]';
+
+  if (message.bg && searchResult) {
+    props.className = message.bg.split('hover')[0];
+    props.titleclass = message.bg.split(props.className)[1] + ' cursor-pointer';
   }
 
-  if ((notUser && backgroundColor) || isBing) {
-    icon = (
-      <div
-        style={isBing ? { background: 'radial-gradient(circle at 90% 110%, #F0F0FA, #D0E0F9)' } : { backgroundColor }}
-        className="relative flex h-[30px] w-[30px] items-center justify-center rounded-sm p-1 text-white"
-      >
-        {isBing ? <BingIcon /> : <GPTIcon />}
-        {error && (
-          <span className="absolute right-0 top-[20px] -mr-2 flex h-4 w-4 items-center justify-center rounded-full border border-white bg-red-500 text-[10px] text-white">
-            !
-          </span>
-        )}
-      </div>
-    );
-  }
+  const resubmitMessage = () => {
+    const text = textEditor.current.innerText;
 
-  const wrapText = (text) => <TextWrapper text={text} />;
+    ask({
+      text,
+      parentMessageId: message?.parentMessageId,
+      conversationId: message?.conversationId
+    });
+
+    setSiblingIdx(siblingCount - 1);
+    enterEdit(true);
+  };
+
+  const clickSearchResult = async () => {
+    if (!searchResult) return;
+    const convoResponse = await fetchById('convos', message.conversationId);
+    const convo = convoResponse.data;
+
+    switchToConversation(convo);
+  };
 
   return (
-    <div
-      {...props}
-      onWheel={handleWheel}
-      onMouseOver={handleMouseOver}
-      onMouseOut={handleMouseOut}
-    >
-      <div className="m-auto flex gap-4 p-4 text-base md:max-w-2xl md:gap-6 md:py-6 lg:max-w-2xl lg:px-0 xl:max-w-3xl">
-        <strong className="relative flex w-[30px] flex-col items-end text-right">
-          {icon}
-        </strong>
-        <div className="relative flex w-[calc(100%-50px)] flex-col gap-1 whitespace-pre-wrap md:gap-3 lg:w-[calc(100%-115px)]">
-          <div className="flex flex-grow flex-col gap-3">
-            {error ? (
-              <div className="flex flex min-h-[20px] flex-row flex-col items-start gap-4 gap-2 whitespace-pre-wrap text-red-500">
-                <div className="rounded-md border border-red-500 bg-red-500/10 py-2 px-3 text-sm text-gray-600 dark:text-gray-100">
-                  {text}
-                </div>
-              </div>
+    <>
+      <div
+        {...props}
+        onWheel={handleWheel}
+      >
+        <div className="relative m-auto flex gap-4 p-4 text-base md:max-w-2xl md:gap-6 md:py-6 lg:max-w-2xl lg:px-0 xl:max-w-3xl">
+          <div className="relative flex h-[30px] w-[30px] flex-col items-end text-right text-xs md:text-sm">
+            {typeof icon === 'string' && icon.match(/[^\\x00-\\x7F]+/) ? (
+              <span className=" direction-rtl w-40 overflow-x-scroll">{icon}</span>
             ) : (
-              <div className="flex min-h-[20px] flex-col items-start gap-4 whitespace-pre-wrap">
-                {/* <div className={`${blinker ? 'result-streaming' : ''} markdown prose dark:prose-invert light w-full break-words`}> */}
-                <div className="markdown prose dark:prose-invert light w-full break-words">
-                  {notUser ? wrapText(text) : text}
-                  {blinker && <span className="result-streaming">█</span>}
-                </div>
-              </div>
+              icon
             )}
+            <div className="sibling-switch invisible absolute left-0 top-2 -ml-4 flex -translate-x-full items-center justify-center gap-1 text-xs group-hover:visible">
+              <SiblingSwitch
+                siblingIdx={siblingIdx}
+                siblingCount={siblingCount}
+                setSiblingIdx={setSiblingIdx}
+              />
+            </div>
           </div>
-          <div className="flex justify-between">
-            {isHovering && <HoverButtons user={!notUser} />}
+          <div className="relative flex w-[calc(100%-50px)] flex-col gap-1 whitespace-pre-wrap md:gap-3 lg:w-[calc(100%-115px)]">
+            {searchResult && (
+              <SubRow
+                classes={props.titleclass + ' rounded'}
+                subclasses="switch-result pl-2 pb-2"
+                onClick={clickSearchResult}
+              >
+                <strong>{`${message.title} | ${message.sender}`}</strong>
+              </SubRow>
+            )}
+            <div className="flex flex-grow flex-col gap-3">
+              {error ? (
+                <div className="flex flex min-h-[20px] flex-grow flex-col items-start gap-4 gap-2 whitespace-pre-wrap text-red-500">
+                  <div className="rounded-md border border-red-500 bg-red-500/10 py-2 px-3 text-sm text-gray-600 dark:text-gray-100">
+                    {`An error occurred. Please try again in a few moments.\n\nError message: ${text}`}
+                  </div>
+                </div>
+              ) : edit ? (
+                <div className="flex min-h-[20px] flex-grow flex-col items-start gap-4 whitespace-pre-wrap">
+                  {/* <div className={`${blinker ? 'result-streaming' : ''} markdown prose dark:prose-invert light w-full break-words`}> */}
+
+                  <div
+                    className="markdown prose dark:prose-invert light w-full break-words border-none focus:outline-none"
+                    contentEditable={true}
+                    ref={textEditor}
+                    suppressContentEditableWarning={true}
+                  >
+                    {text}
+                  </div>
+                  <div className="mt-2 flex w-full justify-center text-center">
+                    <button
+                      className="btn btn-primary relative mr-2"
+                      disabled={isSubmitting}
+                      onClick={resubmitMessage}
+                    >
+                      Save & Submit
+                    </button>
+                    <button
+                      className="btn btn-neutral relative"
+                      onClick={() => enterEdit(true)}
+                    >
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              ) : (
+                <div className="flex min-h-[20px] flex-grow flex-col items-start gap-4 whitespace-pre-wrap">
+                  {/* <div className={`${blinker ? 'result-streaming' : ''} markdown prose dark:prose-invert light w-full break-words`}> */}
+                  <div className="markdown prose dark:prose-invert light w-full break-words">
+                    {!isCreatedByUser ? (
+                      <>
+                        <Content content={text} />
+                      </>
+                    ) : (
+                      <>{text}</>
+                    )}
+                  </div>
+                </div>
+              )}
+            </div>
+            <HoverButtons
+              model={model}
+              visible={!error && isCreatedByUser && !edit && !searchResult}
+              onClick={() => enterEdit()}
+            />
+            <SubRow subclasses="switch-container">
+              <SiblingSwitch
+                siblingIdx={siblingIdx}
+                siblingCount={siblingCount}
+                setSiblingIdx={setSiblingIdx}
+              />
+            </SubRow>
           </div>
         </div>
       </div>
-    </div>
+      <MultiMessage
+        conversation={conversation}
+        messagesTree={message.children}
+        scrollToBottom={scrollToBottom}
+        currentEditId={currentEditId}
+        setCurrentEditId={setCurrentEditId}
+      />
+    </>
   );
 }

client/src/components/Messages/MessageBar.jsx

@@ -0,0 +1,38 @@
+import React, { useRef, useEffect, useState } from 'react';
+
+const MessageBar = ({ children, dynamicProps, handleWheel, clickSearchResult }) => {
+  const ref = useRef(null);
+  const [isVisible, setIsVisible] = useState(false);
+
+  useEffect(() => {
+    const observer = new IntersectionObserver(
+      ([entry]) => {
+        if (entry.isIntersecting) {
+          setIsVisible(true);
+          observer.unobserve(ref.current);
+        }
+      },
+      { threshold: 0.1 }
+    );
+
+    observer.observe(ref.current);
+
+    return () => {
+      observer.unobserve(ref.current);
+    };
+  }, []);
+
+  return (
+    <div
+      {...dynamicProps}
+      onWheel={handleWheel}
+      // onClick={clickSearchResult}
+
+      ref={ref}
+    >
+      {isVisible ? children : null}
+    </div>
+  );
+};
+
+export default MessageBar;

client/src/components/Messages/MultiMessage.jsx

@@ -0,0 +1,67 @@
+import React, { useEffect, useState } from 'react';
+import Message from './Message';
+
+export default function MultiMessage({
+  conversation,
+  messagesTree,
+  scrollToBottom,
+  currentEditId,
+  setCurrentEditId,
+  isSearchView
+}) {
+  const [siblingIdx, setSiblingIdx] = useState(0);
+
+  const setSiblingIdxRev = value => {
+    setSiblingIdx(messagesTree?.length - value - 1);
+  };
+
+  useEffect(() => {
+    // reset siblingIdx when changes, mostly a new message is submitting.
+    setSiblingIdx(0);
+  }, [messagesTree?.length]);
+
+  // if (!messageList?.length) return null;
+  if (!(messagesTree && messagesTree.length)) {
+    return null;
+  }
+
+  if (siblingIdx >= messagesTree?.length) {
+    setSiblingIdx(0);
+    return null;
+  }
+
+  const message = messagesTree[messagesTree.length - siblingIdx - 1];
+  if (isSearchView)
+    return (
+      <>
+        {messagesTree
+          ? messagesTree.map(message => (
+              <Message
+                key={message.messageId}
+                conversation={conversation}
+                message={message}
+                scrollToBottom={scrollToBottom}
+                currentEditId={currentEditId}
+                setCurrentEditId={null}
+                siblingIdx={1}
+                siblingCount={1}
+                setSiblingIdx={null}
+              />
+            ))
+          : null}
+      </>
+    );
+  return (
+    <Message
+      key={message.messageId}
+      conversation={conversation}
+      message={message}
+      scrollToBottom={scrollToBottom}
+      currentEditId={currentEditId}
+      setCurrentEditId={setCurrentEditId}
+      siblingIdx={messagesTree.length - siblingIdx - 1}
+      siblingCount={messagesTree.length}
+      setSiblingIdx={setSiblingIdxRev}
+    />
+  );
+}

client/src/components/Messages/SiblingSwitch.jsx

@@ -0,0 +1,26 @@
+import React from 'react';
+
+export default function SiblingSwitch({ 
+    siblingIdx,
+    siblingCount,
+    setSiblingIdx
+}) {
+  const previous = () => {
+    setSiblingIdx(siblingIdx - 1);
+  }
+
+  const next = () => {
+    setSiblingIdx(siblingIdx + 1);
+  }
+  return siblingCount > 1 ? (
+    <>
+      <button className="dark:text-white disabled:text-gray-300 dark:disabled:text-gray-400" onClick={previous} disabled={siblingIdx==0}>
+        <svg stroke="currentColor" fill="none" strokeWidth="1.5" viewBox="0 0 24 24" strokeLinecap="round" strokeLinejoin="round" className="h-3 w-3" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><polyline points="15 18 9 12 15 6"></polyline></svg>
+      </button>
+      <span className="flex-grow flex-shrink-0">{siblingIdx + 1}/{siblingCount}</span>
+      <button className="dark:text-white disabled:text-gray-300 dark:disabled:text-gray-400" onClick={next} disabled={siblingIdx==siblingCount-1}>
+        <svg stroke="currentColor" fill="none" strokeWidth="1.5" viewBox="0 0 24 24" strokeLinecap="round" strokeLinejoin="round" className="h-3 w-3" height="1em" width="1em" xmlns="http://www.w3.org/2000/svg"><polyline points="9 18 15 12 9 6"></polyline></svg>
+      </button>
+      </>
+  ):null;
+}

client/src/components/Messages/TextWrapper.jsx

@@ -1,137 +0,0 @@
-import React from 'react';
-import Markdown from 'markdown-to-jsx';
-import Embed from './Embed';
-import Highlight from './Highlight';
-import regexSplit from '~/utils/regexSplit';
-import { wrapperRegex } from '~/utils';
-const { codeRegex, inLineRegex, markupRegex, languageMatch, newLineMatch } = wrapperRegex;
-const mdOptions = { wrapper: React.Fragment, forceWrapper: true };
-
-const inLineWrap = (parts) => {
-  let previousElement = null;
-  return parts.map((part, i) => {
-    if (part.match(markupRegex)) {
-      const codeElement = <code key={i}>{part.slice(1, -1)}</code>;
-      if (previousElement && typeof previousElement !== 'string') {
-        // Append code element as a child to previous non-code element
-        previousElement = (
-          <Markdown
-            options={mdOptions}
-            key={i}
-          >
-            {previousElement}
-            {codeElement}
-          </Markdown>
-        );
-        return previousElement;
-      } else {
-        return codeElement;
-      }
-    } else {
-      previousElement = part;
-      return previousElement;
-    }
-  });
-};
-
-export default function TextWrapper({ text }) {
-  let embedTest = false;
-
-  // to match unenclosed code blocks
-  if (text.match(/```/g)?.length === 1) {
-    embedTest = true;
-  }
-
-  // match enclosed code blocks
-  if (text.match(codeRegex)) {
-    const parts = regexSplit(text);
-    // console.log(parts);
-    const codeParts = parts.map((part, i) => {
-      if (part.match(codeRegex)) {
-        let language = 'javascript';
-        let matched = false;
-
-        if (part.match(languageMatch)) {
-          language = part.match(languageMatch)[1].toLowerCase();
-          part = part.replace(languageMatch, '```');
-          matched = true;
-          // highlight.js language validation
-          // const validLanguage = languages.some((lang) => language === lang);
-          // part = validLanguage ? part.replace(languageMatch, '```') : part;
-          // language = validLanguage ? language : 'javascript';
-        }
-
-        part = part.replace(newLineMatch, '```');
-
-        return (
-          <Embed
-            key={i}
-            language={language}
-            code={part.slice(3, -3)}
-            matched={matched}
-          >
-            <Highlight
-              language={language}
-              code={part.slice(3, -3)}
-            />
-          </Embed>
-        );
-      } else if (part.match(inLineRegex)) {
-        const innerParts = part.split(inLineRegex);
-        return inLineWrap(innerParts);
-      } else {
-        return (
-          <Markdown
-            options={mdOptions}
-            key={i}
-          >
-            {part}
-          </Markdown>
-        );
-      }
-    });
-
-    return <>{codeParts}</>; // return the wrapped text
-  } else if (embedTest) {
-    const language = text.match(/```(\w+)/)?.[1].toLowerCase() || 'javascript';
-    const parts = text.split(text.match(/```(\w+)/)?.[0] || '```');
-    const codeParts = parts.map((part, i) => {
-      if (i === 1) {
-        part = part.replace(/^\n+/, '');
-
-        return (
-          <Embed
-            key={i}
-            language={language}
-          >
-            <Highlight
-              code={part}
-              language={language}
-            />
-          </Embed>
-        );
-      } else if (part.match(inLineRegex)) {
-        const innerParts = part.split(inLineRegex);
-        return inLineWrap(innerParts);
-      } else {
-        return (
-          <Markdown
-            options={mdOptions}
-            key={i}
-          >
-            {part}
-          </Markdown>
-        );
-      }
-    });
-
-    return <>{codeParts}</>; // return the wrapped text
-  } else if (text.match(markupRegex)) {
-    // map over the parts and wrap any text between tildes with <code> tags
-    const parts = text.split(markupRegex);
-    const codeParts = inLineWrap(parts);
-    return <>{codeParts}</>; // return the wrapped text
-  } else {
-    return <Markdown options={mdOptions}>{text}</Markdown>;
-  }
-}

client/src/components/Messages/index.jsx

@@ -1,36 +1,67 @@
-import React, { useEffect, useState, useRef } from 'react';
+import React, { useEffect, useState, useRef, useCallback } from 'react';
+import { useRecoilValue } from 'recoil';
+import Spinner from '../svg/Spinner';
+import { throttle } from 'lodash';
 import { CSSTransition } from 'react-transition-group';
 import ScrollToBottom from './ScrollToBottom';
-import Message from './Message';
+import MultiMessage from './MultiMessage';
 
-const Messages = ({ messages }) => {
+import store from '~/store';
+
+export default function Messages({ isSearchView = false }) {
+  const [currentEditId, setCurrentEditId] = useState(-1);
   const [showScrollButton, setShowScrollButton] = useState(false);
   const scrollableRef = useRef(null);
   const messagesEndRef = useRef(null);
 
+  const messagesTree = useRecoilValue(store.messagesTree);
+  const searchResultMessagesTree = useRecoilValue(store.searchResultMessagesTree);
+
+  const _messagesTree = isSearchView ? searchResultMessagesTree : messagesTree;
+
+  const conversation = useRecoilValue(store.conversation) || {};
+  const { conversationId, model, chatGptLabel } = conversation;
+
+  const models = useRecoilValue(store.models) || [];
+  const modelName = models.find(element => element.model == model)?.name;
+
+  const searchQuery = useRecoilValue(store.searchQuery);
+
   useEffect(() => {
     const timeoutId = setTimeout(() => {
-      const scrollable = scrollableRef.current;
-      const hasScrollbar = scrollable.scrollHeight > scrollable.clientHeight;
+      const { scrollTop, scrollHeight, clientHeight } = scrollableRef.current;
+      const diff = Math.abs(scrollHeight - scrollTop);
+      const percent = Math.abs(clientHeight - diff) / clientHeight;
+      const hasScrollbar = scrollHeight > clientHeight && percent > 0.2;
       setShowScrollButton(hasScrollbar);
     }, 650);
 
+    // Add a listener on the window object
+    window.addEventListener('scroll', handleScroll);
+
     return () => {
       clearTimeout(timeoutId);
+      window.removeEventListener('scroll', handleScroll);
     };
-  }, [messages]);
+  }, [_messagesTree]);
 
-  const scrollToBottom = () => {
-    messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
-    setShowScrollButton(false);
-  };
+  const scrollToBottom = useCallback(
+    throttle(
+      () => {
+        messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
+        setShowScrollButton(false);
+      },
+      750,
+      { leading: true }
+    ),
+    [messagesEndRef]
+  );
 
   const handleScroll = () => {
     const { scrollTop, scrollHeight, clientHeight } = scrollableRef.current;
     const diff = Math.abs(scrollHeight - scrollTop);
-    const bottom =
-      diff === clientHeight || (diff <= clientHeight + 25 && diff >= clientHeight - 25);
-    if (bottom) {
+    const percent = Math.abs(clientHeight - diff) / clientHeight;
+    if (percent <= 0.2) {
       setShowScrollButton(false);
     } else {
       setShowScrollButton(true);
@@ -43,49 +74,58 @@ const Messages = ({ messages }) => {
     timeoutId = setTimeout(handleScroll, 100);
   };
 
-  const scrollHandler = (e) => {
+  const scrollHandler = e => {
     e.preventDefault();
     scrollToBottom();
   };
 
   return (
     <div
-      className="flex-1 overflow-y-auto "
+      className="flex-1 overflow-y-auto pt-10 md:pt-0"
       ref={scrollableRef}
       onScroll={debouncedHandleScroll}
     >
-      {/* <div className="flex-1 overflow-hidden"> */}
-      <div className="h-full dark:gpt-dark-gray">
-        <div className="flex h-full flex-col items-center text-sm dark:gpt-dark-gray">
-          {messages.map((message, i) => (
-            <Message
-              key={i}
-              sender={message.sender}
-              text={message.text}
-              last={i === messages.length - 1}
-              error={message.error ? true : false}
-              scrollToBottom={i === messages.length - 1 ? scrollToBottom : null}
-            />
-          ))}
-          <CSSTransition
-            in={showScrollButton}
-            timeout={400}
-            classNames="scroll-down"
-            unmountOnExit={false}
-            // appear
-          >
-            {() => showScrollButton && <ScrollToBottom scrollHandler={scrollHandler} />}
-          </CSSTransition>
-
+      <div className="dark:gpt-dark-gray h-full">
+        <div className="dark:gpt-dark-gray flex h-full flex-col items-center text-sm">
+          <div className="flex w-full items-center justify-center gap-1 border-b border-black/10 bg-gray-50 p-3 text-sm text-gray-500 dark:border-gray-900/50 dark:bg-gray-700 dark:text-gray-300">
+            {isSearchView
+              ? `Search: ${searchQuery}`
+              : `Model: ${modelName} ${chatGptLabel ? `(${chatGptLabel})` : ''}`}
+          </div>
+          {_messagesTree === null ? (
+            <Spinner />
+          ) : _messagesTree?.length == 0 && isSearchView ? (
+            <div className="flex w-full items-center justify-center gap-1 bg-gray-50 p-3 text-sm text-gray-500 dark:border-gray-900/50 dark:bg-gray-800 dark:text-gray-300">
+              Nothing found
+            </div>
+          ) : (
+            <>
+              <MultiMessage
+                key={conversationId} // avoid internal state mixture
+                conversation={conversation}
+                messagesTree={_messagesTree}
+                scrollToBottom={scrollToBottom}
+                currentEditId={currentEditId}
+                setCurrentEditId={setCurrentEditId}
+                isSearchView={isSearchView}
+              />
+              <CSSTransition
+                in={showScrollButton}
+                timeout={400}
+                classNames="scroll-down"
+                unmountOnExit={false}
+                // appear
+              >
+                {() => showScrollButton && <ScrollToBottom scrollHandler={scrollHandler} />}
+              </CSSTransition>
+            </>
+          )}
           <div
-            className="group h-32 w-full flex-shrink-0 dark:border-gray-900/50 dark:gpt-dark-gray md:h-48"
+            className="dark:gpt-dark-gray group h-32 w-full flex-shrink-0 dark:border-gray-900/50 md:h-48"
             ref={messagesEndRef}
           />
         </div>
       </div>
-      {/* </div> */}
     </div>
   );
-};
-
-export default Messages;
+}

client/src/components/Models/ModelItem.jsx

@@ -1,152 +0,0 @@
-import React, { useState, useRef } from 'react';
-import { useSelector } from 'react-redux';
-import { DropdownMenuRadioItem } from '../ui/DropdownMenu.tsx';
-import { Circle } from 'lucide-react';
-import { DialogTrigger } from '../ui/Dialog.tsx';
-import RenameButton from '../Conversations/RenameButton';
-import TrashIcon from '../svg/TrashIcon';
-import manualSWR from '~/utils/fetchers';
-
-export default function ModelItem({ modelName, value, onSelect }) {
-  const { customModel } = useSelector((state) => state.submit);
-  const { initial } = useSelector((state) => state.models);
-  const [isHovering, setIsHovering] = useState(false);
-  const [renaming, setRenaming] = useState(false);
-  const [currentName, setCurrentName] = useState(modelName);
-  const [modelInput, setModelInput] = useState(modelName);
-  const inputRef = useRef(null);
-  const rename = manualSWR(`http://localhost:3080/api/customGpts`, 'post');
-  const deleteCustom = manualSWR(`http://localhost:3080/api/customGpts/delete`, 'post');
-
-  if (value === 'chatgptCustom') {
-    return (
-      <DialogTrigger className="w-full">
-        <DropdownMenuRadioItem
-          value={value}
-          className="dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800"
-        >
-          {modelName}
-          <sup>$</sup>
-        </DropdownMenuRadioItem>
-      </DialogTrigger>
-    );
-  }
-
-  if (initial[value]) {
-    return (
-      <DropdownMenuRadioItem
-        value={value}
-        className="dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800"
-      >
-        {modelName}
-        {value === 'chatgpt' && <sup>$</sup>}
-      </DropdownMenuRadioItem>
-    );
-  }
-
-  const handleMouseOver = () => {
-    setIsHovering(true);
-  };
-
-  const handleMouseOut = () => {
-    setIsHovering(false);
-  };
-
-  const renameHandler = (e) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setRenaming(true);
-    setTimeout(() => {
-      inputRef.current.focus();
-    }, 25);
-  };
-
-  const onRename = (e) => {
-    e.preventDefault();
-    setRenaming(false);
-    if (modelInput === modelName) {
-      return;
-    }
-    rename.trigger({
-      prevLabel: currentName,
-      chatGptLabel: modelInput,
-      value: modelInput.toLowerCase()
-    });
-    setCurrentName(modelInput);
-  };
-
-  const onDelete = async (e) => {
-    e.preventDefault();
-    await deleteCustom.trigger({ value: currentName.toLowerCase() });
-    // await mutate();
-    onSelect('chatgpt', true);
-  };
-
-  const handleKeyDown = (e) => {
-    if (e.key === 'Enter') {
-      onRename(e);
-    }
-  };
-
-  const buttonClass = {
-    className:
-      'z-50 rounded-md m-0 text-gray-400 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200'
-  };
-
-  const itemClass = {
-    className:
-      'relative flex cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm font-medium outline-none hover:bg-slate-100 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:hover:bg-slate-700 dark:font-semibold dark:text-gray-100 dark:hover:bg-gray-800'
-  };
-
-  const showButtons = isHovering && !initial[value];
-
-  return (
-    <span
-      value={value}
-      className={itemClass.className}
-      onClick={(e) => {
-        onSelect(value, true);
-      }}
-      onMouseOver={handleMouseOver}
-      onMouseOut={handleMouseOut}
-    >
-      {customModel === value && (
-        <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-          <Circle className="h-2 w-2 fill-current" />
-        </span>
-      )}
-      {renaming === true ? (
-        <input
-          ref={inputRef}
-          type="text"
-          className="pointer-events-auto z-50 m-0 mr-2 w-3/4 border border-blue-500 bg-transparent p-0 text-sm leading-tight outline-none"
-          value={modelInput}
-          onClick={(e) => e.stopPropagation()}
-          onChange={(e) => setModelInput(e.target.value)}
-          onBlur={onRename}
-          onKeyDown={handleKeyDown}
-        />
-      ) : (
-        modelInput
-      )}
-
-      {value === 'chatgpt' && <sup>$</sup>}
-      {showButtons && (
-        <>
-          <RenameButton
-            twcss={`ml-auto mr-2 ${buttonClass.className}`}
-            onRename={onRename}
-            renaming={renaming}
-            renameHandler={renameHandler}
-          />
-          <button
-            {...buttonClass}
-            onClick={onDelete}
-          >
-            <TrashIcon />
-          </button>
-        </>
-      )}
-    </span>
-  );
-}

client/src/components/Models/ModelMenu.jsx

@@ -1,166 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useSelector, useDispatch } from 'react-redux';
-import { setModel, setDisabled, setCustomGpt, setCustomModel } from '~/store/submitSlice';
-import { setNewConvo } from '~/store/convoSlice';
-import ModelDialog from './ModelDialog';
-import MenuItems from './MenuItems';
-import manualSWR from '~/utils/fetchers';
-import { setModels } from '~/store/modelSlice';
-import GPTIcon from '../svg/GPTIcon';
-import BingIcon from '../svg/BingIcon';
-import { Button } from '../ui/Button.tsx';
-
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuLabel,
-  DropdownMenuRadioGroup,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger
-} from '../ui/DropdownMenu.tsx';
-
-import { Dialog } from '../ui/Dialog.tsx';
-
-export default function ModelMenu() {
-  const dispatch = useDispatch();
-  const [modelSave, setModelSave] = useState(false);
-  const [menuOpen, setMenuOpen] = useState(false);
-  const { model, customModel } = useSelector((state) => state.submit);
-  const { models, modelMap, initial } = useSelector((state) => state.models);
-  const { trigger } = manualSWR(`http://localhost:3080/api/customGpts`, 'get', (res) => {
-    const fetchedModels = res.map((modelItem) => ({
-      ...modelItem,
-      name: modelItem.chatGptLabel
-    }));
-
-    dispatch(setModels(fetchedModels));
-  });
-
-  useEffect(() => {
-    trigger();
-    const lastSelected = JSON.parse(localStorage.getItem('model'));
-    if (lastSelected && lastSelected !== 'chatgptCustom' && initial[lastSelected]) {
-      dispatch(setModel(lastSelected));
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  useEffect(() => {
-    localStorage.setItem('model', JSON.stringify(model));
-  }, [model]);
-
-  const onChange = (value, custom = false) => {
-    if (!value) {
-      return;
-    } else if (value === 'chatgptCustom') {
-      // dispatch(setMessages([]));
-    } else if (initial[value]) {
-      dispatch(setModel(value));
-      dispatch(setDisabled(false));
-      dispatch(setCustomModel(null));
-      if (custom) {
-        trigger();
-      }
-    } else if (!initial[value]) {
-      const chatGptLabel = modelMap[value]?.chatGptLabel;
-      const promptPrefix = modelMap[value]?.promptPrefix;
-      dispatch(setCustomGpt({ chatGptLabel, promptPrefix }));
-      dispatch(setModel('chatgptCustom'));
-      dispatch(setCustomModel(value));
-      // if (custom) {
-      //   setMenuOpen((prevOpen) => !prevOpen);
-      // }
-    } else if (!modelMap[value]) {
-      dispatch(setCustomModel(null));
-    }
-
-    // Set new conversation
-    dispatch(setNewConvo());
-  };
-
-  const onOpenChange = (open) => {
-    if (!open) {
-      setModelSave(false);
-    }
-  };
-
-  const handleSaveState = (value) => {
-    if (!modelSave) {
-      return;
-    }
-
-    dispatch(setCustomModel(value));
-    setModelSave(false);
-  };
-
-  const defaultColorProps = [
-    'text-gray-500',
-    'hover:bg-gray-100',
-    'hover:bg-opacity-20',
-    'disabled:hover:bg-transparent',
-    'dark:data-[state=open]:bg-gray-800',
-    'dark:hover:bg-opacity-20',
-    'dark:hover:bg-gray-900',
-    'dark:hover:text-gray-400',
-    'dark:disabled:hover:bg-transparent'
-  ];
-
-  const chatgptColorProps = [
-    'text-green-700',
-    'data-[state=open]:bg-green-100',
-    'dark:text-emerald-300',
-    'hover:bg-green-100',
-    'disabled:hover:bg-transparent',
-    'dark:data-[state=open]:bg-green-900',
-    'dark:hover:bg-opacity-50',
-    'dark:hover:bg-green-900',
-    'dark:hover:text-gray-100',
-    'dark:disabled:hover:bg-transparent'
-  ];
-
-  const isBing = model === 'bingai' || model === 'sydney';
-  const colorProps = model === 'chatgpt' ? chatgptColorProps : defaultColorProps;
-  const icon = isBing ? <BingIcon button={true} /> : <GPTIcon button={true} />;
-
-  return (
-    <Dialog onOpenChange={onOpenChange}>
-      <DropdownMenu
-        open={menuOpen}
-        onOpenChange={setMenuOpen}
-      >
-        <DropdownMenuTrigger asChild>
-          <Button
-            variant="outline"
-            // style={{backgroundColor: 'rgb(16, 163, 127)'}}
-            className={`absolute bottom-0.5 rounded-md border-0 p-1 pl-2 outline-none ${colorProps.join(
-              ' '
-            )} focus:ring-0 focus:ring-offset-0 disabled:bottom-0.5 dark:data-[state=open]:bg-opacity-50 md:bottom-1 md:left-2 md:pl-1 md:disabled:bottom-1`}
-          >
-            {icon}
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent className="w-56 dark:bg-gray-700">
-          <DropdownMenuLabel className="dark:text-gray-300">Select a Model</DropdownMenuLabel>
-          <DropdownMenuSeparator />
-          <DropdownMenuRadioGroup
-            value={customModel ? customModel : model}
-            onValueChange={onChange}
-            className="overflow-y-auto"
-          >
-            <MenuItems
-              models={models}
-              onSelect={onChange}
-            />
-          </DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
-      <ModelDialog
-        mutate={trigger}
-        modelMap={modelMap}
-        setModelSave={setModelSave}
-        handleSaveState={handleSaveState}
-      />
-    </Dialog>
-  );
-}

client/src/components/Nav/ClearConvos.jsx

@@ -1,34 +1,47 @@
 import React from 'react';
+import store from '~/store';
 import TrashIcon from '../svg/TrashIcon';
 import { useSWRConfig } from 'swr';
 import manualSWR from '~/utils/fetchers';
-import { useDispatch } from 'react-redux';
-import { setNewConvo, removeAll } from '~/store/convoSlice';
-import { setMessages } from '~/store/messageSlice';
+import { Dialog, DialogTrigger } from '../ui/Dialog.tsx';
+import DialogTemplate from '../ui/DialogTemplate';
 
 export default function ClearConvos() {
-  const dispatch = useDispatch();
+  const { newConversation } = store.useConversation();
+  const { refreshConversations } = store.useConversations();
   const { mutate } = useSWRConfig();
 
-  const { trigger } = manualSWR(`http://localhost:3080/api/convos/clear`, 'post', () => {
-    dispatch(setMessages([]));
-    dispatch(setNewConvo());
-    mutate(`http://localhost:3080/api/convos`);
+  const { trigger } = manualSWR(`/api/convos/clear`, 'post', () => {
+    newConversation();
+    refreshConversations();
+    mutate(`/api/convos`);
   });
 
   const clickHandler = () => {
     console.log('Clearing conversations...');
-    dispatch(removeAll());
     trigger({});
   };
 
   return (
-    <a
-      className="flex cursor-pointer items-center gap-3 rounded-md py-3 px-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10"
-      onClick={clickHandler}
-    >
-      <TrashIcon />
-      Clear conversations
-    </a>
+    <Dialog>
+      <DialogTrigger asChild>
+        <a
+          className="flex cursor-pointer items-center gap-3 rounded-md py-3 px-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10"
+          // onClick={clickHandler}
+        >
+          <TrashIcon />
+          Clear conversations
+        </a>
+      </DialogTrigger>
+      <DialogTemplate
+        title="Clear conversations"
+        description="Are you sure you want to clear all conversations? This is irreversible."
+        selection={{
+          selectHandler: clickHandler,
+          selectClasses: 'bg-red-600 hover:bg-red-700 dark:hover:bg-red-800 text-white',
+          selectText: 'Clear'
+        }}
+      />
+    </Dialog>
   );
 }

client/src/components/Nav/Logout.jsx

@@ -0,0 +1,23 @@
+import React from 'react';
+import LogOutIcon from '../svg/LogOutIcon';
+import { useRecoilValue } from 'recoil';
+import store from '~/store';
+
+export default function Logout() {
+  const user = useRecoilValue(store.user);
+
+  const clickHandler = () => {
+    window.location.href = '/auth/logout';
+  };
+
+  return (
+    <a
+      className="flex cursor-pointer items-center gap-3 rounded-md py-3 px-3 text-sm text-white transition-colors duration-200 hover:bg-gray-500/10"
+      onClick={clickHandler}
+    >
+      <LogOutIcon />
+      {user?.display || user?.username || 'USER'}
+      <small>Log out</small>
+    </a>
+  );
+}

client/src/components/Nav/MobileNav.jsx

@@ -1,11 +1,19 @@
 import React from 'react';
+import { useRecoilValue } from 'recoil';
+
+import store from '~/store';
+
+export default function MobileNav({ setNavVisible }) {
+  const conversation = useRecoilValue(store.conversation);
+  const { newConversation } = store.useConversation();
+  const { title = 'New Chat' } = conversation || {};
 
-export default function MobileNav({ title = 'New Chat' }) {
   return (
-    <div className="sticky top-0 z-10 flex items-center border-b border-white/20 bg-gray-800 pl-1 pt-1 text-gray-200 sm:pl-3 md:hidden">
+    <div className="fixed top-0 left-0 right-0 z-10 flex items-center border-b border-white/20 bg-gray-800 pl-1 pt-1 text-gray-200 sm:pl-3 md:hidden">
       <button
         type="button"
         className="-ml-0.5 -mt-0.5 inline-flex h-10 w-10 items-center justify-center rounded-md hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-inset focus:ring-white dark:hover:text-white"
+        onClick={() => setNavVisible(prev => !prev)}
       >
         <span className="sr-only">Open sidebar</span>
         <svg
@@ -40,10 +48,11 @@ export default function MobileNav({ title = 'New Chat' }) {
           />
         </svg>
       </button>
-      <h1 className="flex-1 text-center text-base font-normal">{title}</h1>
+      <h1 className="flex-1 text-center text-base font-normal">{title || 'New Chat'}</h1>
       <button
         type="button"
         className="px-3"
+        onClick={() => newConversation()}
       >
         <svg
           stroke="currentColor"

client/src/components/Nav/NavLinks.jsx

@@ -1,18 +1,22 @@
 import React from 'react';
-import NavLink from './NavLink';
-import LogOutIcon from '../svg/LogOutIcon';
+import SearchBar from './SearchBar';
 import ClearConvos from './ClearConvos';
 import DarkMode from './DarkMode';
+import Logout from './Logout';
 
-export default function NavLinks() {
+export default function NavLinks({ fetch, onSearchSuccess, clearSearch, isSearchEnabled }) {
   return (
     <>
-      <ClearConvos />
+      {!!isSearchEnabled && (
+        <SearchBar
+          fetch={fetch}
+          onSuccess={onSearchSuccess}
+          clearSearch={clearSearch}
+        />
+      )}
       <DarkMode />
-      <NavLink
-        svg={LogOutIcon}
-        text="Log out"
-      />
+      <ClearConvos />
+      <Logout />
     </>
   );
 }

client/src/components/Nav/NewChat.jsx

@@ -1,16 +1,13 @@
 import React from 'react';
-import { useDispatch } from 'react-redux';
-import { setNewConvo } from '~/store/convoSlice';
-import { setMessages } from '~/store/messageSlice';
-import { setText } from '~/store/textSlice';
+import store from '~/store';
 
 export default function NewChat() {
-  const dispatch = useDispatch();
+  const { newConversation } = store.useConversation();
 
   const clickHandler = () => {
-    dispatch(setText(''));
-    dispatch(setMessages([]));
-    dispatch(setNewConvo());
+    // dispatch(setInputValue(''));
+    // dispatch(setQuery(''));
+    newConversation();
   };
 
   return (