Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix templates handling [WIP]
Tomas Valentad394aa8a870c
diff --git a/api-service/app.py b/api-service/app.pyindex 97b8ba397..617bcbde1 100644--- a/api-service/app.py+++ b/api-service/app.py@@ -28,16 +28,6 @@ app.config.from_prefixed_env()app = cors(app, allow_origin="*")-def get_request_body_template(blocks: List[dict[str, str]]):- request_body_blocks = [- block for block in blocks if block.get("type") == "RequestBody"- ]- request_body_template = (- request_body_blocks[0]["content"] if len(request_body_blocks) > 0 else None- )- return request_body_template--@app.route("/health", methods=["GET"])async def health():return "OK"diff --git a/components/Editor/Sidebar/Context.tsx b/components/Editor/Sidebar/Context.tsxdeleted file mode 100644index 590e8d15f..000000000--- a/components/Editor/Sidebar/Context.tsx+++ /dev/null@@ -1,72 +0,0 @@-import Text from 'components/Text'-import { html2markdown } from 'editor/schema'-import { useMemo } from 'react'-import { useStateStore } from 'state/StoreProvider'--export interface Props {-}--function Context({--}: Props) {- const [selector] = useStateStore()- const routes = selector.use.routes()- const references = useMemo(() => routes- .flatMap(r => r.blocks)- .filter(b => b.type === 'Instructions' || b.type === 'Description')- .flatMap(b => {- const [, references] = html2markdown(b.content)- return references- }).filter((reference, index, self) =>- index === self.findIndex((r) => (- r.type === reference.type && r.value === reference.value- ))- )- , [routes])-- return (- <div className="- flex- flex-col- overflow-hidden- ">- <div className="- flex- bg-slate-50- items-center- justify-between- border-b- py-3.5- pr-4- ">- <Text- text="Context"- size={Text.size.S2}- className="- uppercase- text-slate-400- font-semibold- px-4- "- />- </div>- <div className="- flex- flex-1- flex-col- space-y-2- ">- {references.map(r =>- <div- key={r.type + '/' + r.value}- >- {r.type}- {r.value}- </div>- )}- </div>- </div>- )-}--export default Contextdiff --git a/components/Editor/Sidebar/Deploy.tsx b/components/Editor/Sidebar/Deploy.tsxdeleted file mode 100644index 01e5ea43d..000000000--- a/components/Editor/Sidebar/Deploy.tsx+++ /dev/null@@ -1,82 +0,0 @@-import { deployments } from '@prisma/client'-import Text from 'components/Text'-import Link from 'next/link'--export interface Props {- deployment?: deployments-}--function Deploy({- deployment,-}: Props) {-- return (- <div className="- flex- flex-col- overflow-hidden- ">- <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-1- space-y-2- p-4- flex-col- "- >- <Text- text="Latest Deployment"- className="- font-semibold- uppercase- text-slate-400- "- size={Text.size.S3}- />- {deployment?.url &&- <Link- href={deployment.url}- className="underline"- target="_blank"- rel="noopener noreferrer"- >- <Text- size={Text.size.S3}- text={deployment.url.substring('https://'.length)}- />- </Link>- }- {!deployment?.url &&- <Text- text="No deployment URL found"- size={Text.size.S3}- className="text-slate-400"- />- }- </div>- </div>- )-}--export default Deploydiff --git a/components/Editor/Sidebar/Envs.tsx b/components/Editor/Sidebar/Envs.tsxindex 7b19a2d4b..9fb9f0ac2 100644--- a/components/Editor/Sidebar/Envs.tsx+++ b/components/Editor/Sidebar/Envs.tsx@@ -3,24 +3,25 @@ import { memo, useCallback } from 'react'import Button from 'components/Button'import Text from 'components/Text'import { useStateStore } from 'state/StoreProvider'+import { getDefaultEnv } from 'state/envs'function Envs() {const [selector] = useStateStore()const envs = selector.use.envs()const setEnvs = selector.use.setEnvs()- const changeEnv = selector.use.changeEnv()+ const setEnv = selector.use.setEnv()const handleEnvKeyChange = useCallback((event: any, idx: number) => {- changeEnv({ key: event.target.value.trim(), value: envs[idx].value }, idx)- }, [envs, changeEnv])+ setEnv({ key: event.target.value.trim(), value: envs[idx].value }, idx)+ }, [envs, setEnv])const handleEnvValueChange = useCallback((event: any, idx: number) => {- changeEnv({ key: envs[idx].key, value: event.target.value.trim() }, idx)- }, [envs, changeEnv])+ setEnv({ key: envs[idx].key, value: event.target.value.trim() }, idx)+ }, [envs, setEnv])const addNewEnv = useCallback(() => {- setEnvs([...envs, { key: '', value: '' }])+ setEnvs([...envs, getDefaultEnv()])}, [envs, setEnvs])const deleteEnv = useCallback((delIdx: number) => {diff --git a/components/Editor/Sidebar/Model/ProviderCard/ArgHandler.tsx b/components/Editor/Sidebar/Model/ProviderCard/ArgHandler.tsxindex 8f29a0c25..0ffd039ad 100644--- a/components/Editor/Sidebar/Model/ProviderCard/ArgHandler.tsx+++ b/components/Editor/Sidebar/Model/ProviderCard/ArgHandler.tsx@@ -1,35 +1,29 @@import Input from 'components/Input'-import { ModelArgTemplate } from 'state/model'-import { SelectedModel } from 'state/store'+import { ModelTemplateArg } from 'state/model'import { parseInput } from 'utils/parseInput'export interface Props {- updateSelectedModel: (config: Omit<SelectedModel, 'name' | 'provider'>) => void- argTemplate: ModelArgTemplate- selectedModel?: SelectedModel+ argTemplate: ModelTemplateArgarg: stringisSelected?: boolean+ updateModelConfigArg: (value: string | number | undefined) => voidselectModel?: () => void+ value?: string | number | undefined}function ArgHandler({isSelected,arg,- updateSelectedModel,argTemplate,- selectedModel,+ updateModelConfigArg,selectModel,+ value,}: Props) {return (<Input- value={selectedModel?.args[arg]?.toString() || ''}+ value={value?.toString() || ''}type={argTemplate.type === 'number' ? 'number' : 'text'}- onChange={v => updateSelectedModel({- args: {- ...selectedModel?.args,- [arg]: parseInput(argTemplate, v),- }- })}+ onChange={v => updateModelConfigArg(parseInput(argTemplate, v))}isDisabled={!isSelected}max={argTemplate.max}onClick={selectModel}diff --git a/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx b/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsxindex 680cd7f29..184d11d1e 100644--- a/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx+++ b/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx@@ -1,34 +1,32 @@import React, { useState } from 'react'-import { ModelConfigTemplate } from 'state/model'-import { SelectedModel } from 'state/store'+import { ModelProvider, ModelTemplate } from 'state/model'import Text from 'components/Text'import { CheckSquare, ChevronDown, Square } from 'lucide-react'import clsx from 'clsx'import ArgHandler from './ArgHandler'+import { ModelConfig } from 'state/store'+import { useStateStore } from 'state/StoreProvider'interface Props {+ provider: ModelProvider+ modelTemplate: Omit<ModelTemplate, 'provider'>isSelected?: boolean- updateSelectedModel: (config: Omit<SelectedModel, 'name' | 'provider'>) => void- modelTemplate: ModelConfigTemplate- selectedModel?: SelectedModel+ selectModel: () => void+ updateModelConfig: (config: Partial<Omit<ModelConfig, 'name' | 'provider'>>) => void}function ModelSection({- isSelected,- updateSelectedModel,modelTemplate,- selectedModel,+ provider,+ isSelected,+ selectModel,+ updateModelConfig,}: Props) {const [isDefaultArgsOpen, setIsDefaultArgsOpen] = useState(false)- function selectModel() {- updateSelectedModel({- args: {- ...selectedModel?.args,- }- })- }+ const [selectors] = useStateStore()+ const modelConfig = selectors.use.modelConfigs().find(c => c.name === modelTemplate.name && c.provider === provider)const editableArgs = Object.entries(modelTemplate.args || {})@@ -37,6 +35,15 @@ function ModelSection({const requiredParams = editableArgs.filter(a => a[1].value === undefined && !a[1].optional)const defaultedArgs = editableArgs.filter(a => a[1].value !== undefined || a[1].optional)+ function updateModelConfigArg(key: string, value: string | number | undefined) {+ updateModelConfig({+ args: {+ ...modelConfig?.args,+ [key]: value+ }+ })+ }+return (<div className="flex@@ -88,12 +95,12 @@ function ModelSection({{requiredParams.map(([arg, template]) =><ArgHandlerselectModel={selectModel}- updateSelectedModel={updateSelectedModel}+ updateModelConfigArg={value => updateModelConfigArg(arg, value)}arg={arg}+ value={modelConfig?.args[arg]}key={arg}argTemplate={template}isSelected={isSelected}- selectedModel={selectedModel}/>)}{defaultedArgs.length > 0 &&@@ -135,12 +142,12 @@ function ModelSection({{defaultedArgs.map(([arg, template]) =><ArgHandlerselectModel={selectModel}- updateSelectedModel={updateSelectedModel}+ updateModelConfigArg={value => updateModelConfigArg(arg, value)}arg={arg}+ value={modelConfig?.args[arg]}key={arg}argTemplate={template}isSelected={isSelected}- selectedModel={selectedModel}/>)}</div>diff --git a/components/Editor/Sidebar/Model/ProviderCard/index.tsx b/components/Editor/Sidebar/Model/ProviderCard/index.tsxindex 657a7d6e0..bdd203730 100644--- a/components/Editor/Sidebar/Model/ProviderCard/index.tsx+++ b/components/Editor/Sidebar/Model/ProviderCard/index.tsx@@ -1,19 +1,18 @@import { useRouter } from 'next/router'+import Link from 'next/link'import Text from 'components/Text'import { providerIcons } from 'components/icons/ProviderIcon'-import { ModelProvider, getMissingCreds, ProviderTemplate } from 'state/model'-import { SelectedModel } from 'state/store'+import { ModelProvider, getMissingCreds, ProviderTemplate, Model } from 'state/model'import { Creds } from 'hooks/useModelProviderArgs'-import { useStateStore } from 'state/StoreProvider'import Button from 'components/Button'+import { useStateStore } from 'state/StoreProvider'import ModelSection from './ModelSection'-import Link from 'next/link'export interface Props {provider: ModelProvider- selectedModel: SelectedModel+ selectedModel: Modelcreds: Credstemplate: ProviderTemplate}@@ -24,9 +23,11 @@ function ProviderCard({creds,selectedModel,}: Props) {- const [selector] = useStateStore()const router = useRouter()- const setModel = selector.use.setModel()+ const [selectors] = useStateStore()++ const selectModel = selectors.use.selectModel()+ const setModelConfig = selectors.use.setModelConfig()return (<div className="@@ -114,16 +115,14 @@ function ProviderCard({{template.models.map(m =><ModelSectionkey={m.name}- modelTemplate={{ ...m, provider: provider as ModelProvider }}- selectedModel={- m.name === selectedModel?.name && provider === selectedModel.provider- ? selectedModel- : undefined}+ provider={provider}+ modelTemplate={m}+ selectModel={() => selectModel({ provider, name: m.name })}isSelected={m.name === selectedModel?.name && provider === selectedModel.provider}- updateSelectedModel={i => setModel({+ updateModelConfig={c => setModelConfig({name: m.name,provider: provider as ModelProvider,- ...i,+ ...c,})}/>)}diff --git a/components/Editor/Sidebar/Model/index.tsx b/components/Editor/Sidebar/Model/index.tsxindex adcf7f474..b46e7ae89 100644--- a/components/Editor/Sidebar/Model/index.tsx+++ b/components/Editor/Sidebar/Model/index.tsx@@ -1,6 +1,6 @@import Text from 'components/Text'import { useStateStore } from 'state/StoreProvider'-import { ModelProvider, modelTemplates, ProviderTemplate } from 'state/model'+import { ModelProvider, providerTemplates, ProviderTemplate } from 'state/model'import useModelProviderArgs from 'hooks/useModelProviderArgs'import { sortByOrder } from 'utils/sortByOrder'@@ -18,7 +18,8 @@ export interface Props { }function Model({ }: Props) {const [selector] = useStateStore()- const model = selector.use.model()+ const selectedModel = selector.use.selectedModel()+const [creds] = useModelProviderArgs()return (@@ -60,7 +61,7 @@ function Model({ }: Props) {">{Object- .entries(modelTemplates)+ .entries(providerTemplates).slice().sort(modelProviderOrder).map(([provider, template], i, a) =>@@ -72,7 +73,7 @@ function Model({ }: Props) {"><ProviderCard- selectedModel={model}+ selectedModel={selectedModel}creds={creds}template={template}provider={provider as ModelProvider}diff --git a/components/Editor/Sidebar/Prompt/PromptEditor.tsx b/components/Editor/Sidebar/Prompt/PromptEditor.tsxindex 8cc6ef053..02472fa5b 100644--- a/components/Editor/Sidebar/Prompt/PromptEditor.tsx+++ b/components/Editor/Sidebar/Prompt/PromptEditor.tsx@@ -1,45 +1,50 @@import { EditorContent } from '@tiptap/react'import Fuse from 'fuse.js'+import { useCallback } from 'react'import Text from 'components/Text'import useDocEditor from 'hooks/useDocEditor'import { Reference } from 'editor/referenceType'-import { PromptPart, SelectedModel } from 'state/store'-import { useCallback } from 'react'import { useStateStore } from 'state/StoreProvider'+import { ModelConfig } from 'state/store'export interface Props {title?: stringplaceholder?: string- onChange?: (value: string) => void- content: stringreferenceSearch?: Fuse<Reference>- model: SelectedModel- templateID: string+ modelConfig: ModelConfigidx: number- promptPart: PromptPart+ content: string}function Editor({title,idx,- promptPart,- templateID,- model,- content,placeholder,+ modelConfig,+ content: initialContent,referenceSearch,}: Props) {const [selectors] = useStateStore()- const setPrompt = selectors.use.setPrompt()+ const setModelConfigPrompt = selectors.use.setModelConfigPrompt()const onChange = useCallback((content: string) => {- setPrompt(templateID, model.provider, model.name, idx, { content, role: promptPart.role, type: promptPart.type })- }, [setPrompt, templateID, model.provider, model.name, idx, promptPart.role, promptPart.type])+ if (!modelConfig?.name) return+ if (!modelConfig?.provider) return+ setModelConfigPrompt({+ name: modelConfig.name,+ provider: modelConfig.provider,+ }, idx, { content })+ }, [+ setModelConfigPrompt,+ modelConfig?.name,+ modelConfig?.provider,+ idx,+ ])const editor = useDocEditor({- initialContent: content,+ initialContent,onContentChange: onChange,placeholder,referenceSearch,diff --git a/components/Editor/Sidebar/Prompt/index.tsx b/components/Editor/Sidebar/Prompt/index.tsxindex 30f38fda4..8947dfee2 100644--- a/components/Editor/Sidebar/Prompt/index.tsx+++ b/components/Editor/Sidebar/Prompt/index.tsx@@ -1,20 +1,14 @@import Text from 'components/Text'import { useStateStore } from 'state/StoreProvider'-import { defaultPromptTemplate, getDescription } from 'state/prompt'-import { defaultTemplateID } from 'state/store'+import { getPromptLabel } from 'state/prompt'import Editor from './PromptEditor'import { providerIcons } from 'components/icons/ProviderIcon'function Prompt() {const [selectors] = useStateStore()- const model = selectors.use.model()- const modelSetup = selectors.use.modelSetups().find(p =>- p.templateID === defaultTemplateID &&- p.provider === model.provider &&- p.modelName === model.name- )- const prompt = modelSetup?.prompt || defaultPromptTemplate+ const model = selectors.use.selectedModel()+ const modelConfig = selectors.use.selectedModelConfig()return (<div className="@@ -91,7 +85,7 @@ function Prompt() {max-w-[65ch]grow">- {prompt.map((p, i) =>+ {modelConfig?.prompt.map((p, i) =><divkey={i}className="@@ -109,17 +103,14 @@ function Prompt() {<TextclassName="font-medium text-slate-400"size={Text.size.S3}- text={getDescription(p)}+ text={getPromptLabel(p)}/></div><Editor- // title={`${p.role} ${p.type.replace(/([A-Z])/g, ' $1')}`.toUpperCase()}placeholder={`Specify ${p.role} ${p.type.replace(/([A-Z])/g, ' $1').toLowerCase()} prompt here`}content={p.content}- model={model}- templateID={defaultTemplateID}+ modelConfig={modelConfig}idx={i}- promptPart={p}/></div>)}diff --git a/components/Editor/Sidebar/RunButton.tsx b/components/Editor/Sidebar/RunButton.tsxindex 42f7da2bb..e381aa826 100644--- a/components/Editor/Sidebar/RunButton.tsx+++ b/components/Editor/Sidebar/RunButton.tsx@@ -18,7 +18,7 @@ interface DeploymentRepresentation {icon: ReactNode | null}-function getDeploymentRepresentation(deployStatus: deployment_state | null | undefined, isInitializingDeploy: boolean | undefined): DeploymentRepresentation {+function getProgressRepresentation(deployStatus: deployment_state | null | undefined, isInitializingDeploy: boolean | undefined): DeploymentRepresentation {if (isInitializingDeploy) {return {text: 'Initializing...',@@ -55,7 +55,7 @@ function DeployButton({isDeployRequestRunning,isInitializingDeploy,}: Props) {- const representation = getDeploymentRepresentation(deployStatus, isInitializingDeploy)+ const representation = getProgressRepresentation(deployStatus, isInitializingDeploy)return (<>diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsxindex fadb3d451..ffdf6afbb 100644--- a/components/Editor/Sidebar/index.tsx+++ b/components/Editor/Sidebar/index.tsx@@ -6,7 +6,7 @@ import { projects } from '@prisma/client'import { defaultTemplateID, PromptPart, Route } from 'state/store'import { useLatestDeployment } from 'hooks/useLatestDeployment'import { useStateStore } from 'state/StoreProvider'-import { ModelConfig, getModelConfig } from 'state/model'+import { ModelConfig, getModelArgs } from 'state/model'import useModelProviderArgs from 'hooks/useModelProviderArgs'import { defaultPromptTemplate, evaluatePrompt } from 'state/prompt'@@ -14,9 +14,7 @@ import Agent from './Agent'import Envs from './Envs'import Model from './Model'import Prompt from './Prompt'-import { identity } from 'utils/identity'import { MenuSection } from '../SidebarMenu'-// import Deploy from './Deploy'export interface Props {project: projects@@ -76,22 +74,19 @@ function Sidebar({const [selectors] = useStateStore()const envs = selectors.use.envs()const model = selectors.use.model()- const route = selectors.use.routes().find(identity)+const prompt = selectors.use.modelSetups().find(p =>p.templateID === defaultTemplateID &&p.provider === model.provider &&p.modelName === model.name)?.prompt || defaultPromptTemplate+ const modelConfig = selectors.use.selectedModelConfig()+const [creds] = useModelProviderArgs()async function deploy() {- if (!route) {- console.error('Cannot get route')- return- }-- const config = getModelConfig(model, creds)+ const config = getModelArgs(model, creds)if (!config) {console.error('Cannot get model config')returndiff --git a/components/Editor/SidebarMenu.tsx b/components/Editor/SidebarMenu.tsxindex e7e3ee1b0..891736dba 100644--- a/components/Editor/SidebarMenu.tsx+++ b/components/Editor/SidebarMenu.tsx@@ -6,8 +6,6 @@ export enum MenuSection {Envs = 'Envs',Model = 'Model',Prompt = 'Prompt',- // Context = 'Context',- // Deploy = 'Deploy',}const menuIconSize = '18px'@@ -16,10 +14,6 @@ function getMenuSelectionIcon(selection: MenuSection) {switch (selection) {case MenuSection.Agent:return <Code size={menuIconSize} />- // case MenuSection.Context:- // return <Box size={menuIconSize} />- // case MenuSection.Deploy:- // return <Server size={menuIconSize} />case MenuSection.Prompt:return <WholeWord size={menuIconSize} />case MenuSection.Envs:diff --git a/components/Editor/Template/NodeJSExpressTemplate/Instructions.tsx b/components/Editor/Template/NodeJSExpressTemplate/Instructions.tsxindex 714638d1c..518c8f26b 100644--- a/components/Editor/Template/NodeJSExpressTemplate/Instructions.tsx+++ b/components/Editor/Template/NodeJSExpressTemplate/Instructions.tsx@@ -1,5 +1,4 @@-import { Route } from 'state/store'-import useBlock from 'hooks/useBlock'+import useInstruction from 'components/Editor/Template/NodeJSExpressTemplate/useInstruction'import InstructionsEditor from './InstructionsEditor'import RequestBodyEditor from './RequestBodyEditor'@@ -10,9 +9,9 @@ export interface Props {}function RouteEditor({ route }: Props) {- const [requestBodyBlock, updateRequestBodyBlock] = useBlock('RequestBody', 1, route)- const [descriptionBlock, updateDescriptionBlock] = useBlock('Description', 1, route)- const [instructionsBlock, updateInstructionsBlock] = useBlock('Instructions', 1, route)+ const [descriptionBlock, updateDescriptionBlock] = useInstruction('Description', 'xml')+ const [requestBodyBlock, updateRequestBodyBlock] = useInstruction('RequestBody', 'text')+ const [instructionsBlock, updateInstructionsBlock] = useInstruction('Instructions', 'xml')const [referenceSearch] = useReferences()diff --git a/components/Editor/Template/NodeJSExpressTemplate/Routes.tsx b/components/Editor/Template/NodeJSExpressTemplate/Routes.tsxindex 6dfa23f43..1f482e65c 100644--- a/components/Editor/Template/NodeJSExpressTemplate/Routes.tsx+++ b/components/Editor/Template/NodeJSExpressTemplate/Routes.tsx@@ -1,14 +1,11 @@import clsx from 'clsx'import { Plus } from 'lucide-react'-import { Method, methods, Route } from 'state/store'import Button from 'components/Button'import Text from 'components/Text'import Select from 'components/Select'import { useStateStore } from 'state/StoreProvider'--export enum Method {POST = 'post',GET = 'get',@@ -19,11 +16,9 @@ export enum Method {export const methods = Object.keys(Method)- .filter((item) => isNaN(Number(item)))+ .filter(item => isNaN(Number(item))).map(v => v.toLowerCase())--export interface Props {routes: Route[]selectRoute: (id: string) => voiddiff --git a/components/Editor/Template/NodeJSExpressTemplate/index.tsx b/components/Editor/Template/NodeJSExpressTemplate/index.tsxindex 319519f0f..bb53cd5ff 100644--- a/components/Editor/Template/NodeJSExpressTemplate/index.tsx+++ b/components/Editor/Template/NodeJSExpressTemplate/index.tsx@@ -1,43 +1,23 @@-import { useState, useEffect } from 'react'-import { useStateStore } from 'state/StoreProvider'import RouteEditor from './Instructions'import Routes from './Routes'+import useRoutes from './useRoutes'-export interface Props {--}--function NodeJSExpressTemplate({ }: Props) {- const [selectors] = useStateStore()-- // TODO: Handle editor state differently so we don't rerender this component on each editor edit.- const routes = selectors.use.routes()- const deleteRoute = selectors.use.deleteRoute()-- 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- }- })- }+function NodeJSExpressTemplate() {+ const {+ deleteRoute,+ routes,+ updateRoute,+ selectedRoute,+ selectRoute,+ } = useRoutes()return (<><Routesroutes={routes}- selectRoute={setSelectedRouteID}+ selectRoute={selec}selectedRouteID={selectedRoute?.id}deleteRoute={handleDeleteRoute}/>diff --git a/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.tsnew file mode 100644index 000000000..cd5ad20eb--- /dev/null+++ b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts@@ -0,0 +1,49 @@+import { useCallback } from 'react'+import { Instruction } from 'state/instruction'++import { useStateStore } from 'state/StoreProvider'+import { Method } from './Routes'++export interface Route {+ Method: Instruction+ Path: Instruction+}++export interface RouteInfo extends Route {+ Description: Instruction+ RequestBody: Instruction+ Instructions: Instruction+}++function useRoutes(): {+ routes: Route[],+ selectedRoute?: Route,+ updateRoute: (method: Method, path: string, route: Route) => void,+ deleteRoute: (method: Method, path: string) => void,+ selectRoute: (method: Method, path: string) => void,+} {+ const [selectors] = useStateStore()+ const setInstructions = selectors.use.setInstructions()+ const instructions = selectors.use.instructions()++ const routes = instructions['Routes']+ const selectedRoute = instructions['selectedRoute']+++ const selectRoute = useCallback((method: Method, path: string) => {+ setInstructions(i => {+ i['selectedRoute'] = {++ }+ })++ }, [setInstructions])++ return {+ routes,+ updateRoute,+ deleteRoute,+ }+}++export default useRoutesdiff --git a/components/Editor/Template/index.tsx b/components/Editor/Template/index.tsxindex 2dea03d45..9b6396b2c 100644--- a/components/Editor/Template/index.tsx+++ b/components/Editor/Template/index.tsx@@ -1,10 +1,14 @@import { forwardRef } from 'react'+import { useStateStore } from 'state/StoreProvider'+import { templates } from 'state/template'-import NodeJSExpressTemplate from './NodeJSExpressTemplate'export interface Props { }const Template = forwardRef<HTMLDivElement, Props>(({ }, ref) => {+ const [selectors] = useStateStore()+ const templateID = selectors.use.templateID()+return (<divref={ref}@@ -13,7 +17,7 @@ const Template = forwardRef<HTMLDivElement, Props>(({ }, ref) => {flex-colflex-1">- <NodeJSExpressTemplate />+ {templates[templateID].component}</div>)})diff --git a/hooks/useBlock.ts b/hooks/useBlock.tsdeleted file mode 100644index 6f6cba043..000000000--- a/hooks/useBlock.ts+++ /dev/null@@ -1,49 +0,0 @@-import { useCallback, useMemo } from 'react'--import { Route, BlockType, TemplateBlock } from 'state/store'-import { useStateStore } from 'state/StoreProvider'--/**- *- * For example, if there are two block for type `RequestBody` and we call `useBlock('RequestBody`, 2, route)`,- * the hook will return the value and change handler for the second `RequestBody` block from the array of all blocks in the `route`.- *- * @param blockType type of block to filter- * @param position which block from all the blocks with type `blockType` should this hook use.- * The position starts from "1".- * @param route- * @returns- */-function useBlock(blockType: BlockType, position: number, route?: Route): [TemplateBlock | undefined, (prompt: string) => void] {- const [selectors] = useStateStore()-- const changeBlock = selectors.use.changeBlock()-- const blockIdx = useMemo(() => {- let count = 0- return route?.blocks.findIndex((r, i) => {- if (r.type === blockType) {- count++- return count === position- }- return false- })- }, [route, position, blockType])-- const block = blockIdx !== undefined &&- blockIdx !== -1 &&- route?.blocks.length !== undefined &&- route?.blocks.length >= blockIdx- ? route?.blocks[blockIdx]- : undefined-- const setBlock = useCallback((content: string) => {- if (route?.id && blockIdx !== undefined && blockIdx !== -1) {- changeBlock(route.id, blockIdx, { content })- }- }, [blockIdx, route?.id, changeBlock])-- return [block, setBlock]-}--export default useBlockdiff --git a/package-lock.json b/package-lock.jsonindex 610a1a51f..5e121ae53 100644--- a/package-lock.json+++ b/package-lock.json@@ -29,6 +29,7 @@"http-proxy-middleware": "^3.0.0-beta.1","human-id": "^4.0.0","immer": "^9.0.19",+ "lodash.mapvalues": "^4.6.0","lucide-react": "^0.161.0","mustache": "^4.2.0","nanoid": "^4.0.1",@@ -50,6 +51,7 @@},"devDependencies": {"@tailwindcss/typography": "^0.5.9",+ "@types/lodash.mapvalues": "^4.6.7","@types/mustache": "^4.2.2","@types/node": "^18.14.6","@types/randomcolor": "^0.5.7",@@ -1023,6 +1025,21 @@"integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==","dev": true},+ "node_modules/@types/lodash": {+ "version": "4.14.194",+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.194.tgz",+ "integrity": "sha512-r22s9tAS7imvBt2lyHC9B8AGwWnXaYb1tY09oyLkXDs4vArpYJzw09nj8MLx5VfciBPGIb+ZwG0ssYnEPJxn/g==",+ "dev": true+ },+ "node_modules/@types/lodash.mapvalues": {+ "version": "4.6.7",+ "resolved": "https://registry.npmjs.org/@types/lodash.mapvalues/-/lodash.mapvalues-4.6.7.tgz",+ "integrity": "sha512-yGTo9zD60Iw1Q+YBvx4Ad7RDj5rA6EpvYTpVPVsfe6pwHcwDcGChSqL1n2sPBMbCeHJ3R5kcaqpkdlrFe/y4Vg==",+ "dev": true,+ "dependencies": {+ "@types/lodash": "*"+ }+ },"node_modules/@types/mdast": {"version": "3.0.10","resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.10.tgz",@@ -4479,6 +4496,11 @@"integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==","dev": true},+ "node_modules/lodash.mapvalues": {+ "version": "4.6.0",+ "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",+ "integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ=="+ },"node_modules/lodash.memoize": {"version": "4.1.2","resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",diff --git a/package.json b/package.jsonindex 7b5808f78..4c1417f9f 100644--- a/package.json+++ b/package.json@@ -58,6 +58,7 @@"http-proxy-middleware": "^3.0.0-beta.1","human-id": "^4.0.0","immer": "^9.0.19",+ "lodash.mapvalues": "^4.6.0","lucide-react": "^0.161.0","mustache": "^4.2.0","nanoid": "^4.0.1",@@ -79,6 +80,7 @@},"devDependencies": {"@tailwindcss/typography": "^0.5.9",+ "@types/lodash.mapvalues": "^4.6.7","@types/mustache": "^4.2.2","@types/node": "^18.14.6","@types/randomcolor": "^0.5.7",@@ -99,4 +101,4 @@"tailwindcss": "^3.2.7","typescript": "^4.9.5"}-}\ No newline at end of file+}diff --git a/pages/settings.tsx b/pages/settings.tsxindex f64e47fa2..84f0c381d 100644--- a/pages/settings.tsx+++ b/pages/settings.tsx@@ -9,7 +9,7 @@ import Text from 'components/Text'import { Database } from 'db/supabase'import { serverCreds } from 'db/credentials'import useModelProviderArgs from 'hooks/useModelProviderArgs'-import { modelTemplates, ModelProvider } from 'state/model'+import { providerTemplates, ModelProvider } from 'state/model'import Input from 'components/Input'export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {@@ -133,7 +133,7 @@ function Settings({ }: Props) {w-[450px]">- {Object.entries(modelTemplates).map(([provider, value]) =>+ {Object.entries(providerTemplates).map(([provider, value]) =><divkey={provider}>diff --git a/state/envs.ts b/state/envs.tsnew file mode 100644index 000000000..d543c99bc--- /dev/null+++ b/state/envs.ts@@ -0,0 +1,8 @@+export interface EnvVar {+ key: string+ value: string+}++export function getDefaultEnv(): EnvVar {+ return { key: '', value: '' }+}diff --git a/state/instruction.ts b/state/instruction.tsnew file mode 100644index 000000000..1c9bcff8a--- /dev/null+++ b/state/instruction.ts@@ -0,0 +1,47 @@+import mapValues from 'lodash.mapvalues'++import { Reference } from 'editor/referenceType'+import { html2markdown } from 'editor/schema'++export interface Instruction {+ type: 'text' | 'xml'+ // `content` must be valid XML when `type` is `xml`+ content: string+}++export type NestedInstruction =+ undefined |+ Instruction |+ Instruction[] |+ InstructionsRoot |+ InstructionsRoot[]++export interface InstructionsRoot {+ [key: string]: NestedInstruction+}++export function evaluateInstruction(instruction: Instruction): [string, Reference[]] {+ if (instruction.type === 'xml') {+ return html2markdown(instruction.content)+ }+ return [instruction.content, []]+}++export function isInstruction(value: Instruction | InstructionsRoot): value is Instruction {+ return value.content !== undefined && value.type !== undefined+}++export function mapNestedInstructions(instructions: InstructionsRoot, transform: (i: Instruction) => string) {+ function transformValues(i: Instruction | InstructionsRoot): any {+ return isInstruction(i)+ ? transform(i)+ : mapNestedInstructions(i, transform)+ }++ return mapValues(instructions, (value, key) => {+ if (!value) return+ return Array.isArray(value)+ ? value.map(transformValues)+ : transformValues(value)+ })+}\ No newline at end of filediff --git a/state/model.ts b/state/model.tsindex 58f161ca0..664953e00 100644--- a/state/model.ts+++ b/state/model.ts@@ -1,6 +1,6 @@import { Creds } from 'hooks/useModelProviderArgs'-import { SelectedModel } from './store'+import { PromptFragment } from './prompt'export enum ModelProvider {OpenAI = 'OpenAI',@@ -9,13 +9,18 @@ export enum ModelProvider {HuggingFace = 'HuggingFace',}+export interface ModelConfig extends Model {+ args: ModelArgs+ prompt: PromptFragment[]+}+export type ArgValue = string | numberexport interface ModelArgs {[arg: string]: ArgValue | undefined}-export interface ModelArgTemplate {+export interface ModelTemplateArg {label?: stringeditable?: booleantype: 'string' | 'number'@@ -28,28 +33,31 @@ export interface ModelArgTemplate {optional?: boolean}-export interface ProviderCredsTemplate {- [key: string]: Omit<ModelArgTemplate, 'editable' | 'value'>+export interface ProviderTemplateCreds {+ [key: string]: Omit<ModelTemplateArg, 'editable' | 'value'>}-export interface ModelConfigTemplate {+export interface Model {provider: ModelProvidername: string+}++export interface ModelTemplate extends Model {/*** Args should be exactly the same as the args to the langchain's model class in Python.*/- args?: { [arg: string]: ModelArgTemplate }+ args?: { [arg: string]: ModelTemplateArg }}export interface ProviderTemplate {// These creds are merged with the model args then send to the API.- creds?: ProviderCredsTemplate- models: Omit<ModelConfigTemplate, 'provider'>[]+ creds?: ProviderTemplateCreds+ models: Omit<ModelTemplate, 'provider'>[]link?: string}-export const modelTemplates: {- [provider in keyof typeof ModelProvider]?: ProviderTemplate+export const providerTemplates: {+ [provider in keyof typeof ModelProvider]: ProviderTemplate} = {[ModelProvider.Anthropic]: {link: 'https://anthropic.com',@@ -450,19 +458,15 @@ export const modelTemplates: {},}-export interface ModelConfig extends Omit<ModelConfigTemplate, 'args' | 'name'> {- args: ModelArgs-}--export function getModelConfig(- config: SelectedModel,+export function getModelArgs(+ modelConfig: Pick<ModelConfig, 'provider' | 'name' | 'args'>,creds: Creds,-): ModelConfig | undefined {- const model = modelTemplates[config.provider]?.models.find(m => m.name === config.name)- if (!model) return+): ModelArgs | undefined {+ const template = providerTemplates[modelConfig.provider]?.models.find(m => m.name === modelConfig.name)+ if (!template) returnconst defaultArgs = Object- .entries(model.args || {})+ .entries(template.args || {}).reduce<ModelArgs>((prev, [key, info]) => {if (info.value !== undefined) {prev[key] = info.value@@ -471,19 +475,23 @@ export function getModelConfig(}, {})return {- provider: config.provider,- args: {- ...defaultArgs,- ...creds[config.provider]?.creds,- ...config.args,- }+ ...defaultArgs,+ ...creds[modelConfig.provider]?.creds,+ ...modelConfig.args,}}export function getMissingCreds(provider: ModelProvider, creds: Creds) {- const missing = Object- .entries(modelTemplates[provider]?.creds || {})+ return Object+ .entries(providerTemplates[provider]?.creds || {}).filter(([key,]) => creds[provider]?.creds?.[key] === undefined)+}- return missing+export function getDefaultModelConfig(): ModelConfig {+ return {+ provider: ModelProvider.OpenAI,+ name: providerTemplates[ModelProvider.OpenAI].models[0].name,+ args: {},+ prompt: [],+ }}diff --git a/state/prompt.ts b/state/prompt.tsindex 73e6dd120..b550522d6 100644--- a/state/prompt.ts+++ b/state/prompt.ts@@ -1,90 +1,66 @@-import { html2markdown } from 'editor/schema'import Mustache from 'mustache'-import { TemplateBlock, PromptPart } from 'state/store'+import { html2markdown } from 'editor/schema'+import { Reference } from 'editor/referenceType'import { identity } from 'utils/identity'-export function getDescription(part: PromptPart) {- if (part.role === 'system' && part.type === 'prefix') {+import { evaluateInstruction, mapNestedInstructions, InstructionsRoot } from './instruction'++export function getPromptLabel(fragment: PromptFragment) {+ if (fragment.role === 'system' && fragment.type === 'prefix') {return 'Specify model\'s behavior for the whole run'}- if (part.role === 'system' && part.type === 'suffix') {+ if (fragment.role === 'system' && fragment.type === 'suffix') {return 'Specify how the model should call tools (like WriteJavaScriptCode)'}- if (part.role === 'user' && part.type === 'prefix') {+ if (fragment.role === 'user' && fragment.type === 'prefix') {// https://github.com/janl/mustache.js#templates add docs refreturn 'Describe the context and the start of the task the model should do.\nTo use information from the user prompt (like the steps from "Step-by-step instructions") add them like this: `{{Instructions}}`.\nYou can add Description, RequestBody, Instructions, Method, and Route this way.'}-return ''}-export const defaultPromptTemplate: PromptPart[] = [- {- role: 'system',- type: 'prefix',- content: '<p>You are an AI JavaScript developer assistant:</p><p>You are building an Express server that handles REST API.</p><p>The <code>express</code> package is already installed.</p><p>Follow the user\'s instructions carefully & to the letter.</p><p>Minimize any other prose.</p><p>You have access to the following tools:\n</p>',- },- {- role: 'system',- type: 'suffix',- content: '<p>The way you use the tools is by specifying a XML snippet.</p><p>The XML snippet MUST have a <code><action tool="$TOOL_NAME">$INPUT</action></code> element with the name of the tool in the <code>tool</code> attribute and input for the tool inside the XML tag.</p><p></p><p>Here is an example of a valid XML snippet:</p><p><action tool="$TOOL_NAME"></p><p>$INPUT</p><p></action></p><p></p><p>ALWAYS use the following format:</p><p>Thought: you should always think about what to do</p><p>Action:</p><p><action tool="$TOOL_NAME"></p><p>$INPUT</p><p></action></p><p>Observation: the result of the action</p><p>... (this Thought/Action/Observation can repeat N times)</p><p>Thought: I now know the final server code and can show it.</p><p>Final Answer: the final answer</p>',- },- {- role: 'user',- type: 'prefix',- content: '<p>The handler you are building should do the following:</p><p>{{Description}}</p><p></p><p>{{#RequestBody}}</p><p>The incoming request body is JSON that looks like this:</p><pre><code>{\n{{RequestBody}}\n}</code></pre><p>{{/RequestBody}}</p><p></p><p>Use this starting template:</p><pre><code>import express from \'express\';\nconst app = express();\nconst port = 3000;\napp.use(express.json())\n\n// TODO: Implement the {{Method}} handler here\n\napp.listen(port, async () => {\n console.log(`Server listening on port ${ port }`)\n})</code></pre><p>The HTTP request handler is of type {{Method}}.</p><p>The request handler MUST be on the route <code>{{Route}}</code>.</p><p>Do not forget to use async and await.</p><p>Always test that the generated server works without bugs and errors as required by running the code and making mock <code>curl</code> requests to the server.</p><p>Generate the full required server code.</p><p></p><p>{{#Instructions}}</p><p>Here are the required implementation instructions:</p><p>{{Instructions}}</p><p>{{/Instructions}}</p><p></p><p>Thought: Here is the plan of how I will go about solving this:</p>',- },-]--interface BlockMap {- [blockType: string]: string+export interface PromptFragment {+ role: 'user' | 'system'+ type: string+ content: string}export function evaluatePrompt(- blocks: TemplateBlock[],- promptTemplate: PromptPart[],- additionalArgs: {- Method: string,- Route: string,- },-) {- const blockMap = blocks- // Transform XML from ProseMirror to text- .map(b => {- switch (b.type) {- case 'Description':- case 'Instructions':+ instructions: InstructionsRoot,+ prompt: PromptFragment[],+): PromptFragment[] {+ const references: Reference[] = []++ const textualInstructionsView = mapNestedInstructions(instructions, (i) => {+ const [markdown, references] = evaluateInstruction(i)+ references.push(...references)+ return markdown+ })++ const textualPrompt = prompt+ .map(p => {+ const [markdown, references] = html2markdown(p.content)+ references.push(...references)+ return {+ ...p,+ content: markdown,+ }+ })+ .map(p => {+ return {+ ...p,+ content: Mustache.render(p.content, {+ ...textualInstructionsView,// TODO: Use the references to build context- const [markdown, references] = html2markdown(b.content)- const block: TemplateBlock = {- ...b,- content: markdown,- }- return block- default:- return b+ References: references,+ }, undefined, {+ escape: identity,+ }),}})- .reduce<BlockMap>((prev, curr) => {- prev[curr.type] = curr.content- return prev- }, {})- const evaluatedPrompt = promptTemplate.map(t => {- // TODO: Use the references to build context- const [markdown, references] = html2markdown(t.content)- return {- ...t,- content: Mustache.render(markdown, {- ...additionalArgs,- ...blockMap,- }, undefined, {- escape: identity,- }),- }- })- console.log('Prompt', evaluatedPrompt)- return evaluatedPrompt+ console.log('Prompt', textualPrompt)+ return textualPrompt}diff --git a/state/store.ts b/state/store.tsindex 13f38ec2c..acaebd430 100644--- a/state/store.ts+++ b/state/store.ts@@ -3,83 +3,51 @@ import { immer } from 'zustand/middleware/immer'import { persist } from 'zustand/middleware'import { SupabaseClient } from '@supabase/supabase-js'import { projects, Prisma } from '@prisma/client'+import { WritableDraft } from 'immer/dist/internal'import { Database } from 'db/supabase'import { projectsTable } from 'db/tables'-import { ModelArgs, ModelProvider } from './model'-import { defaultPromptTemplate } from './prompt'--export interface SelectedModel {- provider: ModelProvider- args: ModelArgs- name: string-}--export const defaultTemplateID = 'NodeJSServer'-export const defaultModelName: 'GPT 3.5 Turbo' = 'GPT 3.5 Turbo'--export interface TemplateBlock {- type: 'text' | 'xml'- // `content` must be valid HTML when `type` is `Description` or `Instructions`- content: string-}--export interface PromptPart {- role: 'user' | 'system'- type: string- content: string-}--export interface ModelSetup {- templateID: string- provider: ModelProvider- modelName: string- prompt: PromptPart[]-}+import { ModelConfig, getDefaultModelConfig, Model } from './model'+import { PromptFragment } from './prompt'+import { defaultTemplateID, TemplateID, templates } from './template'+import { EnvVar, getDefaultEnv } from './envs'+import { InstructionsRoot } from './instruction'export interface SerializedState {+ instructions: InstructionsRootenvs: { key: string, value: string }[]- blocks: { [key: string]: TemplateBlock }- model: SelectedModel- modelSetups: ModelSetup[]-}--export interface EnvVar {- key: string- value: string+ modelConfigs: ModelConfig[]+ templateID: TemplateID+ selectedModel: Model}export interface State extends SerializedState {- setBlock: (key: string, block: Partial<TemplateBlock>) => void+ setInstructions: (set: (nextStateOrUpdater: InstructionsRoot | Partial<InstructionsRoot> | ((state: WritableDraft<InstructionsRoot>) => void)) => void) => voidsetEnvs: (pair: EnvVar[]) => voidsetEnv: (pair: EnvVar, idx: number) => void- setModel: (model: SelectedModel) => void- setPrompt: (templateID: string, provider: ModelProvider, modelName: string, idx: number, promptPart: PromptPart) => void-}--function getDefaultModel(): SelectedModel {- return {- provider: ModelProvider.OpenAI,- name: defaultModelName,- args: {},- }+ setModelConfigPrompt: (config: Model, idx: number, prompt: Partial<PromptFragment>) => void+ setModelConfig: (config: Partial<ModelConfig> & Model) => void+ selectedModelConfig: ModelConfig | undefined+ selectModel: (model: Model) => void}-function getDefaultModelSetup(): ModelSetup[] {- return [{- provider: ModelProvider.OpenAI,- modelName: defaultModelName,- templateID: defaultTemplateID,- prompt: defaultPromptTemplate,- }]-}+function getDefaultState(templateID: TemplateID): SerializedState {+ const prompt = templates[templateID].prompt+ const defaultModel = getDefaultModelConfig()-function getDefaultState(): SerializedState {return {- envs: [{ key: '', value: '' }],- model: getDefaultModel(),- modelSetups: getDefaultModelSetup(),+ envs: [getDefaultEnv()],+ modelConfigs: [{+ ...defaultModel,+ prompt,+ }],+ instructions: {},+ templateID,+ selectedModel: {+ name: defaultModel.name,+ provider: defaultModel.provider,+ }}}@@ -91,87 +59,91 @@ export function getTypedState(data?: Prisma.JsonValue): SerializedState | undefi}export function createStore(project: projects, client?: SupabaseClient<Database>) {- const initialState = getTypedState(project.data) || getDefaultState()+ const initialState = getTypedState(project.data) || getDefaultState(defaultTemplateID)- if (!initialState.envs || initialState.envs.length === 0) {- initialState.envs = [{ key: '', value: '' }]+ if (!initialState.envs?.length) {+ initialState.envs = [getDefaultEnv()]}- if (!initialState.modelSetups) {- initialState.modelSetups = getDefaultModelSetup()+ if (!initialState.modelConfigs) {+ initialState.modelConfigs = [{+ ...getDefaultModelConfig(),+ prompt: templates[defaultTemplateID].prompt,+ }]}- // TEMPORARY: We are checking .model === string for backwards compatibility.- if (!initialState.model || typeof initialState.model === 'string') {- initialState.model = getDefaultModel()+ if (!initialState.selectedModel) {+ const defaultModel = getDefaultModelConfig()+ initialState.selectedModel = {+ provider: defaultModel.provider,+ name: defaultModel.name,+ }}const immerStore = immer<State>((set, get) => ({...initialState,- setBlock: (key, block) => set(state => {- state.blocks[key] = {- ...state.blocks[key],- ...block,+ setInstructions: transform => set(state => transform(state.instructions)),+ setEnvs: (envs) => set(state => state.envs = envs),+ setEnv: (pair, idx) => set(state => state.envs[idx] = pair),+ selectModel: (model) => set(state => {+ state.selectedModel = {+ provider: model.provider,+ name: model.name}}),- setEnvs: (envs) => set(state => {- state.envs = envs- }),- setEnv: (pair, idx) => set(state => {- state.envs[idx] = pair- }),- setModel: (model) => set(state => {- const modelSetupIdx = state.modelSetups.findIndex(p =>- p.templateID === defaultTemplateID &&- p.provider === model.provider &&- p.modelName === model.name,+ setModelConfigPrompt: (config, idx, prompt) => set(state => {+ const existingConfigIndex = state.modelConfigs.findIndex(c =>+ c.provider === config.provider &&+ c.name === config.name,)- if (modelSetupIdx === -1) {- state.modelSetups.push({- provider: model.provider,- templateID: defaultTemplateID,- prompt: defaultPromptTemplate,- modelName: model.name,- })+ if (existingConfigIndex !== -1) {+ const configPrompt = state.modelConfigs[existingConfigIndex].prompt+ if (configPrompt.length > idx) {+ configPrompt[idx] = {+ ...configPrompt[idx],+ ...prompt,+ }+ return+ }}- state.model = model+ console.error('Invalid index when setting model config prompt', config, idx)}),- setPrompt: (templateID, provider, modelName, idx, promptPart) => set(state => {- let modelSetupIdx = state.modelSetups.findIndex(p =>- p.templateID === templateID &&- p.provider === provider &&- p.modelName === modelName+ setModelConfig: (config) => set(state => {+ const existingConfigIndex = state.modelConfigs.findIndex(c =>+ c.provider === config.provider &&+ c.name === config.name,)- if (modelSetupIdx === -1) {- state.modelSetups.push({- provider,- templateID: defaultTemplateID,- prompt: defaultPromptTemplate,- modelName,+ if (existingConfigIndex === -1) {+ state.modelConfigs.push({+ args: {},+ prompt: [],+ ...config,})- modelSetupIdx = 0+ } else {+ state.modelConfigs[existingConfigIndex] = {+ ...state.modelConfigs[existingConfigIndex],+ ...config+ }}- state.modelSetups[modelSetupIdx].prompt[idx] = promptPart}),+ get selectedModelConfig() {+ const state = get()+ const model = state.selectedModel+ return state.modelConfigs.find(c =>+ c.provider === model.provider &&+ c.name === model.name,+ )+ },}))const persistent = persist(immerStore, {name: 'supabase-persistence',- partialize: (state) => state,storage: client ? {- getItem: async (name) => {- // We retrieve the data on the server- return null- },- removeItem: async () => {- // TODO: SECURITY - Enable row security for all tables and configure access to projects.- const res = await client.from(projectsTable).update({ data: {} }).eq('id', project.id).single()- if (res.error) {- throw res.error- }- },+ // We retrieve the data on the server+ getItem: () => null,+ removeItem: () => { },setItem: async (name, value) => {// TODO: SECURITY - Enable row security for all tables and configure access to projects.const res = await client.from(projectsTable).update({ data: value as any }).eq('id', project.id)diff --git a/state/template.tsx b/state/template.tsxindex 8a17289e2..cf4e8fa12 100644--- a/state/template.tsx+++ b/state/template.tsx@@ -1,18 +1,40 @@import { ReactNode } from 'react'+import NodeJSExpressTemplate from 'components/Editor/Template/NodeJSExpressTemplate'+import { PromptFragment } from './prompt'-export enum ProjectTemplateID {+export enum TemplateID {NodeJSExpress = 'NodeJSExpress',}-export interface ProjectTemplate {+export interface Template {component: ReactNode+ prompt: PromptFragment[]}export const templates: {- [templateID in keyof typeof ProjectTemplateID]: ProjectTemplate+ [templateID in keyof typeof TemplateID]: Template} = {- [ProjectTemplateID.NodeJSExpress]: {+ [TemplateID.NodeJSExpress]: {component: <NodeJSExpressTemplate />,- }+ prompt: [+ {+ role: 'system',+ type: 'prefix',+ content: '<p>You are an AI JavaScript developer assistant:</p><p>You are building an Express server that handles REST API.</p><p>The <code>express</code> package is already installed.</p><p>Follow the user\'s instructions carefully & to the letter.</p><p>Minimize any other prose.</p><p>You have access to the following tools:\n</p>',+ },+ {+ role: 'system',+ type: 'suffix',+ content: '<p>The way you use the tools is by specifying a XML snippet.</p><p>The XML snippet MUST have a <code><action tool="$TOOL_NAME">$INPUT</action></code> element with the name of the tool in the <code>tool</code> attribute and input for the tool inside the XML tag.</p><p></p><p>Here is an example of a valid XML snippet:</p><p><action tool="$TOOL_NAME"></p><p>$INPUT</p><p></action></p><p></p><p>ALWAYS use the following format:</p><p>Thought: you should always think about what to do</p><p>Action:</p><p><action tool="$TOOL_NAME"></p><p>$INPUT</p><p></action></p><p>Observation: the result of the action</p><p>... (this Thought/Action/Observation can repeat N times)</p><p>Thought: I now know the final server code and can show it.</p><p>Final Answer: the final answer</p>',+ },+ {+ role: 'user',+ type: 'prefix',+ content: '<p>The handler you are building should do the following:</p><p>{{Description}}</p><p></p><p>{{#RequestBody}}</p><p>The incoming request body is JSON that looks like this:</p><pre><code>{\n{{RequestBody}}\n}</code></pre><p>{{/RequestBody}}</p><p></p><p>Use this starting template:</p><pre><code>import express from \'express\';\nconst app = express();\nconst port = 3000;\napp.use(express.json())\n\n// TODO: Implement the {{Method}} handler here\n\napp.listen(port, async () => {\n console.log(`Server listening on port ${ port }`)\n})</code></pre><p>The HTTP request handler is of type {{Method}}.</p><p>The request handler MUST be on the route <code>{{Route}}</code>.</p><p>Do not forget to use async and await.</p><p>Always test that the generated server works without bugs and errors as required by running the code and making mock <code>curl</code> requests to the server.</p><p>Generate the full required server code.</p><p></p><p>{{#Instructions}}</p><p>Here are the required implementation instructions:</p><p>{{Instructions}}</p><p>{{/Instructions}}</p><p></p><p>Thought: Here is the plan of how I will go about solving this:</p>',+ },+ ],+ },}++export const defaultTemplateID = TemplateID.NodeJSExpressdiff --git a/utils/parseInput.ts b/utils/parseInput.tsindex e5b01be08..032d49bb4 100644--- a/utils/parseInput.ts+++ b/utils/parseInput.ts@@ -1,6 +1,6 @@-import { ModelArgTemplate } from 'state/model'+import { ModelTemplateArg } from 'state/model'-export function parseInput(argTemplate: ModelArgTemplate, value: string) {+export function parseInput(argTemplate: ModelTemplateArg, value: string) {if (argTemplate.type === 'number') {try {const result = parseFloat(value)