Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Clarify naming
Tomas Valentae79fc340a2d6
diff --git a/components/Editor/Sidebar/Model/ModelCard.tsx b/components/Editor/Sidebar/Model/ModelCard.tsxindex 1064fbfa0..6b1046c83 100644--- a/components/Editor/Sidebar/Model/ModelCard.tsx+++ b/components/Editor/Sidebar/Model/ModelCard.tsx@@ -4,21 +4,21 @@ import Text from 'components/Text'import { Check, Wrench } from 'lucide-react'import React from 'react'-import { ModelConfig } from 'state/model'-import { ModelInfo } from 'state/store'+import { ModelConfigTemplate } from 'state/model'+import { SelectedModel } from 'state/store'interface Props {isSelected?: boolean- select: (config: Omit<ModelInfo, 'name' | 'provider'>) => void- model: Omit<ModelConfig, 'provider'>- modelInfo?: ModelInfo+ updateSelectedModel: (config: Omit<SelectedModel, 'name' | 'provider'>) => void+ modelTemplate: Omit<ModelConfigTemplate, 'provider'>+ selectedModel?: SelectedModel}function ModelCard({isSelected,- select,- model,- modelInfo,+ updateSelectedModel,+ modelTemplate,+ selectedModel,}: Props) {return (<div@@ -38,9 +38,9 @@ function ModelCard({hover:text-slate-600hover:border-green-800`)}- onClick={() => select({- userArgs: {- ...modelInfo?.userArgs,+ onClick={() => updateSelectedModel({+ args: {+ ...selectedModel?.args,}})}>@@ -61,10 +61,10 @@ function ModelCard({items-centerfont-medium">- {model.name}+ {modelTemplate.name}</div>{Object- .entries(model.args || {})+ .entries(modelTemplate.args || {}).filter(([, value]) => value.editable).length > 0 &&<><Text@@ -79,17 +79,17 @@ function ModelCard({space-y-2">- {Object.entries(model.args || {})+ {Object.entries(modelTemplate.args || {}).filter(([, value]) => value.editable).map(([key, value]) =><divkey={key}><Input- value={modelInfo?.userArgs[key]?.toString() || ''}- onChange={v => select({- userArgs: {- ...modelInfo?.userArgs,+ value={selectedModel?.args[key]?.toString() || ''}+ onChange={v => updateSelectedModel({+ args: {+ ...selectedModel?.args,[key]: value.type === 'number' ? parseFloat(v) : v,}})}diff --git a/components/Editor/Sidebar/Model/index.tsx b/components/Editor/Sidebar/Model/index.tsxindex a5c939425..5728d64fb 100644--- a/components/Editor/Sidebar/Model/index.tsx+++ b/components/Editor/Sidebar/Model/index.tsx@@ -117,10 +117,10 @@ function Model({ }: Props) {{value.models.map(m =><ModelCardkey={m.name}- model={m}- modelInfo={m.name === model.name ? model : undefined}+ modelTemplate={m}+ selectedModel={m.name === model.name ? model : undefined}isSelected={m.name === model.name}- select={i => setModel({+ updateSelectedModel={i => setModel({name: m.name,provider: provider as ModelProvider,...i,diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsxindex 54410c5f4..7ff005e72 100644--- a/components/Editor/Sidebar/index.tsx+++ b/components/Editor/Sidebar/index.tsx@@ -11,7 +11,7 @@ import { Route, Block } from 'state/store'import { useLatestDeployment } from 'hooks/useLatestDeployment'import { useStateStore } from 'state/StoreProvider'import { html2markdown } from 'editor/schema'-import { EvaluatedModelConfig, evaluateModelConfig } from 'state/model'+import { ModelConfig, getModelConfig } from 'state/model'import useModelProviderCreds from 'hooks/useModelProviderCreds'// import Deploy from './Deploy'@@ -33,7 +33,7 @@ async function handlePostGenerate(url: string, { arg }: {arg: {projectID: string,route: Route,- modelConfig: EvaluatedModelConfig,+ modelConfig: ModelConfig,envs: { key: string, value: string }[],}}) {@@ -84,12 +84,11 @@ function Sidebar({const envs = selectors.use.envs()const model = selectors.use.model()-const [creds] = useModelProviderCreds()async function deploy() {if (!route) return- const config = evaluateModelConfig(model, creds)+ const config = getModelConfig(model, creds)if (!config) {console.error('Cannot get model config')returndiff --git a/hooks/useModelProviderCreds.ts b/hooks/useModelProviderCreds.tsindex b3f91bae8..c3722aa43 100644--- a/hooks/useModelProviderCreds.ts+++ b/hooks/useModelProviderCreds.ts@@ -2,11 +2,11 @@ import { useCallback } from 'react'import { useLocalStorage } from 'usehooks-ts'import produce from 'immer'-import { ArgValue, EvaluatedArgs, ModelProvider } from 'state/model'+import { ArgValue, ModelArgs, ModelProvider } from 'state/model'export type Creds = {[model in keyof typeof ModelProvider]?: {- creds?: EvaluatedArgs+ creds?: ModelArgs}}diff --git a/state/model.ts b/state/model.tsindex 896c7b5c7..1b1299a5b 100644--- a/state/model.ts+++ b/state/model.ts@@ -1,5 +1,5 @@import { Creds } from 'hooks/useModelProviderCreds'-import { ModelInfo } from './store'+import { SelectedModel } from './store'export enum ModelProvider {OpenAI = 'OpenAI',@@ -8,11 +8,11 @@ export enum ModelProvider {export type ArgValue = string | number-export interface EvaluatedArgs {+export interface ModelArgs {[arg: string]: ArgValue | undefined}-export interface ModelArg {+export interface ModelArgTemplate {label?: stringeditable?: booleantype: 'string' | 'number'@@ -20,20 +20,20 @@ export interface ModelArg {value?: ArgValue}-export interface ModelConfig {+export interface ModelConfigTemplate {provider: ModelProvidername: string/*** Args should be exactly the same as the args to the langchain's model class in Python.*/- args?: { [arg: string]: ModelArg }+ args?: { [arg: string]: ModelArgTemplate }}export const models: {[model in keyof typeof ModelProvider]: {// These creds are merged with the model args then send to the API.- creds?: { [key: string]: Omit<ModelArg, 'editable' | 'value'> }- models: Omit<ModelConfig, 'provider'>[]+ creds?: { [key: string]: Omit<ModelArgTemplate, 'editable' | 'value'> }+ models: Omit<ModelConfigTemplate, 'provider'>[]}} = {[ModelProvider.Replicate]: {@@ -110,20 +110,20 @@ export const models: {},}-export interface EvaluatedModelConfig extends Omit<ModelConfig, 'args' | 'name'> {- args: EvaluatedArgs+export interface ModelConfig extends Omit<ModelConfigTemplate, 'args' | 'name'> {+ args: ModelArgs}-export function evaluateModelConfig(- config: ModelInfo,+export function getModelConfig(+ config: SelectedModel,creds: Creds,-): EvaluatedModelConfig | undefined {+): ModelConfig | undefined {const model = models[config.provider].models.find(m => m.name === config.name)if (!model) returnconst defaultArgs = Object.entries(model.args || {})- .reduce<EvaluatedArgs>((prev, [key, info]) => {+ .reduce<ModelArgs>((prev, [key, info]) => {if (info.value !== undefined) {prev[key] = info.value}@@ -135,7 +135,7 @@ export function evaluateModelConfig(args: {...defaultArgs,...creds[config.provider]?.creds,- ...config.userArgs,+ ...config.args,}}}diff --git a/state/store.ts b/state/store.tsindex 3814d9845..988d9e10e 100644--- a/state/store.ts+++ b/state/store.ts@@ -8,11 +8,11 @@ import { projects, Prisma } from '@prisma/client'import { Database } from 'db/supabase'import { projectsTable } from 'db/tables'-import { EvaluatedArgs, ModelProvider } from './model'+import { ModelArgs, ModelProvider } from './model'-export interface ModelInfo {+export interface SelectedModel {provider: ModelProvider- userArgs: EvaluatedArgs+ args: ModelArgsname: string}@@ -54,7 +54,7 @@ export const methods = Objectexport interface SerializedState {envs: { key: string, value: string }[]routes: Route[]- model: ModelInfo+ model: SelectedModel}export interface State extends SerializedState {@@ -64,7 +64,7 @@ export interface State extends SerializedState {addRoute: () => voidsetEnvs: (envs: { key: string, value: string }[]) => voidchangeEnv: (pair: { key: string, value: string }, idx: number) => void- setModel: (model: ModelInfo) => void+ setModel: (model: SelectedModel) => void}function createBlock(type: BlockType): Block {@@ -88,11 +88,11 @@ function getDefaultRoute(): Route {}}-function getDefaultModel(): ModelInfo {+function getDefaultModel(): SelectedModel {return {provider: ModelProvider.OpenAI,name: 'GPT 3.5 Turbo',- userArgs: {},+ args: {},}}