Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Add steps grouping [WIP]

Tomas Valentabba504ce6e7f
diff --git a/components/AgentDeploymentsLogsList.tsx b/components/AgentDeploymentsLogsList.tsx
deleted file mode 100644
index 411089345..000000000
--- a/components/AgentDeploymentsLogsList.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
- useState,
- useEffect,
- useCallback,
- Fragment,
-} from 'react'
-import { useRouter } from 'next/router'
-import clsx from 'clsx'
-import { usePostHog } from 'posthog-js/react'
-
-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 posthog = usePostHog()
-
- const selectLog = useCallback((idx: number) => {
- setSelectedLogIdx(idx)
- onSelected(logs[idx])
- posthog?.capture('selected log', {
- logIdx: idx,
- })
- router.replace({
- pathname: '',
- query: {
- ...router.query,
- selectedLog: idx.toString(),
- },
- }, undefined, { shallow: true })
- }, [logs, onSelected, router, posthog])
-
- 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">
- {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 flex justify-between',
- selectedLogIdx === idx && 'bg-[#1F2437]',
- )}
- >
- <span>
- {ctx.message}
- </span>
- <span className="text-gray-600 text-sm self-center">
- {new Date(ctx.timestamp).toLocaleTimeString()}
- </span>
- </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/AgentDeploymentsStepsList.tsx b/components/AgentDeploymentsStepsList.tsx
new file mode 100644
index 000000000..1121ef955
--- /dev/null
+++ b/components/AgentDeploymentsStepsList.tsx
@@ -0,0 +1,174 @@
+import {
+ useEffect,
+ useCallback,
+ Fragment,
+ useMemo,
+} from 'react'
+import { useRouter } from 'next/router'
+import clsx from 'clsx'
+import { usePostHog } from 'posthog-js/react'
+
+interface Step {
+ type: string
+ id: string
+ message: string
+ timestamp: string
+ group?: {
+ id: string
+ message: string
+ }
+}
+
+interface StepGroup {
+ id?: string
+ message?: string
+ steps: Step[]
+}
+
+function groupSteps(steps: Step[]) {
+ return steps.reduce<StepGroup[]>((acc, step) => {
+ if (!step.group) {
+ acc.push({
+ steps: [step],
+ })
+ } else {
+ const group = acc.find((g) => g.id === step.group?.id)
+ if (group) {
+ group.steps.push(step)
+ } else {
+ acc.push({
+ id: step.group.id,
+ message: step.group.message,
+ steps: [step],
+ })
+ }
+ }
+ return acc
+ }, [])
+}
+
+
+export interface Props {
+ steps: Step[]
+}
+
+function AgentDeploymentStepsList({
+ steps,
+}: Props) {
+ const router = useRouter()
+ const selectedStepID = router.query.stepID as string
+ const posthog = usePostHog()
+
+ const selectStep = useCallback((id: string) => {
+ posthog?.capture('selected log step', {
+ stepID: id,
+ })
+ router.replace({
+ pathname: '',
+ query: {
+ ...router.query,
+ stepID: id,
+ },
+ }, undefined, { shallow: true })
+ }, [router, posthog])
+
+ useEffect(function selectDefaultStep() {
+ if (selectedStepID) return
+
+ const id = steps.length > 0 ? steps[0].id : undefined
+ if (id) {
+ selectStep(id)
+ }
+ }, [router, steps, selectedStepID, selectStep])
+
+ const groupedSteps = useMemo(() => groupSteps(steps), [steps])
+
+ // useEffect(function listenToArrowNavigitons() {
+ // function handleUpDownKey(e: KeyboardEvent) {
+ // const currentGroupIdx = groupedSteps.findIndex((group) => group.steps.some((step) => step.id === selectedStepID))
+ // if (currentGroupIdx === undefined) return
+ // const currentGroupStepIdx = groupedSteps[currentGroupIdx].steps.findIndex((step) => step.id === selectedStepID)
+
+
+
+ // if (e.key === 'ArrowUp') {
+ // if (currentGroupStepIdx === 0) {
+
+ // }
+
+ // if (selectedLogID === 0) {
+ // selectLog(logs.length - 1)
+ // } else {
+ // selectLog(selectedLogID - 1)
+ // }
+ // } else if (e.key === 'ArrowDown') {
+ // if (selectedLogID === logs.length - 1) {
+ // selectLog(0)
+ // } else {
+ // selectLog(selectedLogID + 1)
+ // }
+ // }
+ // }
+ // window.addEventListener('keydown', handleUpDownKey)
+ // return () => window.removeEventListener('keydown', handleUpDownKey)
+ // }, [groupedSteps, selectStep, selectedStepID])
+
+ return (
+ <div className="flex flex-col overflow-auto ml-4">
+ {steps.length === 0 && (
+ <div className="flex-1 flex items-center justify-center h-full">
+ <p className="text-gray-400">No logs</p>
+ </div>
+ )}
+ {groupedSteps.map((group, idx) => (
+ <Fragment key={idx}>
+ <div className={clsx({ 'border-gray-700 rounded-md py-4 my-3': group.id, 'border-transparent my-1': !group.id }, 'px-4 border relative')}>
+ {group.id &&
+ <span className="absolute top-[-10px] bg-gray-900 text-xs px-1.5 text-gray-50">
+ {group.message}
+ </span>
+ }
+ {group.steps.map((step, stepIdx) => (
+ <>
+ <div
+ className={clsx('flex items-center space-x-2 cursor-pointer group')}
+ onClick={() => selectStep(step.id)}
+ >
+ <span className={clsx(
+ 'font-bold text-sm capitalize min-w-[72px] group-hover:text-[#6366F1] transition-all',
+ selectedStepID === step.id && 'text-[#6366F1]',
+ selectedStepID !== step.id && 'text-[#55618C]',
+ )}
+ >
+ {step.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 flex justify-between',
+ selectedStepID === step.id && 'bg-[#1F2437]',
+ )}
+ >
+ <span>
+ {step.message}
+ </span>
+ <span className="text-gray-600 text-sm self-center">
+ {new Date(step.timestamp).toLocaleTimeString()}
+ </span>
+ </span>
+ </div>
+ {stepIdx !== group.steps.length - 1 && (
+ <div className="ml-1 rounded h-[24px] w-px bg-gray-800" />
+ )}
+ </>
+ ))}
+ </div>
+ {idx !== groupedSteps.length - 1 && (
+ <div className="ml-[21px] rounded h-[24px] w-px bg-gray-800" />
+ )}
+ </Fragment>
+ ))}
+ </div>
+ )
+}
+
+export default AgentDeploymentStepsList
diff --git a/components/AgentRunLogContent.tsx b/components/AgentRunLogContent.tsx
index 9d6b6bcde..ddace37af 100644
--- a/components/AgentRunLogContent.tsx
+++ b/components/AgentRunLogContent.tsx
@@ -1,7 +1,6 @@
import {
useCallback,
useMemo,
- useState,
} from 'react'
import Splitter from '@devbookhq/splitter'
import clsx from 'clsx'
@@ -13,7 +12,7 @@ import {
import { useLocalStorage } from 'hooks/useLocalStorage'
import useDeploymentRunLog from 'hooks/useDeploymentRunLog'
import AgentRunLogDetail from './AgentRunLogDetail'
-import AgentDeploymentLogsList from './AgentDeploymentsLogsList'
+import AgentDeploymentStepsList from './AgentDeploymentsStepsList'
import Spinner from './Spinner'
export interface Props {
@@ -23,9 +22,9 @@ export interface Props {
function AgentRunLogContent({
log: initialLog,
}: Props) {
- const [selectedLog, setSelectedLog] = useState<any>()
const [splitterSizes, setSplitterSizes] = useLocalStorage('log-content-splitter', [40, 60])
const router = useRouter()
+ const selectedStepID = router.query.stepID as string
const slug = router.query.slug as string
@@ -34,6 +33,9 @@ function AgentRunLogContent({
}, [setSplitterSizes])
const log = useDeploymentRunLog(initialLog)
+ const selectedStep = useMemo(() => {
+ return log.content?.find((c: any) => c.id === selectedStepID)
+ }, [log.content, selectedStepID])
const runSteps = log.content && log.content.filter((c: any) => c.type === 'Run')
const isRunOlderThanTimeout = useMemo(() => {
@@ -68,12 +70,11 @@ function AgentRunLogContent({
onResizeFinished={setSizes}
minWidths={[120, 120]}
>
- <AgentDeploymentLogsList
- logs={log.content as any}
- onSelected={setSelectedLog}
+ <AgentDeploymentStepsList
+ steps={log.content as any}
/>
<AgentRunLogDetail
- log={selectedLog}
+ step={selectedStep}
/>
</Splitter>
</div>
diff --git a/components/AgentRunLogDetail.tsx b/components/AgentRunLogDetail.tsx
index fd0aaec22..c33eafc97 100644
--- a/components/AgentRunLogDetail.tsx
+++ b/components/AgentRunLogDetail.tsx
@@ -2,31 +2,31 @@ import dynamic from 'next/dynamic'
const ReactJson = dynamic(import('react-json-view'), { ssr: false })
export interface Props {
- log?: any
+ step?: any
}
function AgentRunLogDetail({
- log,
+ step,
}: 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 && (
+ {step && (
<>
<div className="flex flex-col space-y-1 w-full">
<span className="text-sm font-medium text-gray-500">Type</span>
- <span className="text-sm text-gray-200 w-full">{log.type}</span>
+ <span className="text-sm text-gray-200 w-full">{step.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>
+ <p className="text-sm text-gray-200 w-full prose whitespace-pre-wrap max-w-full">{step.message}</p>
</div>
- {log.properties &&
+ {step.properties &&
<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}
+ src={step.properties}
name={null}
style={{
background: 'transparent',