Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Add client side upload logs fetching
Tomas Valenta0682ce82b40e
diff --git a/components/UploadFiletree.tsx b/components/AgentLogFilesList/UploadFiletree.tsxsimilarity index 82%rename from components/UploadFiletree.tsxrename to components/AgentLogFilesList/UploadFiletree.tsxindex 4a5e38ddc..516e7c88f 100644--- a/components/UploadFiletree.tsx+++ b/components/AgentLogFilesList/UploadFiletree.tsx@@ -2,28 +2,33 @@ import { useCallback } from 'react'import path from 'path-browserify'import Filesystem, { FileInfo } from 'components/Filesystem'-import { LiteLogFile, LiteLogUpload } from 'utils/agentLogs'+import { AgentChallengeTag, LiteLogFile } from 'utils/agentLogs'import { FiletreeProvider } from 'hooks/useFiletree'+import { log_uploads } from 'db/prisma'export interface Props {- log: LiteLogUpload+ logUpload: log_uploads+ logFiles: {+ id: string;+ relativePath: string;+ filename: string;+ }[]selectedLogFile?: LiteLogFile}function UploadTree({- log: logUpload,+ logUpload,selectedLogFile,+ logFiles,}: Props) {const fetchLogDirContent = useCallback<(dirpath: string) => (FileInfo & { id?: string, logUploadID: string, href?: any })[]>(dirpath => {const currentDir = dirpath.slice(1)- const childFiles = logUpload- .log_files+ const childFiles = logFiles.filter(f => {return path.dirname(f.relativePath) === currentDir})- const filesInChildDirs = logUpload- .log_files+ const filesInChildDirs = logFiles.filter(f => {const fileDir = path.dirname(f.relativePath)return fileDir !== currentDir && fileDir.startsWith(currentDir)@@ -60,14 +65,13 @@ function UploadTree({name: dir,isDir: true,// Filter out tags that don't belong to this dir.- tags: logUpload.tags.filter(t => t.path === `/${dir}`),+ tags: (logUpload.tags as unknown as AgentChallengeTag[]).filter(t => t.path === `/${dir}`),logUploadID: logUpload.id,})),]- .sort((a, b) => a.name.localeCompare(b.name))return content- }, [logUpload])+ }, [logUpload, logFiles])return (<div className="flex flex-col items-start justify-start">diff --git a/components/AgentLogFilesList/UploadedLogsDetail.tsx b/components/AgentLogFilesList/UploadedLogsDetail.tsxindex 85cc5f306..75360e38c 100644--- a/components/AgentLogFilesList/UploadedLogsDetail.tsx+++ b/components/AgentLogFilesList/UploadedLogsDetail.tsx@@ -4,12 +4,29 @@ import { useEffect, useState } from 'react'import { useRouter } from 'next/router'import RenameLogUploadButton from 'components/RenameLogUploadButton'-import UploadTree from 'components/UploadFiletree'+import UploadTree from 'components/AgentLogFilesList/UploadFiletree'import { useRenameLogUpload } from 'hooks/useRenameLogUpload'-import { LiteLogFile, LiteLogUpload } from 'utils/agentLogs'+import { LiteLogFile } from 'utils/agentLogs'+import { SupabaseClient, useSupabaseClient } from '@supabase/auth-helpers-react'+import { Database } from 'db/supabase'+import { formatLogFileContent } from 'utils/formatLogFileContent'+import { log_uploads } from 'db/prisma'++async function getUploadLogsContent(client: SupabaseClient<Database>, logUploadID: string) {+ const result = await client+ .from('log_files')+ .select('id, content, relativePath, filename')+ .eq('log_upload_id', logUploadID)++ if (result.error) {+ throw new Error(`failed to fetch log files for upload ${logUploadID} - ${result.error.message}`)+ }++ return result.data+}export interface Props {- logUpload: LiteLogUpload+ logUpload: log_uploadsonSelectLogFile: (logFile: LiteLogFile) => voidselectedLogFile?: LiteLogFile}@@ -20,27 +37,61 @@ function UploadedLogsDetail({ logUpload, onSelectLogFile, selectedLogFile }: Proconst renameLogUpload = useRenameLogUpload()const [uploadName, setUploadName] = useState(logUpload.display_name || `Upload from ${logUpload.created_at.toLocaleString()}`)const [isRenaming, setIsRenaming] = useState(false)- const openLogFile = logUpload.id === selectedLogFile?.log_upload_id ? selectedLogFile : undefined+ const client = useSupabaseClient()++ const [logFiles, setLogFiles] = useState<{+ id: string;+ content: string;+ relativePath: string;+ filename: string;+ }[]>()++ const openLogFile = logUpload.id === selectedLogFile?.log_upload_id && logFiles ? selectedLogFile : undefined++ useEffect(function openIfLogFile() {+ if (logUpload.id !== selectedLogFile?.log_upload_id) return+ setIsOpen(true)+ }, [logUpload.id, selectedLogFile?.log_upload_id])++ useEffect(function fetchLogFiles() {+ if (!isOpen) return+ getUploadLogsContent(client, logUpload.id).then(f => {+ setLogFiles(+ f+ .sort((a, b) => a.relativePath.localeCompare(b.relativePath))+ .map(f => ({+ ...f,+ ...formatLogFileContent(f),+ }))+ )+ })+ }, [isOpen, client, logUpload])useEffect(function handleLogFileSelection() {const id = router.query.logFileIDif (!id) return- const logFile = logUpload.log_files.find(f => f.id === id)+ if (!logFiles) return+ const logFile = logFiles.find(f => f.id === id)if (!logFile) return- onSelectLogFile(logFile)+ onSelectLogFile({+ ...logFile,+ log_upload_id: logUpload.id,+ })setIsOpen(true)- }, [router.query, logUpload, onSelectLogFile])+ }, [router.query, logUpload, onSelectLogFile, logFiles])async function handleRenameLogUpload() {const newName = prompt('Enter a new name for the logs')if (!newName) return+ const oldName = uploadNamesetUploadName(newName)try {setIsRenaming(true)await renameLogUpload({ logUploadID: logUpload.id, displayName: newName })} catch (err) {console.error(`failed to rename log upload ${logUpload.id}`, err)+ setUploadName(oldName)} finally {setIsRenaming(false)}@@ -89,8 +140,9 @@ function UploadedLogsDetail({ logUpload, onSelectLogFile, selectedLogFile }: Pro{isOpen && (<div className="flex flex-col space-y-3 border-l border-white/5 pl-2 ml-[11px] flex-1"><UploadTree- log={logUpload}+ logUpload={logUpload}selectedLogFile={openLogFile}+ logFiles={logFiles || []}/></div>)}diff --git a/components/AgentLogFilesList/index.tsx b/components/AgentLogFilesList/index.tsxindex 26bfa1539..be3894b5f 100644--- a/components/AgentLogFilesList/index.tsx+++ b/components/AgentLogFilesList/index.tsx@@ -1,5 +1,6 @@import {useCallback,+ useEffect,useMemo,useState,} from 'react'@@ -8,25 +9,60 @@ import Splitter, { SplitDirection } from '@devbookhq/splitter'import {LiteLogFile,- LiteLogUpload,} from 'utils/agentLogs'import AgentLogFileContent from 'components/AgentLogFileContent'import { useLocalStorage } from 'hooks/useLocalStorage'import Upload from './Upload'import UploadedLogsDetail from './UploadedLogsDetail'+import { log_uploads } from '@prisma/client'+import { SupabaseClient } from '@supabase/supabase-js'+import { Database } from 'db/supabase'+import { useSupabaseClient } from '@supabase/auth-helpers-react'+import { useRouter } from 'next/router'+import { formatLogFileContent } from 'utils/formatLogFileContent'export interface Props {- logUploads: LiteLogUpload[]+ logUploads: log_uploads[]defaultProjectID: string}+async function getUploadLog(client: SupabaseClient<Database>, id: string) {+ const result = await client+ .from('log_files')+ .select('id, content, relativePath, log_upload_id, filename')+ .eq('id', id)+ .single()++ if (result.error) {+ throw new Error(`failed to fetch log files for upload ${id} - ${result.error.message}`)+ }++ return result.data+}+function AgentLogFilesList({logUploads,defaultProjectID,}: Props) {const [splitterSizes, setSplitterSizes] = useLocalStorage('log-file-list-splitter', [40, 60])const [selectedLogFile, setSelectedLogFile] = useState<LiteLogFile>()+ const router = useRouter()+ const client = useSupabaseClient()++ useEffect(function fetchSelectedLogDetails() {+ // Only fetch this for the initial load+ const logID = router.query.logFileID+ if (!logID) return+ getUploadLog(client, logID as string).then(log => {+ setSelectedLogFile({+ id: logID as string,+ ...formatLogFileContent(log),+ log_upload_id: log.log_upload_id,+ })++ })+ }, [client])const setSizes = useCallback((_: number, sizes: number[]) => {setSplitterSizes(sizes)diff --git a/components/DashboardHome.tsx b/components/DashboardHome.tsxindex 807c7ab93..d94bac693 100644--- a/components/DashboardHome.tsx+++ b/components/DashboardHome.tsx@@ -2,13 +2,13 @@ import { useMemo } from 'react'import { useRouter } from 'next/router'import AgentLogFilesList from 'components/AgentLogFilesList'-import { projects } from 'db/prisma'-import { LiteDeployment, LiteLogUpload } from 'utils/agentLogs'+import { log_uploads, projects } from 'db/prisma'+import { LiteDeployment } from 'utils/agentLogs'import AgentDeploymentsList from './AgentDeploymentsList'export interface Props {- projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]+ projects: (projects & { log_uploads: log_uploads[], deployments: LiteDeployment[] })[]defaultProjectID: stringview: 'deployments' | 'logs'}diff --git a/components/DeploymentTree.tsx b/components/DeploymentTree.tsxindex 232373b18..4fbf89dc3 100644--- a/components/DeploymentTree.tsx+++ b/components/DeploymentTree.tsx@@ -20,6 +20,7 @@ function DeploymentTree({timestamp: f.created_at,isDir: false,id: slug,+ tags: [],href: {pathname: '/logs/[slug]',query: {diff --git a/components/Filesystem/index.tsx b/components/Filesystem/index.tsxindex 211be1df6..335bbdfda 100644--- a/components/Filesystem/index.tsx+++ b/components/Filesystem/index.tsx@@ -30,7 +30,7 @@ export interface Props {rootPath: stringignore?: string[]onFiletreeClick?: (path: string, type: NodeType) => void- fetchContent: (dirpath: string) => (FileInfo & { href?: any, id?: string, timestamp?: Date, logUploadID: string })[]+ fetchContent: (dirpath: string) => (FileInfo & { href?: any, id?: string, timestamp?: Date, logUploadID?: string })[]expandedPath?: stringfile?: React.ComponentType<FileProps>}@@ -56,6 +56,7 @@ function Filesystem({timestamp: f.timestamp,}})))+fs.add(dirpath, ns, ignore)files.forEach(f => {fs.setMetadata<AgentChallengeTag[]>(path.join(dirpath, f.name), { key: 'tags', value: f.tags })@@ -132,6 +133,7 @@ function Filesystem({w-full"><FilesystemPrimitive.Tree+ emptyPlaceholder='Loading...'className={clsx('px-1','flex-1',diff --git a/db/supabase.ts b/db/supabase.tsindex 3826da3d0..2670b094c 100644--- a/db/supabase.ts+++ b/db/supabase.ts@@ -11,10 +11,12 @@ export interface Database {Tables: {deployments: {Row: {+ auth: Json | nullconfig: Json | nullcreated_at: stringenabled: booleanid: string+ last_finished_prompt: string | nulllogs: Json[] | nulllogs_raw: string | nullproject_id: string@@ -23,10 +25,12 @@ export interface Database {url: string | null}Insert: {+ auth?: Json | nullconfig?: Json | nullcreated_at?: stringenabled?: booleanid?: string+ last_finished_prompt?: string | nulllogs?: Json[] | nulllogs_raw?: string | nullproject_id: string@@ -35,10 +39,12 @@ export interface Database {url?: string | null}Update: {+ auth?: Json | nullconfig?: Json | nullcreated_at?: stringenabled?: booleanid?: string+ last_finished_prompt?: string | nulllogs?: Json[] | nulllogs_raw?: string | nullproject_id?: string@@ -46,6 +52,131 @@ export interface Database {state?: Database["public"]["Enums"]["deployment_state"] | nullurl?: string | null}+ Relationships: [+ {+ foreignKeyName: "deployments_project_id_fkey"+ columns: ["project_id"]+ referencedRelation: "projects"+ referencedColumns: ["id"]+ }+ ]+ }+ feedback: {+ Row: {+ created_at: string | null+ email: string | null+ id: number+ text: string | null+ user_id: string | null+ }+ Insert: {+ created_at?: string | null+ email?: string | null+ id?: number+ text?: string | null+ user_id?: string | null+ }+ Update: {+ created_at?: string | null+ email?: string | null+ id?: number+ text?: string | null+ user_id?: string | null+ }+ Relationships: [+ {+ foreignKeyName: "feedback_user_id_fkey"+ columns: ["user_id"]+ referencedRelation: "users"+ referencedColumns: ["id"]+ }+ ]+ }+ log_files: {+ Row: {+ content: string+ created_at: string+ deployment_id: string | null+ filename: string+ id: string+ last_modified: string | null+ log_upload_id: string | null+ project_id: string+ relativePath: string+ }+ Insert: {+ content?: string+ created_at?: string+ deployment_id?: string | null+ filename?: string+ id?: string+ last_modified?: string | null+ log_upload_id?: string | null+ project_id: string+ relativePath?: string+ }+ Update: {+ content?: string+ created_at?: string+ deployment_id?: string | null+ filename?: string+ id?: string+ last_modified?: string | null+ log_upload_id?: string | null+ project_id?: string+ relativePath?: string+ }+ Relationships: [+ {+ foreignKeyName: "log_files_deployment_id_fkey"+ columns: ["deployment_id"]+ referencedRelation: "deployments"+ referencedColumns: ["id"]+ },+ {+ foreignKeyName: "log_files_log_upload_id_fkey"+ columns: ["log_upload_id"]+ referencedRelation: "log_uploads"+ referencedColumns: ["id"]+ },+ {+ foreignKeyName: "log_files_project_id_fkey"+ columns: ["project_id"]+ referencedRelation: "projects"+ referencedColumns: ["id"]+ }+ ]+ }+ log_uploads: {+ Row: {+ created_at: string+ display_name: string | null+ id: string+ project_id: string | null+ tags: Json+ }+ Insert: {+ created_at?: string+ display_name?: string | null+ id?: string+ project_id?: string | null+ tags?: Json+ }+ Update: {+ created_at?: string+ display_name?: string | null+ id?: string+ project_id?: string | null+ tags?: Json+ }+ Relationships: [+ {+ foreignKeyName: "log_uploads_project_id_fkey"+ columns: ["project_id"]+ referencedRelation: "projects"+ referencedColumns: ["id"]+ }+ ]}projects: {Row: {@@ -53,7 +184,9 @@ export interface Database {data: Json | nulldevelopment_logs: Json[] | nullid: string+ is_default: booleanname: string+ slug: string | nullteam_id: string}Insert: {@@ -61,7 +194,9 @@ export interface Database {data?: Json | nulldevelopment_logs?: Json[] | nullid?: string+ is_default?: booleanname?: string+ slug?: string | nullteam_id: string}Update: {@@ -69,9 +204,19 @@ export interface Database {data?: Json | nulldevelopment_logs?: Json[] | nullid?: string+ is_default?: booleanname?: string+ slug?: string | nullteam_id?: string}+ Relationships: [+ {+ foreignKeyName: "projects_team_id_fkey"+ columns: ["team_id"]+ referencedRelation: "teams"+ referencedColumns: ["id"]+ }+ ]}teams: {Row: {@@ -92,6 +237,7 @@ export interface Database {is_default?: boolean | nullname?: string}+ Relationships: []}users_teams: {Row: {@@ -109,13 +255,37 @@ export interface Database {team_id?: stringuser_id?: string}+ Relationships: [+ {+ foreignKeyName: "users_teams_team_id_fkey"+ columns: ["team_id"]+ referencedRelation: "teams"+ referencedColumns: ["id"]+ },+ {+ foreignKeyName: "users_teams_user_id_fkey"+ columns: ["user_id"]+ referencedRelation: "users"+ referencedColumns: ["id"]+ }+ ]}}Views: {[_ in never]: never}Functions: {- [_ in never]: never+ append_array: {+ Args: {+ new_element: Json+ id: string+ }+ Returns: undefined+ }+ get_project_user_ids: {+ Args: Record<PropertyKey, never>+ Returns: string[]+ }}Enums: {deployment_state: "generating" | "deploying" | "finished" | "error"diff --git a/package-lock.json b/package-lock.jsonindex 407de401d..927a3a4c8 100644--- a/package-lock.json+++ b/package-lock.json@@ -48,8 +48,8 @@"posthog-node": "^3.1.1","prosemirror-state": "^1.4.2","prosemirror-view": "^1.30.2",- "react": "18.2.0",- "react-dom": "18.2.0",+ "react": "^18.3.0-canary-8ec962d82-20230623",+ "react-dom": "^18.3.0-canary-8ec962d82-20230623","react-json-view": "^1.21.3","react-markdown": "^8.0.5","react-textarea-autosize": "^8.4.0",@@ -91,6 +91,7 @@"version": "5.2.0","resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz","integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",+ "dev": true,"engines": {"node": ">=10"},@@ -209,6 +210,7 @@"version": "0.3.3","resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz","integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",+ "dev": true,"dependencies": {"@jridgewell/set-array": "^1.0.1","@jridgewell/sourcemap-codec": "^1.4.10",@@ -222,6 +224,7 @@"version": "3.1.0","resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz","integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",+ "dev": true,"engines": {"node": ">=6.0.0"}@@ -230,6 +233,7 @@"version": "1.1.2","resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz","integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",+ "dev": true,"engines": {"node": ">=6.0.0"}@@ -243,6 +247,7 @@"version": "0.3.18","resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz","integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",+ "dev": true,"dependencies": {"@jridgewell/resolve-uri": "3.1.0","@jridgewell/sourcemap-codec": "1.4.14"@@ -251,7 +256,8 @@"node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {"version": "1.4.14","resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",- "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="+ "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",+ "dev": true},"node_modules/@linaria/core": {"version": "3.0.0-beta.13",@@ -471,6 +477,7 @@"version": "2.1.5","resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz","integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",+ "dev": true,"dependencies": {"@nodelib/fs.stat": "2.0.5","run-parallel": "^1.1.9"@@ -483,6 +490,7 @@"version": "2.0.5","resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz","integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",+ "dev": true,"engines": {"node": ">= 8"}@@ -491,6 +499,7 @@"version": "1.2.8","resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz","integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",+ "dev": true,"dependencies": {"@nodelib/fs.scandir": "2.1.5","fastq": "^1.6.0"@@ -853,7 +862,7 @@"version": "4.13.0","resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-4.13.0.tgz","integrity": "sha512-HrniowHRZXHuGT9XRgoXEaP2gJLXM5RMoItaY2PkjvuZ+iHc0Zjbm/302MB8YsPdWozAPHHn+jpFEcEn71OgPw==",- "devOptional": true,+ "dev": true,"hasInstallScript": true},"node_modules/@prisma/engines-version": {@@ -1907,6 +1916,7 @@"version": "18.0.28","resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz","integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==",+ "dev": true,"dependencies": {"@types/prop-types": "*","@types/scheduler": "*",@@ -1925,7 +1935,8 @@"node_modules/@types/scheduler": {"version": "0.16.2","resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz",- "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew=="+ "integrity": "sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==",+ "dev": true},"node_modules/@types/throttle-debounce": {"version": "2.1.0",@@ -2133,12 +2144,14 @@"node_modules/any-promise": {"version": "1.3.0","resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",- "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="+ "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",+ "dev": true},"node_modules/anymatch": {"version": "3.1.3","resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz","integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",+ "dev": true,"dependencies": {"normalize-path": "^3.0.0","picomatch": "^2.0.4"@@ -2150,7 +2163,8 @@"node_modules/arg": {"version": "5.0.2","resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",- "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="+ "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",+ "dev": true},"node_modules/argparse": {"version": "2.0.1",@@ -2393,6 +2407,7 @@"version": "2.2.0","resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz","integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",+ "dev": true,"engines": {"node": ">=8"}@@ -2417,6 +2432,7 @@"version": "1.1.11","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz","integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",+ "dev": true,"dependencies": {"balanced-match": "^1.0.0","concat-map": "0.0.1"@@ -2544,6 +2560,7 @@"version": "2.0.1","resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz","integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",+ "dev": true,"engines": {"node": ">= 6"}@@ -2627,6 +2644,7 @@"version": "3.5.3","resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz","integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",+ "dev": true,"funding": [{"type": "individual",@@ -2653,6 +2671,7 @@"version": "5.1.2","resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz","integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",+ "dev": true,"dependencies": {"is-glob": "^4.0.1"},@@ -2793,7 +2812,8 @@"node_modules/concat-map": {"version": "0.0.1","resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",- "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",+ "dev": true},"node_modules/concurrently": {"version": "7.6.0",@@ -2946,6 +2966,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz","integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",+ "dev": true,"bin": {"cssesc": "bin/cssesc"},@@ -3064,7 +3085,8 @@"node_modules/csstype": {"version": "3.1.1","resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz",- "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="+ "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==",+ "dev": true},"node_modules/d": {"version": "1.0.1",@@ -3257,7 +3279,8 @@"node_modules/didyoumean": {"version": "1.2.2","resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",- "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="+ "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",+ "dev": true},"node_modules/diff": {"version": "5.1.0",@@ -3282,7 +3305,8 @@"node_modules/dlv": {"version": "1.1.3","resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",- "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="+ "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",+ "dev": true},"node_modules/doctrine": {"version": "3.0.0",@@ -4141,6 +4165,7 @@"version": "3.2.12","resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz","integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",+ "dev": true,"dependencies": {"@nodelib/fs.stat": "^2.0.2","@nodelib/fs.walk": "^1.2.3",@@ -4156,6 +4181,7 @@"version": "5.1.2","resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz","integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",+ "dev": true,"dependencies": {"is-glob": "^4.0.1"},@@ -4179,6 +4205,7 @@"version": "1.15.0","resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz","integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",+ "dev": true,"dependencies": {"reusify": "^1.0.4"}@@ -4424,7 +4451,8 @@"node_modules/function-bind": {"version": "1.1.1","resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",+ "dev": true},"node_modules/function.prototype.name": {"version": "1.1.5",@@ -4538,6 +4566,7 @@"version": "6.0.2","resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz","integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",+ "dev": true,"dependencies": {"is-glob": "^4.0.3"},@@ -4635,6 +4664,7 @@"version": "1.0.3","resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz","integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",+ "dev": true,"dependencies": {"function-bind": "^1.1.1"},@@ -4948,6 +4978,7 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz","integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",+ "dev": true,"dependencies": {"binary-extensions": "^2.0.0"},@@ -5009,6 +5040,7 @@"version": "2.11.0","resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz","integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",+ "dev": true,"dependencies": {"has": "^1.0.3"},@@ -5347,6 +5379,7 @@"version": "1.18.2","resolved": "https://registry.npmjs.org/jiti/-/jiti-1.18.2.tgz","integrity": "sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==",+ "dev": true,"bin": {"jiti": "bin/jiti.js"}@@ -5505,6 +5538,7 @@"version": "2.1.0","resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz","integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",+ "dev": true,"engines": {"node": ">=10"}@@ -5512,7 +5546,8 @@"node_modules/lines-and-columns": {"version": "1.2.4","resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",- "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="+ "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",+ "dev": true},"node_modules/linkify-it": {"version": "4.0.1",@@ -5774,6 +5809,7 @@"version": "1.4.1","resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz","integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",+ "dev": true,"engines": {"node": ">= 8"}@@ -6262,6 +6298,7 @@"version": "3.1.2","resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz","integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",+ "dev": true,"dependencies": {"brace-expansion": "^1.1.7"},@@ -6345,6 +6382,7 @@"version": "2.7.0","resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz","integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",+ "dev": true,"dependencies": {"any-promise": "^1.0.0","object-assign": "^4.0.1",@@ -6553,6 +6591,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz","integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",+ "dev": true,"engines": {"node": ">=0.10.0"}@@ -6599,6 +6638,7 @@"version": "3.0.0","resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz","integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",+ "dev": true,"engines": {"node": ">= 6"}@@ -6900,6 +6940,7 @@"version": "1.0.1","resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz","integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",+ "dev": true,"engines": {"node": ">=0.10.0"}@@ -6916,7 +6957,8 @@"node_modules/path-parse": {"version": "1.0.7","resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",- "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",+ "dev": true},"node_modules/path-type": {"version": "4.0.0",@@ -6947,6 +6989,7 @@"version": "2.3.0","resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz","integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",+ "dev": true,"engines": {"node": ">=0.10.0"}@@ -6955,6 +6998,7 @@"version": "4.0.5","resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz","integrity": "sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==",+ "dev": true,"engines": {"node": ">= 6"}@@ -6963,6 +7007,7 @@"version": "8.4.24","resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz","integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",+ "dev": true,"funding": [{"type": "opencollective",@@ -7085,6 +7130,7 @@"version": "15.1.0","resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz","integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",+ "dev": true,"dependencies": {"postcss-value-parser": "^4.0.0","read-cache": "^1.0.0",@@ -7101,6 +7147,7 @@"version": "4.0.1","resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz","integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",+ "dev": true,"dependencies": {"camelcase-css": "^2.0.1"},@@ -7217,6 +7264,7 @@"version": "6.0.1","resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz","integrity": "sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==",+ "dev": true,"dependencies": {"postcss-selector-parser": "^6.0.11"},@@ -7415,6 +7463,7 @@"version": "6.0.11","resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz","integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",+ "dev": true,"dependencies": {"cssesc": "^3.0.0","util-deprecate": "^1.0.2"@@ -7457,12 +7506,14 @@"node_modules/postcss-value-parser": {"version": "4.2.0","resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",- "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",+ "dev": true},"node_modules/postcss/node_modules/nanoid": {"version": "3.3.6","resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz","integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",+ "dev": true,"funding": [{"type": "github",@@ -7534,7 +7585,7 @@"version": "4.13.0","resolved": "https://registry.npmjs.org/prisma/-/prisma-4.13.0.tgz","integrity": "sha512-L9mqjnSmvWIRCYJ9mQkwCtj4+JDYYTdhoyo8hlsHNDXaZLh/b4hR0IoKIBbTKxZuyHQzLopb/+0Rvb69uGV7uA==",- "devOptional": true,+ "dev": true,"hasInstallScript": true,"dependencies": {"@prisma/engines": "4.13.0"@@ -7796,6 +7847,7 @@"version": "1.2.3","resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz","integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",+ "dev": true,"funding": [{"type": "github",@@ -7834,9 +7886,9 @@}},"node_modules/react": {- "version": "18.2.0",- "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz",- "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==",+ "version": "18.3.0-canary-8ec962d82-20230623",+ "resolved": "https://registry.npmjs.org/react/-/react-18.3.0-canary-8ec962d82-20230623.tgz",+ "integrity": "sha512-BNWboLH0wIvIlwCtvLBFh1mbum5FXSFatGBeLrh6FPis5lrA2dmECPKo9a5cmdZibDMnm3r5Eis/mGw2I/HCSQ==","dependencies": {"loose-envify": "^1.1.0"},@@ -7856,15 +7908,15 @@}},"node_modules/react-dom": {- "version": "18.2.0",- "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz",- "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==",+ "version": "18.3.0-canary-8ec962d82-20230623",+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.0-canary-8ec962d82-20230623.tgz",+ "integrity": "sha512-ZvsCwzK6j1oy+UVCRrennf2jqlHufQDaAx3BszQh/+K1EIc2dGrpyWqCxGZ8iFXSoauoynJXz+4F6XOlIruqzw==","dependencies": {"loose-envify": "^1.1.0",- "scheduler": "^0.23.0"+ "scheduler": "0.24.0-canary-8ec962d82-20230623"},"peerDependencies": {- "react": "^18.2.0"+ "react": "18.3.0-canary-8ec962d82-20230623"}},"node_modules/react-is": {@@ -7947,6 +7999,7 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz","integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",+ "dev": true,"dependencies": {"pify": "^2.3.0"}@@ -7977,6 +8030,7 @@"version": "3.6.0","resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz","integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",+ "dev": true,"dependencies": {"picomatch": "^2.2.1"},@@ -8065,6 +8119,7 @@"version": "1.22.2","resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz","integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",+ "dev": true,"dependencies": {"is-core-module": "^2.11.0","path-parse": "^1.0.7",@@ -8090,6 +8145,7 @@"version": "1.0.4","resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz","integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",+ "dev": true,"engines": {"iojs": ">=1.0.0","node": ">=0.10.0"@@ -8175,6 +8231,7 @@"version": "1.2.0","resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz","integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",+ "dev": true,"funding": [{"type": "github",@@ -8252,9 +8309,9 @@}},"node_modules/scheduler": {- "version": "0.23.0",- "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz",- "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==",+ "version": "0.24.0-canary-8ec962d82-20230623",+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.24.0-canary-8ec962d82-20230623.tgz",+ "integrity": "sha512-2XnYPqAUOcCMR+iiuXLN8VqgfSAzWvg1cppnrjIwIYHsAuWI/zIlxSUHC8wLPTiDqu8GT0oGym1FwbxxHEfT+A==","dependencies": {"loose-envify": "^1.1.0"}@@ -8631,6 +8688,7 @@"version": "3.32.0","resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.32.0.tgz","integrity": "sha512-ydQOU34rpSyj2TGyz4D2p8rbktIOZ8QY9s+DGLvFU1i5pWJE8vkpruCjGCMHsdXwnD7JDcS+noSwM/a7zyNFDQ==",+ "dev": true,"dependencies": {"@jridgewell/gen-mapping": "^0.3.2","commander": "^4.0.0",@@ -8652,6 +8710,7 @@"version": "4.1.1","resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz","integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",+ "dev": true,"engines": {"node": ">= 6"}@@ -8660,6 +8719,7 @@"version": "7.1.6","resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz","integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",+ "dev": true,"dependencies": {"fs.realpath": "^1.0.0","inflight": "^1.0.4",@@ -8738,6 +8798,7 @@"version": "1.0.0","resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz","integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",+ "dev": true,"engines": {"node": ">= 0.4"},@@ -8803,6 +8864,7 @@"version": "3.3.2","resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.2.tgz","integrity": "sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==",+ "dev": true,"dependencies": {"@alloc/quick-lru": "^5.2.0","arg": "^5.0.2",@@ -8840,6 +8902,7 @@"version": "4.0.1","resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.1.tgz","integrity": "sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==",+ "dev": true,"dependencies": {"lilconfig": "^2.0.5","yaml": "^2.1.1"@@ -8931,6 +8994,7 @@"version": "3.3.1","resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz","integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",+ "dev": true,"dependencies": {"any-promise": "^1.0.0"}@@ -8939,6 +9003,7 @@"version": "1.6.0","resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz","integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",+ "dev": true,"dependencies": {"thenify": ">= 3.1.0 < 4"},@@ -9032,7 +9097,8 @@"node_modules/ts-interface-checker": {"version": "0.1.13","resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",- "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="+ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",+ "dev": true},"node_modules/tsconfig-paths": {"version": "3.14.2",@@ -9630,27 +9696,6 @@"node": "^14.17.0 || ^16.13.0 || >=18.0.0"}},- "node_modules/ws": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",- "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",- "peer": true,- "engines": {- "node": ">=10.0.0"- },- "peerDependencies": {- "bufferutil": "^4.0.1",- "utf-8-validate": ">=5.0.2"- },- "peerDependenciesMeta": {- "bufferutil": {- "optional": true- },- "utf-8-validate": {- "optional": true- }- }- },"node_modules/y18n": {"version": "5.0.8","resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",@@ -9677,6 +9722,7 @@"version": "2.3.1","resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.1.tgz","integrity": "sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==",+ "dev": true,"engines": {"node": ">= 14"}diff --git a/package.json b/package.jsonindex 45c73a79b..d7860dbde 100644--- a/package.json+++ b/package.json@@ -80,8 +80,8 @@"posthog-node": "^3.1.1","prosemirror-state": "^1.4.2","prosemirror-view": "^1.30.2",- "react": "18.2.0",- "react-dom": "18.2.0",+ "react": "^18.3.0-canary-8ec962d82-20230623",+ "react-dom": "^18.3.0-canary-8ec962d82-20230623","react-json-view": "^1.21.3","react-markdown": "^8.0.5","react-textarea-autosize": "^8.4.0",@@ -124,4 +124,4 @@"react-dom": "$react-dom"}}-}\ No newline at end of file+}diff --git a/pages/index.tsx b/pages/index.tsxindex c24506227..8dc88f7bb 100644--- a/pages/index.tsx+++ b/pages/index.tsx@@ -1,83 +1,18 @@import type { GetServerSideProps } from 'next'import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'import { nanoid } from 'nanoid'-import path from 'path'-import { prisma, projects, log_files } from 'db/prisma'+import { prisma, projects, log_uploads } from 'db/prisma'import { serverCreds } from 'db/credentials'import DashboardHome from 'components/DashboardHome'-import { AgentChallengeTag, AgentNextActionLog, AgentPromptLogs, LiteDeployment, LiteLogUpload } from 'utils/agentLogs'+import { LiteDeployment } from 'utils/agentLogs'export interface Props {- projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]+ projects: (projects & { log_uploads: log_uploads[], deployments: LiteDeployment[] })[]defaultProjectID: stringview: 'deployments' | 'logs'}-export interface Props {- projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]- defaultProjectID: string-}--function getLastTwoDirsAndFile(fullPath: string): string {- const fileName = path.basename(fullPath)- const dirName = path.dirname(fullPath)-- const parts = dirName.split(path.sep)- const lastTwoDirs = parts.slice(-2).join(path.sep)-- return path.join(lastTwoDirs, fileName)-}--function formatLogFileContent(logFile: log_files) {- const relativePath = getLastTwoDirsAndFile(logFile.relativePath)-- // This parsing is very Ssecific to the AutoGPT format.- const filename = logFile.filename- if (filename.includes('user_input.txt')- || filename.includes('summary.txt')- ) {- return {- ...logFile,- relativePath,- content: logFile.content as string,- }- } else if (filename.includes('next_action')) {- const parsedFileContent = JSON.parse(logFile.content)- return {- ...logFile,- relativePath,- content: parsedFileContent as AgentNextActionLog,- }- } else if (- filename.includes('full_message_history')- || filename.includes('current_context')- || filename.includes('prompt_summary')- ) {- const parsedFileContent = JSON.parse(logFile.content)- return {- ...logFile,- relativePath,- content: {- logs: parsedFileContent as AgentPromptLogs,- },- }- } else {- console.error(`Unexpected log file: ${filename}`)- }-- const parsedFileContent = JSON.parse(logFile.content)- return {- ...logFile,- relativePath,- content: {- ...parsedFileContent,- logs: parsedFileContent?.context || [],- context: undefined,- },- }-}-export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {const defaultNewTeamID = process.env.DEFAULT_NEW_TEAM_ID as string | undefinedconst showUploadedLogs = process.env.NEXT_PUBLIC_SHOW_UPLOADED_LOGS === '1'@@ -109,11 +44,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {is_default: true,projects: {include: {- log_uploads: {- include: {- log_files: true,- },- },+ log_uploads: true,deployments: {include: {log_files: {@@ -166,11 +97,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {include: {projects: {include: {- log_uploads: {- include: {- log_files: true,- },- },+ log_uploads: true,deployments: {include: {log_files: {@@ -202,11 +129,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {include: {projects: {include: {- log_uploads: {- include: {- log_files: true,- },- },+ log_uploads: true,deployments: {include: {log_files: {@@ -270,11 +193,7 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {},},include: {- log_uploads: {- include: {- log_files: true,- },- },+ log_uploads: true,deployments: {include: {log_files: {@@ -308,17 +227,10 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {projects: [defaultProject,...teams.flatMap(t => t.projects).filter(p => p.id !== defaultProject.id),- ]- .map(p => ({- ...p,- log_uploads: p- .log_uploads- .map<LiteLogUpload>(u => ({- ...u,- log_files: u.log_files.map(formatLogFileContent),- tags: u.tags as unknown as AgentChallengeTag[],- }))- }))+ ].map(p => ({+ ...p,+ deployments: showUploadedLogs ? [] : p.deployments,+ }))},}}diff --git a/utils/agentLogs.ts b/utils/agentLogs.tsindex 6dbbe72f0..6cef34ff3 100644--- a/utils/agentLogs.ts+++ b/utils/agentLogs.ts@@ -20,7 +20,7 @@ export interface AgentChallengeTag {severity: string}-export interface LiteLogFile extends Omit<log_files, 'content'> {+export interface LiteLogFile extends Omit<log_files, 'content' | 'created_at' | 'last_modified' | 'project_id' | 'deployment_id'> {content: AgentPromptLogs | AgentNextActionLog | string}diff --git a/utils/formatLogFileContent.ts b/utils/formatLogFileContent.tsnew file mode 100644index 000000000..06e12a6d9--- /dev/null+++ b/utils/formatLogFileContent.ts@@ -0,0 +1,62 @@+import { log_files } from 'db/prisma'+import path from 'path-browserify'+import { AgentNextActionLog, AgentPromptLogs } from './agentLogs'++function getLastTwoDirsAndFile(fullPath: string): string {+ const fileName = path.basename(fullPath)+ const dirName = path.dirname(fullPath)++ const parts = dirName.split(path.sep)+ const lastTwoDirs = parts.slice(-2).join(path.sep)++ return path.join(lastTwoDirs, fileName)+}++export function formatLogFileContent(logFile: Pick<log_files, 'content' | 'filename' | 'relativePath'>) {+ const relativePath = getLastTwoDirsAndFile(logFile.relativePath)++ // This parsing is very Ssecific to the AutoGPT format.+ const filename = logFile.filename+ if (filename.includes('user_input.txt')+ || filename.includes('summary.txt')+ ) {+ return {+ ...logFile,+ relativePath,+ content: logFile.content as string,+ }+ } else if (filename.includes('next_action')) {+ const parsedFileContent = JSON.parse(logFile.content)+ return {+ ...logFile,+ relativePath,+ content: parsedFileContent as AgentNextActionLog,+ }+ } else if (+ filename.includes('full_message_history')+ || filename.includes('current_context')+ || filename.includes('prompt_summary')+ ) {+ const parsedFileContent = JSON.parse(logFile.content)+ return {+ ...logFile,+ relativePath,+ content: {+ logs: parsedFileContent as AgentPromptLogs,+ },+ }+ } else {+ console.error(`Unexpected log file: ${filename}`)+ }++ const parsedFileContent = JSON.parse(logFile.content)+ return {+ ...logFile,+ relativePath,+ content: {+ ...parsedFileContent,+ logs: parsedFileContent?.context || [],+ context: undefined,+ },+ }+}