fix qa comments set 3

Author: Subash-Mohan

backend/onyx/server/features/projects/api.py

@@ -505,6 +505,44 @@ def get_chat_session_project_token_count(
     return TokenCountResponse(total_tokens=int(total_tokens))
 
 
+@router.get("/session/{chat_session_id}/files")
+def get_chat_session_project_files(
+    chat_session_id: str,
+    user: User | None = Depends(current_user),
+    db_session: Session = Depends(get_session),
+) -> list[UserFileSnapshot]:
+    """Return user files for the project linked to the given chat session.
+
+    If the chat session has no project, returns an empty list.
+    Only returns files owned by the current user and not FAILED.
+    """
+    user_id = user.id if user is not None else None
+
+    chat_session = (
+        db_session.query(ChatSession)
+        .filter(ChatSession.id == chat_session_id, ChatSession.user_id == user_id)
+        .one_or_none()
+    )
+    if chat_session is None:
+        raise HTTPException(status_code=404, detail="Chat session not found")
+
+    if chat_session.project_id is None:
+        return []
+
+    user_files = (
+        db_session.query(UserFile)
+        .filter(
+            UserFile.projects.any(id=chat_session.project_id),
+            UserFile.user_id == user_id,
+            UserFile.status != UserFileStatus.FAILED,
+        )
+        .order_by(UserFile.created_at.desc())
+        .all()
+    )
+
+    return [UserFileSnapshot.from_model(user_file) for user_file in user_files]
+
+
 @router.get("/{project_id}/token-count", response_model=TokenCountResponse)
 def get_project_token_count(
     project_id: int,

web/src/app/admin/assistants/AssistantEditor.tsx

@@ -90,9 +90,6 @@ import useSWR from "swr";
 import { errorHandlingFetcher } from "@/lib/fetcher";
 import { ConfirmEntityModal } from "@/components/modals/ConfirmEntityModal";
 
-import { FilePickerModal } from "@/app/chat/my-documents/components/FilePicker";
-import { useDocumentsContext } from "@/app/chat/my-documents/DocumentsContext";
-
 import {
   IMAGE_GENERATION_TOOL_ID,
   SEARCH_TOOL_ID,
@@ -173,7 +170,6 @@ export function AssistantEditor({
 
   const [presentingDocument, setPresentingDocument] =
     useState<MinimalOnyxDocument | null>(null);
-  const [filePickerModalOpen, setFilePickerModalOpen] = useState(false);
   const [showAdvancedOptions, setShowAdvancedOptions] = useState(false);
   const [showAllUserFiles, setShowAllUserFiles] = useState(false);
 
@@ -1109,6 +1105,12 @@ export function AssistantEditor({
                                 showTriggerLabel
                                 triggerLabel="Add User  Files"
                                 recentFiles={recentFiles}
+                                onFileClick={(file: ProjectFile) => {
+                                  setPresentingDocument({
+                                    document_id: `project_file__${file.file_id}`,
+                                    semantic_identifier: file.name,
+                                  });
+                                }}
                                 onPickRecent={(file: ProjectFile) => {
                                   if (!values.user_file_ids.includes(file.id)) {
                                     setFieldValue("user_file_ids", [

web/src/app/chat/components/ChatPage.tsx

@@ -524,7 +524,7 @@ export function ChatPage({
       setSelectedAssistantFromId,
     });
 
-  const { onMessageSelection, currentSessionFileTokenCount } =
+  const { onMessageSelection, currentSessionFileTokenCount, projectFiles } =
     useChatSessionController({
       existingChatSessionId,
       searchParams,
@@ -906,6 +906,7 @@ export function ChatPage({
               maxTokens={maxTokens}
               initialWidth={400}
               isOpen={true}
+              projectFiles={projectFiles}
             />
           </Modal>
         </div>
@@ -1059,6 +1060,7 @@ export function ChatPage({
               maxTokens={maxTokens}
               initialWidth={400}
               isOpen={documentSidebarVisible && !settings?.isMobile}
+              projectFiles={projectFiles}
             />
           </div>
 
@@ -1159,6 +1161,7 @@ export function ChatPage({
                             llmManager={llmManager}
                             deepResearchEnabled={deepResearchEnabled}
                             currentMessageFiles={currentMessageFiles}
+                            projectFiles={projectFiles}
                             setPresentingDocument={setPresentingDocument}
                             setCurrentFeedback={setCurrentFeedback}
                             onSubmit={onSubmit}
@@ -1223,6 +1226,9 @@ export function ChatPage({
                                     availableContextTokens={
                                       availableContextTokens
                                     }
+                                    setPresentingDocument={
+                                      setPresentingDocument
+                                    }
                                   />
                                 )}
                               <ChatInputBar
@@ -1253,6 +1259,7 @@ export function ChatPage({
                                   handleMessageSpecificFileUpload
                                 }
                                 textAreaRef={textAreaRef}
+                                setPresentingDocument={setPresentingDocument}
                               />
                             </div>
 

web/src/app/chat/components/MessagesDisplay.tsx

@@ -18,6 +18,7 @@ interface MessagesDisplayProps {
   llmManager: { currentLlm: LlmDescriptor | null };
   deepResearchEnabled: boolean;
   currentMessageFiles: ProjectFile[];
+  projectFiles: ProjectFile[];
   setPresentingDocument: (doc: MinimalOnyxDocument | null) => void;
   setCurrentFeedback: (feedback: [FeedbackType, number] | null) => void;
   onSubmit: (args: {
@@ -58,6 +59,7 @@ export const MessagesDisplay: React.FC<MessagesDisplayProps> = ({
   llmManager,
   deepResearchEnabled,
   currentMessageFiles,
+  projectFiles,
   setPresentingDocument,
   setCurrentFeedback,
   onSubmit,
@@ -204,6 +206,7 @@ export const MessagesDisplay: React.FC<MessagesDisplayProps> = ({
                   parentMessage?.childrenNodeIds ?? emptyChildrenIds
                 }
                 onMessageSelection={onMessageSelection}
+                projectFiles={projectFiles}
               />
             </div>
           );

web/src/app/chat/components/documentSidebar/DocumentResults.tsx

@@ -1,7 +1,6 @@
 import { MinimalOnyxDocument, OnyxDocument } from "@/lib/search/interfaces";
 import { ChatDocumentDisplay } from "./ChatDocumentDisplay";
 import { removeDuplicateDocs } from "@/lib/documentUtils";
-import { ChatFileType } from "@/app/chat/interfaces";
 import {
   Dispatch,
   ForwardedRef,
@@ -16,6 +15,31 @@ import {
   useCurrentMessageTree,
   useSelectedNodeForDocDisplay,
 } from "../../stores/useChatSessionStore";
+import type { ProjectFile } from "@/app/chat/projects/projectsService";
+
+// Build an OnyxDocument from basic file info
+const buildOnyxDocumentFromFile = (
+  id: string,
+  name?: string | null,
+  appendProjectPrefix?: boolean
+): OnyxDocument => {
+  const document_id = appendProjectPrefix ? `project_file__${id}` : id;
+  return {
+    document_id,
+    semantic_identifier: name || id,
+    link: "",
+    source_type: "file" as any,
+    blurb: "",
+    boost: 0,
+    hidden: false,
+    score: 1,
+    chunk_ind: 0,
+    match_highlights: [],
+    metadata: {},
+    updated_at: null,
+    is_internet: false,
+  } as any;
+};
 
 interface DocumentResultsProps {
   closeSidebar: () => void;
@@ -29,6 +53,7 @@ interface DocumentResultsProps {
   isSharedChat?: boolean;
   modal: boolean;
   setPresentingDocument: Dispatch<SetStateAction<MinimalOnyxDocument | null>>;
+  projectFiles?: ProjectFile[];
 }
 
 const DocumentResultsComponent = (
@@ -44,6 +69,7 @@ const DocumentResultsComponent = (
     isSharedChat,
     isOpen,
     setPresentingDocument,
+    projectFiles = [],
   }: DocumentResultsProps,
   ref: ForwardedRef<HTMLDivElement>
 ) => {
@@ -80,7 +106,7 @@ const DocumentResultsComponent = (
     : null;
 
   const humanFileDescriptors = humanMessage?.files.filter(
-    (file) => file.type == ChatFileType.USER_KNOWLEDGE
+    (file) => file.user_file_id !== null
   );
   const selectedDocumentIds =
     selectedDocuments?.map((document) => document.document_id) || [];
@@ -103,6 +129,15 @@ const DocumentResultsComponent = (
       !citedDocumentIds.has(doc.document_id)
   );
 
+  const hasDocs = dedupedDocuments.length > 0;
+  const hasCited = citedDocuments.length > 0;
+  const hasOther = otherDocuments.length > 0;
+  const hasHumanFiles = (humanFileDescriptors?.length || 0) > 0;
+  const hasProjectFiles = (projectFiles?.length || 0) > 0;
+  const showCloseInUserFiles = !hasCited && !hasOther && hasHumanFiles;
+  const showCloseInProjectFiles =
+    !hasCited && !hasOther && !hasHumanFiles && hasProjectFiles;
+
   return (
     <>
       <div
@@ -127,10 +162,11 @@ const DocumentResultsComponent = (
         >
           <div className="flex flex-col h-full">
             <div className="overflow-y-auto h-fit mb-8 pb-8 sm:mx-0 flex-grow gap-y-0 default-scrollbar dark-scrollbar flex flex-col">
-              {dedupedDocuments.length > 0 ? (
+              {/* Documents Sections */}
+              {hasDocs && (
                 <>
                   {/* Cited Documents Section */}
-                  {citedDocuments.length > 0 && (
+                  {hasCited && (
                     <div className="mt-4">
                       <div className="px-4 pb-3 pt-2 flex justify-between border-b border-border">
                         <h3 className="text-base font-semibold text-text-700">
@@ -175,7 +211,7 @@ const DocumentResultsComponent = (
                   )}
 
                   {/* Other Documents Section */}
-                  {otherDocuments.length > 0 && (
+                  {hasOther && (
                     <div className="mt-4">
                       <>
                         <div className="px-4 pb-3 pt-2 border-b border-border">
@@ -215,7 +251,90 @@ const DocumentResultsComponent = (
                     </div>
                   )}
                 </>
-              ) : null}
+              )}
+
+              {/* Human Files Section */}
+              {humanFileDescriptors && humanFileDescriptors.length > 0 && (
+                <div className="mt-4">
+                  <div className="px-4 pb-3 pt-2 flex justify-between border-b border-border">
+                    <h3 className="text-base font-semibold text-text-700">
+                      User Files
+                    </h3>
+                    {showCloseInUserFiles && (
+                      <button
+                        aria-label="Close sidebar"
+                        title="Close"
+                        className="my-auto p-1 rounded transition-colors hover:bg-neutral-200 dark:hover:bg-neutral-700"
+                        onClick={closeSidebar}
+                      >
+                        <XIcon size={16} />
+                      </button>
+                    )}
+                  </div>
+                  {humanFileDescriptors.map((f) => (
+                    <div key={f.id} className={`desktop:px-2 w-full mb-2`}>
+                      <ChatDocumentDisplay
+                        setPresentingDocument={setPresentingDocument}
+                        closeSidebar={closeSidebar}
+                        modal={modal}
+                        document={buildOnyxDocumentFromFile(
+                          f.id,
+                          f.name,
+                          false
+                        )}
+                        isSelected={false}
+                        handleSelect={() => {}}
+                        hideSelection={true}
+                        tokenLimitReached={false}
+                      />
+                    </div>
+                  ))}
+                </div>
+              )}
+
+              {/* Project Files Section */}
+              {projectFiles && projectFiles.length > 0 && (
+                <div className="mt-4">
+                  <div className="px-4 pb-3 pt-2 flex justify-between border-b border-border">
+                    <h3 className="text-base font-semibold text-text-700">
+                      Project Files
+                    </h3>
+                    {showCloseInProjectFiles && (
+                      <button
+                        aria-label="Close sidebar"
+                        title="Close"
+                        className="my-auto p-1 rounded transition-colors hover:bg-neutral-200 dark:hover:bg-neutral-700"
+                        onClick={closeSidebar}
+                      >
+                        <XIcon size={16} />
+                      </button>
+                    )}
+                  </div>
+                  {projectFiles.slice(0, 20).map((f) => (
+                    <div key={f.id} className={`desktop:px-2 w-full mb-2`}>
+                      <ChatDocumentDisplay
+                        setPresentingDocument={setPresentingDocument}
+                        closeSidebar={closeSidebar}
+                        modal={modal}
+                        document={buildOnyxDocumentFromFile(
+                          f.file_id,
+                          f.name,
+                          true
+                        )}
+                        isSelected={false}
+                        handleSelect={() => {}}
+                        hideSelection={true}
+                        tokenLimitReached={false}
+                      />
+                    </div>
+                  ))}
+                  {projectFiles.length > 20 && (
+                    <div className="text-text-500 px-4 py-2 text-xs">
+                      +{projectFiles.length - 20} more
+                    </div>
+                  )}
+                </div>
+              )}
             </div>
           </div>
         </div>