Fix types and remove unncessary code

frontend/src/StateProvider.tsx

@@ -7,7 +7,7 @@ export const StateContext = createContext<{
   stagedFiles: File[]
   setStagedFiles: React.Dispatch<React.SetStateAction<File[]>>
   handleFileRemove: (index: number) => void
-  handleFileSelection: (file: File) => void
+  handleFileSelection: (event: React.ChangeEvent<HTMLInputElement>) => void
   loading: boolean
   setLoading: React.Dispatch<React.SetStateAction<boolean>>
   query: string
@@ -23,31 +23,33 @@ export const StateContextProvider: React.FC<{ children: React.ReactNode }> = ({
   const [query, setQuery] = useState<string>("")
   const { toast } = useToast()
 
-  const handleFileSelection = (event) => {
-    const files = Array.from(event.target!.files) as File[]
+  const handleFileSelection = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const files = event?.target?.files
     const validFiles: File[] = [] // Array to hold files that pass validation
 
-    files.forEach((file: File) => {
-      // File size check: 20 MB limit
-      const fileSizeInMB = file.size / (1024 * 1024)
-      if (fileSizeInMB > 20) {
-        toast({
-          title: `File Too Large`,
-          description: `The file "${file.name}" exceeds the 20MB size limit. Please choose a smaller file.`,
-          variant: "destructive",
-        })
-      } else if (!isSupportedFileType(file.type)) {
-        // Check for unsupported file types
-        toast({
-          title: "File Type not supported",
-          description: `The file "${file.name}" is of type "${file.type}", which is not supported. Please upload a valid file type.`,
-          variant: "destructive",
-        })
-      } else {
-        // If valid, add the file to the validFiles array
-        validFiles.push(file)
-      }
-    })
+    if (files) {
+      Array.from(files).forEach((file) => {
+        // File size check: 20 MB limit
+        const fileSizeInMB = file.size / (1024 * 1024)
+        if (fileSizeInMB > 20) {
+          toast({
+            title: `File Too Large`,
+            description: `The file "${file.name}" exceeds the 20MB size limit. Please choose a smaller file.`,
+            variant: "destructive",
+          })
+        } else if (!isSupportedFileType(file.type)) {
+          // Check for unsupported file types
+          toast({
+            title: "File Type not supported",
+            description: `The file "${file.name}" is of type "${file.type}", which is not supported. Please upload a valid file type.`,
+            variant: "destructive",
+          })
+        } else {
+          // If valid, add the file to the validFiles array
+          validFiles.push(file)
+        }
+      })
+    }
 
     setStagedFiles((prev) => {
       if (prev.length + validFiles.length > 5) {

frontend/src/components/ChatBox.tsx

@@ -14,7 +14,7 @@ interface ChatBoxProps {
   handleSend: (messageToSend: string) => void
   stagedFiles: File[]
   handleFileRemove: (index: number) => void
-  handleFileSelection: (event: any) => void // todo fix any
+  handleFileSelection: (event: React.ChangeEvent<HTMLInputElement>) => void
   loading: boolean
   isStreaming?: boolean
 }

frontend/src/routes/_authenticated/chat.tsx

@@ -10,7 +10,7 @@ import {
 } from "@tanstack/react-router"
 import { Bookmark, Copy, Ellipsis, Eye, EyeOff, File } from "lucide-react"
 import { useEffect, useRef, useState } from "react"
-import { ChatSSEvents, SelectPublicMessage, Citation } from "shared/types"
+import { ChatSSEvents, SelectPublicMessage, Citation, AttachmentMetadata } from "shared/types"
 import AssistantLogo from "@/assets/assistant-logo.svg"
 import Retry from "@/assets/retry.svg"
 import { PublicUser, PublicWorkspace } from "shared/types"
@@ -154,9 +154,6 @@ export const ChatPage = ({ user, workspace }: ChatPageProps) => {
       setLoading(true)
       uploadedFilesMetadata = await handleFileUpload()
       setStagedFiles([])
-      if (uploadedFilesMetadata.length !== 0) {
-        console.log(`handleFileUpload ran sucessfully...`)
-      }
       setLoading(false)
     }
 
@@ -175,7 +172,6 @@ export const ChatPage = ({ user, workspace }: ChatPageProps) => {
     setCurrentResp({ resp: "" })
     currentRespRef.current = { resp: "", sources: [] }
 
-    console.log(`Message Create API called...`)
     const url = new URL(`/api/v1/message/create`, window.location.origin)
     if (chatId) {
       url.searchParams.append("chatId", chatId)
@@ -520,7 +516,6 @@ export const ChatPage = ({ user, workspace }: ChatPageProps) => {
               {currentResp && (
                 <ChatMessage
                   message={currentResp.resp}
-                  attachments={currentResp.attachments}
                   citations={currentResp.sources?.map((c: Citation) => c.url)}
                   isUser={false}
                   responseDone={false}
@@ -642,7 +637,7 @@ const ChatMessage = ({
   sourcesVisible,
 }: {
   message: string
-  attachments: any
+  attachments?: AttachmentMetadata[]
   isUser: boolean
   responseDone: boolean
   isRetrying?: boolean
@@ -685,10 +680,10 @@ const ChatMessage = ({
     >
       {isUser ? (
         <>
-          {attachments?.length > 0 && (
+          {attachments && attachments?.length > 0 && (
             <div className="flex-col w-full">
               <ul className="flex flex-col space-y-2 pb-2">
-                {attachments.map((attachment, index) => (
+                {attachments?.map((attachment, index) => (
                   <li
                     key={index}
                     className="flex items-center p-2 border rounded border-gray-300 min-w-[200px] max-w-[300px]"

server/ai/context.ts

@@ -6,6 +6,7 @@ import {
   mailSchema,
   userSchema,
   VespaSearchResultsSchema,
+  type VespaChatAttachmentSearch,
   type VespaEventSearch,
   type VespaFileSearch,
   type VespaMailSearch,
@@ -39,15 +40,14 @@ ${fields.chunks_summary && fields.chunks_summary.length ? `Content: ${fields.chu
 }
 
 const constructChatAttachmentContext = (
-  fields: VespaFileSearch,
+  fields: VespaChatAttachmentSearch,
   relevance: number,
 ): string => {
   return `Title: ${fields.title ? `Title: ${fields.title}` : ""}
 Created: ${getRelativeTime(fields.createdAt)}
 Updated At: ${getRelativeTime(fields.updatedAt)}
 ${fields.ownerEmail ? `Owner Email: ${fields.ownerEmail}` : ""}
 ${fields.mimeType ? `Mime Type: ${fields.mimeType}` : ""}
-${fields.permissions ? `Permissions: ${fields.permissions.join(", ")}` : ""}
 ${fields.chunks_summary && fields.chunks_summary.length ? `Content: ${fields.chunks_summary.slice(0, maxSummaryChunks).join("\n")}` : ""}
 \nvespa relevance score: ${relevance}\n`
 }
@@ -390,4 +390,4 @@ export const replaceLinks = (text: string): string => {
       return match
     }
   })
-}
+}

server/api/chat.ts

@@ -278,13 +278,12 @@ const handlePDFFile = async (file: Blob, userEmail: string) => {
 
 export const UploadFilesApi = async (c: Context) => {
   try {
-    //todo schema
     const { sub } = c.get(JwtPayloadKey)
     const email = sub
 
     const formData = await c.req.formData()
     const files = formData.getAll("files") as File[]
-    const metadata: any[] = []
+    const metadata: AttachmentMetadata[] = []
 
     for (const file of files) {
       // Parse file according to its type
@@ -301,7 +300,6 @@ export const UploadFilesApi = async (c: Context) => {
       }
     }
 
-    Logger.info(`Returning metadata`)
     return c.json({ attachmentsMetadata: metadata })
   } catch (error) {
     const errMsg = getErrorMessage(error)
@@ -372,6 +370,15 @@ const MinimalCitationSchema = z.object({
 
 export type Citation = z.infer<typeof MinimalCitationSchema>
 
+const AttachmentMetadataSchema = z.object({
+  docId: z.string(),
+  fileName: z.string(),
+  fileSize: z.number(),
+  fileType: z.string(),
+})
+
+export type AttachmentMetadata = z.infer<typeof AttachmentMetadataSchema>
+
 interface CitationResponse {
   answer?: string
   citations?: number[]
@@ -411,7 +418,6 @@ const searchToCitation = (
       })
     } else if (result.fields.sddocname === chatAttachmentSchema) {
       citations.push({
-        // todo
         title: fields?.title,
         sddocname: fields?.sddocname,
         mimeType: fields?.mimeType,
@@ -915,7 +921,6 @@ export const MessageApiV2 = async (c: Context) => {
   // if the value exists then we send the error to the frontend via it
   let stream: any
   try {
-    Logger.info(`MessageApiV2 called....`)
     const { sub, workspaceId } = c.get(JwtPayloadKey)
     const email = sub
     // @ts-ignore

server/api/search.ts

@@ -163,10 +163,6 @@ export const SearchApi = async (c: Context) => {
     )
   }
 
-  console.log("\nresults")
-  console.log(results.root.children)
-  console.log("results\n")
-
   // TODO: deduplicate for google admin and contacts
   const newResults = VespaSearchResponseToSearchResult(results)
   newResults.groupCount = groupCount

server/search/types.ts

@@ -274,7 +274,11 @@ export const VespaChatAttachmentSearchSchema = VespaChatAttachmentSchema.extend(
   {
     sddocname: z.literal("chatAttachment"),
   },
-).merge(defaultVespaFieldsSchema)
+)
+  .merge(defaultVespaFieldsSchema)
+  .extend({
+    chunks_summary: z.array(z.string()).optional(),
+  })
 
 export const VespaMailGetSchema = VespaMailSchema.merge(
   defaultVespaFieldsSchema,
@@ -427,6 +431,7 @@ export type VespaSearchResponse = z.infer<typeof VespaSearchResponseSchema>
 
 export type VespaFileGet = z.infer<typeof VespaFileGetSchema>
 export type VespaFileSearch = z.infer<typeof VespaFileSearchSchema>
+export type VespaChatAttachmentSearch = z.infer<typeof VespaChatAttachmentSearchSchema>
 export type VespaMailSearch = z.infer<typeof VespaMailSearchSchema>
 export type VespaEventSearch = z.infer<typeof VespaEventSearchSchema>
 export type VespaFile = z.infer<typeof VespaFileSchema>

server/shared/types.ts

@@ -25,7 +25,7 @@ import { z } from "zod"
 // @ts-ignore
 export type { MessageReqType } from "@/api/search"
 // @ts-ignore
-export type { Citation } from "@/api/chat"
+export type { Citation, AttachmentMetadata } from "@/api/chat"
 export type {
   SelectPublicMessage,
   PublicUser,