Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix directory uploading

Tomas Valenta10c0b87f8bce
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
index 4e3ed55a5..3f681d9bd 100644
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@ -1,6 +1,3 @@
-// Disable ts check because html attributes for folder uploads are not type in react
-// @ts-nocheck
-
import {
useRef,
useState,
@@ -13,9 +10,9 @@ import Link from 'next/link'
import clsx from 'clsx'
import { useRouter } from 'next/router'
-import { LogFile } from 'utils/agentLogs'
-import { useUploadLog } from 'hooks/useUploadLogs'
-import type { File as BufferFile } from 'buffer'
+import { LogFile, RawFileLog } from 'utils/agentLogs'
+import { useUploadLogs } from 'hooks/useUploadLogs'
+import { useDeleteLogs } from 'hooks/useRemoveLogs'
export interface Props {
logFiles: LogFile[]
@@ -32,48 +29,57 @@ function AgentLogFilesList({
const [selectedLogFileID, setSelectedLogFileID] = useState(initialSelectedLogFileID || '')
const fileInput = useRef<any>(null)
- const uploadFile = useUploadLog(defaultProjectID)
+ const uploadFiles = useUploadLogs(defaultProjectID)
+ const deleteLogs = useDeleteLogs()
function handleClick() {
// trigger the click event of the file input
fileInput.current.click()
}
- async function handleUpload(file: BufferFile) {
- const text = await file.text()
+ async function handleUpload(files: FileList) {
+ const logFiles: RawFileLog[] = []
+
+ for (let i = 0; i < files.length; i++) {
+ const file = files[i]
+ const content = await file.text()
+
+ logFiles.push({
+ filename: file.name,
+ content,
+ metadata: {
+ size: file.size,
+ type: file.type,
+ timestamp: file.lastModified,
+ }
+ })
+ }
- const log = await uploadFile({
- content: text,
- filename: file.name,
- metadata: {
- size: file.size,
- type: file.type,
- timestamp: file.lastModified,
- },
- })
+ const logEntry = await uploadFiles(logFiles, {})
// Reload to refresh the list of
router.reload()
}
async function handleFileChange(event: any) {
- const file: BufferFile = event.target.files[0]
- await handleUpload(file)
+ if (event.target.files.length === 0) return
+ console.log('Files', event.target.files)
+ await handleUpload(event.target.files)
}
const handleDrag = function (e: any) {
e.preventDefault()
e.stopPropagation()
if (e.type === 'dragenter' || e.type === 'dragover') {
- } else if (e.type === 'dragleave') {
- }
+ } else if (e.type === 'dragleave') { }
}
async function handleDrop(e: any) {
e.preventDefault()
e.stopPropagation()
- if (e.dataTransfer.files && e.dataTransfer.files[0]) {
- await handleUpload(e.dataTransfer.files[0])
+ if (e.dataTransfer.files && e.dataTransfer.files.length > 0) {
+ console.log('Files', e.dataTransfer.files)
+ await handleUpload(e.dataTransfer.files)
}
}
@@ -94,6 +100,7 @@ function AgentLogFilesList({
style={{ display: 'none' }}
ref={fileInput}
onChange={handleFileChange}
+ // @ts-ignore
directory=""
webkitdirectory=""
mozdirectory=""
diff --git a/hooks/useRemoveLogs.ts b/hooks/useRemoveLogs.ts
index fd3c42183..c654c568b 100644
--- a/hooks/useRemoveLogs.ts
+++ b/hooks/useRemoveLogs.ts
@@ -18,14 +18,12 @@ async function handleDeleteLogs(url: string, { arg }: { arg: DeleteLogs }) {
return await response.json() as DeleteLogsResponse
}
-export function useRemoveLog() {
+export function useDeleteLogs() {
const {
trigger: remove,
} = useSWRMutation('/api/logs', handleDeleteLogs)
- const deleteLogs = useCallback(async (logID: string) => remove({
+ return useCallback(async (logID: string) => remove({
id: logID,
}), [remove])
-
- return deleteLogs
}
diff --git a/hooks/useUploadLogs.ts b/hooks/useUploadLogs.ts
index 9770ab606..15f43ec76 100644
--- a/hooks/useUploadLogs.ts
+++ b/hooks/useUploadLogs.ts
@@ -1,11 +1,12 @@
import { useCallback } from 'react'
import useSWRMutation from 'swr/mutation'
-import { RawFileLog } from 'utils/agentLogs'
+import { LogsMetadata, RawFileLog } from 'utils/agentLogs'
export interface PostLogs {
logFiles: RawFileLog[]
projectID: string
+ metadata: LogsMetadata
}
export interface PostLogsResponse {
@@ -23,16 +24,15 @@ async function handlePostLogs(url: string, { arg }: { arg: PostLogs }) {
return await response.json() as PostLogsResponse
}
-export function useUploadLog(projectID: string) {
+export function useUploadLogs(projectID: string) {
const {
trigger: upload,
} = useSWRMutation('/api/logs', handlePostLogs)
- const uploadLog = useCallback(async (logFiles: RawFileLog[]) =>
+ return useCallback(async (logFiles: RawFileLog[], metadata: LogsMetadata) =>
upload({
logFiles,
projectID,
+ metadata,
}), [projectID, upload])
-
- return uploadLog
-}
+}
\ No newline at end of file
diff --git a/pages/api/logs/index.ts b/pages/api/logs/index.ts
index 6263afe93..9588c6aee 100644
--- a/pages/api/logs/index.ts
+++ b/pages/api/logs/index.ts
@@ -84,6 +84,7 @@ async function postLogs(req: NextApiRequest, res: NextApiResponse) {
const {
logFiles,
projectID,
+ metadata,
} = req.body as PostLogs
try {
@@ -137,6 +138,7 @@ async function postLogs(req: NextApiRequest, res: NextApiResponse) {
const logs = await prisma.logs.create({
data: {
data: logFiles as any,
+ metadata: metadata,
projects: {
connect: {
id: projectID,
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index ca15f9006..8b9c34119 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -313,6 +313,7 @@ model logs {
created_at DateTime? @default(now()) @db.Timestamptz(6)
data Json[]
project_id String
+ metadata Json?
projects projects @relation(fields: [project_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
@@schema("public")
diff --git a/utils/agentLogs.ts b/utils/agentLogs.ts
index 377667095..48a292a9a 100644
--- a/utils/agentLogs.ts
+++ b/utils/agentLogs.ts
@@ -8,6 +8,10 @@ export interface RawFileLog {
}
}
+export interface LogsMetadata {
+
+}
+
export interface LogFile {
id: string
name: string