Update app.py

app.py

@@ -358,7 +358,8 @@ GOOGLEAI_MODELS = {
 ANTHROPIC_MODELS = {
     "claude-3-7-sonnet-20250219": 128000,  # Claude 3.7 Sonnet
     "claude-3-5-sonnet-20241022": 200000,  # Claude 3.5 Sonnet
-    "claude-3-5-haiku-20240307": 200000,   # Claude 3.5 Haiku
+    "claude-3-5-haiku-20240307": 200000,   # Claude 3.5 Haiku 
+    "claude-3-5-sonnet-20240620": 200000,  # Claude 3.5 Sonnet 2024-06-20
     "claude-3-opus-20240229": 200000,      # Claude 3 Opus
     "claude-3-haiku-20240307": 200000,     # Claude 3 Haiku
     "claude-3-sonnet-20240229": 200000,    # Claude 3 Sonnet
@@ -632,12 +633,9 @@ def get_model_info(provider, model_choice):
     elif provider == "Together":
         if model_choice in TOGETHER_MODELS:
             return model_choice, TOGETHER_MODELS[model_choice]
-    elif provider == "OVH":
-        if model_choice in OVH_MODELS:
-            return model_choice, OVH_MODELS[model_choice]
-    elif provider == "Cerebras":
-        if model_choice in CEREBRAS_MODELS:
-            return model_choice, CEREBRAS_MODELS[model_choice]
+    elif provider == "Anthropic":
+        if model_choice in ANTHROPIC_MODELS:
+            return model_choice, ANTHROPIC_MODELS[model_choice]
     elif provider == "GoogleAI":
         if model_choice in GOOGLEAI_MODELS:
             return model_choice, GOOGLEAI_MODELS[model_choice]
@@ -707,7 +705,6 @@ def call_anthropic_api(payload, api_key_override=None):
         # Try to import Anthropic
         try:
             import anthropic
-            from anthropic import Anthropic
         except ImportError:
             raise ImportError("Anthropic package not installed. Install it with: pip install anthropic")
             
@@ -715,7 +712,7 @@ def call_anthropic_api(payload, api_key_override=None):
         if not api_key:
             raise ValueError("Anthropic API key is required")
             
-        client = Anthropic(api_key=api_key)
+        client = anthropic.Anthropic(api_key=api_key)
         
         # Extract parameters from payload
         model = payload.get("model", "claude-3-5-sonnet-20241022")
@@ -726,32 +723,30 @@ def call_anthropic_api(payload, api_key_override=None):
         # Format messages for Anthropic
         # Find system message if any
         system_prompt = None
-        chat_messages = []
+        anthropic_messages = []
         
         for msg in messages:
             if msg["role"] == "system":
                 system_prompt = msg["content"]
             else:
-                # Format content
+                # Handle multimodal content if needed
                 if isinstance(msg["content"], list):
-                    # Handle multimodal content (images)
-                    anthropic_content = []
+                    # For image handling
+                    content_parts = []
                     for item in msg["content"]:
                         if item["type"] == "text":
-                            anthropic_content.append({
-                                "type": "text",
+                            content_parts.append({
+                                "type": "text", 
                                 "text": item["text"]
                             })
                         elif item["type"] == "image_url":
-                            # Extract base64 from data URL if present
-                            image_url = item["image_url"]["url"]
-                            if image_url.startswith("data:"):
-                                # Extract media type and base64 data
-                                parts = image_url.split(",", 1)
-                                media_type = parts[0].split(":")[1].split(";")[0]
-                                base64_data = parts[1]
-                                
-                                anthropic_content.append({
+                            # Handle base64 images if needed
+                            img_url = item["image_url"]["url"]
+                            if img_url.startswith("data:image"):
+                                # Extract the media type and base64 data
+                                media_type = img_url.split(";")[0].split(":")[1]
+                                base64_data = img_url.split(",")[1]
+                                content_parts.append({
                                     "type": "image",
                                     "source": {
                                         "type": "base64",
@@ -759,20 +754,14 @@ def call_anthropic_api(payload, api_key_override=None):
                                         "data": base64_data
                                     }
                                 })
-                            else:
-                                # URL not supported by Anthropic yet
-                                anthropic_content.append({
-                                    "type": "text",
-                                    "text": f"[Image URL: {image_url}]"
-                                })
-                    chat_messages.append({
-                        "role": msg["role"],
-                        "content": anthropic_content
+                    anthropic_messages.append({
+                        "role": "user" if msg["role"] == "user" else "assistant",
+                        "content": content_parts
                     })
                 else:
-                    # Simple text content
-                    chat_messages.append({
-                        "role": msg["role"],
+                    # Simple text messages
+                    anthropic_messages.append({
+                        "role": "user" if msg["role"] == "user" else "assistant",
                         "content": msg["content"]
                     })
         
@@ -782,7 +771,7 @@ def call_anthropic_api(payload, api_key_override=None):
             max_tokens=max_tokens,
             temperature=temperature,
             system=system_prompt,
-            messages=chat_messages
+            messages=anthropic_messages
         )
         
         return response
@@ -2865,8 +2854,8 @@ def create_app():
             return None
         
         # Set up submission event
-        def submit_message(message, history, provider, openrouter_model, openai_model, hf_model, groq_model, cohere_model, 
-                together_model, anthropic_model, googleai_model, 
+        def submit_message(message, chatbot, provider_choice, 
+                openrouter_model, openai_model, hf_model, groq_model, cohere_model, together_model, anthropic_model, googleai_model, 
                 temperature, max_tokens, top_p, frequency_penalty, presence_penalty, repetition_penalty, 
                 top_k, min_p, seed, top_a, stream_output, response_format,
                 images, documents, reasoning_effort, system_message, transforms, 
@@ -2874,41 +2863,41 @@ def create_app():
 
             """Submit message to selected provider and model"""
             # Get the currently selected model
-            model_choice = get_current_model(provider, openrouter_model, openai_model, hf_model, groq_model, cohere_model, 
+            model_choice = get_current_model(provider_choice, openrouter_model, openai_model, hf_model, groq_model, cohere_model, 
                                     together_model, anthropic_model, googleai_model)
             
             # Check if model is selected
             if not model_choice:
-                error_message = f"Error: No model selected for provider {provider}"
-                return history + [
+                error_message = f"Error: No model selected for provider {provider_choice}"
+                return chatbot + [
                     {"role": "user", "content": message},
                     {"role": "assistant", "content": error_message}
                 ]
             
             # Select the appropriate API key based on the provider
             api_key_override = None
-            if provider == "OpenRouter" and openrouter_api_key:
+            if provider_choice == "OpenRouter" and openrouter_api_key:
                 api_key_override = openrouter_api_key
-            elif provider == "OpenAI" and openai_api_key:
+            elif provider_choice == "OpenAI" and openai_api_key:
                 api_key_override = openai_api_key
-            elif provider == "HuggingFace" and hf_api_key:
+            elif provider_choice == "HuggingFace" and hf_api_key:
                 api_key_override = hf_api_key
-            elif provider == "Groq" and groq_api_key:
+            elif provider_choice == "Groq" and groq_api_key:
                 api_key_override = groq_api_key
-            elif provider == "Cohere" and cohere_api_key:
+            elif provider_choice == "Cohere" and cohere_api_key:
                 api_key_override = cohere_api_key
-            elif provider == "Together" and together_api_key:
+            elif provider_choice == "Together" and together_api_key:
                 api_key_override = together_api_key
-            elif provider == "Anthropic" and anthropic_api_key:
+            elif provider_choice == "Anthropic" and anthropic_api_key:
                 api_key_override = anthropic_api_key
-            elif provider == "GoogleAI" and googleai_api_key:
+            elif provider_choice == "GoogleAI" and googleai_api_key:
                 api_key_override = googleai_api_key
             
             # Call the ask_ai function with the appropriate parameters
             return ask_ai(
                 message=message,
-                history=history,
-                provider=provider,
+                history=chatbot,
+                provider=provider_choice,
                 model_choice=model_choice,
                 temperature=temperature,
                 max_tokens=max_tokens,
@@ -2958,7 +2947,7 @@ def create_app():
                 temperature, max_tokens, top_p, frequency_penalty, presence_penalty, repetition_penalty, 
                 top_k, min_p, seed, top_a, stream_output, response_format,
                 images, documents, reasoning_effort, system_message, transforms,
-                openrouter_api_key, openai_api_key, hf_api_key, groq_api_key, cohere_api_key, together_api_key, googleai_api_key
+                openrouter_api_key, openai_api_key, hf_api_key, groq_api_key, cohere_api_key, together_api_key, anthropic_api_key, googleai_api_key
             ],
             outputs=chatbot,
             show_progress="minimal",