Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix state problems; Add routes and logs sidebars [WIP]; Add state enum for deployments [WIP]
Tomas Valenta58fb8d8556e7
diff --git a/api-service/app.py b/api-service/app.pyindex 23f08692a..a8e27f69e 100644--- a/api-service/app.py+++ b/api-service/app.py@@ -40,6 +40,10 @@ def generate():project_id=project_id, route_id=route_id, blocks=blocks, method=method)+ # TODO: Change deployments.state field in db to "deploying"+ # and after finishing deploying to "finished" (or "error")+ # (use Database.update_state from codegen/db/base)+cf_worker_dir_path = (os.path.abspath(os.path.dirname(__file__)) + "/cf-worker-template")diff --git a/api-service/codegen/db/base.py b/api-service/codegen/db/base.pyindex 646c2dbc0..792c812f6 100644--- a/api-service/codegen/db/base.py+++ b/api-service/codegen/db/base.py@@ -1,6 +1,13 @@from typing import List+from enum import Enumfrom supabase import create_client+class DeploymentState(Enum):+ Generating = "generating"+ Deploying = "deploying"+ Finished = "finished"+ Error = "error"+class Database():def __init__(self, url: str, key: str):self.client = create_client(url, key)@@ -13,5 +20,14 @@ class Database():'logs': logs,'project_id': project_id,'route_id': route_id,+ 'state': DeploymentState.Generating,},- ).execute()\ No newline at end of file+ ).execute()++ def update_state(self, run_id: str, state: DeploymentState) -> None:+ self.client.table('deployments').update(+ json={+ 'id': run_id,+ 'state': state,+ },+ ).execute()diff --git a/components/DeleteButton.tsx b/components/DeleteButton.tsxnew file mode 100644index 000000000..aaa022140--- /dev/null+++ b/components/DeleteButton.tsx@@ -0,0 +1,74 @@+import clsx from 'clsx'+import { useState, useEffect, MouseEvent } from 'react'++import Text from './Text'++export interface Props {+ onDelete: () => void+}++function DeleteButton({ onDelete }: Props) {+ const [confirmDelete, setConfirmDelete] = useState(false)++ useEffect(+ function expireConfirm() {+ if (confirmDelete) {+ const cleanup = setTimeout(() => setConfirmDelete(false), 4000)+ return () => {+ clearTimeout(cleanup)+ }+ }+ },+ [confirmDelete],+ )++ function handleDelete(+ e: MouseEvent<HTMLButtonElement, globalThis.MouseEvent>,+ ) {+ e.stopPropagation()+ e.preventDefault()++ if (confirmDelete) {+ try {+ onDelete()+ } catch (err) {+ const msg = err instanceof Error ? err.message : String(err)+ console.error(`Error deleting item: ${msg}`)+ }+ } else {+ setConfirmDelete(true)+ }+ }++ return (+ <button+ className={clsx(+ `flex+ items-center+ justify-center+ transition-all+ rounded-lg+ border+ border-transparent+ px-3+ py-2+ `,+ {+ 'border-red-600 hover:bg-red-600/10': confirmDelete,+ },+ )}+ onClick={handleDelete}+ >+ <Text+ size={Text.size.S3}+ text={confirmDelete ? 'Confirm' : 'Delete'}+ className={clsx('whitespace-nowrap hover:text-red-600 transition-all', {+ 'text-red-600': confirmDelete,+ 'text-slate-300': !confirmDelete,+ })}+ />+ </button>+ )+}++export default DeleteButtondiff --git a/components/Editor/AddBlockButton.tsx b/components/Editor/AddBlockButton.tsxindex b122aa5fb..b148a8d63 100644--- a/components/Editor/AddBlockButton.tsx+++ b/components/Editor/AddBlockButton.tsx@@ -1,20 +1,14 @@import clsx from 'clsx'import { Plus } from 'lucide-react'-import { nanoid } from 'nanoid'--import { Block } from 'state/store'export interface Props {- addBlock: (block: Block) => void+ addBlock: () => void}function AddBlockButton({ addBlock }: Props) {return (<button- onMouseDown={() => addBlock({- prompt: '',- id: nanoid(),- })}+ onMouseDown={addBlock}type="submit"className={clsx('items-center',diff --git a/components/Editor/BlockEditor.tsx b/components/Editor/BlockEditor.tsxindex 256effd64..0300e7e4c 100644--- a/components/Editor/BlockEditor.tsx+++ b/components/Editor/BlockEditor.tsx@@ -1,15 +1,12 @@import clsx from 'clsx'-import { Wrench } from 'lucide-react'import {- useState,useEffect,- MouseEvent,useRef,} from 'react'import TextareaAutosize from 'react-textarea-autosize'-import Text from 'components/Text'import { Block } from 'state/store'+import DeleteButton from 'components/DeleteButton'export interface Props {onChange: (block: Block) => void@@ -28,84 +25,21 @@ function BlockEditor({focus,onFocus,}: Props) {- const [confirmDelete, setConfirmDelete] = useState(false)const ref = useRef<HTMLTextAreaElement>(null)- useEffect(- function expireConfirm() {- if (confirmDelete) {- const cleanup = setTimeout(() => setConfirmDelete(false), 4000)- return () => {- clearTimeout(cleanup)- }- }- },- [confirmDelete],- )-useEffect(function autofocus() {if (focus.index === index) {ref.current?.focus()}}, [focus, index])- function handleDelete(- e: MouseEvent<HTMLButtonElement, globalThis.MouseEvent>,- ) {- e.stopPropagation()- e.preventDefault()-- if (confirmDelete) {- try {- onDelete()- } catch (err) {- const msg = err instanceof Error ? err.message : String(err)- console.error(`Error deleting item: ${msg}`)- }- } else {- setConfirmDelete(true)- }- }-return (<div className="flexrelativew-[65ch]+ items-center">- <div className="- absolute- -translate-x-full- pr-2- ">- <button- className={clsx(- `flex- items-center- justify-center- transition-all- rounded-lg- border- border-transparent- px-3- py-1.5- `,- {- 'border-red-600 hover:bg-red-600/10': confirmDelete,- },- )}- onClick={handleDelete}- >- <Text- size={Text.size.S3}- text={confirmDelete ? 'Confirm' : 'Delete'}- className={clsx('whitespace-nowrap hover:text-red-600 transition-all', {- 'text-red-600': confirmDelete,- 'text-slate-300': !confirmDelete,- })}- />- </button>- </div><TextareaAutosizeautoCapitalize="off"autoComplete="off"@@ -143,28 +77,11 @@ function BlockEditor({absolutetranslate-x-fullright-0- pl-2- ">- <button- className={clsx(`- flex- items-center- justify-center- rounded-lg- border- border-transparent- px-3- py-1.5- `,- )}- >- <Text- size={Text.size.S3}- text="Tools"- icon={<Wrench size="14px" />}- className={clsx('whitespace-nowrap transition-all text-slate-400 hover:text-slate-500')}- />- </button>+ pl-1+ ">+ <DeleteButton+ onDelete={onDelete}+ /></div></div>)diff --git a/components/Editor/Logs.tsx b/components/Editor/Logs.tsxindex b5a9dfc1f..617774dbd 100644--- a/components/Editor/Logs.tsx+++ b/components/Editor/Logs.tsx@@ -2,35 +2,58 @@ import Ansi from 'ansi-to-react'import { Log } from '.'import { Fragment } from 'react'+import Button from 'components/Button'+import Sidebar from 'components/Sidebar'export interface Props {- logs: Log[]+ logs?: Log[]+ deploy: () => void}-function Logs({ logs }: Props) {+function Logs({+ logs,+ deploy,+}: Props) {return (- <div className="+ <Sidebar+ side={Sidebar.side.Right}+ className="+ flex-col+ min-h-0+ flex+ p-4+ space-y-4+ "+ >+ <div>+ <Button+ text="Deploy"+ onClick={deploy}+ variant={Button.variant.Full}+ />++ </div>+ <div className="flexflex-col- bg-white+ flex-1overflow-y-autotext-xsleading-4break-words- w-[250px]whitespace-normalspace-y-2- p-4- ">- {logs.map((l, i) =>- <Fragment key={i}>- <Ansi>- {l}- </Ansi>- <hr />- </Fragment>- )}- </div>+ ">+ {logs?.map((l, i) =>+ <Fragment key={i}>+ <Ansi>+ {l}+ </Ansi>+ <hr />+ </Fragment>+ )}+ </div>+ </Sidebar>)}diff --git a/components/Editor/Routes.tsx b/components/Editor/Routes.tsxindex 9b96caa62..6fb8a6800 100644--- a/components/Editor/Routes.tsx+++ b/components/Editor/Routes.tsx@@ -1,81 +1,82 @@-import Link from 'next/link'-import { useRouter } from 'next/router'-import useSWRMutation from 'swr/mutation'import { Route } from 'state/store'import Button from 'components/Button'--interface PostRouteBody {- projectID: string-}--async function handlePostRoute(url: string, { arg }: { arg: PostRouteBody }) {- return await fetch(url, {- method: 'POST',- body: JSON.stringify(arg),- headers: {- 'Content-Type': 'application/json',- },- }).then(r => r.json())-}+import Sidebar from 'components/Sidebar'+import Text from 'components/Text'+import DeleteButton from 'components/DeleteButton'+import clsx from 'clsx'export interface Props {routes: Route[]- projectID: string+ selectRoute: (id: string) => void+ selectedRouteID?: string+ addRoute: () => void+ deleteRoute: (id: string) => void}-function Routes({ routes, projectID }: Props) {- const router = useRouter()-- const {- trigger: createRoute,- } = useSWRMutation('/api/route', handlePostRoute)-- async function handleCreateRoute() {- await createRoute({- projectID,- })- }-+function Routes({+ routes,+ selectedRouteID,+ addRoute,+ deleteRoute,+ selectRoute,+}: Props) {return (- <div>- <Button- text="New route"- onClick={handleCreateRoute}- />+ <Sidebar+ side={Sidebar.side.Left}+ className="+ flex-col+ min-h-0+ flex+ p-4+ space-y-4+ "+ >+ <div>+ <Button+ text="New route"+ onClick={addRoute}+ variant={Button.variant.Full}+ />+ </div><div className="flexflex-coloverflow-y-auto- text-xsleading-4break-words- w-[250px]whitespace-normalspace-y-2- p-4- ">- {routes.map(r => {- return <Link+ ">+ {routes.map(r =>+ <divkey={r.id}- href={{- pathname: router.pathname,- query: {- ...router.query,- route: r.id,+ className={clsx(`+ flex+ items-center+ justify-between+ hover:text-green-800+ `,+ {+ 'text-green-800': selectedRouteID === r.id,}- }}- shallow+ )}>- <div className="flex space-x-2 font-bold">- {r.method}- {r.route}- </div>- </Link>- }+ <button+ onClick={() => selectRoute(r.id)}+ >+ <Text+ className="font-mono"+ text={r.method.toUpperCase() + ' ' + r.route}+ />+ </button>+ <DeleteButton+ onDelete={() => deleteRoute(r.id)}+ />+ </div>)}</div>- </div>+ </Sidebar>)}diff --git a/components/Editor/index.tsx b/components/Editor/index.tsxindex 4ec4e5986..23227c915 100644--- a/components/Editor/index.tsx+++ b/components/Editor/index.tsx@@ -1,13 +1,11 @@import useSWRMutation from 'swr/mutation'-import { Fragment, useState } from 'react'+import { Fragment, useEffect, useState } from 'react'import Hotkeys from 'react-hot-keys'import { projects } from '@prisma/client'-import { useRouter } from 'next/router'import { Route, methods, Method } from 'state/store'import { useStateStore } from 'state/StoreProvider'import Select from 'components/Select'-import Button from 'components/Button'import Text from 'components/Text'import { useLatestDeployment } from 'hooks/useLatestDeployment'@@ -50,18 +48,32 @@ async function handlePostGenerate(url: string, { arg }: {}function Editor({ project }: Props) {- const router = useRouter()const store = useStateStore()const routes = store.use.routes()const addBlock = store.use.addBlock()const deleteBlock = store.use.deleteBlock()const changeBlock = store.use.changeBlock()+ const deleteRoute = store.use.deleteRoute()const changeRoute = store.use.changeRoute()+ const addRoute = store.use.addRoute()- const selectedRoute =- routes.find(r => r.id === router.query.route) ||- (routes.length > 0 ? routes[0] : undefined)+ const [selectedRouteID, setSelectedRouteID] = useState(() => routes.length > 0 ? routes[0].id : undefined)+ const selectedRoute = routes.find(s => s.id === selectedRouteID)++ useEffect(function selectDefaultRoute() {+ if (selectedRoute?.id || routes.length === 0) return+ setSelectedRouteID(routes[0].id)+ }, [routes, selectedRoute?.id])++ function handleDeleteRoute(id: string) {+ deleteRoute(id)+ setSelectedRouteID(r => {+ if (r === id) {+ return routes.length > 0 ? routes[0].id : undefined+ }+ })+ }const deployment = useLatestDeployment(project, selectedRoute)const logs = deployment?.logs as Log[] | undefined@@ -96,28 +108,34 @@ function Editor({ project }: Props) {setFocusedBlock(b => ({ index: b.index > 0 ? b.index - 1 : b.index }))}}}- filter={() => {- return true- }}+ filter={() => true}allowRepeat>- <div className="flex flex-row flex-1 overflow-hidden">+ <div className="+ flex+ flex-row+ overflow-hidden+ flex-1+ "><Routesroutes={routes}- projectID={project.id}+ selectRoute={setSelectedRouteID}+ selectedRouteID={selectedRoute?.id}+ deleteRoute={handleDeleteRoute}+ addRoute={addRoute}/>{selectedRoute &&<><div className="- flex- flex-1- p-8- flex-col- items-center- overflow-auto- scroller- relative- ">+ flex+ flex-1+ p-8+ flex-col+ items-center+ overflow-auto+ scroller+ relative+ "><div className="flex items-center space-x-2"><Texttext="Incoming"@@ -135,11 +153,11 @@ function Editor({ project }: Props) {/></div><div className="- flex- flex-col- items-center- transition-all- ">+ flex+ flex-col+ items-center+ transition-all+ ">{selectedRoute.blocks.map((b, i) =><Fragmentkey={b.id}@@ -166,19 +184,15 @@ function Editor({ project }: Props) {)}</div><ConnectionLine className='min-h-[16px]' />- <AddBlockButton addBlock={(block) => {- addBlock(selectedRoute.id, block)+ <AddBlockButton addBlock={() => {+ addBlock(selectedRoute.id)setTimeout(() => setFocusedBlock({ index: selectedRoute.blocks.length }), 0)}} />- <div className="fixed right-3 top-14">- <Button- text="Deploy"- onClick={deploy}- variant={Button.variant.Full}- />- </div></div>- {logs && <Logs logs={logs} />}+ <Logs+ logs={logs}+ deploy={deploy}+ /></>}</div>diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxnew file mode 100644index 000000000..5238908be--- /dev/null+++ b/components/Sidebar.tsx@@ -0,0 +1,33 @@+import clsx from 'clsx'+import { PropsWithChildren } from 'react'++export enum Side {+ Left,+ Right,+}++export interface Props {+ side: Side+ className?: string+}++function Sidebar({ children, side, className }: PropsWithChildren<Props>) {+ return (+ <div+ className={clsx(+ 'flex w-[250px] border-slate-200',+ {+ 'border-r': side === Side.Left,+ 'border-l': side === Side.Right,+ },+ className,+ )}+ >+ {children}+ </div>+ )+}++Sidebar.side = Side++export default Sidebardiff --git a/db/supabase.ts b/db/supabase.tsindex 439e545ff..251881621 100644--- a/db/supabase.ts+++ b/db/supabase.ts@@ -15,21 +15,24 @@ export interface Database {id: stringlogs: Json[] | nullproject_id: string- route_id: string | null+ route_id: string+ state: Database["public"]["Enums"]["deployment_state"] | null}Insert: {created_at?: stringid?: stringlogs?: Json[] | nullproject_id: string- route_id?: string | null+ route_id: string+ state?: Database["public"]["Enums"]["deployment_state"] | null}Update: {created_at?: stringid?: stringlogs?: Json[] | nullproject_id?: string- route_id?: string | null+ route_id?: string+ state?: Database["public"]["Enums"]["deployment_state"] | null}}projects: {@@ -100,7 +103,7 @@ export interface Database {[_ in never]: never}Enums: {- [_ in never]: never+ deployment_state: "generating" | "deploying" | "finished" | "error"}CompositeTypes: {[_ in never]: neverdiff --git a/pages/[projectID].tsx b/pages/[projectID].tsxindex 086493ec6..5a91982fc 100644--- a/pages/[projectID].tsx+++ b/pages/[projectID].tsx@@ -82,10 +82,11 @@ interface Props {function EditorPage({ project }: Props) {const client = useSupabaseClient<Database>()+ console.log('rel2')return (<StoreProviderclient={client}- initialState={project}+ project={project}><Editorproject={project}diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 60dddc68d..588fa5ace 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -252,12 +252,13 @@ model users_teams {}model deployments {- id String @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid- created_at DateTime @default(now()) @db.Timestamptz(6)+ id String @id @default(dbgenerated("uuid_generate_v4()")) @db.Uuid+ created_at DateTime @default(now()) @db.Timestamptz(6)logs Json[]project_id String- route_id String?- projects projects @relation(fields: [project_id], references: [id], onDelete: NoAction, onUpdate: NoAction)+ route_id String+ state deployment_state?+ projects projects @relation(fields: [project_id], references: [id], onDelete: NoAction, onUpdate: NoAction)@@schema("public")}@@ -295,3 +296,12 @@ enum factor_type {@@schema("auth")}++enum deployment_state {+ generating+ deploying+ finished+ error++ @@schema("public")+}diff --git a/state/StoreProvider.tsx b/state/StoreProvider.tsxindex e5c6d92b6..c97be6a61 100644--- a/state/StoreProvider.tsx+++ b/state/StoreProvider.tsx@@ -18,19 +18,17 @@ type SelectorsType = ReturnType<typeof createSelectors<StoreType>>const storeContext = createContext<SelectorsType | null>(null)export interface Props extends PropsWithChildren {- initialState?: projects+ project: projectsclient: SupabaseClient<Database>}export function StoreProvider({- initialState,+ project,client,children,}: Props) {- const store = useMemo(() => createStore(initialState, client), [initialState, client])+ const store = useMemo(() => createStore(project, client), [project.id, project.data, client])const selectors = createSelectors(store)-- const s = store(selectors.use.changeRoute)return (<storeContext.Provider value={selectors}>{children}diff --git a/state/store.ts b/state/store.tsindex 185e1236a..1f13d971c 100644--- a/state/store.ts+++ b/state/store.ts@@ -8,12 +8,7 @@ import { projects, Prisma } from '@prisma/client'import { Database } from 'db/supabase'import { projectsTable } from 'db/tables'-export interface Tool {- name: string-}-export interface Block {- tools?: Tool[]id: stringprompt: string}@@ -45,10 +40,10 @@ export interface SerializedState {export interface State extends SerializedState {changeBlock: (routeID: string, index: number, block: Partial<Omit<Block, 'id'>>) => voiddeleteBlock: (routeID: string, index: number) => void- addBlock: (routeID: string, block?: Block) => void+ addBlock: (routeID: string) => voidchangeRoute: (id: string, route: Partial<Omit<Route, 'id'>>) => voiddeleteRoute: (id: string) => void- addRoute: (route?: Route) => void+ addRoute: () => void}function getDefaultBlock(): Block {@@ -80,72 +75,70 @@ export function getTypedState(data?: Prisma.JsonValue): SerializedState | undefi}}-export function createStore(initialState?: projects, client?: SupabaseClient<Database>) {- const state = getTypedState(initialState?.data) || getDefaultState()+export function createStore(project: projects, client?: SupabaseClient<Database>) {+ const initialState = getTypedState(project.data) || getDefaultState()- if (state.routes.length === 0) {- state.routes.push(getDefaultRoute())+ if (initialState.routes.length === 0) {+ initialState.routes.push(getDefaultRoute())}const immerStore = immer<State>((set) => ({- ...state,- addRoute: (route = getDefaultRoute()) => {- state.routes.push(route)- },- deleteRoute: (id) => {- state.routes = state.routes.filter(r => r.id !== id)- },- changeRoute: (id, route) => {+ ...initialState,+ addRoute: () => set(state => {+ state.routes.push(getDefaultRoute())+ }),+ deleteRoute: (id) => set(state => {const idx = state.routes.findIndex(r => r.id === id)- if (idx > -1) {+ state.routes.splice(idx, 1)+ }),+ changeRoute: (id, route) => set(state => {+ const idx = state.routes.findIndex(r => r.id === id)+ if (idx !== -1) {state.routes[idx] = {...state.routes[idx],...route,}}- },- changeBlock: (routeID, index, block) =>- set(state => {- const idx = state.routes.findIndex(r => r.id === routeID)- if (idx > -1) {- state.routes[idx].blocks[index] = {- ...state.routes[idx].blocks[index],- ...block,- }- }- }),- deleteBlock: (routeID, index) =>- set(state => {- const idx = state.routes.findIndex(r => r.id === routeID)- if (idx > -1) {- state.routes[idx].blocks.splice(index, 1)+ }),+ changeBlock: (routeID, index, block) => set(state => {+ const idx = state.routes.findIndex(r => r.id === routeID)+ if (idx !== -1) {+ state.routes[idx].blocks[index] = {+ ...state.routes[idx].blocks[index],+ ...block,}- }),- addBlock: (routeID, block = getDefaultBlock()) =>- set(state => {- const idx = state.routes.findIndex(r => r.id === routeID)- if (idx > -1) {- state.routes[idx].blocks.push(block)- }- }),+ }+ }),+ deleteBlock: (routeID, index) => set(state => {+ const idx = state.routes.findIndex(r => r.id === routeID)+ if (idx !== -1) {+ state.routes[idx].blocks.splice(index, 1)+ }+ }),+ addBlock: (routeID) => set(state => {+ const idx = state.routes.findIndex(r => r.id === routeID)+ if (idx !== -1) {+ state.routes[idx].blocks.push(getDefaultBlock())+ }+ }),}))const persistent = persist(immerStore, {name: 'supabase-storage',partialize: (state) => state,- storage: client && initialState ? {+ storage: client ? {getItem: async (name) => {// We retrieve the data on the serverreturn null},removeItem: async () => {- const res = await client.from(projectsTable).update({ data: {} }).eq('id', initialState.id).single()+ const res = await client.from(projectsTable).update({ data: {} }).eq('id', project.id).single()if (res.error) {throw res.error}},setItem: async (name, value) => {- const res = await client.from(projectsTable).update({ data: value as any }).eq('id', initialState.id)+ const res = await client.from(projectsTable).update({ data: value as any }).eq('id', project.id)if (res.error) {throw res.error}diff --git a/utils/getProjectURL.ts b/utils/getProjectURL.tsindex 3d698639e..41e9a725c 100644--- a/utils/getProjectURL.ts+++ b/utils/getProjectURL.ts@@ -1,3 +1,3 @@export function getProjectURL(projectID: string) {- return `${projectID}.api.usedevbook.com`+ return `${projectID}.devbook.workers.dev`}