Skip to content

An AI-powered search engine with a generative UI

Refactor model-selector component to use selected model ID instead of identifier

Yoshiki Miuraaaa61e44b21d
diff --git a/components/chat-panel.tsx b/components/chat-panel.tsx
index d8b0d352..05634300 100644
--- a/components/chat-panel.tsx
+++ b/components/chat-panel.tsx
@@ -15,12 +15,12 @@ import { useAppState } from '@/lib/utils/app-state'
import { ModelSelector } from './model-selector'
import { models } from '@/lib/types/models'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
-import { getDefaultModelIdentifier } from '@/lib/utils/model'
+import { getDefaultModelId } from '@/lib/utils'
interface ChatPanelProps {
messages: UIState
query?: string
- onModelChange?: (identifier: string) => void
+ onModelChange?: (id: string) => void
}
export function ChatPanel({ messages, query, onModelChange }: ChatPanelProps) {
@@ -34,8 +34,10 @@ export function ChatPanel({ messages, query, onModelChange }: ChatPanelProps) {
const inputRef = useRef<HTMLTextAreaElement>(null)
const isFirstRender = useRef(true) // For development environment
- const [selectedModelIdentifier, setSelectedModelIdentifier] =
- useLocalStorage<string>('selectedModel', getDefaultModelIdentifier(models))
+ const [selectedModelId, setSelectedModelId] = useLocalStorage<string>(
+ 'selectedModel',
+ getDefaultModelId(models)
+ )
const [isComposing, setIsComposing] = useState(false) // Composition state
const [enterDisabled, setEnterDisabled] = useState(false) // Disable Enter after composition ends
@@ -67,7 +69,7 @@ export function ChatPanel({ messages, query, onModelChange }: ChatPanelProps) {
const data = formData || new FormData()
// Add or update the model information
- const modelString = selectedModelIdentifier
+ const modelString = selectedModelId
data.set('model', modelString)
// Add or update the input query if not already present
@@ -152,10 +154,10 @@ export function ChatPanel({ messages, query, onModelChange }: ChatPanelProps) {
<form onSubmit={handleSubmit} className="max-w-2xl w-full px-6">
<div className="relative flex items-center w-full">
<ModelSelector
- selectedModelIdentifier={selectedModelIdentifier}
- onModelChange={identifier => {
- setSelectedModelIdentifier(identifier)
- onModelChange?.(identifier)
+ selectedModelId={selectedModelId}
+ onModelChange={id => {
+ setSelectedModelId(id)
+ onModelChange?.(id)
}}
/>
<Textarea
diff --git a/components/copilot.tsx b/components/copilot.tsx
index c052440b..04529fc7 100644
--- a/components/copilot.tsx
+++ b/components/copilot.tsx
@@ -17,7 +17,7 @@ import type { AI } from '@/app/actions'
import { useAppState } from '@/lib/utils/app-state'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
import { models } from '@/lib/types/models'
-import { getDefaultModelIdentifier } from '@/lib/utils/model'
+import { getDefaultModelId } from '@/lib/utils'
export type CopilotProps = {
inquiry?: StreamableValue<PartialInquiry>
@@ -36,9 +36,9 @@ export const Copilot: React.FC<CopilotProps> = ({ inquiry }: CopilotProps) => {
const { submit } = useActions()
const { isGenerating, setIsGenerating } = useAppState()
const [object, setObject] = useState<PartialInquiry>()
- const [selectedModelIdentifier] = useLocalStorage<string>(
+ const [selectedModelId] = useLocalStorage<string>(
'selectedModel',
- getDefaultModelIdentifier(models)
+ getDefaultModelId(models)
)
const handleInputChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -95,7 +95,7 @@ export const Copilot: React.FC<CopilotProps> = ({ inquiry }: CopilotProps) => {
const formData = new FormData()
// Add model information
- formData.set('model', selectedModelIdentifier)
+ formData.set('model', selectedModelId)
// If not skipping, add form data from the event
if (!skip) {
diff --git a/components/followup-panel.tsx b/components/followup-panel.tsx
index cb4a91ab..f5c23d5c 100644
--- a/components/followup-panel.tsx
+++ b/components/followup-panel.tsx
@@ -10,7 +10,7 @@ import { ArrowRight } from 'lucide-react'
import { useAppState } from '@/lib/utils/app-state'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
import { models } from '@/lib/types/models'
-import { getDefaultModelIdentifier } from '@/lib/utils/model'
+import { getDefaultModelId } from '@/lib/utils'
export function FollowupPanel() {
const [input, setInput] = useState('')
@@ -18,9 +18,9 @@ export function FollowupPanel() {
const [, setMessages] = useUIState<typeof AI>()
const { isGenerating, setIsGenerating } = useAppState()
- const [selectedModelIdentifier] = useLocalStorage<string>(
+ const [selectedModelId] = useLocalStorage<string>(
'selectedModel',
- getDefaultModelIdentifier(models)
+ getDefaultModelId(models)
)
const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
@@ -33,7 +33,7 @@ export function FollowupPanel() {
const formData = new FormData(event.currentTarget as HTMLFormElement)
// Add model information to formData
- formData.set('model', selectedModelIdentifier)
+ formData.set('model', selectedModelId)
const userMessage = {
id: Date.now(),
diff --git a/components/model-selector.tsx b/components/model-selector.tsx
index 6790df3d..55ae734b 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 { createModelIdentifier } from '@/lib/utils/model'
+import { createModelId } from '@/lib/utils'
interface ModelSelectorProps {
- selectedModelIdentifier: string
- onModelChange: (identifier: string) => void
+ selectedModelId: string
+ onModelChange: (id: string) => void
}
function groupModelsByProvider(models: Model[]) {
@@ -30,11 +30,11 @@ function groupModelsByProvider(models: Model[]) {
}
export function ModelSelector({
- selectedModelIdentifier,
+ selectedModelId,
onModelChange
}: ModelSelectorProps) {
- const handleModelChange = (identifier: string) => {
- onModelChange(identifier)
+ const handleModelChange = (id: string) => {
+ onModelChange(id)
}
const groupedModels = groupModelsByProvider(models)
@@ -43,7 +43,7 @@ export function ModelSelector({
<div className="absolute -top-8 left-2">
<Select
name="model"
- value={selectedModelIdentifier}
+ value={selectedModelId}
onValueChange={handleModelChange}
>
<SelectTrigger className="mr-2 h-7 text-xs border-none shadow-none focus:ring-0">
@@ -57,8 +57,8 @@ export function ModelSelector({
</SelectLabel>
{models.map(model => (
<SelectItem
- key={createModelIdentifier(model)}
- value={createModelIdentifier(model)}
+ key={createModelId(model)}
+ value={createModelId(model)}
className="py-2"
>
<div className="flex items-center space-x-1">
diff --git a/components/search-related.tsx b/components/search-related.tsx
index 96cf8e8b..8d371d5d 100644
--- a/components/search-related.tsx
+++ b/components/search-related.tsx
@@ -16,7 +16,7 @@ import { Section } from './section'
import { Skeleton } from './ui/skeleton'
import { useLocalStorage } from '@/lib/hooks/use-local-storage'
import { models } from '@/lib/types/models'
-import { getDefaultModelIdentifier } from '@/lib/utils/model'
+import { getDefaultModelId } from '@/lib/utils'
export interface SearchRelatedProps {
relatedQueries: StreamableValue<PartialRelated>
@@ -30,9 +30,9 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
const [data, error, pending] = useStreamableValue(relatedQueries)
const [related, setRelated] = useState<PartialRelated>()
- const [selectedModelIdentifier] = useLocalStorage<string>(
+ const [selectedModelId] = useLocalStorage<string>(
'selectedModel',
- getDefaultModelIdentifier(models)
+ getDefaultModelId(models)
)
useEffect(() => {
@@ -54,7 +54,7 @@ export const SearchRelated: React.FC<SearchRelatedProps> = ({
}
// Add model information to formData
- formData.set('model', selectedModelIdentifier)
+ formData.set('model', selectedModelId)
const userMessage = {
id: Date.now(),
diff --git a/lib/utils/index.ts b/lib/utils/index.ts
index a60ce09f..4adfa3c9 100644
--- a/lib/utils/index.ts
+++ b/lib/utils/index.ts
@@ -1,7 +1,7 @@
import { type ClassValue, clsx } from 'clsx'
import { twMerge } from 'tailwind-merge'
import { CoreMessage } from 'ai'
-
+import { type Model } from '@/lib/types/models'
export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
}
@@ -35,3 +35,14 @@ export function transformToolMessages(messages: CoreMessage[]): CoreMessage[] {
export function sanitizeUrl(url: string): string {
return url.replace(/\s+/g, '%20')
}
+
+export function createModelId(model: Model): string {
+ return `${model.providerId}:${model.id}`
+}
+
+export function getDefaultModelId(models: Model[]): string {
+ if (!models.length) {
+ throw new Error('No models available')
+ }
+ return createModelId(models[0])
+}
diff --git a/lib/utils/model.ts b/lib/utils/model.ts
deleted file mode 100644
index 38c36f55..00000000
--- a/lib/utils/model.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-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])
-}