build(deps): bump urllib3 from 2.3.0 to 2.5.0 in /application

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

README.md

@@ -52,10 +52,8 @@
 - [x] Chatbots menu re-design to handle tools, agent types, and more (April 2025)
 - [x] New input box in the conversation menu (April 2025)
 - [x] Add triggerable actions / tools (webhook) (April 2025)
-- [x] Agent optimisations (May 2025)
-- [ ] Anthropic Tool compatibility (June 2025)
-- [ ] MCP support (June 2025)
-- [ ] Add OAuth 2.0 authentication for tools and sources (July 2025)
+- [ ] Anthropic Tool compatibility (May 2025)
+- [ ] Add OAuth 2.0 authentication for tools and sources
 - [ ] Agent scheduling
 
 You can find our full roadmap [here](https://github.com/orgs/arc53/projects/2). Please don't hesitate to contribute or create issues, it helps us improve DocsGPT!

application/core/settings.py

@@ -16,7 +16,6 @@ class Settings(BaseSettings):
         None  # if LLM_PROVIDER is openai, LLM_NAME can be gpt-4 or gpt-3.5-turbo
     )
     EMBEDDINGS_NAME: str = "huggingface_sentence-transformers/all-mpnet-base-v2"
-    EMBEDDINGS_PATH: Optional[str] = "./models/all-mpnet-base-v2" # Set None for SentenceTransformer to manage download
     CELERY_BROKER_URL: str = "redis://localhost:6379/0"
     CELERY_RESULT_BACKEND: str = "redis://localhost:6379/1"
     MONGO_URI: str = "mongodb://localhost:27017/docsgpt"

application/llm/handlers/handler_creator.py

@@ -14,5 +14,5 @@ class LLMHandlerCreator:
     def create_handler(cls, llm_type: str, *args, **kwargs) -> LLMHandler:
         handler_class = cls.handlers.get(llm_type.lower())
         if not handler_class:
-            handler_class = OpenAILLMHandler
+            raise ValueError(f"No LLM handler class found for type {llm_type}")
         return handler_class(*args, **kwargs)

application/requirements.txt

@@ -75,7 +75,7 @@ transformers==4.51.3
 typing-extensions==4.12.2
 typing-inspect==0.9.0
 tzdata==2024.2
-urllib3==2.3.0
+urllib3==2.5.0
 vine==5.1.0
 wcwidth==0.2.13
 werkzeug==3.1.3

application/vectorstore/base.py

@@ -74,11 +74,17 @@ class BaseVectorStore(ABC):
                     embeddings_name,
                     openai_api_key=embeddings_key
                 )
+        elif embeddings_name == "huggingface_sentence-transformers/all-mpnet-base-v2":
+            if os.path.exists("./models/all-mpnet-base-v2"):
+                embedding_instance = EmbeddingsSingleton.get_instance(
+                    embeddings_name = "./models/all-mpnet-base-v2",
+                )
+            else:
+                embedding_instance = EmbeddingsSingleton.get_instance(
+                    embeddings_name,
+                )
         else:
-            model_identifier = embeddings_name
-            if settings.EMBEDDINGS_PATH and os.path.exists(settings.EMBEDDINGS_PATH):
-                model_identifier = settings.EMBEDDINGS_PATH
-            embedding_instance = EmbeddingsSingleton.get_instance(model_identifier)
+            embedding_instance = EmbeddingsSingleton.get_instance(embeddings_name)
 
         return embedding_instance
     

frontend/package-lock.json

@@ -8,7 +8,7 @@
       "name": "frontend",
       "version": "0.0.0",
       "dependencies": {
-        "@reduxjs/toolkit": "^2.8.2",
+        "@reduxjs/toolkit": "^2.5.1",
         "chart.js": "^4.4.4",
         "clsx": "^2.1.1",
         "i18next": "^24.2.0",
@@ -19,7 +19,7 @@
         "react-chartjs-2": "^5.3.0",
         "react-copy-to-clipboard": "^5.1.0",
         "react-dom": "^18.3.1",
-        "react-dropzone": "^14.3.8",
+        "react-dropzone": "^14.3.5",
         "react-helmet": "^6.1.0",
         "react-i18next": "^15.4.0",
         "react-markdown": "^9.0.1",
@@ -1198,13 +1198,11 @@
       }
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.2.tgz",
-      "integrity": "sha512-MYlOhQ0sLdw4ud48FoC5w0dH9VfWQjtCjreKwYTT3l+r427qYC5Y8PihNutepr8XrNaBUDQo9khWUwQxZaqt5A==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.5.1.tgz",
+      "integrity": "sha512-UHhy3p0oUpdhnSxyDjaRDYaw8Xra75UiLbCiRozVPHjfDwNYkh0TsVm/1OmTW8Md+iDAJmYPWUKMvsMc2GtpNg==",
       "license": "MIT",
       "dependencies": {
-        "@standard-schema/spec": "^1.0.0",
-        "@standard-schema/utils": "^0.3.0",
         "immer": "^10.0.3",
         "redux": "^5.0.1",
         "redux-thunk": "^3.1.0",
@@ -1545,18 +1543,6 @@
       "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==",
       "dev": true
     },
-    "node_modules/@standard-schema/spec": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.0.0.tgz",
-      "integrity": "sha512-m2bOd0f2RT9k8QJx1JN85cZYyH1RqFBdlwtkSlf4tBDYLCiiZnv1fIIwacK6cqwXavOydf0NPToMQgpKq+dVlA==",
-      "license": "MIT"
-    },
-    "node_modules/@standard-schema/utils": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
-      "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
-      "license": "MIT"
-    },
     "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
@@ -9201,10 +9187,9 @@
       }
     },
     "node_modules/react-dropzone": {
-      "version": "14.3.8",
-      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.8.tgz",
-      "integrity": "sha512-sBgODnq+lcA4P296DY4wacOZz3JFpD99fp+hb//iBO2HHnyeZU3FwWyXJ6salNpqQdsZrgMrotuko/BdJMV8Ug==",
-      "license": "MIT",
+      "version": "14.3.5",
+      "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-14.3.5.tgz",
+      "integrity": "sha512-9nDUaEEpqZLOz5v5SUcFA0CjM4vq8YbqO0WRls+EYT7+DvxUdzDPKNCPLqGfj3YL9MsniCLCD4RFA6M95V6KMQ==",
       "dependencies": {
         "attr-accept": "^2.2.4",
         "file-selector": "^2.1.0",

frontend/package.json

@@ -19,7 +19,7 @@
     ]
   },
   "dependencies": {
-    "@reduxjs/toolkit": "^2.8.2",
+    "@reduxjs/toolkit": "^2.5.1",
     "chart.js": "^4.4.4",
     "clsx": "^2.1.1",
     "i18next": "^24.2.0",
@@ -30,7 +30,7 @@
     "react-chartjs-2": "^5.3.0",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.3.1",
-    "react-dropzone": "^14.3.8",
+    "react-dropzone": "^14.3.5",
     "react-helmet": "^6.1.0",
     "react-i18next": "^15.4.0",
     "react-markdown": "^9.0.1",

frontend/src/Navigation.tsx

@@ -81,27 +81,8 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
     useState<ActiveState>('INACTIVE');
   const [recentAgents, setRecentAgents] = useState<Agent[]>([]);
 
-  const navRef = useRef<HTMLDivElement>(null);
-  useEffect(() => {
-    function handleClickOutside(event: MouseEvent) {
-      if (
-        navRef.current &&
-        !navRef.current.contains(event.target as Node) &&
-        (isMobile || isTablet) &&
-        navOpen
-      ) {
-        setNavOpen(false);
-      }
-    }
+  const navRef = useRef(null);
 
-    //event listener only for mobile/tablet when nav is open
-    if ((isMobile || isTablet) && navOpen) {
-      document.addEventListener('mousedown', handleClickOutside);
-      return () => {
-        document.removeEventListener('mousedown', handleClickOutside);
-      };
-    }
-  }, [navOpen, isMobile, isTablet, setNavOpen]);
   async function fetchRecentAgents() {
     try {
       const response = await userService.getPinnedAgents(token);

frontend/src/agents/AgentPreview.tsx

@@ -6,23 +6,24 @@ import ConversationMessages from '../conversation/ConversationMessages';
 import { Query } from '../conversation/conversationModels';
 import {
   addQuery,
-  fetchPreviewAnswer,
-  handlePreviewAbort,
+  fetchAnswer,
+  handleAbort,
   resendQuery,
-  resetPreview,
-  selectPreviewQueries,
-  selectPreviewStatus,
-} from './agentPreviewSlice';
+  resetConversation,
+  selectQueries,
+  selectStatus,
+} from '../conversation/conversationSlice';
 import { selectSelectedAgent } from '../preferences/preferenceSlice';
 import { AppDispatch } from '../store';
 
 export default function AgentPreview() {
   const dispatch = useDispatch<AppDispatch>();
 
-  const queries = useSelector(selectPreviewQueries);
-  const status = useSelector(selectPreviewStatus);
+  const queries = useSelector(selectQueries);
+  const status = useSelector(selectStatus);
   const selectedAgent = useSelector(selectSelectedAgent);
 
+  const [input, setInput] = useState('');
   const [lastQueryReturnedErr, setLastQueryReturnedErr] = useState(false);
 
   const fetchStream = useRef<any>(null);
@@ -30,7 +31,7 @@ export default function AgentPreview() {
   const handleFetchAnswer = useCallback(
     ({ question, index }: { question: string; index?: number }) => {
       fetchStream.current = dispatch(
-        fetchPreviewAnswer({ question, indx: index }),
+        fetchAnswer({ question, indx: index, isPreview: true }),
       );
     },
     [dispatch],
@@ -94,11 +95,11 @@ export default function AgentPreview() {
   };
 
   useEffect(() => {
-    dispatch(resetPreview());
+    dispatch(resetConversation());
     return () => {
       if (fetchStream.current) fetchStream.current.abort();
-      handlePreviewAbort();
-      dispatch(resetPreview());
+      handleAbort();
+      dispatch(resetConversation());
     };
   }, [dispatch]);
 

frontend/src/agents/SharedAgent.tsx

@@ -57,7 +57,9 @@ export default function SharedAgent() {
 
   const handleFetchAnswer = useCallback(
     ({ question, index }: { question: string; index?: number }) => {
-      fetchStream.current = dispatch(fetchAnswer({ question, indx: index }));
+      fetchStream.current = dispatch(
+        fetchAnswer({ question, indx: index, isPreview: false }),
+      );
     },
     [dispatch],
   );

frontend/src/agents/agentPreviewSlice.ts

@@ -1,319 +0,0 @@
-import { createAsyncThunk, createSlice, PayloadAction } from '@reduxjs/toolkit';
-import {
-  Answer,
-  ConversationState,
-  Query,
-  Status,
-} from '../conversation/conversationModels';
-import {
-  handleFetchAnswer,
-  handleFetchAnswerSteaming,
-} from '../conversation/conversationHandlers';
-import {
-  selectCompletedAttachments,
-  clearAttachments,
-} from '../upload/uploadSlice';
-import store from '../store';
-
-const initialState: ConversationState = {
-  queries: [],
-  status: 'idle',
-  conversationId: null,
-};
-
-const API_STREAMING = import.meta.env.VITE_API_STREAMING === 'true';
-
-let abortController: AbortController | null = null;
-export function handlePreviewAbort() {
-  if (abortController) {
-    abortController.abort();
-    abortController = null;
-  }
-}
-
-export const fetchPreviewAnswer = createAsyncThunk<
-  Answer,
-  { question: string; indx?: number }
->(
-  'agentPreview/fetchAnswer',
-  async ({ question, indx }, { dispatch, getState }) => {
-    if (abortController) abortController.abort();
-    abortController = new AbortController();
-    const { signal } = abortController;
-
-    const state = getState() as RootState;
-    const attachmentIds = selectCompletedAttachments(state)
-      .filter((a) => a.id)
-      .map((a) => a.id) as string[];
-
-    if (attachmentIds.length > 0) {
-      dispatch(clearAttachments());
-    }
-
-    if (state.preference) {
-      if (API_STREAMING) {
-        await handleFetchAnswerSteaming(
-          question,
-          signal,
-          state.preference.token,
-          state.preference.selectedDocs!,
-          state.agentPreview.queries,
-          null, // No conversation ID for previews
-          state.preference.prompt.id,
-          state.preference.chunks,
-          state.preference.token_limit,
-          (event) => {
-            const data = JSON.parse(event.data);
-            const targetIndex = indx ?? state.agentPreview.queries.length - 1;
-
-            if (data.type === 'end') {
-              dispatch(agentPreviewSlice.actions.setStatus('idle'));
-            } else if (data.type === 'thought') {
-              dispatch(
-                updateThought({
-                  index: targetIndex,
-                  query: { thought: data.thought },
-                }),
-              );
-            } else if (data.type === 'source') {
-              dispatch(
-                updateStreamingSource({
-                  index: targetIndex,
-                  query: { sources: data.source ?? [] },
-                }),
-              );
-            } else if (data.type === 'tool_call') {
-              dispatch(
-                updateToolCall({
-                  index: targetIndex,
-                  tool_call: data.data,
-                }),
-              );
-            } else if (data.type === 'error') {
-              dispatch(agentPreviewSlice.actions.setStatus('failed'));
-              dispatch(
-                agentPreviewSlice.actions.raiseError({
-                  index: targetIndex,
-                  message: data.error,
-                }),
-              );
-            } else {
-              dispatch(
-                updateStreamingQuery({
-                  index: targetIndex,
-                  query: { response: data.answer },
-                }),
-              );
-            }
-          },
-          indx,
-          state.preference.selectedAgent?.id,
-          attachmentIds,
-          false, // Don't save preview conversations
-        );
-      } else {
-        // Non-streaming implementation
-        const answer = await handleFetchAnswer(
-          question,
-          signal,
-          state.preference.token,
-          state.preference.selectedDocs!,
-          state.agentPreview.queries,
-          null, // No conversation ID for previews
-          state.preference.prompt.id,
-          state.preference.chunks,
-          state.preference.token_limit,
-          state.preference.selectedAgent?.id,
-          attachmentIds,
-          false, // Don't save preview conversations
-        );
-
-        if (answer) {
-          const sourcesPrepped = answer.sources.map(
-            (source: { title: string }) => {
-              if (source && source.title) {
-                const titleParts = source.title.split('/');
-                return {
-                  ...source,
-                  title: titleParts[titleParts.length - 1],
-                };
-              }
-              return source;
-            },
-          );
-
-          const targetIndex = indx ?? state.agentPreview.queries.length - 1;
-
-          dispatch(
-            updateQuery({
-              index: targetIndex,
-              query: {
-                response: answer.answer,
-                thought: answer.thought,
-                sources: sourcesPrepped,
-                tool_calls: answer.toolCalls,
-              },
-            }),
-          );
-          dispatch(agentPreviewSlice.actions.setStatus('idle'));
-        }
-      }
-    }
-
-    return {
-      conversationId: null,
-      title: null,
-      answer: '',
-      query: question,
-      result: '',
-      thought: '',
-      sources: [],
-      tool_calls: [],
-    };
-  },
-);
-
-export const agentPreviewSlice = createSlice({
-  name: 'agentPreview',
-  initialState,
-  reducers: {
-    addQuery(state, action: PayloadAction<Query>) {
-      state.queries.push(action.payload);
-    },
-    resendQuery(
-      state,
-      action: PayloadAction<{ index: number; prompt: string; query?: Query }>,
-    ) {
-      state.queries = [
-        ...state.queries.splice(0, action.payload.index),
-        action.payload,
-      ];
-    },
-    updateStreamingQuery(
-      state,
-      action: PayloadAction<{
-        index: number;
-        query: Partial<Query>;
-      }>,
-    ) {
-      const { index, query } = action.payload;
-      if (state.status === 'idle') return;
-
-      if (query.response != undefined) {
-        state.queries[index].response =
-          (state.queries[index].response || '') + query.response;
-      }
-    },
-    updateThought(
-      state,
-      action: PayloadAction<{
-        index: number;
-        query: Partial<Query>;
-      }>,
-    ) {
-      const { index, query } = action.payload;
-      if (query.thought != undefined) {
-        state.queries[index].thought =
-          (state.queries[index].thought || '') + query.thought;
-      }
-    },
-    updateStreamingSource(
-      state,
-      action: PayloadAction<{
-        index: number;
-        query: Partial<Query>;
-      }>,
-    ) {
-      const { index, query } = action.payload;
-      if (!state.queries[index].sources) {
-        state.queries[index].sources = query?.sources;
-      } else if (query.sources) {
-        state.queries[index].sources!.push(...query.sources);
-      }
-    },
-    updateToolCall(state, action) {
-      const { index, tool_call } = action.payload;
-
-      if (!state.queries[index].tool_calls) {
-        state.queries[index].tool_calls = [];
-      }
-
-      const existingIndex = state.queries[index].tool_calls.findIndex(
-        (call) => call.call_id === tool_call.call_id,
-      );
-
-      if (existingIndex !== -1) {
-        const existingCall = state.queries[index].tool_calls[existingIndex];
-        state.queries[index].tool_calls[existingIndex] = {
-          ...existingCall,
-          ...tool_call,
-        };
-      } else state.queries[index].tool_calls.push(tool_call);
-    },
-    updateQuery(
-      state,
-      action: PayloadAction<{ index: number; query: Partial<Query> }>,
-    ) {
-      const { index, query } = action.payload;
-      state.queries[index] = {
-        ...state.queries[index],
-        ...query,
-      };
-    },
-    setStatus(state, action: PayloadAction<Status>) {
-      state.status = action.payload;
-    },
-    raiseError(
-      state,
-      action: PayloadAction<{
-        index: number;
-        message: string;
-      }>,
-    ) {
-      const { index, message } = action.payload;
-      state.queries[index].error = message;
-    },
-    resetPreview: (state) => {
-      state.queries = initialState.queries;
-      state.status = initialState.status;
-      state.conversationId = initialState.conversationId;
-      handlePreviewAbort();
-    },
-  },
-  extraReducers(builder) {
-    builder
-      .addCase(fetchPreviewAnswer.pending, (state) => {
-        state.status = 'loading';
-      })
-      .addCase(fetchPreviewAnswer.rejected, (state, action) => {
-        if (action.meta.aborted) {
-          state.status = 'idle';
-          return state;
-        }
-        state.status = 'failed';
-        state.queries[state.queries.length - 1].error = 'Something went wrong';
-      });
-  },
-});
-
-type RootState = ReturnType<typeof store.getState>;
-
-export const selectPreviewQueries = (state: RootState) =>
-  state.agentPreview.queries;
-export const selectPreviewStatus = (state: RootState) =>
-  state.agentPreview.status;
-
-export const {
-  addQuery,
-  updateQuery,
-  resendQuery,
-  updateStreamingQuery,
-  updateThought,
-  updateStreamingSource,
-  updateToolCall,
-  setStatus,
-  raiseError,
-  resetPreview,
-} = agentPreviewSlice.actions;
-
-export default agentPreviewSlice.reducer;

frontend/src/components/Dropdown.tsx

@@ -53,7 +53,7 @@ function Dropdown({
   darkBorderColor?: string;
   showEdit?: boolean;
   onEdit?: (value: { name: string; id: string; type: string }) => void;
-  showDelete?: boolean | ((option: any) => boolean);
+  showDelete?: boolean;
   onDelete?: (value: string) => void;
   placeholder?: string;
   placeholderTextColor?: string;
@@ -173,15 +173,8 @@ function Dropdown({
               )}
               {showDelete && onDelete && (
                 <button
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    onDelete?.(typeof option === 'string' ? option : option.id);
-                  }}
-                  className={`${
-                    typeof showDelete === 'function' && !showDelete(option)
-                      ? 'hidden'
-                      : ''
-                  } mr-2 h-4 w-4 cursor-pointer hover:opacity-50`}
+                  onClick={() => onDelete(option.id)}
+                  disabled={option.type === 'public'}
                 >
                   <img
                     src={Trash}

frontend/src/conversation/ConversationBubble.tsx

@@ -157,7 +157,12 @@ const ConversationBubble = forwardRef<
             {!isEditClicked && (
               <>
                 <div className="relative mr-2 flex w-full flex-col">
-                  <div className="ml-2 mr-2 flex max-w-full items-start gap-2 whitespace-pre-wrap break-words rounded-[28px] bg-gradient-to-b from-medium-purple to-slate-blue px-5 py-4 text-sm leading-normal text-white sm:text-base">
+                  <div
+                    style={{
+                      wordBreak: 'break-word',
+                    }}
+                    className="ml-2 mr-2 flex max-w-full items-start gap-2 whitespace-pre-wrap rounded-[28px] bg-gradient-to-b from-medium-purple to-slate-blue py-[14px] pl-[19px] pr-3 text-sm leading-normal text-white sm:text-base"
+                  >
                     <div
                       ref={messageRef}
                       className={`${isQuestionCollapsed ? 'line-clamp-4' : ''} w-full`}
@@ -170,7 +175,7 @@ const ConversationBubble = forwardRef<
                           e.stopPropagation();
                           setIsQuestionCollapsed(!isQuestionCollapsed);
                         }}
-                        className="ml-1 rounded-full p-2 hover:bg-[#D9D9D933]"
+                        className="rounded-full p-2.5 hover:bg-[#D9D9D933]"
                       >
                         <img
                           src={ChevronDown}

frontend/src/conversation/conversationSlice.ts

@@ -11,7 +11,13 @@ import {
   handleFetchAnswer,
   handleFetchAnswerSteaming,
 } from './conversationHandlers';
-import { Answer, ConversationState, Query, Status } from './conversationModels';
+import {
+  Answer,
+  Attachment,
+  ConversationState,
+  Query,
+  Status,
+} from './conversationModels';
 import { ToolCallsType } from './types';
 
 const initialState: ConversationState = {
@@ -32,64 +38,65 @@ export function handleAbort() {
 
 export const fetchAnswer = createAsyncThunk<
   Answer,
-  { question: string; indx?: number }
->('fetchAnswer', async ({ question, indx }, { dispatch, getState }) => {
-  if (abortController) abortController.abort();
-  abortController = new AbortController();
-  const { signal } = abortController;
+  { question: string; indx?: number; isPreview?: boolean }
+>(
+  'fetchAnswer',
+  async ({ question, indx, isPreview = false }, { dispatch, getState }) => {
+    if (abortController) abortController.abort();
+    abortController = new AbortController();
+    const { signal } = abortController;
 
-  let isSourceUpdated = false;
-  const state = getState() as RootState;
-  const attachmentIds = selectCompletedAttachments(state)
-    .filter((a) => a.id)
-    .map((a) => a.id) as string[];
+    let isSourceUpdated = false;
+    const state = getState() as RootState;
+    const attachmentIds = selectCompletedAttachments(state)
+      .filter((a) => a.id)
+      .map((a) => a.id) as string[];
 
-  if (attachmentIds.length > 0) {
-    dispatch(clearAttachments());
-  }
+    if (attachmentIds.length > 0) {
+      dispatch(clearAttachments());
+    }
 
-  const currentConversationId = state.conversation.conversationId;
+    const currentConversationId = state.conversation.conversationId;
+    const conversationIdToSend = isPreview ? null : currentConversationId;
+    const save_conversation = isPreview ? false : true;
 
-  if (state.preference) {
-    if (API_STREAMING) {
-      await handleFetchAnswerSteaming(
-        question,
-        signal,
-        state.preference.token,
-        state.preference.selectedDocs!,
-        state.conversation.queries,
-        currentConversationId,
-        state.preference.prompt.id,
-        state.preference.chunks,
-        state.preference.token_limit,
-        (event) => {
-          const data = JSON.parse(event.data);
-          const targetIndex = indx ?? state.conversation.queries.length - 1;
+    if (state.preference) {
+      if (API_STREAMING) {
+        await handleFetchAnswerSteaming(
+          question,
+          signal,
+          state.preference.token,
+          state.preference.selectedDocs!,
+          state.conversation.queries,
+          conversationIdToSend,
+          state.preference.prompt.id,
+          state.preference.chunks,
+          state.preference.token_limit,
+          (event) => {
+            const data = JSON.parse(event.data);
+            const targetIndex = indx ?? state.conversation.queries.length - 1;
 
-          // Only process events if they match the current conversation
-          if (currentConversationId === state.conversation.conversationId) {
             if (data.type === 'end') {
               dispatch(conversationSlice.actions.setStatus('idle'));
-              getConversations(state.preference.token)
-                .then((fetchedConversations) => {
-                  dispatch(setConversations(fetchedConversations));
-                })
-                .catch((error) => {
-                  console.error('Failed to fetch conversations: ', error);
-                });
+              if (!isPreview) {
+                getConversations(state.preference.token)
+                  .then((fetchedConversations) => {
+                    dispatch(setConversations(fetchedConversations));
+                  })
+                  .catch((error) => {
+                    console.error('Failed to fetch conversations: ', error);
+                  });
+              }
               if (!isSourceUpdated) {
                 dispatch(
                   updateStreamingSource({
-                    conversationId: currentConversationId,
                     index: targetIndex,
                     query: { sources: [] },
                   }),
                 );
               }
             } else if (data.type === 'id') {
-              // Only update the conversationId if it's currently null
-              const currentState = getState() as RootState;
-              if (currentState.conversation.conversationId === null) {
+              if (!isPreview) {
                 dispatch(
                   updateConversationId({
                     query: { conversationId: data.id },
@@ -100,7 +107,6 @@ export const fetchAnswer = createAsyncThunk<
               const result = data.thought;
               dispatch(
                 updateThought({
-                  conversationId: currentConversationId,
                   index: targetIndex,
                   query: { thought: result },
                 }),
@@ -109,7 +115,6 @@ export const fetchAnswer = createAsyncThunk<
               isSourceUpdated = true;
               dispatch(
                 updateStreamingSource({
-                  conversationId: currentConversationId,
                   index: targetIndex,
                   query: { sources: data.source ?? [] },
                 }),
@@ -126,7 +131,6 @@ export const fetchAnswer = createAsyncThunk<
               dispatch(conversationSlice.actions.setStatus('failed'));
               dispatch(
                 conversationSlice.actions.raiseError({
-                  conversationId: currentConversationId,
                   index: targetIndex,
                   message: data.error,
                 }),
@@ -134,87 +138,88 @@ export const fetchAnswer = createAsyncThunk<
             } else {
               dispatch(
                 updateStreamingQuery({
-                  conversationId: currentConversationId,
                   index: targetIndex,
                   query: { response: data.answer },
                 }),
               );
             }
-          }
-        },
-        indx,
-        state.preference.selectedAgent?.id,
-        attachmentIds,
-        true, // Always save conversation
-      );
-    } else {
-      const answer = await handleFetchAnswer(
-        question,
-        signal,
-        state.preference.token,
-        state.preference.selectedDocs!,
-        state.conversation.queries,
-        state.conversation.conversationId,
-        state.preference.prompt.id,
-        state.preference.chunks,
-        state.preference.token_limit,
-        state.preference.selectedAgent?.id,
-        attachmentIds,
-        true, // Always save conversation
-      );
-      if (answer) {
-        let sourcesPrepped = [];
-        sourcesPrepped = answer.sources.map((source: { title: string }) => {
-          if (source && source.title) {
-            const titleParts = source.title.split('/');
-            return {
-              ...source,
-              title: titleParts[titleParts.length - 1],
-            };
-          }
-          return source;
-        });
-
-        const targetIndex = indx ?? state.conversation.queries.length - 1;
-
-        dispatch(
-          updateQuery({
-            index: targetIndex,
-            query: {
-              response: answer.answer,
-              thought: answer.thought,
-              sources: sourcesPrepped,
-              tool_calls: answer.toolCalls,
-            },
-          }),
+          },
+          indx,
+          state.preference.selectedAgent?.id,
+          attachmentIds,
+          save_conversation,
         );
-        dispatch(
-          updateConversationId({
-            query: { conversationId: answer.conversationId },
-          }),
+      } else {
+        const answer = await handleFetchAnswer(
+          question,
+          signal,
+          state.preference.token,
+          state.preference.selectedDocs!,
+          state.conversation.queries,
+          state.conversation.conversationId,
+          state.preference.prompt.id,
+          state.preference.chunks,
+          state.preference.token_limit,
+          state.preference.selectedAgent?.id,
+          attachmentIds,
+          save_conversation,
         );
-        getConversations(state.preference.token)
-          .then((fetchedConversations) => {
-            dispatch(setConversations(fetchedConversations));
-          })
-          .catch((error) => {
-            console.error('Failed to fetch conversations: ', error);
+        if (answer) {
+          let sourcesPrepped = [];
+          sourcesPrepped = answer.sources.map((source: { title: string }) => {
+            if (source && source.title) {
+              const titleParts = source.title.split('/');
+              return {
+                ...source,
+                title: titleParts[titleParts.length - 1],
+              };
+            }
+            return source;
           });
-        dispatch(conversationSlice.actions.setStatus('idle'));
+
+          const targetIndex = indx ?? state.conversation.queries.length - 1;
+
+          dispatch(
+            updateQuery({
+              index: targetIndex,
+              query: {
+                response: answer.answer,
+                thought: answer.thought,
+                sources: sourcesPrepped,
+                tool_calls: answer.toolCalls,
+              },
+            }),
+          );
+          if (!isPreview) {
+            dispatch(
+              updateConversationId({
+                query: { conversationId: answer.conversationId },
+              }),
+            );
+            getConversations(state.preference.token)
+              .then((fetchedConversations) => {
+                dispatch(setConversations(fetchedConversations));
+              })
+              .catch((error) => {
+                console.error('Failed to fetch conversations: ', error);
+              });
+          }
+          dispatch(conversationSlice.actions.setStatus('idle'));
+        }
       }
     }
-  }
-  return {
-    conversationId: null,
-    title: null,
-    answer: '',
-    query: question,
-    result: '',
-    thought: '',
-    sources: [],
-    tool_calls: [],
-  };
-});
+    return {
+      conversationId: null,
+      title: null,
+      answer: '',
+      query: question,
+      result: '',
+      thought: '',
+      sources: [],
+      tool_calls: [],
+    };
+  },
+);
 
 export const conversationSlice = createSlice({
   name: 'conversation',
@@ -237,20 +242,18 @@ export const conversationSlice = createSlice({
     },
     updateStreamingQuery(
       state,
-      action: PayloadAction<{
-        conversationId: string | null;
-        index: number;
-        query: Partial<Query>;
-      }>,
+      action: PayloadAction<{ index: number; query: Partial<Query> }>,
     ) {
-      const { conversationId, index, query } = action.payload;
-      // Only update if this update is for the current conversation
-      if (state.status === 'idle' || state.conversationId !== conversationId)
-        return;
-
+      if (state.status === 'idle') return;
+      const { index, query } = action.payload;
       if (query.response != undefined) {
         state.queries[index].response =
           (state.queries[index].response || '') + query.response;
+      } else {
+        state.queries[index] = {
+          ...state.queries[index],
+          ...query,
+        };
       }
     },
     updateConversationId(
@@ -262,35 +265,28 @@ export const conversationSlice = createSlice({
     },
     updateThought(
       state,
-      action: PayloadAction<{
-        conversationId: string | null;
-        index: number;
-        query: Partial<Query>;
-      }>,
+      action: PayloadAction<{ index: number; query: Partial<Query> }>,
     ) {
-      const { conversationId, index, query } = action.payload;
-      if (state.conversationId !== conversationId) return;
-
+      const { index, query } = action.payload;
       if (query.thought != undefined) {
         state.queries[index].thought =
           (state.queries[index].thought || '') + query.thought;
+      } else {
+        state.queries[index] = {
+          ...state.queries[index],
+          ...query,
+        };
       }
     },
     updateStreamingSource(
       state,
-      action: PayloadAction<{
-        conversationId: string | null;
-        index: number;
-        query: Partial<Query>;
-      }>,
+      action: PayloadAction<{ index: number; query: Partial<Query> }>,
     ) {
-      const { conversationId, index, query } = action.payload;
-      if (state.conversationId !== conversationId) return;
-
+      const { index, query } = action.payload;
       if (!state.queries[index].sources) {
         state.queries[index].sources = query?.sources;
-      } else if (query.sources) {
-        state.queries[index].sources!.push(...query.sources);
+      } else {
+        state.queries[index].sources!.push(query.sources![0]);
       }
     },
     updateToolCall(state, action) {
@@ -327,15 +323,9 @@ export const conversationSlice = createSlice({
     },
     raiseError(
       state,
-      action: PayloadAction<{
-        conversationId: string | null;
-        index: number;
-        message: string;
-      }>,
+      action: PayloadAction<{ index: number; message: string }>,
     ) {
-      const { conversationId, index, message } = action.payload;
-      if (state.conversationId !== conversationId) return;
-
+      const { index, message } = action.payload;
       state.queries[index].error = message;
     },
 

frontend/src/settings/Prompts.tsx

@@ -177,7 +177,7 @@ export default function Prompts({
               rounded="3xl"
               border="border"
               showEdit
-              showDelete={(prompt) => prompt.type !== 'public'}
+              showDelete
               onEdit={({
                 id,
                 name,

frontend/src/store.ts

@@ -8,7 +8,6 @@ import {
   prefSlice,
 } from './preferences/preferenceSlice';
 import uploadReducer from './upload/uploadSlice';
-import agentPreviewReducer from './agents/agentPreviewSlice';
 
 const key = localStorage.getItem('DocsGPTApiKey');
 const prompt = localStorage.getItem('DocsGPTPrompt');
@@ -55,7 +54,6 @@ const store = configureStore({
     conversation: conversationSlice.reducer,
     sharedConversation: sharedConversationSlice.reducer,
     upload: uploadReducer,
-    agentPreview: agentPreviewReducer,
   },
   middleware: (getDefaultMiddleware) =>
     getDefaultMiddleware().concat(prefListenerMiddleware.middleware),