Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Add creds handling; Add custom models with user args [WIP]

Tomas Valenta554016bde0f9
diff --git a/components/Editor/Sidebar/Model.tsx b/components/Editor/Sidebar/Model.tsx
index 0304a760a..b8012ce23 100644
--- a/components/Editor/Sidebar/Model.tsx
+++ b/components/Editor/Sidebar/Model.tsx
@@ -1,16 +1,21 @@
-import Radio from 'components/Radio'
+import Radio from 'components/ModelRadio'
import Text from 'components/Text'
import { useStateStore } from 'state/StoreProvider'
-import { models } from 'state/model'
+import { allCredsOk, ModelProvider, models } from 'state/model'
+import useModelProviderCreds from 'hooks/useModelProviderCreds'
+import { useRouter } from 'next/router'
export interface Props { }
function Context({ }: Props) {
const [selector] = useStateStore()
+ const router = useRouter()
const model = selector.use.model()
const setModel = selector.use.setModel()
+ const [creds, mergeCreds] = useModelProviderCreds()
+
return (
<div className="
flex
@@ -51,15 +56,32 @@ function Context({ }: Props) {
<div
key={provider}
>
- <Text
- text={provider}
- className="
- font-semibold
- uppercase
- text-slate-400
+ <div className="
+ flex
+ justify-between
+ space-x-2
"
- size={Text.size.S3}
- />
+ >
+ <Text
+ text={provider}
+ className="
+ font-semibold
+ uppercase
+ text-slate-400
+ "
+ size={Text.size.S2}
+ />
+ <Text
+ text={allCredsOk(provider as ModelProvider, creds) ? 'Credentials found' : 'Credentials missing'}
+ className="
+ text-slate-400
+ cursor-pointer
+ hover:text-slate-500
+ "
+ size={Text.size.S3}
+ onClick={() => router.push('/settings')}
+ />
+ </div>
<div className="
flex
items-start
@@ -68,9 +90,11 @@ function Context({ }: Props) {
"
>
<Radio
- items={value.models.map(m => m.name)}
- getLabel={item => value.models.find(m => m.name === item)?.name}
- select={setModel}
+ items={value.models}
+ select={(i) => setModel({
+
+ ...i,
+ })}
selected={model}
/>
</div>
diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsx
index c327f2d9f..54410c5f4 100644
--- a/components/Editor/Sidebar/index.tsx
+++ b/components/Editor/Sidebar/index.tsx
@@ -1,16 +1,18 @@
import { useEffect, useState } from 'react'
import clsx from 'clsx'
import useSWRMutation from 'swr/mutation'
-
import { projects } from '@prisma/client'
-import { Route, Block } from 'state/store'
-import { useLatestDeployment } from 'hooks/useLatestDeployment'
-import { useStateStore } from 'state/StoreProvider'
-import { html2markdown } from 'editor/schema'
import Agent from './Agent'
import Envs from './Envs'
import Model from './Model'
+
+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 useModelProviderCreds from 'hooks/useModelProviderCreds'
// import Deploy from './Deploy'
export interface Props {
@@ -31,7 +33,7 @@ async function handlePostGenerate(url: string, { arg }: {
arg: {
projectID: string,
route: Route,
- model: string,
+ modelConfig: EvaluatedModelConfig,
envs: { key: string, value: string }[],
}
}) {
@@ -55,8 +57,7 @@ async function handlePostGenerate(url: string, { arg }: {
return b
}
}),
- maxTokens: 2056,
- model: arg.model,
+ modelConfig: arg.modelConfig,
method: arg.route.method.toLowerCase(),
route: arg.route.route,
envs: arg.envs,
@@ -83,13 +84,22 @@ 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)
+ if (!config) {
+ console.error('Cannot get model config')
+ return
+ }
+
await generate({
projectID: project.id,
route,
envs,
- model,
+ modelConfig: config,
})
}
diff --git a/components/Radio.tsx b/components/ModelRadio.tsx
similarity index 85%
rename from components/Radio.tsx
rename to components/ModelRadio.tsx
index 6250de953..d260147d0 100644
--- a/components/Radio.tsx
+++ b/components/ModelRadio.tsx
@@ -1,25 +1,25 @@
import { RadioGroup } from '@headlessui/react'
import { Check } from 'lucide-react'
-export type Item = string
+import { ModelConfig } from 'state/model'
+
+export type Item = Omit<ModelConfig, 'provider'>
export interface Props {
selected: Item
select: (item: Item) => void
items: Item[]
- getLabel: (item: Item) => string | undefined
}
-function Radio<T>({ selected, items, select, getLabel }: Props) {
+function Radio<T>({ selected, items, select }: Props) {
return (
<div className="mx-auto w-full">
<RadioGroup value={selected} onChange={select}>
- <RadioGroup.Label className="sr-only">Server size</RadioGroup.Label>
<div className="space-y-2">
{items.map((item) => (
<RadioGroup.Option
- key={item}
- value={item}
+ key={item.name}
+ value={item.name}
className={({ active, checked }) =>
`
${checked ? 'border-green-800' : 'bg-white border-slate-300'
@@ -37,7 +37,7 @@ function Radio<T>({ selected, items, select, getLabel }: Props) {
className={`font-medium ${checked ? 'text-slate-600' : 'text-slate-500'
}`}
>
- {getLabel(item)}
+ {item.name}
</RadioGroup.Label>
<RadioGroup.Description
as="span"
@@ -45,7 +45,7 @@ function Radio<T>({ selected, items, select, getLabel }: Props) {
}`}
>
<span className="font-mono">
- {item}
+ {item.name}
</span>
</RadioGroup.Description>
</div>
diff --git a/hooks/useModelProviderCreds.ts b/hooks/useModelProviderCreds.ts
index acd3f9665..b3f91bae8 100644
--- a/hooks/useModelProviderCreds.ts
+++ b/hooks/useModelProviderCreds.ts
@@ -10,16 +10,15 @@ export type Creds = {
}
}
-function useModelProviderCreds() {
+export interface MergeCreds {
+ (provider: ModelProvider, key: string, value?: ArgValue): void
+}
+
+function useModelProviderCreds(): [Creds, MergeCreds] {
const [creds, setCreds] = useLocalStorage<Creds>('e2b-model-creds', {})
- const mergeCreds = useCallback((provider: ModelProvider, key: string, value?: ArgValue) => {
+ const mergeCreds = useCallback<MergeCreds>((provider, key, value) => {
setCreds(produce(creds, d => {
- if (!value) {
- delete d[provider]?.creds?.[key]
- return
- }
-
if (!d[provider]?.creds) {
d[provider] = { creds: { [key]: value } }
return
diff --git a/pages/settings.tsx b/pages/settings.tsx
index 4519a78bf..e679c6aa5 100644
--- a/pages/settings.tsx
+++ b/pages/settings.tsx
@@ -8,6 +8,9 @@ import Button from 'components/Button'
import Text from 'components/Text'
import { Database } from 'db/supabase'
import { serverCreds } from 'db/credentials'
+import useModelProviderCreds from 'hooks/useModelProviderCreds'
+import { models, ModelProvider } from 'state/model'
+import Input from 'components/Input'
export const getServerSideProps: GetServerSideProps<Props> = async (ctx) => {
const supabase = createServerSupabaseClient<Database>(ctx, serverCreds)
@@ -43,6 +46,8 @@ function Settings({ }: Props) {
router.push('/')
}
+ const [creds, mergeCreds] = useModelProviderCreds()
+
return (
<div
className="
@@ -95,6 +100,47 @@ function Settings({ }: Props) {
text={user?.email!}
/>
</div>
+ <div
+ className="
+ flex
+ flex-col
+ space-y-1
+ "
+ >
+ <Text
+ className="text-slate-400"
+ size={Text.size.S2}
+ text="Credentials"
+ />
+ <div
+ className="
+ flex
+ pt-1
+ flex-col
+ space-y-3
+ flex-1
+ w-[450px]
+ "
+ >
+ {Object.entries(models).map(([provider, value]) =>
+ <div
+ key={provider}
+ >
+ {Object.entries(value.creds || {}).map(([key, cred]) =>
+ <div key={key}>
+ <Input
+ title={cred.label || key}
+ value={creds[provider as ModelProvider]?.creds?.[key]?.toString()}
+ onChange={(v) => mergeCreds(provider as ModelProvider, key, v || undefined)}
+ placeholder={cred.label}
+ label={cred.label}
+ />
+ </div>
+ )}
+ </div>
+ )}
+ </div>
+ </div>
<div className="pt-2">
<Button
onClick={handleSignOut}
diff --git a/state/model.ts b/state/model.ts
index d79e1ba01..ee2918192 100644
--- a/state/model.ts
+++ b/state/model.ts
@@ -1,4 +1,5 @@
import { Creds } from 'hooks/useModelProviderCreds'
+import { ModelInfo } from './store'
export enum ModelProvider {
OpenAI = 'OpenAI',
@@ -8,7 +9,7 @@ export enum ModelProvider {
export type ArgValue = string | number
export interface EvaluatedArgs {
- [arg: string]: ArgValue
+ [arg: string]: ArgValue | undefined
}
export interface ModelArg {
@@ -108,34 +109,38 @@ export const models: {
},
}
-interface EvaluatedModelConfig extends Omit<ModelConfig, 'args' | 'name'> {
+export interface EvaluatedModelConfig extends Omit<ModelConfig, 'args' | 'name'> {
args: EvaluatedArgs
}
export function evaluateModelConfig(
- provider: ModelProvider,
- name: string,
+ config: ModelInfo,
creds: Creds,
- userArgs: EvaluatedArgs,
): EvaluatedModelConfig | undefined {
- const model = models[provider].models.find(m => m.name === name)
+ const model = models[config.provider].models.find(m => m.name === config.name)
if (!model) return
const defaultArgs = Object
.entries(model.args || {})
.reduce<EvaluatedArgs>((prev, [key, info]) => {
- if (info.value) {
+ if (info.value !== undefined) {
prev[key] = info.value
}
return prev
}, {})
return {
- provider,
+ provider: config.provider,
args: {
...defaultArgs,
- ...creds[provider]?.creds,
- ...userArgs,
+ ...creds[config.provider]?.creds,
+ ...config.userArgs,
}
}
}
+
+export function allCredsOk(provider: ModelProvider, creds: Creds) {
+ return Object
+ .entries(models[provider]?.creds || {})
+ .every(([key, val]) => creds[provider]?.creds?.[key] !== undefined)
+}
diff --git a/state/store.ts b/state/store.ts
index 33b8850c3..3814d9845 100644
--- a/state/store.ts
+++ b/state/store.ts
@@ -13,6 +13,7 @@ import { EvaluatedArgs, ModelProvider } from './model'
export interface ModelInfo {
provider: ModelProvider
userArgs: EvaluatedArgs
+ name: string
}
export type BlockType =
@@ -53,10 +54,7 @@ export const methods = Object
export interface SerializedState {
envs: { key: string, value: string }[]
routes: Route[]
- model: {
- provider: ModelProvider
- userArgs?: EvaluatedArgs
- }
+ model: ModelInfo
}
export interface State extends SerializedState {
@@ -93,9 +91,8 @@ function getDefaultRoute(): Route {
function getDefaultModel(): ModelInfo {
return {
provider: ModelProvider.OpenAI,
- userArgs: {
- model_name: 'gpt-3.5-turbo',
- },
+ name: 'GPT 3.5 Turbo',
+ userArgs: {},
}
}