Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Add custom model handling to frontend [WIP]

Tomas Valentaf5095e4b702f
diff --git a/api-service/models/base.py b/api-service/models/base.py
index 0e8bf1fac..a24b4bfe4 100644
--- a/api-service/models/base.py
+++ b/api-service/models/base.py
@@ -1,43 +1,37 @@
from typing import TypedDict, Dict, Any
from enum import Enum
-from langchain.llms import Anthropic
+from langchain.llms import Replicate, GPT4All
from langchain.chat_models import ChatOpenAI
from langchain.schema import BaseLanguageModel
from langchain.callbacks.base import BaseCallbackManager
+
class ModelProvider(Enum):
OpenAI = "OpenAI"
- Anthropic = "Anthropic"
+ Replicate = "Replicate"
+
class ModelConfig(TypedDict):
provider: ModelProvider
- name: str
- max_tokens: int
- temperature: float
args: Dict[str, Any]
+
def get_model(
config: ModelConfig,
callback_manager: BaseCallbackManager,
- ) -> BaseLanguageModel:
+) -> BaseLanguageModel:
match config["provider"]:
case ModelProvider.OpenAI:
return ChatOpenAI(
+ **config["args"],
verbose=True,
streaming=True,
callback_manager=callback_manager,
- model_name=config["name"],
- temperature=config["temperature"],
- max_tokens=config["max_tokens"],
- **config["args"],
)
- case ModelProvider.Anthropic:
- return Anthropic(
- streaming=True,
+ case ModelProvider.Replicate:
+ return Replicate(
+ **config["args"],
verbose=True,
- temperature=config["temperature"],
- max_tokens=config["max_tokens"],
callback_manager=callback_manager,
- **config["args"],
)
diff --git a/components/Editor/Sidebar/Model.tsx b/components/Editor/Sidebar/Model.tsx
index 38e1d9010..0304a760a 100644
--- a/components/Editor/Sidebar/Model.tsx
+++ b/components/Editor/Sidebar/Model.tsx
@@ -1,13 +1,11 @@
import Radio from 'components/Radio'
import Text from 'components/Text'
import { useStateStore } from 'state/StoreProvider'
-import { models } from 'state/store'
-
+import { models } from 'state/model'
export interface Props { }
-function Context({
-}: Props) {
+function Context({ }: Props) {
const [selector] = useStateStore()
const model = selector.use.model()
@@ -49,29 +47,35 @@ function Context({
items-stretch
"
>
- <Text
- text="OpenAI"
- className="
- font-semibold
- uppercase
- text-slate-400
- "
- size={Text.size.S3}
- />
- <div className="
- flex
- items-start
- flex-1
- py-1
- "
- >
- <Radio
- items={models.map(m => m.name)}
- getLabel={item => models.find(m => m.name === item)?.label}
- select={setModel}
- selected={model}
- />
- </div>
+ {Object.entries(models).map(([provider, value]) =>
+ <div
+ key={provider}
+ >
+ <Text
+ text={provider}
+ className="
+ font-semibold
+ uppercase
+ text-slate-400
+ "
+ size={Text.size.S3}
+ />
+ <div className="
+ flex
+ items-start
+ flex-1
+ py-1
+ "
+ >
+ <Radio
+ items={value.models.map(m => m.name)}
+ getLabel={item => value.models.find(m => m.name === item)?.name}
+ select={setModel}
+ selected={model}
+ />
+ </div>
+ </div>
+ )}
</div>
</div>
)
diff --git a/hooks/useModelProviderCreds.ts b/hooks/useModelProviderCreds.ts
new file mode 100644
index 000000000..acd3f9665
--- /dev/null
+++ b/hooks/useModelProviderCreds.ts
@@ -0,0 +1,35 @@
+import { useCallback } from 'react'
+import { useLocalStorage } from 'usehooks-ts'
+import produce from 'immer'
+
+import { ArgValue, EvaluatedArgs, ModelProvider } from 'state/model'
+
+export type Creds = {
+ [model in keyof typeof ModelProvider]?: {
+ creds?: EvaluatedArgs
+ }
+}
+
+function useModelProviderCreds() {
+ const [creds, setCreds] = useLocalStorage<Creds>('e2b-model-creds', {})
+
+ const mergeCreds = useCallback((provider: ModelProvider, key: string, value?: ArgValue) => {
+ setCreds(produce(creds, d => {
+ if (!value) {
+ delete d[provider]?.creds?.[key]
+ return
+ }
+
+ if (!d[provider]?.creds) {
+ d[provider] = { creds: { [key]: value } }
+ return
+ }
+
+ d[provider]!.creds![key] = value
+ }))
+ }, [creds, setCreds])
+
+ return [creds, mergeCreds]
+}
+
+export default useModelProviderCreds
diff --git a/state/model.ts b/state/model.ts
index 2614395d8..d79e1ba01 100644
--- a/state/model.ts
+++ b/state/model.ts
@@ -1,29 +1,141 @@
+import { Creds } from 'hooks/useModelProviderCreds'
+
export enum ModelProvider {
- OpenAI = 'OpenAI'
+ OpenAI = 'OpenAI',
+ Replicate = 'Replicate',
+}
+
+export type ArgValue = string | number
+
+export interface EvaluatedArgs {
+ [arg: string]: ArgValue
+}
+
+export interface ModelArg {
+ label?: string
+ editable?: boolean
+ type: 'string' | 'number'
+ // If this property is defined it is used as a default value.
+ value?: ArgValue
}
export interface ModelConfig {
provider: ModelProvider
name: string
- max_tokens: number
- temperature: number
- requiredFields?: string[]
+ /**
+ * Args should be exactly the same as the args to the langchain's model class in Python.
+ */
+ args?: { [arg: string]: ModelArg }
}
-const defaultTokens = 2048
-const defaultTemperature = 0
-
-export const models: { [model in keyof typeof ModelProvider]: Omit<ModelConfig, 'provider'>[] } = {
- [ModelProvider.OpenAI]: [
- {
- name: 'gpt-3.5-turbo',
- max_tokens: defaultTokens,
- temperature: defaultTemperature,
+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'>[]
+ }
+} = {
+ [ModelProvider.Replicate]: {
+ creds: {
+ replicate_api_token: {
+ label: 'Replicate API Key',
+ type: 'string',
+ },
},
- {
- name: 'gpt-4',
- max_tokens: defaultTokens,
- temperature: defaultTemperature,
+ models: [
+ {
+ name: 'Custom model',
+ args: {
+ model_name: {
+ editable: true,
+ type: 'string',
+ },
+ max_tokens: {
+ type: 'number',
+ value: 2048,
+ },
+ temperature: {
+ type: 'number',
+ value: 0,
+ },
+ },
+ },
+ ],
+ },
+ [ModelProvider.OpenAI]: {
+ creds: {
+ openai_api_key: {
+ label: 'OpenAI API Key',
+ type: 'string',
+ },
},
- ],
+ models: [
+ {
+ name: 'GPT 3.5 Turbo',
+ args: {
+ model_name: {
+ type: 'string',
+ value: 'gpt-3.5-turbo',
+ },
+ max_tokens: {
+ type: 'number',
+ value: 2048,
+ },
+ temperature: {
+ type: 'number',
+ value: 0,
+ },
+ },
+ },
+ {
+ name: 'GPT 4',
+ args: {
+ model_name: {
+ type: 'string',
+ value: 'gpt-4',
+ },
+ max_tokens: {
+ type: 'number',
+ value: 2048,
+ },
+ temperature: {
+ type: 'number',
+ value: 0,
+ },
+ },
+ },
+ ],
+ },
+}
+
+interface EvaluatedModelConfig extends Omit<ModelConfig, 'args' | 'name'> {
+ args: EvaluatedArgs
+}
+
+export function evaluateModelConfig(
+ provider: ModelProvider,
+ name: string,
+ creds: Creds,
+ userArgs: EvaluatedArgs,
+): EvaluatedModelConfig | undefined {
+ const model = models[provider].models.find(m => m.name === name)
+ if (!model) return
+
+ const defaultArgs = Object
+ .entries(model.args || {})
+ .reduce<EvaluatedArgs>((prev, [key, info]) => {
+ if (info.value) {
+ prev[key] = info.value
+ }
+ return prev
+ }, {})
+
+ return {
+ provider,
+ args: {
+ ...defaultArgs,
+ ...creds[provider]?.creds,
+ ...userArgs,
+ }
+ }
}
diff --git a/state/store.ts b/state/store.ts
index 3c0234358..33b8850c3 100644
--- a/state/store.ts
+++ b/state/store.ts
@@ -8,22 +8,13 @@ import { projects, Prisma } from '@prisma/client'
import { Database } from 'db/supabase'
import { projectsTable } from 'db/tables'
+import { EvaluatedArgs, ModelProvider } from './model'
+
export interface ModelInfo {
- name: string
- label: string
+ provider: ModelProvider
+ userArgs: EvaluatedArgs
}
-export const models: ModelInfo[] = [
- {
- name: 'gpt-4',
- label: 'GPT-4',
- },
- {
- name: 'gpt-3.5-turbo',
- label: 'GPT-3.5',
- },
-]
-
export type BlockType =
// Raw text
'Basic' |
@@ -62,7 +53,10 @@ export const methods = Object
export interface SerializedState {
envs: { key: string, value: string }[]
routes: Route[]
- model: string
+ model: {
+ provider: ModelProvider
+ userArgs?: EvaluatedArgs
+ }
}
export interface State extends SerializedState {
@@ -72,7 +66,7 @@ export interface State extends SerializedState {
addRoute: () => void
setEnvs: (envs: { key: string, value: string }[]) => void
changeEnv: (pair: { key: string, value: string }, idx: number) => void
- setModel: (model: string) => void
+ setModel: (model: ModelInfo) => void
}
function createBlock(type: BlockType): Block {
@@ -96,11 +90,20 @@ function getDefaultRoute(): Route {
}
}
+function getDefaultModel(): ModelInfo {
+ return {
+ provider: ModelProvider.OpenAI,
+ userArgs: {
+ model_name: 'gpt-3.5-turbo',
+ },
+ }
+}
+
function getDefaultState(): SerializedState {
return {
envs: [{ key: '', value: '' }],
routes: [getDefaultRoute()],
- model: 'gpt-3.5-turbo',
+ model: getDefaultModel(),
}
}
@@ -124,8 +127,9 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
initialState.envs.push({ key: '', value: '' })
}
- if (!initialState.model) {
- initialState.model = 'gpt-3.5-turbo'
+ // TEMPORARY: We are checking .model === string for backwards compatibility.
+ if (!initialState.model || typeof initialState.model === 'string') {
+ initialState.model = getDefaultModel()
}
const immerStore = immer<State>((set, get) => ({
@@ -191,6 +195,5 @@ export function createStore(project: projects, client?: SupabaseClient<Database>
} : undefined,
})
- const useStore = create<State, [['zustand/persist', unknown], ['zustand/immer', never]]>(persistent)
- return useStore
+ return create<State, [['zustand/persist', unknown], ['zustand/immer', never]]>(persistent)
}