remove pip from final container

Issue button to clean chat history

application/Dockerfile

@@ -1,31 +1,70 @@
-FROM python:3.11-slim-bullseye as builder
+# Builder Stage
-
+FROM ubuntu:mantic as builder
-# Tiktoken requires Rust toolchain, so build it in a separate stage
+
-RUN apt-get update && apt-get install -y gcc curl
+# Install necessary packages
-RUN apt-get install -y wget unzip
+RUN apt-get update && \
-RUN wget https://d3dg1063dc54p9.cloudfront.net/models/embeddings/mpnet-base-v2.zip
+    apt-get install -y --no-install-recommends gcc curl wget unzip libc6-dev python3.11 python3-pip python3-venv && \
-RUN unzip mpnet-base-v2.zip -d model
+    ln -s /usr/bin/python3.11 /usr/bin/python && \
-RUN rm mpnet-base-v2.zip
+    ln -sf /usr/bin/pip3 /usr/bin/pip
-RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && apt-get install --reinstall libc6-dev -y
+
-ENV PATH="/root/.cargo/bin:${PATH}"
+# Download and unzip the model
-RUN pip install --upgrade pip && pip install tiktoken==0.5.2
+RUN wget https://d3dg1063dc54p9.cloudfront.net/models/embeddings/mpnet-base-v2.zip && \
+    unzip mpnet-base-v2.zip -d model && \
+    rm mpnet-base-v2.zip
+
+# Install Rust
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# Clean up to reduce container size
+RUN apt-get remove --purge -y wget unzip && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
+
+# Copy requirements.txt
 COPY requirements.txt .
-RUN pip install -r requirements.txt
 
+# Setup Python virtual environment
+RUN python3 -m venv /venv
+ENV PATH="/venv/bin:$PATH"
 
+# Install Python packages
+RUN pip install --no-cache-dir --upgrade pip && \
+    pip install --no-cache-dir tiktoken && \
+    pip install --no-cache-dir -r requirements.txt
 
-FROM python:3.11-slim-bullseye
+# Final Stage
+FROM ubuntu:mantic as final
 
-# Copy pre-built packages and binaries from builder stage
+# Install Python
-COPY --from=builder /usr/local/ /usr/local/
+RUN apt-get update && apt-get install -y --no-install-recommends python3.11 gunicorn && \
+    ln -s /usr/bin/python3.11 /usr/bin/python && \
+    rm -rf /var/lib/apt/lists/*
 
+# Set working directory
 WORKDIR /app
+
+# Create a non-root user: `appuser` (Feel free to choose a name)
+RUN groupadd -r appuser && \
+    useradd -r -g appuser -d /app -s /sbin/nologin -c "Docker image user" appuser
+
+# Copy the virtual environment and model from the builder stage
+COPY --from=builder /venv /venv
 COPY --from=builder /model /app/model
 
+# Copy your application code
 COPY . /app/application
-ENV FLASK_APP=app.py
-ENV FLASK_DEBUG=true
 
+# Change the ownership of the /app directory to the appuser
+RUN chown -R appuser:appuser /app
+
+# Set environment variables
+ENV FLASK_APP=app.py \
+    FLASK_DEBUG=true \
+    PATH="/venv/bin:$PATH"
+
+# Expose the port the app runs on
 EXPOSE 7091
 
-CMD ["gunicorn", "-w", "2", "--timeout", "120", "--bind", "0.0.0.0:7091", "application.wsgi:app"]
+# Switch to non-root user
+USER appuser
+
+# Start Gunicorn
+CMD ["gunicorn", "-w", "2", "--timeout", "120", "--bind", "0.0.0.0:7091", "application.wsgi:app"]

application/api/user/routes.py

@@ -37,6 +37,12 @@ def delete_conversation():
 
     return {"status": "ok"}
 
+@user.route("/api/delete_all_conversations", methods=["POST"])
+def delete_all_conversations():
+    user_id = "local"
+    conversations_collection.delete_many({"user":user_id})
+    return {"status": "ok"}
+
 @user.route("/api/get_conversations", methods=["get"])
 def get_conversations():
     # provides a list of conversations

application/requirements.txt

@@ -10,7 +10,7 @@ escodegen==1.0.11
 esprima==4.0.1
 faiss-cpu==1.7.4
 Flask==3.0.1
-gunicorn==21.2.0
+gunicorn==22.0.0
 html2text==2020.1.16
 javalang==0.13.0
 langchain==0.1.4
@@ -27,8 +27,8 @@ redis==5.0.1
 Requests==2.31.0
 retry==0.9.2
 sentence-transformers
-tiktoken==0.5.2
+tiktoken
-torch==2.1.2
+torch
 tqdm==4.66.1
 transformers==4.36.2
 unstructured==0.12.2

frontend/package.json

@@ -58,4 +58,5 @@
     "vite": "^5.0.13",
     "vite-plugin-svgr": "^4.2.0"
   }
+  
 }

frontend/src/Modal/index.tsx

@@ -8,7 +8,9 @@ interface ModalProps {
   modalState: string;
   isError: boolean;
   errorMessage?: string;
+  textDelete?: boolean;
 }
+
 const Modal = (props: ModalProps) => {
   return (
     <div
@@ -23,7 +25,7 @@ const Modal = (props: ModalProps) => {
             onClick={() => props.handleSubmit()}
             className="ml-auto h-10 w-20 rounded-3xl bg-violet-800 text-white transition-all hover:bg-violet-700"
           >
-            Save
+            {props.textDelete ? 'Delete' : 'Save'}
           </button>
           {props.isCancellable && (
             <button

frontend/src/Navigation.tsx

@@ -20,6 +20,8 @@ import Add from './assets/add.svg';
 import UploadIcon from './assets/upload.svg';
 import { ActiveState } from './models/misc';
 import APIKeyModal from './preferences/APIKeyModal';
+import DeleteConvModal from './preferences/DeleteConvModal';
+
 import {
   selectApiKeyStatus,
   selectSelectedDocs,
@@ -29,6 +31,8 @@ import {
   selectConversations,
   setConversations,
   selectConversationId,
+  selectModalStateDeleteConv,
+  setModalStateDeleteConv,
 } from './preferences/preferenceSlice';
 import {
   setConversation,
@@ -66,7 +70,9 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
   const docs = useSelector(selectSourceDocs);
   const selectedDocs = useSelector(selectSelectedDocs);
   const conversations = useSelector(selectConversations);
+  const modalStateDeleteConv = useSelector(selectModalStateDeleteConv);
   const conversationId = useSelector(selectConversationId);
+
   const { isMobile } = useMediaQuery();
   const [isDarkTheme] = useDarkTheme();
   const [isDocsListOpen, setIsDocsListOpen] = useState(false);
@@ -92,6 +98,7 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
       fetchConversations();
     }
   }, [conversations, dispatch]);
+
   async function fetchConversations() {
     return await getConversations()
       .then((fetchedConversations) => {
@@ -102,6 +109,16 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
       });
   }
 
+  const handleDeleteAllConversations = () => {
+    fetch(`${apiHost}/api/delete_all_conversations`, {
+      method: 'POST',
+    })
+      .then(() => {
+        fetchConversations();
+      })
+      .catch((error) => console.error(error));
+  };
+
   const handleDeleteConversation = (id: string) => {
     fetch(`${apiHost}/api/delete_conversation?id=${id}`, {
       method: 'POST',
@@ -260,7 +277,9 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
         <div className="mb-auto h-[56vh] overflow-y-auto overflow-x-hidden dark:text-white">
           {conversations && (
             <div>
-              <p className="ml-6 mt-3 text-sm font-semibold">Chats</p>
+              <div className=" my-auto mx-4 mt-2 flex h-6 items-center justify-between gap-4 rounded-3xl">
+                <p className="my-auto ml-6 text-sm font-semibold">Chats</p>
+              </div>
               <div className="conversations-container">
                 {conversations?.map((conversation) => (
                   <ConversationTile
@@ -312,7 +331,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
               </p>
             </NavLink>
           </div>
-
           <div className="flex flex-col gap-2 border-b-[1.5px] py-2 dark:border-b-purple-taupe">
             <NavLink
               to="/about"
@@ -370,6 +388,7 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
           />
         </button>
       </div>
+
       <SelectDocsModal
         modalState={selectedDocsModalState}
         setModalState={setSelectedDocsModalState}
@@ -380,6 +399,11 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
         setModalState={setApiKeyModalState}
         isCancellable={isApiKeySet}
       />
+      <DeleteConvModal
+        modalState={modalStateDeleteConv}
+        setModalState={setModalStateDeleteConv}
+        handleDeleteAllConv={handleDeleteAllConversations}
+      />
       <Upload
         modalState={uploadModalState}
         setModalState={setUploadModalState}

frontend/src/preferences/DeleteConvModal.tsx

@@ -0,0 +1,63 @@
+import { useRef } from 'react';
+import { ActiveState } from '../models/misc';
+import { useMediaQuery, useOutsideAlerter } from './../hooks';
+import Modal from '../Modal';
+import { useDispatch } from 'react-redux';
+import { Action } from '@reduxjs/toolkit';
+
+export default function DeleteConvModal({
+  modalState,
+  setModalState,
+  handleDeleteAllConv,
+}: {
+  modalState: ActiveState;
+  setModalState: (val: ActiveState) => Action;
+  handleDeleteAllConv: () => void;
+}) {
+  const dispatch = useDispatch();
+  const modalRef = useRef(null);
+  const { isMobile } = useMediaQuery();
+
+  useOutsideAlerter(
+    modalRef,
+    () => {
+      if (isMobile && modalState === 'ACTIVE') {
+        dispatch(setModalState('INACTIVE'));
+      }
+    },
+    [modalState],
+  );
+
+  function handleSubmit() {
+    handleDeleteAllConv();
+    dispatch(setModalState('INACTIVE'));
+  }
+
+  function handleCancel() {
+    dispatch(setModalState('INACTIVE'));
+  }
+
+  return (
+    <Modal
+      handleCancel={handleCancel}
+      isError={false}
+      modalState={modalState}
+      isCancellable={true}
+      handleSubmit={handleSubmit}
+      textDelete={true}
+      render={() => {
+        return (
+          <article
+            ref={modalRef}
+            className="mx-auto mt-24 flex w-[90vw] max-w-lg  flex-col gap-4 rounded-t-lg bg-white p-6 shadow-lg"
+          >
+            <p className="text-xl text-jet">
+              Are you sure you want to delete all the conversations?
+            </p>
+            <p className="text-md leading-6 text-gray-500"></p>
+          </article>
+        );
+      }}
+    />
+  );
+}

frontend/src/preferences/preferenceSlice.ts

@@ -1,10 +1,12 @@
 import {
+  PayloadAction,
   createListenerMiddleware,
   createSlice,
   isAnyOf,
 } from '@reduxjs/toolkit';
 import { Doc, setLocalApiKey, setLocalRecentDocs } from './preferenceApi';
 import { RootState } from '../store';
+import { ActiveState } from '../models/misc';
 
 interface Preference {
   apiKey: string;
@@ -13,6 +15,7 @@ interface Preference {
   chunks: string;
   sourceDocs: Doc[] | null;
   conversations: { name: string; id: string }[] | null;
+  modalState: ActiveState;
 }
 
 const initialState: Preference = {
@@ -32,6 +35,7 @@ const initialState: Preference = {
   } as Doc,
   sourceDocs: null,
   conversations: null,
+  modalState: 'INACTIVE',
 };
 
 export const prefSlice = createSlice({
@@ -56,6 +60,9 @@ export const prefSlice = createSlice({
     setChunks: (state, action) => {
       state.chunks = action.payload;
     },
+    setModalStateDeleteConv: (state, action: PayloadAction<ActiveState>) => {
+      state.modalState = action.payload;
+    },
   },
 });
 
@@ -66,6 +73,7 @@ export const {
   setConversations,
   setPrompt,
   setChunks,
+  setModalStateDeleteConv,
 } = prefSlice.actions;
 export default prefSlice.reducer;
 
@@ -114,6 +122,8 @@ export const selectSelectedDocsStatus = (state: RootState) =>
   !!state.preference.selectedDocs;
 export const selectSourceDocs = (state: RootState) =>
   state.preference.sourceDocs;
+export const selectModalStateDeleteConv = (state: RootState) =>
+  state.preference.modalState;
 export const selectSelectedDocs = (state: RootState) =>
   state.preference.selectedDocs;
 export const selectConversations = (state: RootState) =>

frontend/src/settings/General.tsx

@@ -8,6 +8,7 @@ import {
   setPrompt,
   setChunks,
   selectChunks,
+  setModalStateDeleteConv,
 } from '../preferences/preferenceSlice';
 
 const apiHost = import.meta.env.VITE_API_HOST || 'https://docsapi.arc53.com';
@@ -43,6 +44,7 @@ const General: React.FC = () => {
     };
     fetchPrompts();
   }, []);
+
   return (
     <div className="mt-[59px]">
       <div className="mb-4">
@@ -93,6 +95,19 @@ const General: React.FC = () => {
           apiHost={apiHost}
         />
       </div>
+      <div className="w-55 w-56">
+        <p className="font-bold text-jet dark:text-bright-gray">
+          Delete all conversations
+        </p>
+        <button
+          className="mt-2 flex w-full cursor-pointer items-center justify-between rounded-3xl  border-2 border-solid border-purple-30 bg-white  px-5 py-3 text-purple-30 hover:bg-purple-30 hover:text-white dark:border-chinese-silver dark:bg-transparent"
+          onClick={() => dispatch(setModalStateDeleteConv('ACTIVE'))}
+        >
+          <span className="overflow-hidden text-ellipsis dark:text-bright-gray">
+            Delete
+          </span>
+        </button>
+      </div>
     </div>
   );
 };

frontend/src/store.ts

@@ -34,6 +34,7 @@ const store = configureStore({
           model: '1.0',
         },
       ],
+      modalState: 'INACTIVE',
     },
   },
   reducer: {