bug: The selected model was not being sent to provider

Author: Sarangk90

chatbot-api/src/chat/provider.py

@@ -38,31 +38,26 @@ def _format_message(self, message: Message) -> dict:
 
     def generate_response(self, messages: List[Message]) -> ChatResponse:
         """Generate a response for messages"""
-        # Use the model from the last message, or default to claude-3-5-sonnet
-        model = next(
-            (m.model for m in reversed(messages) if m.model), "claude-3-5-sonnet"
-        )
-
+        # Use the model from the latest message
+        model = messages[-1].model if messages and messages[-1].model else "claude-3-5-sonnet"
         formatted_messages = [self._format_message(m) for m in messages]
         response = self.client.chat.completions.create(
             model=model, messages=formatted_messages
         )
 
         return ChatResponse(
             content=response.choices[0].message.content,
-            model=response.model,
+            model=model,
             timestamp=datetime.utcnow(),
         )
 
     async def generate_stream(self, messages: List[Message]) -> AsyncIterator[str]:
         """Stream response for messages"""
         try:
-            # Use the model from the last message, or default to claude-3-5-sonnet
-            model = next(
-                (m.model for m in reversed(messages) if m.model), "claude-3-5-sonnet"
-            )
-
+            model = messages[-1].model
+            logger.info(f"Using model: {model}")
             formatted_messages = [self._format_message(m) for m in messages]
+            
             stream = self.client.chat.completions.create(
                 model=model, messages=formatted_messages, stream=True
             )

chatbot-api/src/chat/routes.py

@@ -84,9 +84,13 @@ async def chat(
 async def stream_chat(
     request: ChatRequestSchema, chat_service: ChatService = Depends(get_chat_service)
 ):
-    # Convert request messages to domain models
+    # Get the selected model from the last message
+    selected_model = request.messages[-1].model
+    logger.info(f"Selected model: {selected_model}")
+
+    # Convert previous messages to domain models
     messages = []
-    for msg in request.messages[:-1]:  # All messages except the last one
+    for msg in request.messages[:-1]:
         if isinstance(msg.content, str):
             content = msg.content
         else:
@@ -98,22 +102,18 @@ async def stream_chat(
                 )
                 for c in msg.content
             ]
-        messages.append(
-            Message(
-                role=msg.role,
-                content=content,
-                model=msg.model,
-                timestamp=msg.timestamp or datetime.utcnow(),
-            )
-        )
+        messages.append(Message(role=msg.role, content=content))
 
-    # Extract content from the last message
+    # Extract content from the last message and create it with the selected model
     text, images = extract_message_content(request.messages[-1])
 
     async def generate():
         try:
             async for chunk in chat_service.stream_response(
-                text=text, images=images, conversation_messages=messages
+                text=text,
+                images=images,
+                model=selected_model,
+                conversation_messages=messages
             ):
                 yield f"data: {json.dumps({'content': chunk})}\n\n"
         except Exception as e:

chatbot-api/src/chat/service.py

@@ -35,6 +35,7 @@ async def stream_response(
         self,
         text: str = "",
         images: List[str] = None,
+        model: str = None,
         conversation_messages: List[Message] = None,
     ) -> AsyncIterator[str]:
         """Stream response for a message with optional images"""
@@ -49,7 +50,8 @@ async def stream_response(
         else:
             content = text
 
-        messages.append(Message(role="user", content=content))
+        # Add the current message with the selected model
+        messages.append(Message(role="user", content=content, model=model))
 
         async for chunk in self.ai_provider.generate_stream(messages):
             yield chunk

chatbot-api/src/conversation/service.py

@@ -48,6 +48,7 @@ def generate_name(self, message: str) -> str:
                         role="user",
                         content=prompt,
                         timestamp=datetime.now(timezone.utc),
+                        model="gpt-4o-mini",
                     )
                 ]
             )

chatbot-ui/src/components/MessageBubble.tsx

@@ -22,6 +22,8 @@ export type MessageContent = {
 export interface Message {
   role: 'user' | 'assistant';
   content: string | MessageContent[];
+  model?: string;
+  timestamp?: string;
 }
 
 interface MessageBubbleProps {