Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix state handling; Add blocks
Tomas Valentaabcda5d2942c
diff --git a/components/AuthForm.tsx b/components/AuthForm.tsxindex 558e7c374..2546238f3 100644--- a/components/AuthForm.tsx+++ b/components/AuthForm.tsx@@ -114,7 +114,7 @@ function AuthForm({ authType }: Props) {items-centerspace-y-8self-start- rounded+ rounded-mdborderborder-slate-200bg-white@@ -141,7 +141,7 @@ function AuthForm({ authType }: Props) {'w-full','px-2.5','py-2',- 'rounded',+ 'rounded-md','border','border-slate-200',{@@ -168,7 +168,7 @@ function AuthForm({ authType }: Props) {className={clsx('px-2.5','py-2',- 'rounded',+ 'rounded-md','border','flex','min-w-0',diff --git a/components/Button.tsx b/components/Button.tsxindex 824f23562..ecae216af 100644--- a/components/Button.tsx+++ b/components/Button.tsx@@ -43,7 +43,7 @@ function Button({'items-center','justify-center','transition-all',- 'rounded',+ 'rounded-md','border','space-x-1.5','py-1.5',diff --git a/components/DeploymentEditor.tsx b/components/DeploymentEditor.tsxdeleted file mode 100644index 53d6adfc4..000000000--- a/components/DeploymentEditor.tsx+++ /dev/null@@ -1,137 +0,0 @@-import { shallow } from 'zustand/shallow'-import { api_deployments } from '@prisma/client'-import { useSupabaseClient } from '@supabase/auth-helpers-react'-import { useEffect, useState } from 'react'-import { PlusIcon } from 'lucide-react'--import { createStore, State } from 'state/store'--import Button from './Button'-import Text from './typography/Text'--const selector = (state: State) => ({- blocks: state.blocks,- addBlock: state.addBlock,- removeBlock: state.removeBlock,- changeBlock: state.changeBlock,-})--const useStore = createStore([- {- code: 'cd',- type: 'type',- },- {- code: 'cd',- type: 'type',- },- {- code: 'cd',- type: 'type',- },- {- code: 'cd',- type: 'type',- },-])--export interface Props {- deployment: api_deployments-}--// function useDeployment(deployment: api_deployments) {-// const [latest, setLatest] = useState<api_deployments>(deployment)-// const client = useSupabaseClient()--// useEffect(function subscribe() {-// const sub = client.channel('any')-// .on('postgres_changes',-// {-// event: 'UPDATE',-// schema: 'public',-// table: 'api_deployments',-// filter: `id=eq.${deployment.id}`,-// }, payload => {-// console.log('Change received!', payload)-// setLatest(l => ({ ...l, data: payload.new.data }))-// })-// .subscribe()--// return () => {-// sub.unsubscribe()-// }-// }, [deployment, client])--// return latest-// }--export default function DeploymentEditor({ deployment }: Props) {- const {- addBlock,- blocks,- changeBlock,- removeBlock,- } = useStore(selector, shallow)-- // const syncedDeployment = useDeployment(deployment)- // const dbBlocks = blocks || syncedDeployment.data as unknown as State['blocks']-- return (- <div className="- flex- flex-1- p-4- space-y-4- flex-col- items-center- overflow-auto- relative- ">- <div className="flex">- <Text- text="Request"- className='font-bold'- />- </div>- <div className="- flex- flex-col- space-y-4- max-w-[800px]- w-full- ">- {- blocks.map((b, i) =>- <div- key={i}- className="- flex- flex-1- rounded- bg-white- border- border-slate-200- p-4- min-h-[100px]- "- >- <div className="">{b.type}</div>- <div>{b.code}</div>- <div />- </div>- )- }- </div>- <div className="flex">- <Button- text="Add block"- variant={Button.variant.Outline}- onClick={() => addBlock({- code: 'lore',- type: 'as',- })}- />- </div>- </div>- )-}diff --git a/components/Editor/BodyBlock.tsx b/components/Editor/BodyBlock.tsxnew file mode 100644index 000000000..e29ff65b4--- /dev/null+++ b/components/Editor/BodyBlock.tsx@@ -0,0 +1,143 @@+import clsx from 'clsx'+import { Wrench } from 'lucide-react'+import { useState, useEffect, MouseEvent } from 'react'++import Text from 'components/typography/Text'++import { Block } from 'state/store'++export interface Props {+ onChange: (block: Block) => void+ onDelete: () => void+ block: Block+}++export default function BodyBlock({ onChange, onDelete, block }: 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 (+ <div className="+ flex+ relative+ items-center+ w-[65ch]+ ">+ <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>+ <input+ autoCapitalize="off"+ autoComplete="off"+ autoCorrect="off"+ name="block"+ placeholder="Prompt"+ type="text"+ value={block.prompt}+ onChange={e => onChange({ ...block, prompt: e.target.value })}+ className={clsx(+ 'w-full',+ 'px-4',+ 'py-2',+ 'rounded-lg',+ 'transition-all',+ 'focus:rounded-full',+ 'border',+ 'hover:border-green-800/40',+ 'border-slate-200',+ 'bg-white',+ 'outline-none',+ 'focus:border-green-800',+ 'text-sm',+ 'placeholder:text-slate-300',+ )}+ />+ <div className="+ absolute+ translate-x-full+ right-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>+ </div>+ </div>+ )+}diff --git a/components/Editor/ConnectionLine.tsx b/components/Editor/ConnectionLine.tsxnew file mode 100644index 000000000..b8ccec837--- /dev/null+++ b/components/Editor/ConnectionLine.tsx@@ -0,0 +1,9 @@+export interface Props {+ className: string+}++export default function ConnectionLine({ className }: Props) {+ return (+ <div className={`${className} border-l my-2 rounded border-slate-200`} />+ )+}diff --git a/components/Editor/DeployButton.tsx b/components/Editor/DeployButton.tsxnew file mode 100644index 000000000..0d3e12e7a--- /dev/null+++ b/components/Editor/DeployButton.tsx@@ -0,0 +1,45 @@+import useSWRMutation from 'swr/mutation'+import { shallow } from 'zustand/shallow'++import Button from '../Button'+import { Block, State } from 'state/store'+import { getStoreContext } from 'state/StoreProvider'++const selector = (state: State) => ({+ blocks: state.blocks,+})++async function handlePostGenerate(url: string, { arg }: { arg: { blocks: Block[] } }) {+ return await fetch(url, {+ method: 'POST',+ body: JSON.stringify(arg),++ headers: {+ 'Content-Type': 'application/json',+ },+ }).then(r => r.json())+}++export default function DeployButton() {+ const useStore = getStoreContext()++ const {+ blocks,+ } = useStore(selector, shallow)++ const { trigger: generate } = useSWRMutation('/api/generate', handlePostGenerate)++ async function deploy() {+ generate({+ blocks,+ })+ }++ return (+ <Button+ text="Deploy"+ onClick={deploy}+ variant={Button.variant.Full}+ />+ )+}diff --git a/components/Editor/HeadBlock.tsx b/components/Editor/HeadBlock.tsxnew file mode 100644index 000000000..0a95d0f23--- /dev/null+++ b/components/Editor/HeadBlock.tsx@@ -0,0 +1,66 @@+import clsx from 'clsx'+import { useEffect, useRef, useState } from 'react'+import { toast } from 'sonner'++import { Block } from 'state/store'++export interface Props {+ onConfirm: (block: Block) => void+}++export default function HeadBlock({ onConfirm }: Props) {+ const ref = useRef<HTMLInputElement>(null)+ const [prompt, setPrompt] = useState<string>('')++ useEffect(function autofocus() {+ ref.current?.focus()+ }, [])++ return (+ <div className="flex flex-col flex-1 min-w-[500px]">+ <form+ autoComplete="on"+ onSubmit={e => {+ e.preventDefault()+ if (!prompt) {+ toast('Prompt must not be empty')+ ref.current?.focus()+ return+ }+ onConfirm({+ prompt,+ })+ setPrompt('')+ }}+ >+ <input+ autoCapitalize="off"+ autoComplete="off"+ autoCorrect="off"+ name="block"+ placeholder="What to do..."+ type="text"+ ref={ref}+ value={prompt}+ onChange={e => setPrompt(e.target.value)}+ className={clsx(+ 'w-full',+ 'px-4',+ 'py-2',+ 'hover:border-green-800/40',+ 'rounded-full',+ 'transition-all',+ 'border',+ 'border-slate-200',+ 'bg-white',+ 'outline-none',+ 'focus:border-green-800',+ 'text-sm',+ 'placeholder:text-slate-300',+ )}+ required+ />+ </form>+ </div>+ )+}diff --git a/components/Editor/index.tsx b/components/Editor/index.tsxnew file mode 100644index 000000000..344072dfd--- /dev/null+++ b/components/Editor/index.tsx@@ -0,0 +1,100 @@+import { shallow } from 'zustand/shallow'+import useSWRMutation from 'swr/mutation'++import { State, Block } from 'state/store'+import { getStoreContext } from 'state/StoreProvider'++import Text from '../typography/Text'+import HeadBlock from './HeadBlock'+import BodyBlock from './BodyBlock'+import Button from '../Button'+import ConnectionLine from './ConnectionLine'+import { Fragment } from 'react'++const selector = (state: State) => ({+ blocks: state.blocks,+ addBlock: state.addBlock,+ removeBlock: state.deleteBlock,+ changeBlock: state.changeBlock,+})++export interface Props { }++async function handlePostGenerate(url: string, { arg }: { arg: { blocks: Block[] } }) {+ return await fetch(url, {+ method: 'POST',+ body: JSON.stringify(arg),++ headers: {+ 'Content-Type': 'application/json',+ },+ }).then(r => r.json())+}++export default function Editor({ }: Props) {+ const useStore = getStoreContext()++ const {+ addBlock,+ blocks,+ changeBlock,+ removeBlock,+ } = useStore(selector, shallow)++ const { trigger: generate } = useSWRMutation('/api/generate', handlePostGenerate)++ async function deploy() {+ generate({+ blocks,+ })+ }++ return (+ <div className="+ flex+ flex-1+ p-8+ flex-col+ items-center+ overflow-auto+ relative+ ">+ <div className="flex">+ <Text+ text="Request"+ className='font-bold'+ />+ </div>+ <ConnectionLine className='h-4' />+ <div className="+ flex+ flex-col+ items-center+ transition-all+ ">+ {+ blocks.map((b, i, a) =>+ <Fragment+ key={i.toString() + ' ' + a.length}+ >+ <BodyBlock+ block={b}+ onDelete={() => removeBlock(i)}+ onChange={(b) => changeBlock(i, b)}+ />+ <ConnectionLine className='h-4' />+ </Fragment>+ )+ }+ </div>+ <HeadBlock onConfirm={addBlock} />+ <div className="absolute right-4 top-4">+ <Button+ text="Deploy"+ onClick={deploy}+ variant={Button.variant.Full}+ />+ </div>+ </div>+ )+}diff --git a/package.json b/package.jsonindex 90090342c..f716274db 100644--- a/package.json+++ b/package.json@@ -30,6 +30,7 @@"react": "18.2.0","react-dom": "18.2.0","server-only": "^0.0.1",+ "sonner": "^0.1.6","superjson": "^1.12.2","swr": "^2.0.4","tailwind-merge": "^1.10.0",@@ -55,4 +56,4 @@"typescript": "^4.9.5","vercel": "^28.16.12"}-}\ No newline at end of file+}diff --git a/pages/_app.tsx b/pages/_app.tsxindex f9781555e..64ec034ac 100644--- a/pages/_app.tsx+++ b/pages/_app.tsx@@ -5,11 +5,13 @@ import { SessionContextProvider, Session } from '@supabase/auth-helpers-react'import { useState } from 'react'import { useRouter } from 'next/router'import clsx from 'clsx'+import { Toaster } from 'sonner'+import { api_deployments } from '@prisma/client'import 'styles/global.css'-import Header from '@/components/Header'-import { Database } from '@/db/supabase'+import Header from 'components/Header'+import { Database } from 'db/supabase'const inter = Inter({subsets: ['latin'],@@ -21,7 +23,7 @@ const jetBrains = JetBrains_Mono({variable: '--font-jet-brains',})-export default function App({ Component, pageProps }: AppProps<{ initialSession: Session }>) {+export default function App({ Component, pageProps }: AppProps<{ initialSession: Session, deployment?: api_deployments }>) {const router = useRouter()const [supabaseClient] = useState(() => createBrowserSupabaseClient<Database>())@@ -44,20 +46,11 @@ export default function App({ Component, pageProps }: AppProps<{ initialSession:supabaseClient={supabaseClient}initialSession={pageProps.initialSession}>-{!isSignIn && !isSignUp &&<Header />}- <div- className="- flex- flex-1- flex-col- overflow-hidden- "- >- <Component {...pageProps} />- </div>+ <Toaster />+ <Component {...pageProps} /></SessionContextProvider></main>)diff --git a/pages/index.tsx b/pages/index.tsxindex 6af064820..287258f8a 100644--- a/pages/index.tsx+++ b/pages/index.tsx@@ -1,9 +1,11 @@import type { GetServerSideProps } from 'next'import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'+import { useSupabaseClient } from '@supabase/auth-helpers-react'import { prisma, api_deployments } from 'db/prisma'-import { notEmpty } from '@/utils/notEmpty'-import DeploymentEditor from '@/components/DeploymentEditor'+import { notEmpty } from 'utils/notEmpty'+import DeploymentEditor from 'components/Editor'+import { StoreProvider } from 'state/StoreProvider'export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {const supabase = createServerSupabaseClient(ctx)@@ -20,7 +22,6 @@ export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {}}-const user = await prisma.auth_users.findUniqueOrThrow({where: {id: session.user.id,@@ -119,10 +120,15 @@ interface Props {}function ProjectPage({ deployment }: Props) {+ const client = useSupabaseClient()+return (- <DeploymentEditor+ <StoreProvider+ client={client}deployment={deployment}- />+ >+ <DeploymentEditor />+ </StoreProvider>)}diff --git a/pages/settings.tsx b/pages/settings.tsxindex 828d1e702..c12c1d658 100644--- a/pages/settings.tsx+++ b/pages/settings.tsx@@ -6,7 +6,7 @@ import { useSupabaseClient, useUser } from '@supabase/auth-helpers-react'import Button from 'components/Button'import Text from 'components/typography/Text'-import { Database } from '@/db/supabase'+import { Database } from 'db/supabase'export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {const supabase = createServerSupabaseClient<Database>(ctx)@@ -94,15 +94,6 @@ function Settings({ }: Props) {text={user?.email!}/></div>- <div- className="- flex- flex-col- space-y-1- "- >- </div>-<div className="pt-2"><ButtononClick={handleSignOut}diff --git a/pages/sign.tsx b/pages/sign.tsxindex 45f90ad87..6df23be58 100644--- a/pages/sign.tsx+++ b/pages/sign.tsx@@ -32,7 +32,7 @@ function SignIn() {flex-colitems-centerspace-y-4- rounded+ rounded-md">{!isCreatingNewAccount && (diff --git a/state/StoreProvider.tsx b/state/StoreProvider.tsxnew file mode 100644index 000000000..cd4f5e9f0--- /dev/null+++ b/state/StoreProvider.tsx@@ -0,0 +1,41 @@+import {+ PropsWithChildren,+ useContext,+ createContext,+ useMemo+} from 'react'+import { SupabaseClient } from '@supabase/supabase-js'+import { api_deployments } from '@prisma/client'++import { createStore } from './store'+import { Database } from 'db/supabase'++const storeContext = createContext<ReturnType<typeof createStore> | null>(null)++export interface Props extends PropsWithChildren {+ deployment?: api_deployments+ client: SupabaseClient<Database>+}++export function StoreProvider({+ deployment,+ client,+ children,+}: Props) {+ const store = useMemo(() => createStore(deployment, client), [deployment, client])++ return (+ <storeContext.Provider value={store}>+ {children}+ </storeContext.Provider>+ )+}++export function getStoreContext() {+ const ctx = useContext(storeContext)++ if (!ctx) {+ throw new Error('getStoreContext must be used inside StoreProvider')+ }+ return ctx+}diff --git a/state/store.ts b/state/store.tsindex f3ef2be1e..7b2b9c9d2 100644--- a/state/store.ts+++ b/state/store.ts@@ -2,29 +2,35 @@ import { create } from 'zustand'import { immer } from 'zustand/middleware/immer'import { createJSONStorage, persist } from 'zustand/middleware'import { SupabaseClient } from '@supabase/supabase-js'-import { apiDeploymentsTable } from '@/db/tables'-import { Database } from '@/db/supabase'+import { api_deployments } from '@prisma/client'++import { apiDeploymentsTable } from 'db/tables'+import { Database } from 'db/supabase'++export interface Tool {+ name: string+}export interface Block {- type: string- code: string+ tools?: Tool[]+ prompt: string}export interface State {blocks: Block[]changeBlock: (index: number, block: Partial<Block>) => void- removeBlock: (index: number) => void+ deleteBlock: (index: number) => voidaddBlock: (block: Block) => void}-export function createStore(blocks: Block[], id: string, client: SupabaseClient<Database>) {+export function createStore(deployment?: api_deployments, client?: SupabaseClient<Database>) {const immerStore = immer<State>((set) => ({- blocks,+ blocks: (deployment?.data as any)?.state?.blocks || [],changeBlock: (index, block) =>set(state => {state.blocks[index] = { ...state.blocks[index], ...block }}),- removeBlock: (index) =>+ deleteBlock: (index) =>set(state => {state.blocks.splice(index, 1)}),@@ -34,29 +40,30 @@ export function createStore(blocks: Block[], id: string, client: SupabaseClient<}),}))- client.from('')-const persistent = persist(immerStore, {name: 'supabase-storage',- partialize: (state) => state.blocks,- storage: {+ partialize: (state) => state,+ storage: client && deployment ? createJSONStorage(() => ({getItem: async (name) => {- const res = await client.from(apiDeploymentsTable).select('data').eq('id', id)+ const res = await client.from(apiDeploymentsTable).select('data').eq('id', deployment.id).single()if (res.error) {throw res.error}- return res.data as Pick<State, 'blocks'>+ return JSON.stringify(res.data.data)},- removeItem: () => {-+ removeItem: async () => {+ const res = await client.from(apiDeploymentsTable).update({ data: {} }).eq('id', deployment.id).single()+ if (res.error) {+ throw res.error+ }},- setItem: (name, value) => {--- value.state-+ setItem: async (name, value) => {+ const res = await client.from(apiDeploymentsTable).update({ data: JSON.parse(value) }).eq('id', deployment.id).single()+ if (res.error) {+ throw res.error+ }},- }+ })) : undefined,})const useStore = create<State, [["zustand/persist", unknown], ["zustand/immer", never]]>(persistent)diff --git a/styles/global.css b/styles/global.cssindex a7af12c73..a29c78709 100644--- a/styles/global.css+++ b/styles/global.css@@ -16,14 +16,12 @@html,body {@apply h-full;- @apply bg-gray-100;- @apply text-slate-700 antialiased;-+ @apply bg-slate-50/20;+ @apply text-slate-600 antialiased;text-rendering: optimizeLegibility;}#__next {@apply flex h-inherit flex-col items-center;}-}diff --git a/tailwind.config.js b/tailwind.config.jsindex 6cdd3af62..990e6e095 100644--- a/tailwind.config.js+++ b/tailwind.config.js@@ -14,18 +14,10 @@ module.exports = {},height: { inherit: 'inherit' },colors: {- gray: {- 100: '#FBFBFB',- },green: {400: '#E9F5E6',800: '#20BC69',},- cyan: {- 100: '#b3d1fb',- 200: '#AFCDF3',- 500: '#5BA0FA',- }},},},diff --git a/tsconfig.json b/tsconfig.jsonindex c55e2d0e6..6d4cbcfc7 100644--- a/tsconfig.json+++ b/tsconfig.json@@ -24,18 +24,11 @@"name": "next"}],- "paths": {- "@/*": [- "./*"- ]- }},"include": ["next-env.d.ts","**/*.ts","**/*.tsx",- ".next/types/**/*.ts",- "/project/home/valentatomas/workspace/.next/types/**/*.ts"],"exclude": ["node_modules"diff --git a/yarn.lock b/yarn.lockindex f6842ee5a..6a456f161 100644--- a/yarn.lock+++ b/yarn.lock@@ -7274,6 +7274,11 @@ socks@^2.3.3:ip "^2.0.0"smart-buffer "^4.2.0"+sonner@^0.1.6:+ version "0.1.6"+ resolved "https://registry.yarnpkg.com/sonner/-/sonner-0.1.6.tgz#da0193c8675a0ed497883bf4eac637de459deb80"+ integrity sha512-nLoVOKCcSusA7VY/nlrttZmOdNbPrE3v8C+t3Ac6z/bW6G0ReabXqhPLqjIc1mFcI7twwzpKb5thzF+qak29Kw==+sort-object-keys@^1.1.3:version "1.1.3"resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"