Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Change upload for the new DB model

Tomas Valentadf7ae143ef2e
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
index 067546dd7..875fed71e 100644
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@ -12,6 +12,7 @@ import { useRouter } from 'next/router'
import { useUploadLogs } from 'hooks/useUploadLogs'
import { useDeleteLogs } from 'hooks/useRemoveLogs'
import { LiteLogUpload } from 'pages'
+import { log_files } from '@prisma/client'
export interface Props {
logUploads: LiteLogUpload[]
@@ -37,28 +38,28 @@ function AgentLogFilesList({
}
async function handleUpload(files: FileList) {
- const logFiles: [] = []
+ const logFiles: Pick<log_files, 'content' | 'filename' | 'relativePath' | 'size' | 'last_modified' | 'type'>[] = []
for (let i = 0; i < files.length; i++) {
const file = files[i]
const content = await file.text()
+ if (file.name.startsWith('.')) continue
-
logFiles.push({
filename: file.name,
+ relativePath: file.webkitRelativePath,
+ type: file.type,
content,
- metadata: {
- relativePath: file.webkitRelativePath,
- size: file.size,
- type: file.type,
- timestamp: file.lastModified,
- }
+ last_modified: new Date(file.lastModified),
+ size: file.size,
})
}
- await uploadFiles(logFiles, {})
+
+ console.log('NEW LOGS', logFiles)
+ await uploadFiles(logFiles)
// Reload to refresh the list of log files
- router.reload()
+ // router.reload()
}
async function handleFileChange(event: any) {
@@ -162,30 +163,15 @@ function AgentLogFilesList({
>
{logUpload.id}
</span>
- <div
- className="cursor-pointer"
- onClick={async () => {
- try {
- const res = await deleteLogs(logUpload.id)
- console.log(res)
- router.reload()
- } catch (err) {
- console.error(err)
- }
- }}
- >
- Delete
- </div>
</div>
{logUpload.log_files.map((f, i) =>
<div
key={i}
className={clsx(
- 'flex items-center space-x-2 p-2 cursor-pointer hover:bg-gray-700 transition-all rounded-md',
+ 'flex items-center space-x-2 p-2 cursor-pointer hover:bg-gray-700 transition-all rounded-md justify-between',
selectedLogFileID === f.id && 'bg-gray-700',
selectedLogFileID !== f.id && 'bg-gray-800',
)}
- onClick={() => toggleSelectedLogFileID(f.id, f.filename)}
>
<File size={14} className="text-gray-500" />
<span
@@ -195,9 +181,24 @@ function AgentLogFilesList({
'font-semibold',
selectedLogFileID === f.id && 'font-semibold',
)}
+ onClick={() => toggleSelectedLogFileID(f.id, f.filename)}
>
{f.filename}
</span>
+ <div
+ className="cursor-pointer"
+ onClick={async () => {
+ try {
+ const res = await deleteLogs(f.id)
+ console.log(res)
+ router.reload()
+ } catch (err) {
+ console.error(err)
+ }
+ }}
+ >
+ Delete
+ </div>
</div>
)
}
diff --git a/hooks/useUploadLogs.ts b/hooks/useUploadLogs.ts
index 15f43ec76..b0366b708 100644
--- a/hooks/useUploadLogs.ts
+++ b/hooks/useUploadLogs.ts
@@ -1,12 +1,14 @@
+import { log_files } from 'db/prisma'
import { useCallback } from 'react'
import useSWRMutation from 'swr/mutation'
-import { LogsMetadata, RawFileLog } from 'utils/agentLogs'
+export interface FileUpload extends Pick<log_files, 'content' | 'filename' | 'relativePath' | 'size' | 'last_modified' | 'type'> {
+
+}
export interface PostLogs {
- logFiles: RawFileLog[]
+ logFiles: FileUpload[]
projectID: string
- metadata: LogsMetadata
}
export interface PostLogsResponse {
@@ -29,10 +31,9 @@ export function useUploadLogs(projectID: string) {
trigger: upload,
} = useSWRMutation('/api/logs', handlePostLogs)
- return useCallback(async (logFiles: RawFileLog[], metadata: LogsMetadata) =>
+ return useCallback(async (logFiles: FileUpload[]) =>
upload({
logFiles,
projectID,
- metadata,
}), [projectID, upload])
}
\ No newline at end of file
diff --git a/pages/api/logs/index.ts b/pages/api/logs/index.ts
index bddfeef01..0702f0e6f 100644
--- a/pages/api/logs/index.ts
+++ b/pages/api/logs/index.ts
@@ -84,7 +84,6 @@ async function postLogs(req: NextApiRequest, res: NextApiResponse) {
const {
logFiles,
projectID,
- metadata,
} = req.body as PostLogs
try {
@@ -135,16 +134,22 @@ async function postLogs(req: NextApiRequest, res: NextApiResponse) {
})
}
- const logs = await prisma.logs.create({
+ const logs = await prisma.log_uploads.create({
data: {
- data: logFiles as any,
- metadata: metadata,
projects: {
connect: {
id: projectID,
},
},
- }
+ log_files: {
+ createMany: {
+ data: logFiles.map(l => ({
+ ...l,
+ project_id: projectID,
+ })),
+ },
+ },
+ },
})
res.status(200).json({
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 3c0103dec..631e5ea76 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -335,15 +335,16 @@ model feedback {
/// This model contains row level security and requires additional setup for migrations. Visit https://pris.ly/d/row-level-security for more info.
model log_files {
- id String @id @db.Uuid
+ id String @id @default(dbgenerated("gen_random_uuid()")) @db.Uuid
created_at DateTime? @default(now()) @db.Timestamptz(6)
content String @default("")
filename String
- size BigInt
+ size Int
relativePath String
last_modified DateTime @db.Timestamptz(6)
project_id String
log_upload_id String? @db.Uuid
+ type String?
log_upload log_uploads? @relation(fields: [log_upload_id], references: [id], onDelete: Cascade, onUpdate: NoAction)
projects projects @relation(fields: [project_id], references: [id], onDelete: Cascade, onUpdate: NoAction)