Update app.py

app.py

@@ -538,6 +538,7 @@ def format_to_message_dict(history):
     messages = []
     for item in history:
         if isinstance(item, dict) and "role" in item and "content" in item:
+            # Already in the correct format
             messages.append(item)
         elif isinstance(item, list) and len(item) == 2:
             # Convert from old format [user_msg, ai_msg]
@@ -1262,7 +1263,6 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
             model_id, _ = get_model_info(provider, model_choice)
             if not model_id:
                 error_message = f"Error: Model '{model_choice}' not found in OpenRouter"
-                # Use proper message format
                 return history + [
                     {"role": "user", "content": message},
                     {"role": "assistant", "content": error_message}
@@ -1312,12 +1312,11 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
             
             # Handle streaming response
             if stream_output and response.status_code == 200:
-                # Add message to history
-                updated_history = history + [{"role": "user", "content": message}]
-                
                 # Set up generator for streaming updates
                 def streaming_generator():
+                    updated_history = history + [{"role": "user", "content": message}]
                     assistant_response = ""
+                    
                     for line in response.iter_lines():
                         if not line:
                             continue
@@ -1337,7 +1336,7 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
                                 if "content" in delta and delta["content"]:
                                     # Update the current response
                                     assistant_response += delta["content"]
-                                    # Yield updated history with current assistant response
+                                    # Return updated history with current response
                                     yield updated_history + [{"role": "assistant", "content": assistant_response}]
                         except json.JSONDecodeError:
                             logger.error(f"Failed to parse JSON from chunk: {data}")
@@ -1374,6 +1373,7 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
                 ]
                 
         elif provider == "OpenAI":
+            # Process OpenAI similarly as above...
             # Get model ID from registry
             model_id, _ = get_model_info(provider, model_choice)
             if not model_id:
@@ -1402,12 +1402,11 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
                 
                 # Handle streaming response
                 if stream_output:
-                    # Add message to history
-                    updated_history = history + [{"role": "user", "content": message}]
-                    
                     # Set up generator for streaming updates
                     def streaming_generator():
+                        updated_history = history + [{"role": "user", "content": message}]
                         assistant_response = ""
+                        
                         for chunk in response:
                             if hasattr(chunk.choices[0].delta, "content") and chunk.choices[0].delta.content is not None:
                                 content = chunk.choices[0].delta.content
@@ -1432,7 +1431,6 @@ def ask_ai(message, history, provider, model_choice, temperature, max_tokens, to
                 ]
                 
         elif provider == "HuggingFace":
-            # Get model ID from registry
             model_id, _ = get_model_info(provider, model_choice)
             if not model_id:
                 error_message = f"Error: Model '{model_choice}' not found in HuggingFace"
@@ -2392,23 +2390,23 @@ def create_app():
         def get_current_model(provider, openrouter_model, openai_model, hf_model, groq_model, cohere_model, together_model, ovh_model, cerebras_model, googleai_model):
             """Get the currently selected model based on provider"""
             if provider == "OpenRouter":
-                return openrouter_model
+                return openrouter_model if openrouter_model else OPENROUTER_ALL_MODELS[0][0] if OPENROUTER_ALL_MODELS else None
             elif provider == "OpenAI":
-                return openai_model
+                return openai_model if openai_model else "gpt-3.5-turbo" if "gpt-3.5-turbo" in OPENAI_MODELS else None
             elif provider == "HuggingFace":
-                return hf_model
+                return hf_model if hf_model else "mistralai/Mistral-7B-Instruct-v0.3" if "mistralai/Mistral-7B-Instruct-v0.3" in HUGGINGFACE_MODELS else None
             elif provider == "Groq":
-                return groq_model
+                return groq_model if groq_model else "llama-3.1-8b-instant" if "llama-3.1-8b-instant" in GROQ_MODELS else None
             elif provider == "Cohere":
-                return cohere_model
+                return cohere_model if cohere_model else "command-r-plus" if "command-r-plus" in COHERE_MODELS else None
             elif provider == "Together":
-                return together_model
+                return together_model if together_model else "meta-llama/Llama-3.1-8B-Instruct" if "meta-llama/Llama-3.1-8B-Instruct" in TOGETHER_MODELS else None
             elif provider == "OVH":
-                return ovh_model
+                return ovh_model if ovh_model else "ovh/llama-3.1-8b-instruct" if "ovh/llama-3.1-8b-instruct" in OVH_MODELS else None
             elif provider == "Cerebras":
-                return cerebras_model
+                return cerebras_model if cerebras_model else "cerebras/llama-3.1-8b" if "cerebras/llama-3.1-8b" in CEREBRAS_MODELS else None
             elif provider == "GoogleAI":
-                return googleai_model
+                return googleai_model if googleai_model else "gemini-1.5-pro" if "gemini-1.5-pro" in GOOGLEAI_MODELS else None
             return None