Merge pull request #157 from acara-app/feat/new-ai-model-option-for-gemini-3.1-pro

tuvshinjargal · web-flow · commit 20e4d1df3b35 · 2026-02-22T16:15:24.000-06:00
feat: Added Gemini 3.1 Pro model and refactor chat input to manage mode and model state externally.
diff --git a/app/Enums/ModelName.php b/app/Enums/ModelName.php
@@ -10,6 +10,7 @@ enum ModelName: string
     case GPT_5_NANO = 'gpt-5-nano';
     case GEMINI_2_5_FLASH = 'gemini-2.5-flash';
     case GEMINI_3_FLASH = 'gemini-3-flash-preview';
+    case GEMINI_3_1_PRO = 'gemini-3.1-pro-preview';
 
     /**
      * @return array{id: string, name: string, description: string, provider: string}[]
@@ -29,6 +30,7 @@ public function getName(): string
             self::GPT_5_NANO => 'GPT-5 Nano',
             self::GEMINI_2_5_FLASH => 'Gemini 2.5 Flash',
             self::GEMINI_3_FLASH => 'Gemini 3 Flash',
+            self::GEMINI_3_1_PRO => 'Gemini 3.1 Pro',
         };
     }
 
@@ -39,14 +41,15 @@ public function getDescription(): string
             self::GPT_5_NANO => 'Cheapest model, best for simpler tasks',
             self::GEMINI_2_5_FLASH => 'Fast and versatile performance across a variety of tasks',
             self::GEMINI_3_FLASH => 'Google\'s latest model with frontier intelligence built for speed that helps everyone learn, build, and plan anything — faster',
+            self::GEMINI_3_1_PRO => "Google's latest Pro model with advanced reasoning and frontier capabilities",
         };
     }
 
     public function getProvider(): string
     {
         return match ($this) {
             self::GPT_5_MINI, self::GPT_5_NANO => 'openai',
-            self::GEMINI_2_5_FLASH, self::GEMINI_3_FLASH => 'google',
+            self::GEMINI_2_5_FLASH, self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 'google',
         };
     }
 
@@ -56,7 +59,7 @@ public function getProvider(): string
     public function requiresThinkingMode(): bool
     {
         return match ($this) {
-            self::GEMINI_3_FLASH => true,
+            self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => true,
             default => false,
         };
     }
@@ -68,7 +71,7 @@ public function requiresThinkingMode(): bool
     public function getThinkingBudget(): ?int
     {
         return match ($this) {
-            self::GEMINI_3_FLASH => 8192,
+            self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 8192,
             default => null,
         };
     }
@@ -92,7 +95,7 @@ public function supportsTemperature(): bool
     public function getRecommendedTemperature(): float
     {
         return match ($this) {
-            self::GEMINI_3_FLASH => 1.0,
+            self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 1.0,
             default => 0.7,
         };
     }
@@ -104,7 +107,7 @@ public function getRecommendedTemperature(): float
     public function getMinMaxTokens(): int
     {
         return match ($this) {
-            self::GEMINI_3_FLASH => 16384,
+            self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 16384,
             default => 8000,
         };
     }
diff --git a/app/Http/Requests/StoreAgentConversationRequest.php b/app/Http/Requests/StoreAgentConversationRequest.php
@@ -35,7 +35,7 @@ public function rules(): array
             'messages.*.parts.*.type' => ['required', 'string'],
             'messages.*.parts.*.text' => ['required_if:messages.*.parts.*.type,text', 'string'],
 
-            // Query params
+            // Body params (sent by AI SDK transport)
             'mode' => ['required', Rule::enum(AgentMode::class)],
             'model' => ['required', Rule::enum(ModelName::class)],
         ];
@@ -94,16 +94,4 @@ public function messages(): array
             'model.required' => 'Model is required',
         ];
     }
-
-    /**
-     * Prepare the data for validation.
-     * Merge query parameters into the request data.
-     */
-    protected function prepareForValidation(): void
-    {
-        $this->merge([
-            'mode' => $this->query('mode'),
-            'model' => $this->query('model'),
-        ]);
-    }
 }
diff --git a/lang/en/common.php b/lang/en/common.php
@@ -963,6 +963,7 @@
         ],
         'models' => [
             'gemini_3_flash' => 'Gemini 3 Flash',
+            'gemini_3_1_pro' => 'Gemini 3.1 Pro',
         ],
     ],
 ];
diff --git a/lang/fr/common.php b/lang/fr/common.php
@@ -962,6 +962,7 @@
         ],
         'models' => [
             'gemini_3_flash' => 'Gemini 3 Flash',
+            'gemini_3_1_pro' => 'Gemini 3.1 Pro',
         ],
     ],
 ];
diff --git a/lang/mn/common.php b/lang/mn/common.php
@@ -963,6 +963,7 @@
         ],
         'models' => [
             'gemini_3_flash' => 'Gemini 3 Flash',
+            'gemini_3_1_pro' => 'Gemini 3.1 Pro',
         ],
     ],
 ];
diff --git a/resources/js/hooks/use-chat-stream.ts b/resources/js/hooks/use-chat-stream.ts
@@ -3,7 +3,7 @@ import { stream } from '@/routes/chat';
 import type { ChatStatus } from '@/types/chat';
 import { useChat, type UIMessage } from '@ai-sdk/react';
 import { DefaultChatTransport } from 'ai';
-import { useMemo } from 'react';
+import { useMemo, useRef } from 'react';
 
 interface UseChatStreamOptions {
     conversationId?: string;
@@ -28,14 +28,18 @@ export function useChatStream({
     model,
     initialMessages,
 }: UseChatStreamOptions): UseChatStreamReturn {
+    const modelRef = useRef({ model, mode });
+    modelRef.current = { model, mode };
+
     const transport = useMemo(
         () =>
             new DefaultChatTransport({
                 api: stream.url({
-                    query: { mode, model, conversationId },
+                    query: { conversationId },
                 }),
+                body: () => modelRef.current,
             }),
-        [mode, model, conversationId],
+        [conversationId],
     );
 
     const { messages, sendMessage, status, error } = useChat({
diff --git a/resources/js/pages/chat/chat-input.tsx b/resources/js/pages/chat/chat-input.tsx
@@ -19,6 +19,7 @@ import { useTranslation } from 'react-i18next';
 
 export const AI_MODELS = {
     'gemini-3-flash-preview': 'chat.models.gemini_3_flash',
+    'gemini-3.1-pro-preview': 'chat.models.gemini_3_1_pro',
 } as const;
 
 export type AIModel = keyof typeof AI_MODELS;
@@ -37,30 +38,32 @@ export const CHAT_MODES = {
 export type ChatMode = keyof typeof CHAT_MODES;
 
 interface Props {
-    onSubmit: (message: string, mode: ChatMode, model: AIModel) => void;
+    onSubmit: (message: string) => void;
+    onModeChange: (mode: ChatMode) => void;
+    onModelChange: (model: AIModel) => void;
     className?: string;
     disabled?: boolean;
     isLoading?: boolean;
     mode: ChatMode;
+    model: AIModel;
 }
 
 export default function ChatInput({
     className,
     onSubmit,
+    onModeChange,
+    onModelChange,
     disabled = false,
     isLoading = false,
     mode,
+    model,
 }: Props) {
     const { t } = useTranslation('common');
     const [message, setMessage] = useState('');
-    const [selectedMode, setSelectedMode] = useState<ChatMode>(mode || 'ask');
-    const [selectedModel, setSelectedModel] = useState<AIModel>(
-        'gemini-3-flash-preview',
-    );
 
     const handleSubmit = () => {
         if (message.trim()) {
-            onSubmit(message, selectedMode, selectedModel);
+            onSubmit(message);
             setMessage('');
         }
     };
@@ -72,7 +75,7 @@ export default function ChatInput({
         }
     };
 
-    const SelectedModeIcon = CHAT_MODES[selectedMode].icon;
+    const SelectedModeIcon = CHAT_MODES[mode].icon;
 
     return (
         <div className="mx-auto flex w-full max-w-3xl items-end bg-background p-0.5 md:px-4 md:py-2">
@@ -103,10 +106,8 @@ export default function ChatInput({
                                     className="gap-1.5"
                                 >
                                     <SelectedModeIcon className="size-4" />
-                                    {selectedMode !== 'create-meal-plan' && (
-                                        <span>
-                                            {t(CHAT_MODES[selectedMode].label)}
-                                        </span>
+                                    {mode !== 'create-meal-plan' && (
+                                        <span>{t(CHAT_MODES[mode].label)}</span>
                                     )}
                                     <ChevronDown className="size-3.5 opacity-60" />
                                 </Button>
@@ -117,11 +118,11 @@ export default function ChatInput({
                                         <DropdownMenuItem
                                             key={key}
                                             onClick={() =>
-                                                setSelectedMode(key as ChatMode)
+                                                onModeChange(key as ChatMode)
                                             }
                                             className={cn(
                                                 'gap-2',
-                                                selectedMode === key &&
+                                                mode === key &&
                                                     'bg-accent text-accent-foreground',
                                             )}
                                         >
@@ -152,7 +153,7 @@ export default function ChatInput({
                                     className="gap-1.5 text-muted-foreground hover:text-foreground"
                                 >
                                     <span className="max-w-[80px] truncate sm:max-w-[90px]">
-                                        {t(AI_MODELS[selectedModel])}
+                                        {t(AI_MODELS[model])}
                                     </span>
                                     <ChevronDown className="size-3.5 opacity-60" />
                                 </Button>
@@ -163,10 +164,10 @@ export default function ChatInput({
                                         <DropdownMenuItem
                                             key={key}
                                             onClick={() =>
-                                                setSelectedModel(key as AIModel)
+                                                onModelChange(key as AIModel)
                                             }
                                             className={cn(
-                                                selectedModel === key &&
+                                                model === key &&
                                                     'bg-accent text-accent-foreground',
                                             )}
                                         >
diff --git a/resources/js/pages/chat/create-chat.tsx b/resources/js/pages/chat/create-chat.tsx
@@ -7,6 +7,7 @@ import type { ChatPageProps, UIMessage } from '@/types/chat';
 import { Head, router, usePage } from '@inertiajs/react';
 import { useEffect, useRef, useState } from 'react';
 import ChatInput, { type AIModel, type ChatMode } from './chat-input';
+
 import ChatMessages, { ChatErrorBanner } from './chat-messages';
 
 const breadcrumbs: BreadcrumbItem[] = [
@@ -47,11 +48,7 @@ export default function CreateChat() {
         }
     }, [messages]);
 
-    function handleSubmit(
-        message: string,
-        chatMode: ChatMode,
-        aiModel: AIModel,
-    ) {
+    function handleSubmit(message: string) {
         if (!message.trim()) {
             return;
         }
@@ -65,8 +62,6 @@ export default function CreateChat() {
             });
         }
 
-        setMode(chatMode);
-        setModel(aiModel);
         sendMessage({ text: message });
     }
 
@@ -92,9 +87,12 @@ export default function CreateChat() {
                     <ChatInput
                         className="w-full"
                         onSubmit={handleSubmit}
+                        onModeChange={setMode}
+                        onModelChange={setModel}
                         disabled={isStreaming || isSubmitting}
                         isLoading={isStreaming || isSubmitting}
                         mode={mode}
+                        model={model}
                     />
                     <p className="px-4 pb-4 text-center text-xs text-muted-foreground">
                         For informational purposes only. Not a substitute for
diff --git a/tests/Feature/Controllers/ChatControllerTest.php b/tests/Feature/Controllers/ChatControllerTest.php
@@ -71,13 +71,13 @@
 it('accepts valid stream request', function (): void {
     $user = User::factory()->create();
 
-    $url = route('chat.stream').'?mode='.AgentMode::Ask->value.'&model='.ModelName::GPT_5_MINI->value;
-
     actingAs($user)
-        ->post($url, [
+        ->post(route('chat.stream'), [
             'messages' => [
                 ['role' => 'user', 'parts' => [['type' => 'text', 'text' => 'Hello API']]],
             ],
+            'mode' => AgentMode::Ask->value,
+            'model' => ModelName::GPT_5_MINI->value,
         ])
         ->assertOk();
 });
diff --git a/tests/Unit/Enums/ModelNameTest.php b/tests/Unit/Enums/ModelNameTest.php
@@ -8,32 +8,37 @@
     expect(ModelName::GPT_5_MINI->value)->toBe('gpt-5-mini')
         ->and(ModelName::GPT_5_NANO->value)->toBe('gpt-5-nano')
         ->and(ModelName::GEMINI_2_5_FLASH->value)->toBe('gemini-2.5-flash')
-        ->and(ModelName::GEMINI_3_FLASH->value)->toBe('gemini-3-flash-preview');
+        ->and(ModelName::GEMINI_3_FLASH->value)->toBe('gemini-3-flash-preview')
+        ->and(ModelName::GEMINI_3_1_PRO->value)->toBe('gemini-3.1-pro-preview');
 });
 
 it('returns correct names', function (): void {
     expect(ModelName::GPT_5_MINI->getName())->toBe('GPT-5 mini')
         ->and(ModelName::GPT_5_NANO->getName())->toBe('GPT-5 Nano')
         ->and(ModelName::GEMINI_2_5_FLASH->getName())->toBe('Gemini 2.5 Flash')
-        ->and(ModelName::GEMINI_3_FLASH->getName())->toBe('Gemini 3 Flash');
+        ->and(ModelName::GEMINI_3_FLASH->getName())->toBe('Gemini 3 Flash')
+        ->and(ModelName::GEMINI_3_1_PRO->getName())->toBe('Gemini 3.1 Pro');
 });
 
 it('returns correct descriptions', function (): void {
     expect(ModelName::GPT_5_MINI->getDescription())->toBe('Cheapest model, best for smarter tasks')
         ->and(ModelName::GPT_5_NANO->getDescription())->toBe('Cheapest model, best for simpler tasks')
         ->and(ModelName::GEMINI_2_5_FLASH->getDescription())->toBe('Fast and versatile performance across a variety of tasks')
-        ->and(ModelName::GEMINI_3_FLASH->getDescription())->toBe("Google's latest model with frontier intelligence built for speed that helps everyone learn, build, and plan anything — faster");
+        ->and(ModelName::GEMINI_3_FLASH->getDescription())->toBe("Google's latest model with frontier intelligence built for speed that helps everyone learn, build, and plan anything — faster")
+        ->and(ModelName::GEMINI_3_1_PRO->getDescription())->toBe("Google's latest Pro model with advanced reasoning and frontier capabilities");
 });
 
 it('returns correct providers', function (): void {
     expect(ModelName::GPT_5_MINI->getProvider())->toBe('openai')
         ->and(ModelName::GPT_5_NANO->getProvider())->toBe('openai')
         ->and(ModelName::GEMINI_2_5_FLASH->getProvider())->toBe('google')
-        ->and(ModelName::GEMINI_3_FLASH->getProvider())->toBe('google');
+        ->and(ModelName::GEMINI_3_FLASH->getProvider())->toBe('google')
+        ->and(ModelName::GEMINI_3_1_PRO->getProvider())->toBe('google');
 });
 
 it('identifies models that require thinking mode', function (): void {
     expect(ModelName::GEMINI_3_FLASH->requiresThinkingMode())->toBeTrue()
+        ->and(ModelName::GEMINI_3_1_PRO->requiresThinkingMode())->toBeTrue()
         ->and(ModelName::GEMINI_2_5_FLASH->requiresThinkingMode())->toBeFalse()
         ->and(ModelName::GPT_5_MINI->requiresThinkingMode())->toBeFalse()
         ->and(ModelName::GPT_5_NANO->requiresThinkingMode())->toBeFalse();
@@ -43,23 +48,27 @@
     expect(ModelName::GPT_5_MINI->supportsTemperature())->toBeFalse()
         ->and(ModelName::GPT_5_NANO->supportsTemperature())->toBeFalse()
         ->and(ModelName::GEMINI_2_5_FLASH->supportsTemperature())->toBeTrue()
-        ->and(ModelName::GEMINI_3_FLASH->supportsTemperature())->toBeTrue();
+        ->and(ModelName::GEMINI_3_FLASH->supportsTemperature())->toBeTrue()
+        ->and(ModelName::GEMINI_3_1_PRO->supportsTemperature())->toBeTrue();
 });
 
 it('returns correct thinking budget for thinking models', function (): void {
     expect(ModelName::GEMINI_3_FLASH->getThinkingBudget())->toBe(8192)
+        ->and(ModelName::GEMINI_3_1_PRO->getThinkingBudget())->toBe(8192)
         ->and(ModelName::GEMINI_2_5_FLASH->getThinkingBudget())->toBeNull()
         ->and(ModelName::GPT_5_MINI->getThinkingBudget())->toBeNull();
 });
 
 it('returns correct recommended temperature', function (): void {
     expect(ModelName::GEMINI_3_FLASH->getRecommendedTemperature())->toBe(1.0)
+        ->and(ModelName::GEMINI_3_1_PRO->getRecommendedTemperature())->toBe(1.0)
         ->and(ModelName::GEMINI_2_5_FLASH->getRecommendedTemperature())->toBe(0.7)
         ->and(ModelName::GPT_5_MINI->getRecommendedTemperature())->toBe(0.7);
 });
 
 it('returns correct minimum max tokens', function (): void {
     expect(ModelName::GEMINI_3_FLASH->getMinMaxTokens())->toBe(16384)
+        ->and(ModelName::GEMINI_3_1_PRO->getMinMaxTokens())->toBe(16384)
         ->and(ModelName::GEMINI_2_5_FLASH->getMinMaxTokens())->toBe(8000)
         ->and(ModelName::GPT_5_MINI->getMinMaxTokens())->toBe(8000);
 });
@@ -79,10 +88,11 @@
     $models = ModelName::getAvailableModels();
 
     expect($models)->toBeArray()
-        ->and($models)->toHaveCount(4)
+        ->and($models)->toHaveCount(5)
         ->and($models[0])->toHaveKeys(['id', 'name', 'description', 'provider'])
         ->and($models[0]['id'])->toBe('gpt-5-mini')
         ->and($models[1]['id'])->toBe('gpt-5-nano')
         ->and($models[2]['id'])->toBe('gemini-2.5-flash')
-        ->and($models[3]['id'])->toBe('gemini-3-flash-preview');
+        ->and($models[3]['id'])->toBe('gemini-3-flash-preview')
+        ->and($models[4]['id'])->toBe('gemini-3.1-pro-preview');
 });
diff --git a/tests/Unit/Http/Requests/StoreAgentConversationRequestTest.php b/tests/Unit/Http/Requests/StoreAgentConversationRequestTest.php

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ enum ModelName: string`
`10`	`10`	`case GPT_5_NANO = 'gpt-5-nano';`
`11`	`11`	`case GEMINI_2_5_FLASH = 'gemini-2.5-flash';`
`12`	`12`	`case GEMINI_3_FLASH = 'gemini-3-flash-preview';`
	`13`	`+ case GEMINI_3_1_PRO = 'gemini-3.1-pro-preview';`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* @return array{id: string, name: string, description: string, provider: string}[]`
`@@ -29,6 +30,7 @@ public function getName(): string`
`29`	`30`	`self::GPT_5_NANO => 'GPT-5 Nano',`
`30`	`31`	`self::GEMINI_2_5_FLASH => 'Gemini 2.5 Flash',`
`31`	`32`	`self::GEMINI_3_FLASH => 'Gemini 3 Flash',`
	`33`	`+ self::GEMINI_3_1_PRO => 'Gemini 3.1 Pro',`
`32`	`34`	`};`
`33`	`35`	`}`
`34`	`36`
`@@ -39,14 +41,15 @@ public function getDescription(): string`
`39`	`41`	`self::GPT_5_NANO => 'Cheapest model, best for simpler tasks',`
`40`	`42`	`self::GEMINI_2_5_FLASH => 'Fast and versatile performance across a variety of tasks',`
`41`	`43`	`self::GEMINI_3_FLASH => 'Google\'s latest model with frontier intelligence built for speed that helps everyone learn, build, and plan anything — faster',`
	`44`	`+ self::GEMINI_3_1_PRO => "Google's latest Pro model with advanced reasoning and frontier capabilities",`
`42`	`45`	`};`
`43`	`46`	`}`
`44`	`47`
`45`	`48`	`public function getProvider(): string`
`46`	`49`	`{`
`47`	`50`	`return match ($this) {`
`48`	`51`	`self::GPT_5_MINI, self::GPT_5_NANO => 'openai',`
`49`		`- self::GEMINI_2_5_FLASH, self::GEMINI_3_FLASH => 'google',`
	`52`	`+ self::GEMINI_2_5_FLASH, self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 'google',`
`50`	`53`	`};`
`51`	`54`	`}`
`52`	`55`
`@@ -56,7 +59,7 @@ public function getProvider(): string`
`56`	`59`	`public function requiresThinkingMode(): bool`
`57`	`60`	`{`
`58`	`61`	`return match ($this) {`
`59`		`- self::GEMINI_3_FLASH => true,`
	`62`	`+ self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => true,`
`60`	`63`	`default => false,`
`61`	`64`	`};`
`62`	`65`	`}`
`@@ -68,7 +71,7 @@ public function requiresThinkingMode(): bool`
`68`	`71`	`public function getThinkingBudget(): ?int`
`69`	`72`	`{`
`70`	`73`	`return match ($this) {`
`71`		`- self::GEMINI_3_FLASH => 8192,`
	`74`	`+ self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 8192,`
`72`	`75`	`default => null,`
`73`	`76`	`};`
`74`	`77`	`}`
`@@ -92,7 +95,7 @@ public function supportsTemperature(): bool`
`92`	`95`	`public function getRecommendedTemperature(): float`
`93`	`96`	`{`
`94`	`97`	`return match ($this) {`
`95`		`- self::GEMINI_3_FLASH => 1.0,`
	`98`	`+ self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 1.0,`
`96`	`99`	`default => 0.7,`
`97`	`100`	`};`
`98`	`101`	`}`
`@@ -104,7 +107,7 @@ public function getRecommendedTemperature(): float`
`104`	`107`	`public function getMinMaxTokens(): int`
`105`	`108`	`{`
`106`	`109`	`return match ($this) {`
`107`		`- self::GEMINI_3_FLASH => 16384,`
	`110`	`+ self::GEMINI_3_FLASH, self::GEMINI_3_1_PRO => 16384,`
`108`	`111`	`default => 8000,`
`109`	`112`	`};`
`110`	`113`	`}`