Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Cleanup

Tomas Valentacf71a69aa223
diff --git a/components/Editor/Sidebar/Agent/index.tsx b/components/Editor/Sidebar/Agent/index.tsx
index de7f5499d..53a02f674 100644
--- a/components/Editor/Sidebar/Agent/index.tsx
+++ b/components/Editor/Sidebar/Agent/index.tsx
@@ -50,11 +50,11 @@ function Agent({
const [selectedTab, setSelectedTab] = useState(0)
const client = useSupabaseClient<Database>()
const tabsCss = useTabs(tabsProps)
- const [selector] = useStateStore()
+ const [selectors] = useStateStore()
const router = useRouter()
const [creds] = useModelProviderArgs()
- const modelConfig = selector.use.selectedModelConfig()
+ const modelConfig = selectors.use.getSelectedModelConfig()()
const missingCreds = modelConfig ? getMissingCreds(modelConfig?.provider, creds) : []
async function saveAnswer({
diff --git a/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx b/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx
index a94e56c6c..bc9d42cf4 100644
--- a/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx
+++ b/components/Editor/Sidebar/Model/ProviderCard/ModelSection.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react'
import clsx from 'clsx'
import { CheckSquare, ChevronDown, Square } from 'lucide-react'
-import { ModelProvider, ModelTemplate, ModelConfig } from 'state/model'
+import { ModelProvider, ModelTemplate, ModelConfig, isModelEqual } from 'state/model'
import Text from 'components/Text'
import { useStateStore } from 'state/StoreProvider'
@@ -26,7 +26,7 @@ function ModelSection({
const [isDefaultArgsOpen, setIsDefaultArgsOpen] = useState(false)
const [selectors] = useStateStore()
- const modelConfig = selectors.use.modelConfigs().find(c => c.name === modelTemplate.name && c.provider === provider)
+ const modelConfig = selectors.use.modelConfigs().find(m => isModelEqual(m, { provider, name: modelTemplate.name }))
const editableArgs = Object
.entries(modelTemplate.args || {})
diff --git a/components/Editor/Sidebar/Prompt/index.tsx b/components/Editor/Sidebar/Prompt/index.tsx
index 8947dfee2..7e6ff7b31 100644
--- a/components/Editor/Sidebar/Prompt/index.tsx
+++ b/components/Editor/Sidebar/Prompt/index.tsx
@@ -1,14 +1,14 @@
import Text from 'components/Text'
import { useStateStore } from 'state/StoreProvider'
import { getPromptLabel } from 'state/prompt'
+import { providerIcons } from 'components/icons/ProviderIcon'
import Editor from './PromptEditor'
-import { providerIcons } from 'components/icons/ProviderIcon'
function Prompt() {
const [selectors] = useStateStore()
const model = selectors.use.selectedModel()
- const modelConfig = selectors.use.selectedModelConfig()
+ const modelConfig = selectors.use.getSelectedModelConfig()()
return (
<div className="
diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsx
index f7b1ee491..22f89c0a9 100644
--- a/components/Editor/Sidebar/index.tsx
+++ b/components/Editor/Sidebar/index.tsx
@@ -82,7 +82,7 @@ function Sidebar({
const [selectors] = useStateStore()
const envs = selectors.use.envs()
- const modelConfig = selectors.use.selectedModelConfig()
+ const modelConfig = selectors.use.getSelectedModelConfig()()
const instructions = selectors.use.instructions()
const instructionsTransform = selectors.use.instructionsTransform()
diff --git a/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts
index 68dda763f..c1411a024 100644
--- a/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts
+++ b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts
@@ -110,7 +110,6 @@ function useRoutes(): {
}, [setInstructions])
useEffect(function addDefaultRoute() {
- console.log(routes)
if (routes === undefined || routes?.length === 0) {
const id = nanoid()
addRoute()
diff --git a/state/model.ts b/state/model.ts
index 05a535d45..1705fc2b1 100644
--- a/state/model.ts
+++ b/state/model.ts
@@ -493,8 +493,6 @@ export function getMissingCreds(provider: ModelProvider, creds: Creds) {
export function getDefaultModelConfig(templateID: TemplateID): ModelConfig {
const prompt = templates[templateID].prompt
-
- console.log('def model')
return {
provider: defaultModelProvider,
name: defaultModelName,
@@ -502,3 +500,7 @@ export function getDefaultModelConfig(templateID: TemplateID): ModelConfig {
prompt,
}
}
+
+export function isModelEqual(m1: Model, m2: Model) {
+ return m1.provider === m2.provider && m1.name === m2.name
+}
diff --git a/state/store.ts b/state/store.ts
index 392cc95e9..7214c23b6 100644
--- a/state/store.ts
+++ b/state/store.ts
@@ -8,7 +8,7 @@ import { WritableDraft } from 'immer/dist/internal'
import { Database } from 'db/supabase'
import { projectsTable } from 'db/tables'
-import { ModelConfig, getDefaultModelConfig, Model } from './model'
+import { ModelConfig, getDefaultModelConfig, Model, isModelEqual } from './model'
import { PromptFragment } from './prompt'
import { defaultTemplateID, TemplateID } from './template'
import { EnvVar, getDefaultEnv } from './envs'
@@ -20,7 +20,7 @@ export interface SerializedState {
*
* For example - the instructions for NodeJSExpress template contains an array of `Routes` that each has
* `Description`, `RequestBody`, `Instructions` (Step-by-step instructions), `Method` and `Path` fields.
- * You then use these fields in the prompt via `{{Method}}`, etc.
+ * You then inject these fields in the prompt via `{{Method}}` Mustache syntax.
*
* This object's structure can be specific for each template so the default type is `any`.
*/
@@ -53,7 +53,10 @@ export interface State extends SerializedState {
setModelConfigPrompt: (config: Model, idx: number, prompt: Partial<PromptFragment>) => void
setModelConfig: (config: Partial<ModelConfig> & Model) => void
selectModel: (model: Model) => void
- selectedModelConfig: ModelConfig | null
+ /**
+ * TODO: We would ideally use a getter here but there are some problems with the zustand interactions.
+ */
+ getSelectedModelConfig: () => ModelConfig | null
}
function getDefaultState(templateID: TemplateID): SerializedState {
@@ -122,13 +125,18 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
provider: model.provider,
name: model.name
}
+
+ // Ensure that the model config exists
+ const existingConfigIndex = state.modelConfigs.findIndex(c => isModelEqual(c, model))
+ if (existingConfigIndex === -1) {
+ const templateID = get().templateID
+ if (!templateID) throw new Error('No templateID for current project')
+ state.modelConfigs.push(getDefaultModelConfig(templateID))
+ }
}),
setModelConfigPrompt: (config, idx, prompt) =>
set(state => {
- const existingConfigIndex = state.modelConfigs.findIndex(c =>
- c.provider === config.provider &&
- c.name === config.name,
- )
+ const existingConfigIndex = state.modelConfigs.findIndex(c => isModelEqual(c, config))
if (existingConfigIndex !== -1) {
const configPrompt = state.modelConfigs[existingConfigIndex].prompt
@@ -144,10 +152,7 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
}),
setModelConfig: (config) =>
set(state => {
- const existingConfigIndex = state.modelConfigs.findIndex(c =>
- c.provider === config.provider &&
- c.name === config.name,
- )
+ const existingConfigIndex = state.modelConfigs.findIndex(c => isModelEqual(c, config))
if (existingConfigIndex === -1) {
const templateID = get().templateID
@@ -164,13 +169,9 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
}
}
}),
- get selectedModelConfig() {
- const state = get()
- const model = state.selectedModel
- return state.modelConfigs.find(c =>
- c.provider === model.provider &&
- c.name === model.name,
- ) || null
+ getSelectedModelConfig: () => {
+ const model = get().selectedModel
+ return get().modelConfigs.find(c => isModelEqual(c, model)) || null
},
}))