Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix rendering deployment logs; Fix mobile version and spacing [WIP]

Tomas Valentab5c92f8c1d54
diff --git a/api-service/agent/smol_agent.py b/api-service/agent/smol_agent.py
index 4a148d947..bf128694c 100644
--- a/api-service/agent/smol_agent.py
+++ b/api-service/agent/smol_agent.py
@@ -247,7 +247,7 @@ Begin generating the code now.
await self.on_logs(
{
- "message": f"hi its me, 🐣the smol developer🐣!",
+ "message": f"Initial prompt",
"type": "info",
"properties": {
"prompt": user_prompt,
@@ -261,16 +261,6 @@ Begin generating the code now.
async def initialize_playground():
await playground.open()
- await self.on_logs(
- {
- "message": f"Created playground",
- "properties": {
- "playground": "created",
- "id": playground.id,
- },
- "type": "playground",
- }
- )
span.add_event(
"playground-created",
{
@@ -285,17 +275,6 @@ Begin generating the code now.
rootdir=rootdir,
branch=branch,
)
-
- await self.on_logs(
- {
- "message": f"Cloned repository",
- "properties": {
- "tool": "git",
- "repository": f"{owner}/{repo}",
- },
- "type": "tool",
- }
- )
span.add_event(
"repository-cloned",
{
@@ -314,16 +293,6 @@ Begin generating the code now.
res = await playground.run_command(delete_command, rootdir)
print("Delete command result: ", res.stdout, res.stderr)
- await self.on_logs(
- {
- "message": f"Cleaned root directory",
- "properties": {
- "tool": "filesystem",
- },
- "type": "tool",
- }
- )
-
span.add_event(
"files-deleted",
{
@@ -440,17 +409,6 @@ Exclusively focus on the names of the shared dependencies, and do not add any ot
async def save_file(name, content):
filepath = os.path.join(rootdir, name)
await playground.write_file(filepath, content)
- await self.on_logs(
- {
- "message": f"Saved file",
- "properties": {
- "filename": filepath,
- "content": content,
- "tool": "filesystem",
- },
- "type": "tool",
- },
- )
span.add_event(
"file-saved",
{
@@ -478,18 +436,6 @@ Exclusively focus on the names of the shared dependencies, and do not add any ot
git_email=git_app_email,
git_name=git_app_name,
)
- await self.on_logs(
- {
- "message": f"Pushed repository",
- "properties": {
- "repository_url": f"https://github.com/{owner}/{repo}",
- "branch": branch,
- "commit_message": commit_message,
- "tool": "git",
- },
- "type": "tool",
- },
- )
span.add_event(
"pushed-repository",
{
@@ -524,15 +470,6 @@ Exclusively focus on the names of the shared dependencies, and do not add any ot
finally:
if playground is not None:
await playground.close()
- await self.on_logs(
- {
- "message": f"Closed playground",
- "properties": {
- "playground": "closed",
- },
- "type": "playground",
- },
- )
span.add_event(
"closed-playground",
{},
diff --git a/components/AgentDeploymentLogList.tsx b/components/AgentDeploymentsList.tsx
similarity index 91%
rename from components/AgentDeploymentLogList.tsx
rename to components/AgentDeploymentsList.tsx
index 1f24d2c4b..599820c81 100644
--- a/components/AgentDeploymentLogList.tsx
+++ b/components/AgentDeploymentsList.tsx
@@ -17,7 +17,7 @@ export interface Props {
deployments: LiteDeployment[]
}
-function AgentDeploymentLogList({
+function AgentDeploymentsList({
deployments,
}: Props) {
const [openDeployments, setOpenDeployments] = useState<{ [key: string]: boolean }>({})
@@ -44,8 +44,8 @@ function AgentDeploymentLogList({
}
return (
- <main className="overflow-hidden flex flex-col max-h-full flex-1 border-white/5 border rounded-md">
- <header className="flex items-center justify-between py-4 sm:px-6 lg:px-8 border-b border-b-white/5">
+ <main className="overflow-hidden flex flex-col max-h-full flex-1 rounded-md">
+ <header className="flex items-center justify-between p-4 border-b border-b-white/5">
<h1 className="text-2xl font-semibold text-white">Agent Deployments</h1>
</header>
{sortedDeployments.length === 0 && (
@@ -57,7 +57,7 @@ function AgentDeploymentLogList({
)}
{sortedDeployments.length > 0 && (
- <div className="my-4 flex-col space-y-4 py-2 sm:px-4 lg:px-8 flex-1 flex pr-2 overflow-auto">
+ <div className="my-4 flex-col space-y-4 px-4 py-2 sm:px-4 lg:px-8 flex-1 flex pr-2 overflow-auto">
{sortedDeployments.map(deployment => (
<div
key={deployment.id}
@@ -103,7 +103,7 @@ function AgentDeploymentLogList({
<span className="text-gray-200 font-normal">
{deployment.projects.name}
</span>
- <span className="text-gray-600 font-normal">
+ <span className="text-gray-600 font-normal truncate">
{deployment.projects.slug}
</span>
</div>
@@ -125,4 +125,4 @@ function AgentDeploymentLogList({
)
}
-export default AgentDeploymentLogList
+export default AgentDeploymentsList
diff --git a/components/AgentDeploymentsLogsList.tsx b/components/AgentDeploymentsLogsList.tsx
new file mode 100644
index 000000000..628897280
--- /dev/null
+++ b/components/AgentDeploymentsLogsList.tsx
@@ -0,0 +1,111 @@
+import {
+ useState,
+ useEffect,
+ useCallback,
+ Fragment,
+} from 'react'
+import { useRouter } from 'next/router'
+import clsx from 'clsx'
+import {
+ SystemPromptLog,
+ UserPromptLog,
+ AssistantPromptLog,
+} from 'utils/agentLogs'
+
+export interface Props {
+ logs: any[]
+ onSelected: (ctx: SystemPromptLog | UserPromptLog | AssistantPromptLog) => void
+}
+
+function AgentDeploymentLogsList({
+ logs,
+ onSelected,
+}: Props) {
+ const router = useRouter()
+ const [selectedLogIdx, setSelectedLogIdx] = useState<number>(0)
+
+ const selectLog = useCallback((idx: number) => {
+ setSelectedLogIdx(idx)
+ onSelected(logs[idx])
+ router.replace({
+ // pathname: `/log/${router.query.logFileID}`,
+ pathname: '',
+ query: {
+ ...router.query,
+ selectedLog: idx.toString(),
+ },
+ }, undefined, { shallow: true })
+ }, [logs, onSelected, router])
+
+ useEffect(function selectLogBasedOnURLQuery() {
+ const selectedLog = router.query.selectedLog as string
+ let idx: number
+ if (selectedLog) {
+ idx = parseInt(selectedLog)
+ } else {
+ idx = 0
+ }
+ setSelectedLogIdx(idx)
+ onSelected(logs[idx])
+ }, [router, logs, onSelected])
+
+ useEffect(function listenToArrowNavigitons() {
+ function handleUpKey(e: KeyboardEvent) {
+ if (e.key === 'ArrowUp') {
+ if (selectedLogIdx === 0) {
+ selectLog(logs.length - 1)
+ } else {
+ selectLog(selectedLogIdx - 1)
+ }
+ } else if (e.key === 'ArrowDown') {
+ if (selectedLogIdx === logs.length - 1) {
+ selectLog(0)
+ } else {
+ selectLog(selectedLogIdx + 1)
+ }
+ }
+ }
+ window.addEventListener('keydown', handleUpKey)
+ return () => window.removeEventListener('keydown', handleUpKey)
+ }, [logs, selectLog, selectedLogIdx])
+
+ return (
+ <div className="flex flex-col space-y-1 overflow-auto ml-4 sm:ml-8">
+ {logs.length === 0 && (
+ <div className="flex-1 flex items-center justify-center h-full">
+ <p className="text-gray-400">No logs</p>
+ </div>
+ )}
+ {logs.map((ctx, idx) => (
+ <Fragment key={idx}>
+ <div
+ className="flex items-center space-x-2 cursor-pointer group"
+ onClick={() => selectLog(idx)}
+ >
+ <span className={clsx(
+ 'font-bold text-sm capitalize min-w-[72px] group-hover:text-[#6366F1] transition-all',
+ selectedLogIdx === idx && 'text-[#6366F1]',
+ selectedLogIdx !== idx && 'text-[#55618C]',
+ )}
+ >
+ {ctx.type}
+ </span>
+ <span
+ className={clsx(
+ 'text-sm text-gray-100 max-w-full truncate p-2 group-hover:bg-[#1F2437] transition-all rounded-md cursor-pointer w-full',
+ selectedLogIdx === idx && 'bg-[#1F2437]',
+ )}
+ >
+ {ctx.message}
+ </span>
+ </div>
+ {idx !== logs.length - 1 && (
+ <div className="ml-1 rounded h-[24px] w-px bg-white/5" />
+ )}
+ </Fragment>
+ ))}
+ </div>
+ )
+}
+
+export default AgentDeploymentLogsList
\ No newline at end of file
diff --git a/components/AgentDetail.tsx b/components/AgentDetail.tsx
deleted file mode 100644
index ed06e087e..000000000
--- a/components/AgentDetail.tsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import { Box, Hammer, Cpu, Info } from 'lucide-react'
-
-import { projects } from 'db/prisma'
-import useDeployment from 'hooks/useDeployment'
-import useFilterRunLogs from 'hooks/useFilterRunLogs'
-
-export interface AgentLogBase {
- id: string
- message: string
- timestamp: string
- type: 'info' | 'tool' | 'playground' | 'model'
- properties: {}
-}
-
-export interface AgentToolLog extends AgentLogBase {
- type: 'tool'
- properties: {
- tool: 'filesystem' | 'git'
- }
-}
-
-export interface AgentModelLog extends AgentLogBase {
- type: 'model'
- properties: {
- model: 'gpt-4'
- prompt: string
- result: string
- }
-}
-
-export interface AgentPlaygroundLog extends AgentLogBase {
- type: 'playground'
- properties: {
- playground: string
- }
-}
-
-export interface Props {
- project: projects
- runID: string
-}
-
-export function AgentDetail({
- runID,
- project,
-}: Props) {
- const deployment = useDeployment(project)
- const logs = useFilterRunLogs({ deployment, runID })
-
- return (
- <div className="flex flex-1 flex-col justify-center items-center">
- <div>
- <div>
- <h3 className="text-lg leading-6 font-medium text-gray-100">
- Agent
- </h3>
- </div>
- </div>
- <div className="flow-root">
- <ul role="list" className="-mb-8">
- {(deployment?.logs as unknown as AgentLogBase[])
- ?.slice()
- .reverse()
- .map((log, idx, logs) => (
- <li key={log.timestamp}>
- <div className="relative pb-8">
- <div>
- {log.timestamp}
- </div>
- {idx !== logs.length - 1 ? (
- <span className="absolute left-5 top-5 -ml-px h-full w-0.5 bg-white" aria-hidden="true" />
- ) : null}
- <div className="relative flex items-start space-x-3">
- {log.type === 'info' ? (
- <>
- <div className="relative px-1">
- <div className="flex h-8 w-8 items-center justify-center rounded-full bg-white ring-8 ring-white">
- <Info className="h-5 w-5 text-gray-600" aria-hidden="true" />
- </div>
- </div>
- <div className="min-w-0 flex-1">
- <div>
- <div className="text-sm">
- <a className="font-medium text-gray-400">
- {log.type}
- </a>{' '}
- </div>
- </div>
- <div className="mt-2 text-sm text-gray-600">
- <p>{log.message}</p>
- </div>
- </div>
- </>
- ) : log.type === 'model' ? (
- <>
- <div>
- <div className="relative px-1">
- <div className="flex h-8 w-8 items-center justify-center rounded-full bg-white ring-8 ring-white">
- <Cpu className="h-5 w-5 text-gray-600" aria-hidden="true" />
- </div>
- </div>
- </div>
- <div className="min-w-0 flex-1 py-1.5">
- <div className="text-sm text-gray-600">
- <a className="font-medium text-gray-400">
- {log.type}
- </a>{' '}
- <span className="whitespace-nowrap">{log.message}</span>
- </div>
- </div>
- </>
- ) : log.type === 'playground' ? (
- <>
- <div>
- <div className="relative px-1">
- <div className="flex h-8 w-8 items-center justify-center rounded-full bg-white ring-8 ring-white">
- <Box className="h-5 w-5 text-gray-600" aria-hidden="true" />
- </div>
- </div>
- </div>
- <div className="min-w-0 flex-1 py-0">
- <div className="text-sm leading-8 text-gray-600">
- <span className="mr-0.5">
- <a className="font-medium text-gray-400">
- {log.type}
- </a>{' '}
- </span>
- <span className="whitespace-nowrap">{log.message}</span>
- </div>
- </div>
- </>
- ) : log.type === 'tool' ? (
- <>
- <div>
- <div className="relative px-1">
- <div className="flex h-8 w-8 items-center justify-center rounded-full bg-white ring-8 ring-white">
- <Hammer className="h-5 w-5 text-gray-600" aria-hidden="true" />
- </div>
- </div>
- </div>
- <div className="min-w-0 flex-1 py-0">
- <div className="text-sm leading-8 text-gray-600">
- <span className="mr-0.5">
- <a className="font-medium text-gray-400">
- {log.type}
- </a>{' '}
- </span>
- <span className="mr-0.5">
- </span>
- <span className="whitespace-nowrap">{log.message}</span>
- </div>
- </div>
- </>
- ) : null}
- </div>
- </div>
- </li>
- ))}
- </ul>
- </div>
- </div>
- )
-}
-
-export default AgentDetail
diff --git a/components/AgentLogFilesList.tsx b/components/AgentLogFilesList.tsx
index 899d4946b..e1cae2726 100644
--- a/components/AgentLogFilesList.tsx
+++ b/components/AgentLogFilesList.tsx
@@ -161,7 +161,7 @@ function AgentLogFilesList({
}
return (
- <main className="rounded-md border-white/5 border overflow-hidden pb-6 flex flex-col max-h-full flex-1">
+ <main className="rounded-md overflow-hidden pb-6 flex flex-col max-h-full flex-1">
<input
type="file"
style={{ display: 'none' }}
diff --git a/components/AgentPromptLogDetail.tsx b/components/AgentPromptLogDetail.tsx
index 6690c087d..1706aeaa6 100644
--- a/components/AgentPromptLogDetail.tsx
+++ b/components/AgentPromptLogDetail.tsx
@@ -11,13 +11,13 @@ function handleJSONQuotes(content: string) {
try {
return JSON.parse(content)
} catch (err) {
- console.log('JSON parse error', err, content)
+ // console.log('JSON parse error', err, content)
}
try {
return JSON.parse(content.replace(/"/g, '\\"').replace(/'/g, '"'))
} catch (err) {
- console.log('JSON parse error', err, content)
+ // console.log('JSON parse error', err, content)
}
}
diff --git a/components/AgentRunLogContent.tsx b/components/AgentRunLogContent.tsx
index 86b8d3bde..b4e1436b0 100644
--- a/components/AgentRunLogContent.tsx
+++ b/components/AgentRunLogContent.tsx
@@ -6,34 +6,38 @@ import Splitter from '@devbookhq/splitter'
import clsx from 'clsx'
import {
- SystemPromptLog,
- UserPromptLog,
- AssistantPromptLog,
LiteDeploymentLog,
} from 'utils/agentLogs'
-import AgentPrompLogDetail from 'components/AgentPromptLogDetail'
-import AgentPromptLogsList from 'components/AgentPromptLogsList'
import { useLocalStorage } from 'hooks/useLocalStorage'
+import useDeploymentRunLog from 'hooks/useDeploymentRunLog'
+import AgentRunLogDetail from './AgentRunLogDetail'
+import AgentDeploymentLogsList from './AgentDeploymentsLogsList'
+import { useRouter } from 'next/router'
export interface Props {
log: LiteDeploymentLog
}
function AgentRunLogContent({
- log,
+ log: inialLog,
}: Props) {
- const [selectedLog, setSelectedLog] = useState<SystemPromptLog | UserPromptLog | AssistantPromptLog>()
+ const [selectedLog, setSelectedLog] = useState<any>()
const [splitterSizes, setSplitterSizes] = useLocalStorage('log-content-splitter', [40, 60])
+ const router = useRouter()
+
+ const slug = router.query.slug as string
const setSizes = useCallback((pairIdx: number, sizes: number[]) => {
setSplitterSizes(sizes)
}, [setSplitterSizes])
+ const log = useDeploymentRunLog(inialLog)
+
return (
- <main className="overflow-hidden flex flex-col max-h-full flex-1 border-white/5 border rounded-md">
- <header className="flex items-center py-4 sm:px-6 lg:px-8 border-b border-b-white/5">
+ <main className="overflow-hidden flex flex-col max-h-full flex-1 rounded-md">
+ <header className="flex items-center p-4 border-b border-b-white/5 justify-between">
<h1 className="text-2xl font-semibold text-white">Agent Run Logs</h1>
- <div className="text-base text-gray-400 self-center">Log</div>
+ <div className="text-sm text-gray-400 self-center truncate">{slug}</div>
</header>
<div className="flex-1 flex space-x-2 items-start justify-start overflow-hidden my-4">
<Splitter
@@ -48,11 +52,11 @@ function AgentRunLogContent({
onResizeFinished={setSizes}
minWidths={[120, 120]}
>
- <AgentPromptLogsList
+ <AgentDeploymentLogsList
logs={log.content as any}
onSelected={setSelectedLog}
/>
- <AgentPrompLogDetail
+ <AgentRunLogDetail
log={selectedLog}
/>
</Splitter>
diff --git a/components/AgentRunLogDetail.tsx b/components/AgentRunLogDetail.tsx
new file mode 100644
index 000000000..cdf958254
--- /dev/null
+++ b/components/AgentRunLogDetail.tsx
@@ -0,0 +1,49 @@
+import dynamic from 'next/dynamic'
+const ReactJson = dynamic(import('react-json-view'), { ssr: false })
+
+export interface Props {
+ log?: any
+}
+
+function AgentRunLogDetail({
+ log,
+}: Props) {
+
+ return (
+ <div className="overflow-auto mr-2.5 mb-2.5 p-2 h-full bg-[#1F2437] rounded-md flex flex-col space-y-4 border border-[#6366F1]/50">
+ {log && (
+ <>
+ <div className="flex flex-col space-y-1 w-full">
+ <span className="text-sm font-medium text-gray-500">Action Type</span>
+ <span className="text-sm text-gray-200 w-full">{log.type}</span>
+ </div>
+
+ <div className="flex flex-col space-y-1 w-full">
+ <span className="text-sm font-medium text-gray-500">Message</span>
+ <p className="text-sm text-gray-200 w-full prose whitespace-pre-wrap max-w-full">{log.message}</p>
+ </div>
+ <div className="flex flex-col space-y-1 w-full">
+ <span className="text-sm font-medium text-gray-500">Properties</span>
+ <ReactJson
+ src={log.properties}
+ name={null}
+ style={{
+ background: 'transparent',
+ display: 'flex',
+ whiteSpace: 'pre-wrap',
+ }}
+ displayObjectSize={false}
+ quotesOnKeys={false}
+ sortKeys={true}
+ displayDataTypes={false}
+ theme="ocean"
+ enableClipboard={false}
+ />
+ </div>
+ </>
+ )}
+ </div >
+ )
+}
+
+export default AgentRunLogDetail
\ No newline at end of file
diff --git a/components/AgentRunsList.tsx b/components/AgentRunsList.tsx
index 8233158de..ca916d8f0 100644
--- a/components/AgentRunsList.tsx
+++ b/components/AgentRunsList.tsx
@@ -10,17 +10,12 @@ import Link from 'next/link'
import { deployments, projects } from 'db/prisma'
-
export interface Props {
allDeployedAgents: {
project: projects & { deployments: deployments[] }
deployment: deployments
}[]
initialSelectedAgentID?: string
- // agentInstance: {
- // project: projects & { deployments: deployments[] }
- // deployment: deployments
- // }
}
function AgentRunsList({
@@ -50,14 +45,12 @@ function AgentRunsList({
}
}
-
return (
<main className="overflow-hidden flex flex-col flex-1">
<header className="flex items-center justify-between p-4 sm:p-6 lg:px-8">
<h1 className="text-2xl font-semibold leading-7 text-white">Agent Runs</h1>
</header>
-
<div className="flex flex-col space-y-4">
{/* Each deployed agent */}
{allDeployedAgents.map((a) => (
diff --git a/components/DashboardHome.tsx b/components/DashboardHome.tsx
index e474be16a..807c7ab93 100644
--- a/components/DashboardHome.tsx
+++ b/components/DashboardHome.tsx
@@ -5,7 +5,7 @@ import AgentLogFilesList from 'components/AgentLogFilesList'
import { projects } from 'db/prisma'
import { LiteDeployment, LiteLogUpload } from 'utils/agentLogs'
-import AgentDeploymentLogList from './AgentDeploymentLogList'
+import AgentDeploymentsList from './AgentDeploymentsList'
export interface Props {
projects: (projects & { log_uploads: LiteLogUpload[], deployments: LiteDeployment[] })[]
@@ -36,7 +36,7 @@ function DashboardHome({
return (
<>
{showView === 'deployments' &&
- <AgentDeploymentLogList
+ <AgentDeploymentsList
deployments={deployments}
/>
}
diff --git a/components/Editor/Sidebar/Deploy.tsx b/components/Editor/Sidebar/Deploy.tsx
index 063a61e1c..662ea81d0 100644
--- a/components/Editor/Sidebar/Deploy.tsx
+++ b/components/Editor/Sidebar/Deploy.tsx
@@ -1,174 +1,13 @@
-import { memo, useState } from 'react'
-import Link from 'next/link'
+import { memo } from 'react'
-import api from 'api-client/api'
-import Text from 'components/Text'
import { projects } from 'db/prisma'
-import { useStateStore } from 'state/StoreProvider'
-import { evaluatePrompt } from 'state/prompt'
-import useModelProviderArgs from 'hooks/useModelProviderArgs'
-import { getModelArgs } from 'state/model'
-import Button from 'components/Button'
-import Spinner from 'components/Spinner'
-import useDeployment from 'hooks/useDeployment'
-
-
-const createDeployment = api.path('/deployments').method('put').create({
- project_id: true,
-})
export interface Props {
project: projects
}
-function getSnippet(hostname: string, deploymentID: string) {
- return `curl --request POST \\
---url ${hostname}/deployments/${deploymentID}/interactions \\
---data '{
- "type": "",
- "data": {
- "instructions": {}
- }
-}'`
-}
-
-function Deploy({ project }: Props) {
- const [selectors] = useStateStore()
- const modelConfig = selectors.use.getSelectedModelConfig()()
- const templateID = selectors.use.templateID()
- const [isDeploying, setIsDeploying] = useState(false)
-
- const [creds] = useModelProviderArgs()
-
- const deployment = useDeployment(project)
-
- const baseDeploymentURL = deployment ? `${process.env.NEXT_PUBLIC_API_URL}/deployments/${deployment.id}` : undefined
-
- async function deployAgent() {
- try {
- setIsDeploying(true)
- if (!modelConfig) {
- console.error('Cannot get model config')
- return
- }
- const {
- references: promptReferences,
- prompt: evaluatedPrompt,
- } = evaluatePrompt(modelConfig.prompt)
-
- await createDeployment({
- project_id: project.id,
- config: {
- name: modelConfig.name,
- provider: modelConfig.provider,
- args: getModelArgs(modelConfig, creds) as any,
- prompt: evaluatedPrompt,
- templateID,
- } as any,
- })
- } finally {
- setIsDeploying(false)
- }
- }
-
- return (
- <div className="
- flex
- flex-col
- ">
- <div className="
- flex
- bg-slate-50
- items-center
- justify-between
- border-b
- py-3.5
- pr-4
- ">
- <Text
- text="Deploy"
- size={Text.size.S2}
- className="
- uppercase
- text-slate-400
- font-semibold
- px-4
- "
- />
- </div>
- <div className="
- flex
- flex-col
- p-4
- space-y-4
- "
- >
- <div
- className=""
- >
- <Button
- text={isDeploying ? 'Deploying' : 'Deploy'}
- isDisabled={isDeploying}
- icon={isDeploying ? <Spinner /> : ''}
- onClick={deployAgent}
- variant={Button.variant.Full}
- />
- </div>
- <div
- className="
- "
- >
- {deployment && deployment['config'] && baseDeploymentURL &&
- <div
- className="
- flex
- flex-col
- "
- >
- <Text
- size={Text.size.S3}
- text={`Deployment ID: ${deployment.id}`}
- />
- <Link
- href={baseDeploymentURL}
- target="_blank"
- rel="noopener noreferrers"
- className="text-sm"
- >
- {baseDeploymentURL}
- </Link>
- </div>
- }
- </div>
- {deployment && deployment['config'] && baseDeploymentURL &&
- <div className="
- flex
- flex-col
- space-y-2
- ">
- <div>
- <Text
- text="Example usage"
- />
- <pre className="
- p-2
- rounded
- font-mono
- text-xs
- bg-slate-100
- overflow-auto
- whitespace-pre-wrap
- ">
- <code>
- {getSnippet(process.env.NEXT_PUBLIC_API_URL!, deployment.id)}
- </code>
- </pre>
- </div>
- </div>
- }
- </div>
- </div>
- )
+function Deploy({ }: Props) {
+ return null
}
export default memo(Deploy)
diff --git a/components/Layout.tsx b/components/Layout.tsx
index ca9b3d473..98e06cf39 100644
--- a/components/Layout.tsx
+++ b/components/Layout.tsx
@@ -23,24 +23,6 @@ const inter = Inter({
variable: '--font-inter',
})
-const navigation = [
- // {
- // name: 'Deployed Agents',
- // view: 'deployed',
- // icon: Zap,
- // },
- // {
- // name: 'Agent Runs',
- // view: 'runs',
- // icon: ListEnd,
- // },
- {
- name: 'Agent Logs',
- view: 'logs',
- icon: List,
- },
-]
-
function Layout({ children }: PropsWithChildren) {
const supabaseClient = useSupabaseClient()
const user = useUser()
@@ -90,58 +72,64 @@ function Layout({ children }: PropsWithChildren) {
]
return (
- <div className={clsx(
- inter.variable,
- 'font-sans',
- 'flex-1',
- 'flex',
- 'items-start',
- 'justify-start',
- 'p-2',
- 'space-x-1',
- 'h-full',
- 'w-full',
- 'overflow-hidden',
- )}>
- <DashboardMobileSidebar
- isSidebarOpen={isSidebarOpen}
- onSetSidebarOpen={setIsSidebarOpen}
- onSignOut={signOut}
- navigation={navigation}
- />
-
- <DashboardDesktopSidebar
- onSignOut={signOut}
- navigation={navigation}
- />
-
- <div className="flex flex-col flex-1 self-stretch overflow-hidden">
- {/* Mobile menu icon */}
- <div className="xl:hidden sticky top-0 z-40 flex justify-between h-16 shrink-0 items-center gap-x-6 border-b border-white/5 bg-gray-900 px-4 shadow-sm sm:px-6 lg:px-8">
- <button
- type="button"
- className="-m-2.5 p-2.5 text-white xl:hidden"
- onClick={() => setIsSidebarOpen(true)}
- >
- <span className="sr-only">Open sidebar</span>
- <Menu aria-hidden="true" />
- </button>
+ <>
+ <style jsx global>
+ {`
+ :root {
+ --font-inter: ${inter.variable};
+ }
+ `}
+ </style>
+ <div className={clsx(
+ 'font-sans',
+ 'flex-1',
+ 'flex',
+ 'items-start',
+ 'justify-start',
+ 'p-2',
+ 'h-full',
+ 'w-full',
+ 'overflow-hidden',
+ )}>
+ <DashboardMobileSidebar
+ isSidebarOpen={isSidebarOpen}
+ onSetSidebarOpen={setIsSidebarOpen}
+ onSignOut={signOut}
+ navigation={navigation}
+ />
+ <DashboardDesktopSidebar
+ onSignOut={signOut}
+ navigation={navigation}
+ />
+
+ <div className="flex flex-col flex-1 self-stretch overflow-hidden">
+ {/* Mobile menu icon */}
+ <div className="rounded-md xl:hidden sticky top-0 z-40 flex justify-between h-16 shrink-0 items-center gap-x-6 border border-white/5 bg-gray-900 px-4 shadow-sm sm:px-6 lg:px-8">
+ <button
+ type="button"
+ className="-m-2.5 p-2.5 text-white xl:hidden"
+ onClick={() => setIsSidebarOpen(true)}
+ >
+ <span className="sr-only">Open sidebar</span>
+ <Menu aria-hidden="true" />
+ </button>
+
+ <div className="xl:hidden">
+ <Feedback />
+ </div>
+ </div>
- <div className="xl:hidden">
+ {/* Header` */}
+ <div className="hidden xl:flex py-2 px-4 border border-white/5 bg-gray-900 rounded-md">
<Feedback />
</div>
- </div>
-
- {/* Header` */}
- <div className="hidden xl:flex py-2 px-6 border border-white/5 bg-gray-900 rounded-md">
- <Feedback />
- </div>
- <div className="mt-1 flex-1 flex flex-col self-stretch overflow-auto bg-gray-900 rounded-md">
- {children}
+ <div className="mt-1 flex-1 flex flex-col self-stretch overflow-auto bg-gray-900 rounded-md border border-white/5">
+ {children}
+ </div>
</div>
</div>
- </div>
+ </>
)
}
diff --git a/components/RunItem.tsx b/components/RunItem.tsx
index 27d7ab949..099e0ae1c 100644
--- a/components/RunItem.tsx
+++ b/components/RunItem.tsx
@@ -32,7 +32,7 @@ function RunItem({
'justify-between',
)}
>
- <span className="flex space-x-2">
+ <span className="flex space-x-2 truncate">
<span
className="
text-sm
@@ -45,6 +45,7 @@ function RunItem({
<span
className="
text-sm
+ truncate
whitespace-nowrap
text-gray-500
"
@@ -57,6 +58,7 @@ function RunItem({
text-sm
whitespace-nowrap
text-gray-500
+ truncate
"
>
{metadata['timestamp'].toLocaleString()}
diff --git a/components/Sidebar/DashboardDesktopSidebar.tsx b/components/Sidebar/DashboardDesktopSidebar.tsx
index da989808e..43634ccb4 100644
--- a/components/Sidebar/DashboardDesktopSidebar.tsx
+++ b/components/Sidebar/DashboardDesktopSidebar.tsx
@@ -16,16 +16,9 @@ function DashboardDesktopSidebar({
const router = useRouter()
return (
- <div className="hidden xl:self-stretch xl:z-50 xl:flex xl:w-[220px] xl:flex-col">
+ <div className="hidden xl:self-stretch xl:z-50 xl:flex xl:w-[220px] xl:flex-col pr-1">
<div className="flex grow flex-col gap-y-5 overflow-y-auto bg-gray-900 px-6 border border-white/5 rounded-md">
{/* Logo */}
- {/* <div className="flex h-16 shrink-0 items-center">
- <img
- className="h-8 w-auto"
- src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=500"
- alt="Your Company"
- />
- </div> */}
<nav className="flex flex-1 flex-col space-y-6 py-[22px]">
<div className="font-bold text-gray-100">
e2b
@@ -43,7 +36,6 @@ function DashboardDesktopSidebar({
: 'text-gray-400 hover:text-white hover:bg-[#1F2437]',
'group gap-x-3 rounded-md px-2 py-1 text-sm leading-6 font-semibold flex items-center'
)}
- shallow
>
<item.icon size={16} className="shrink-0" aria-hidden="true" />
{item.name}
diff --git a/components/Sidebar/DashboardMobileSidebar.tsx b/components/Sidebar/DashboardMobileSidebar.tsx
index 0591a7354..9044aa257 100644
--- a/components/Sidebar/DashboardMobileSidebar.tsx
+++ b/components/Sidebar/DashboardMobileSidebar.tsx
@@ -69,17 +69,10 @@ function DashboardMobileSidebar({
{/* Sidebar component, swap this element with another sidebar if you like */}
<div className="flex grow flex-col gap-y-5 overflow-y-auto bg-gray-900 px-6 ring-1 ring-white/10">
{/* Logo */}
- {/* <div className="flex h-16 shrink-0 items-center">
- <img
- className="h-8 w-auto"
- src="https://tailwindui.com/img/logos/mark.svg?color=indigo&shade=500"
- alt="Your Company"
- />
- </div> */}
<nav className="flex flex-1 flex-col">
<ul role="list" className="flex flex-1 flex-col gap-y-7">
<li>
- <ul role="list" className="-mx-2 space-y-1">
+ <ul role="list" className="py-8 space-y-1">
{navigation.map((item) => (
<li key={item.name}>
<Link
@@ -90,7 +83,6 @@ function DashboardMobileSidebar({
: 'text-gray-400 hover:text-white hover:bg-gray-800',
'group gap-x-3 rounded-md px-2 py-1 text-sm leading-6 font-semibold flex items-center'
)}
- shallow
>
<item.icon size={16} className="shrink-0" aria-hidden="true" />
{item.name}
@@ -101,7 +93,7 @@ function DashboardMobileSidebar({
</li>
<li className="-mx-6 mt-auto">
<div
- className="flex items-center gap-x-4 px-6 py-3 text-sm font-semibold leading-6 text-white"
+ className="flex items-center gap-x-4 p-8 text-sm font-semibold leading-6 text-white"
>
<button
className="text-sm font-semibold text-white"
@@ -116,9 +108,9 @@ function DashboardMobileSidebar({
</div>
</Dialog.Panel>
</Transition.Child>
- </div >
- </Dialog >
- </Transition.Root >
+ </div>
+ </Dialog>
+ </Transition.Root>
)
}
diff --git a/db/tables.ts b/db/tables.ts
index 67cc0d5ef..f08c5d911 100644
--- a/db/tables.ts
+++ b/db/tables.ts
@@ -1,2 +1,3 @@
export const projectsTable = 'projects'
export const deploymentsTable = 'deployments'
+export const logsTable = 'log_files'
diff --git a/hooks/useDeployment.ts b/hooks/useDeployment.ts
deleted file mode 100644
index 1cd2fe1b3..000000000
--- a/hooks/useDeployment.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { deployments, projects } from '@prisma/client'
-import { useSupabaseClient } from '@supabase/auth-helpers-react'
-import { useState, useEffect } from 'react'
-
-import { deploymentsTable } from 'db/tables'
-import { Database } from 'db/supabase'
-
-function useDeployment(project: projects) {
- const [initDeployment, setInitDeployment] = useState<deployments>()
-
- const [deployment, setDeployment] = useState<deployments>()
- const client = useSupabaseClient<Database>()
-
- useEffect(function init() {
- (async () => {
- const deployment = await client
- .from(deploymentsTable)
- .select('*')
- .eq('project_id', project.id)
- .order('created_at', { ascending: false })
- .limit(1)
- .maybeSingle()
-
- if (!deployment) return
- if (deployment.error) return
- setInitDeployment(deployment.data as unknown as deployments)
- })()
- }, [client, project.id])
-
- // Sometimes a large field from realtime server can be missing because of the internal POSTGRES/TOAST workings.
- // We changed the table replication to full with `ALTER TABLE events REPLICA IDENTITY FULL;` to fix this.
- // https://github.com/supabase/realtime/issues/223 mentioned that we may need to check the `old_record` field of the payload for the actual value,
- // but so far it seems we don't have to.
- useEffect(function subscribe() {
- // TODO: SECURITY - Enable row security for all tables and configure access to deployments.
- const insertSub = client.channel('any')
- .on('postgres_changes',
- {
- event: 'INSERT',
- schema: 'public',
- table: deploymentsTable,
- filter: `project_id=eq.${project.id}`,
- }, payload => {
- setDeployment(payload.new as deployments)
- })
- .subscribe()
-
- const updateSub = client.channel('any')
- .on('postgres_changes',
- {
- event: 'UPDATE',
- schema: 'public',
- table: deploymentsTable,
- filter: `project_id=eq.${project.id}`,
- }, payload => {
- setDeployment(payload.new as deployments)
- })
- .subscribe()
-
- return () => {
- insertSub.unsubscribe()
- updateSub.unsubscribe()
- }
- }, [
- client,
- project.id,
- ])
-
- return deployment || initDeployment
-}
-
-export default useDeployment
diff --git a/hooks/useDeploymentRunLog.ts b/hooks/useDeploymentRunLog.ts
new file mode 100644
index 000000000..0cce76cc0
--- /dev/null
+++ b/hooks/useDeploymentRunLog.ts
@@ -0,0 +1,46 @@
+import { useSupabaseClient } from '@supabase/auth-helpers-react'
+import { useState, useEffect, useMemo } from 'react'
+
+import { logsTable } from 'db/tables'
+import { Database } from 'db/supabase'
+import { LiteDeploymentLog } from 'utils/agentLogs'
+
+function useDeploymentRunLog(initLog: LiteDeploymentLog) {
+ const [logContent, setLogContent] = useState<any>()
+ const client = useSupabaseClient<Database>()
+ const log = useMemo(() => {
+ if (!logContent) return initLog
+ return {
+ ...initLog,
+ content: logContent,
+ }
+ }, [initLog, logContent])
+
+ // Sometimes a large field from realtime server can be missing because of the internal POSTGRES/TOAST workings.
+ // We changed the table replication to full with `ALTER TABLE events REPLICA IDENTITY FULL;` to fix this.
+ // https://github.com/supabase/realtime/issues/223 mentioned that we may need to check the `old_record` field of the payload for the actual value,
+ // but so far it seems we don't have to.
+ useEffect(function subscribe() {
+ const updateSub = client.channel('any')
+ .on('postgres_changes',
+ {
+ event: 'UPDATE',
+ schema: 'public',
+ table: logsTable,
+ filter: `id=eq.${initLog.id}`,
+ }, payload => {
+ setLogContent(JSON.parse(payload.new.content))
+ })
+ .subscribe()
+ return () => {
+ updateSub.unsubscribe()
+ }
+ }, [
+ client,
+ initLog.id,
+ ])
+
+ return log
+}
+
+export default useDeploymentRunLog
diff --git a/hooks/useFilterRunLogs.tsx b/hooks/useFilterRunLogs.tsx
index 4b9278220..31447b2dc 100644
--- a/hooks/useFilterRunLogs.tsx
+++ b/hooks/useFilterRunLogs.tsx
@@ -14,4 +14,4 @@ function useFilterRunLogs({
return deployment.logs.filter((l: any) => l['properties']?.run_id === runID)
}
-export default useFilterRunLogs
\ No newline at end of file
+export default useFilterRunLogs
diff --git a/pages/agent/smol-developer/index.tsx b/pages/agent/smol-developer/index.tsx
index 15fb65a51..3735500a0 100644
--- a/pages/agent/smol-developer/index.tsx
+++ b/pages/agent/smol-developer/index.tsx
@@ -1,6 +1,4 @@
-import {
- Github,
-} from 'lucide-react'
+import { Github } from 'lucide-react'
import { useRouter } from 'next/router'
import { useEffect } from 'react'
import type { InferGetServerSidePropsType, GetServerSideProps } from 'next'
diff --git a/pages/agent/smol-developer/setup.tsx b/pages/agent/smol-developer/setup.tsx
index 5c76b615b..2b935b0cb 100644
--- a/pages/agent/smol-developer/setup.tsx
+++ b/pages/agent/smol-developer/setup.tsx
@@ -81,6 +81,7 @@ export interface PostAgentResponse {
pullURL: string
pullNumber: number
projectID: string
+ projectSlug: string
}
async function handlePostAgent(url: string, { arg }: { arg: PostAgentBody }) {
@@ -105,6 +106,7 @@ function getSmolDevModelConfig(creds: Creds): ModelConfig & { templateID: Templa
templateID,
}
}
+
function Setup() {
const user = useUser()
const supabaseClient = useSupabaseClient()
@@ -165,7 +167,12 @@ function Setup() {
// Redirect to the dashboard.
if (response) {
- router.push(response.pullURL)
+ router.push({
+ pathname: '/logs/[slug]',
+ query: {
+ slug: `${response.projectSlug}-0`,
+ },
+ })
} else {
console.error('No response from agent creation')
}
diff --git a/pages/api/agent/index.ts b/pages/api/agent/index.ts
index bc34700ff..97c041406 100644
--- a/pages/api/agent/index.ts
+++ b/pages/api/agent/index.ts
@@ -215,6 +215,7 @@ async function postAgent(req: NextApiRequest, res: NextApiResponse) {
owner,
repo,
projectID: project.id,
+ projectSlug: slug,
}
posthog?.capture({