Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
resolve conflicts
Vasek Mlejnskye0fdab341be7
diff --cc components/Editor/Sidebar/Model/ModelCard.tsxindex 9be0693bd,eae8c9b8f..476cab276--- a/components/Editor/Sidebar/Model/ModelCard.tsx+++ b/components/Editor/Sidebar/Model/ModelCard.tsx@@@ -1,11 -1,12 +1,12 @@@-import clsx from 'clsx'-import Input from 'components/Input'-import Text from 'components/Text'import { Check, Wrench } from 'lucide-react'import React from 'react'+import clsx from 'clsx'+import Input from 'components/Input'+import Text from 'components/Text'import { ModelConfigTemplate } from 'state/model'import { SelectedModel } from 'state/store'+ import { parseInput } from 'utils/parseInput'interface Props {isSelected?: booleandiff --cc components/Editor/Sidebar/Model/index.tsxindex c19ed2702,1a2b22e04..b034e78dd--- a/components/Editor/Sidebar/Model/index.tsx+++ b/components/Editor/Sidebar/Model/index.tsx@@@ -135,9 -117,12 +135,18 @@@ function Model({ }: Props){value.models.map(m =><ModelCardkey={m.name}++<<<<<<< HEAD+ modelTemplate={{ ...m, provider: provider as ModelProvider }}+ selectedModel={m.name === model.name ? model : undefined}+ isSelected={m.name === model.name}++=======+ modelTemplate={m}+ selectedModel={+ m.name === model.name && provider === model.provider+ ? model+ : undefined}+ isSelected={m.name === model.name && provider === model.provider}++>>>>>>> 3fb657a674d7cd96185da6021957cfc1a770d27aupdateSelectedModel={i => setModel({name: m.name,provider: provider as ModelProvider,