Skip to content

An AI-powered search engine with a generative UI

refactor: Update model-selector component to include selected model identifier in form data

Yoshiki Miura8a11ad7144b4
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index 38be2943..d8b0d352 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -13,22 +13,17 @@ import Textarea from 'react-textarea-autosize'
import { generateId } from 'ai'
import { useAppState } from '@/lib/utils/app-state'
import { ModelSelector } from './model-selector'
-import { Model, models } from '@/lib/types/models'
+import { models } from '@/lib/types/models'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
+import { getDefaultModelIdentifier } from '@/lib/utils/model'
interface ChatPanelProps {
messages: UIState
query?: string
- onModelChange?: (model: Model) => void
- defaultModel?: Model
+ onModelChange?: (identifier: string) => void
}
-export function ChatPanel({
- messages,
- query,
- onModelChange,
- defaultModel = models[0]
-}: ChatPanelProps) {
+export function ChatPanel({ messages, query, onModelChange }: ChatPanelProps) {
const [input, setInput] = useState('')
const [showEmptyScreen, setShowEmptyScreen] = useState(false)
const [, setMessages] = useUIState<typeof AI>()
@@ -39,11 +34,8 @@ export function ChatPanel({
const inputRef = useRef<HTMLTextAreaElement>(null)
const isFirstRender = useRef(true) // For development environment
- // Use localStorage for selectedModel
- const [selectedModel, setSelectedModel] = useLocalStorage<Model>(
- 'selectedModel',
- defaultModel
- )
+ const [selectedModelIdentifier, setSelectedModelIdentifier] =
+ useLocalStorage<string>('selectedModel', getDefaultModelIdentifier(models))
const [isComposing, setIsComposing] = useState(false) // Composition state
const [enterDisabled, setEnterDisabled] = useState(false) // Disable Enter after composition ends
@@ -75,7 +67,7 @@ export function ChatPanel({
const data = formData || new FormData()
// Add or update the model information
- const modelString = selectedModel.id
+ const modelString = selectedModelIdentifier
data.set('model', modelString)
// Add or update the input query if not already present
@@ -83,12 +75,6 @@ export function ChatPanel({
data.set('input', query)
}
- console.log('Submitting data:', {
- model: modelString,
- input: data.get('input'),
- formDataEntries: Object.fromEntries(data)
- })
-
const responseMessage = await submit(data)
setMessages(currentMessages => [...currentMessages, responseMessage])
}
@@ -166,10 +152,10 @@ export function ChatPanel({
<form onSubmit={handleSubmit} className="max-w-2xl w-full px-6">
<div className="relative flex items-center w-full">
<ModelSelector
- selectedModel={selectedModel}
- onModelChange={model => {
- setSelectedModel(model)
- onModelChange?.(model)
+ selectedModelIdentifier={selectedModelIdentifier}
+ onModelChange={identifier => {
+ setSelectedModelIdentifier(identifier)
+ onModelChange?.(identifier)
}}
/>
<Textarea
diff --git a/components/copilot.tsx b/components/copilot.tsx
index 8911321b..c052440b 100644
--- a/components/copilot.tsx
+++ b/components/copilot.tsx
@@ -16,7 +16,8 @@ import {
import type { AI } from '@/app/actions'
import { useAppState } from '@/lib/utils/app-state'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
-import { Model, models } from '@/lib/types/models'
+import { models } from '@/lib/types/models'
+import { getDefaultModelIdentifier } from '@/lib/utils/model'
export type CopilotProps = {
inquiry?: StreamableValue<PartialInquiry>
@@ -35,7 +36,10 @@ export const Copilot: React.FC<CopilotProps> = ({ inquiry }: CopilotProps) => {
const { submit } = useActions()
const { isGenerating, setIsGenerating } = useAppState()
const [object, setObject] = useState<PartialInquiry>()
- const [selectedModel] = useLocalStorage<Model>('selectedModel', models[0])
+ const [selectedModelIdentifier] = useLocalStorage<string>(
+ 'selectedModel',
+ getDefaultModelIdentifier(models)
+ )
const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
setQuery(event.target.value)
@@ -91,7 +95,7 @@ export const Copilot: React.FC<CopilotProps> = ({ inquiry }: CopilotProps) => {
const formData = new FormData()
// Add model information
- formData.set('model', `${selectedModel.providerId}:${selectedModel.id}`)
+ formData.set('model', selectedModelIdentifier)
// If not skipping, add form data from the event
if (!skip) {
diff --git a/components/followup-panel.tsx b/components/followup-panel.tsx
index 81510173..cb4a91ab 100644
--- a/components/followup-panel.tsx
+++ b/components/followup-panel.tsx
@@ -9,14 +9,19 @@ import { UserMessage } from './user-message'
import { ArrowRight } from 'lucide-react'
import { useAppState } from '@/lib/utils/app-state'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
-import { Model, models } from '@/lib/types/models'
+import { models } from '@/lib/types/models'
+import { getDefaultModelIdentifier } from '@/lib/utils/model'
export function FollowupPanel() {
const [input, setInput] = useState('')
const { submit } = useActions()
const [, setMessages] = useUIState<typeof AI>()
const { isGenerating, setIsGenerating } = useAppState()
- const [selectedModel] = useLocalStorage<Model>('selectedModel', models[0])
+
+ const [selectedModelIdentifier] = useLocalStorage<string>(
+ 'selectedModel',
+ getDefaultModelIdentifier(models)
+ )
const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault()
@@ -28,7 +33,7 @@ export function FollowupPanel() {
const formData = new FormData(event.currentTarget as HTMLFormElement)
// Add model information to formData
- formData.set('model', `${selectedModel.providerId}:${selectedModel.id}`)
+ formData.set('model', selectedModelIdentifier)
const userMessage = {
id: Date.now(),
diff --git a/components/model-selector.tsx b/components/model-selector.tsx
index bb67d158..6790df3d 100644
--- a/components/model-selector.tsx
+++ b/components/model-selector.tsx
@@ -11,11 +11,11 @@ import {
} from './ui/select'
import Image from 'next/image'
import { Model, models } from '@/lib/types/models'
-import { useLocalStorage } from '@/lib/hooks/use-local-storage'
+import { createModelIdentifier } from '@/lib/utils/model'
interface ModelSelectorProps {
- selectedModel: Model
- onModelChange: (model: Model) => void
+ selectedModelIdentifier: string
+ onModelChange: (identifier: string) => void
}
function groupModelsByProvider(models: Model[]) {
@@ -30,28 +30,20 @@ function groupModelsByProvider(models: Model[]) {
}
export function ModelSelector({
- selectedModel: initialModel,
+ selectedModelIdentifier,
onModelChange
}: ModelSelectorProps) {
- const [selectedModel, setSelectedModel] = useLocalStorage<Model>(
- 'selectedModel',
- initialModel
- )
- const groupedModels = groupModelsByProvider(models)
-
- const handleModelChange = (modelId: string) => {
- const selectedModelData = models.find(model => model.id === modelId)
- if (selectedModelData) {
- setSelectedModel(selectedModelData)
- onModelChange(selectedModelData)
- }
+ const handleModelChange = (identifier: string) => {
+ onModelChange(identifier)
}
+ const groupedModels = groupModelsByProvider(models)
+
return (
<div className="absolute -top-8 left-2">
<Select
name="model"
- value={selectedModel.id}
+ value={selectedModelIdentifier}
onValueChange={handleModelChange}
>
<SelectTrigger className="mr-2 h-7 text-xs border-none shadow-none focus:ring-0">
@@ -64,14 +56,18 @@ export function ModelSelector({
{provider}
</SelectLabel>
{models.map(model => (
- <SelectItem key={model.id} value={model.id} className="py-2">
+ <SelectItem
+ key={createModelIdentifier(model)}
+ value={createModelIdentifier(model)}
+ className="py-2"
+ >
<div className="flex items-center space-x-1">
<Image
src={`/providers/logos/${model.providerId}.svg`}
alt={model.provider}
width={18}
height={18}
- className="bg-white rounded-sm border"
+ className="bg-white rounded-full border"
/>
<span className="text-xs font-medium">{model.name}</span>
</div>
diff --git a/components/search-related.tsx b/components/search-related.tsx
index 2e4cd3da..96cf8e8b 100644
--- a/components/search-related.tsx
+++ b/components/search-related.tsx
@@ -15,7 +15,8 @@ import { PartialRelated } from '@/lib/schema/related'
import { Section } from './section'
import { Skeleton } from './ui/skeleton'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
-import { Model, models } from '@/lib/types/models'
+import { models } from '@/lib/types/models'
+import { getDefaultModelIdentifier } from '@/lib/utils/model'
export interface SearchRelatedProps {
relatedQueries: StreamableValue<PartialRelated>
@@ -28,7 +29,11 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
const [, setMessages] = useUIState<typeof AI>()
const [data, error, pending] = useStreamableValue(relatedQueries)
const [related, setRelated] = useState<PartialRelated>()
- const [selectedModel] = useLocalStorage<Model>('selectedModel', models[0])
+
+ const [selectedModelIdentifier] = useLocalStorage<string>(
+ 'selectedModel',
+ getDefaultModelIdentifier(models)
+ )
useEffect(() => {
if (!data) return
@@ -49,7 +54,7 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
}
// Add model information to formData
- formData.set('model', `${selectedModel.providerId}:${selectedModel.id}`)
+ formData.set('model', selectedModelIdentifier)
const userMessage = {
id: Date.now(),
diff --git a/lib/types/models.ts b/lib/types/models.ts
index 0378ff5e..d1a7b9dd 100644
--- a/lib/types/models.ts
+++ b/lib/types/models.ts
@@ -7,43 +7,43 @@ export interface Model {
export const models: Model[] = [
{
- id: 'openai:gpt-4o',
+ id: 'gpt-4o',
name: 'GPT-4o',
provider: 'OpenAI',
providerId: 'openai'
},
{
- id: 'openai:gpt-4o-mini',
+ id: 'gpt-4o-mini',
name: 'GPT-4o mini',
provider: 'OpenAI',
providerId: 'openai'
},
{
- id: 'anthropic:claude-3-5-sonnet-latest',
+ id: 'claude-3-5-sonnet-latest',
name: 'Claude 3.5 Sonnet',
provider: 'Anthropic',
providerId: 'anthropic'
},
{
- id: 'google:gemini-1.5-pro-002',
+ id: 'gemini-1.5-pro-002',
name: 'Gemini 1.5 Pro',
provider: 'Google Generative AI',
providerId: 'google'
},
{
- id: 'groq:llama3-groq-8b-8192-tool-use-preview',
+ id: 'llama3-groq-8b-8192-tool-use-preview',
name: 'LLama 3 Groq 8B Tool Use',
provider: 'Groq',
providerId: 'groq'
},
{
- id: 'ollama:qwen2.5',
+ id: 'qwen2.5',
name: 'Qwen 2.5',
provider: 'Ollama',
providerId: 'ollama'
},
{
- id: 'azure:gpt-4o',
+ id: 'gpt-4o',
name: 'GPT-4o',
provider: 'Azure',
providerId: 'azure'
diff --git a/lib/utils/model.ts b/lib/utils/model.ts
new file mode 100644
index 00000000..38c36f55
--- /dev/null
+++ b/lib/utils/model.ts
@@ -0,0 +1,12 @@
+import type { Model } from '@/lib/types/models'
+
+export function createModelIdentifier(model: Model): string {
+ return `${model.providerId}:${model.id}`
+}
+
+export function getDefaultModelIdentifier(models: Model[]): string {
+ if (!models.length) {
+ throw new Error('No models available')
+ }
+ return createModelIdentifier(models[0])
+}