Advanced settings

app.py

@@ -28,7 +28,6 @@ from library.utils_html import *
 from library.utils_prompt import *
 
 OR = OpenRouterAPI()
-gemini = OpenRouterAPI(api_key = os.getenv("GEMINI_API_KEY"),base_url="https://generativelanguage.googleapis.com/v1beta/openai/")
 
 # Path for storing user preferences
 PREFERENCES_FILE = "data/user_preferences.csv"
@@ -37,45 +36,24 @@ PREFERENCES_FILE = "data/user_preferences.csv"
 os.makedirs(os.path.dirname(PREFERENCES_FILE), exist_ok=True)
 
 # Define model pricing information (approximate costs per 100 image API calls)
-# These are placeholder values - replace with actual pricing
 MODEL_PRICING = {
-    "google/gemini-2.0-flash-001": {"cost": "$0.50"},
-    "gpt-4.1-mini": {"cost": "$2.00"},
-    "gpt-4.1": {"cost": "$5.00"},
-    "anthropic/claude-3.7-sonnet": {"cost": "$4.00"},
-    "google/gemini-2.5-pro-preview-03-25": {"cost": "$1.50"},
-    "google/gemini-2.5-flash-preview:thinking": {"cost": "$0.75"},
-    "gpt-4.1-nano": {"cost": "$1.00"},
-    "openai/chatgpt-4o-latest": {"cost": "$4.50"},
-    "meta-llama/llama-4-maverick": {"cost": "$0.25"}
+    "google/gemini-2.0-flash-001": "$0.50",
+    "gpt-4.1-mini": "$2.00",
+    "gpt-4.1": "$5.00",
+    "anthropic/claude-3.7-sonnet": "$4.00",
+    "google/gemini-2.5-pro-preview-03-25": "$1.50",
+    "google/gemini-2.5-flash-preview:thinking": "$0.75",
+    "gpt-4.1-nano": "$1.00",
+    "openai/chatgpt-4o-latest": "$4.50",
+    "meta-llama/llama-4-maverick": "$0.25"
 }
 
-# Define model lists globally to avoid scope issues
-PREFERRED_MODELS = [
-    ("Gemini 2.0 Flash (default)", "google/gemini-2.0-flash-001"),
-    ("GPT-4.1 Mini", "gpt-4.1-mini"),
-    ("GPT-4.1", "gpt-4.1"),
-    ("Claude 3.7 Sonnet", "anthropic/claude-3.7-sonnet"),
-    ("Gemini 2.5 Pro", "google/gemini-2.5-pro-preview-03-25"),
-    ("Gemini 2.5 Flash Thinking", "google/gemini-2.5-flash-preview:thinking")
-]
-
-ADDITIONAL_MODELS = [
-    ("GPT-4.1 Nano", "gpt-4.1-nano"),
-    ("ChatGPT Latest", "openai/chatgpt-4o-latest"),
-    ("Llama 4 Maverick", "meta-llama/llama-4-maverick")
-]
-
-# Default model
-DEFAULT_MODEL = "google/gemini-2.0-flash-001"
-
 def get_sys_prompt(length="medium", photograph=False):
-
     extra_prompt = ""
 
     if photograph:
         object_type = "wildlife photography"
-        extra_prompt = " Do not guess the exact species of the animals in the photograph - simply use a broader grouping to make less errors."
+        extra_prompt = " Do not guess the exact species of the animals in the photograph unless you are certain - simply use a broader terms e.g. the genus or family to make less errors, "
     else:
         object_type = "museum objects"
         
@@ -114,36 +92,6 @@ def get_base_filename(filepath):
     filename = os.path.splitext(basename)[0]
     return filename
 
-# Functions for model selection outside the create_demo scope to avoid errors
-def update_model_dropdown(show_all, current_model):
-    """Update the model dropdown based on the checkbox state"""
-    if show_all:
-        # Combine preferred and additional models
-        all_models = PREFERRED_MODELS + ADDITIONAL_MODELS
-        return gr.Dropdown.update(choices=all_models, value=current_model)
-    else:
-        # Only show preferred models
-        # If current model is not in preferred, switch to default
-        current_model_in_preferred = any(model[1] == current_model for model in PREFERRED_MODELS)
-        if not current_model_in_preferred:
-            return gr.Dropdown.update(choices=PREFERRED_MODELS, value=DEFAULT_MODEL)
-        return gr.Dropdown.update(choices=PREFERRED_MODELS, value=current_model)
-
-def update_model_info(model_id):
-    """Update the model information display"""
-    # Find the display name for the model ID
-    all_models = PREFERRED_MODELS + ADDITIONAL_MODELS
-    model_name = next((name for name, id in all_models if id == model_id), "Unknown Model")
-    
-    # Get pricing info
-    pricing_info = MODEL_PRICING.get(model_id, {"cost": "Unknown"})
-    
-    # Create markdown text - removed speed information
-    info_text = f"""**Current Model**: {model_name}  
-    **Cost per 100 Images**: {pricing_info['cost']}"""
-    
-    return info_text
-
 # Define the Gradio interface
 def create_demo():
     # --- Reintroduce CSS ---
@@ -186,6 +134,31 @@ def create_demo():
                              show_share_button=False, show_fullscreen_button=False,
                              container=False, elem_id="nml-logo")
 
+        # Store model choices and state
+        show_all_models_state = gr.State(False)
+
+        # Define preferred and additional models directly in the function
+        preferred_models = [
+            ("Gemini 2.0 Flash (default)", "google/gemini-2.0-flash-001"),
+            ("GPT-4.1 Mini", "gpt-4.1-mini"),
+            ("GPT-4.1", "gpt-4.1"),
+            ("Claude 3.7 Sonnet", "anthropic/claude-3.7-sonnet"),
+            ("Gemini 2.5 Pro", "google/gemini-2.5-pro-preview-03-25"),
+            ("Gemini 2.5 Flash Thinking", "google/gemini-2.5-flash-preview:thinking")
+        ]
+        
+        additional_models = [
+            ("GPT-4.1 Nano", "gpt-4.1-nano"),
+            ("ChatGPT Latest", "openai/chatgpt-4o-latest"),
+            ("Llama 4 Maverick", "meta-llama/llama-4-maverick")
+        ]
+        
+        # Calculate all models once
+        all_models = preferred_models + additional_models
+        
+        # Default model value
+        default_model = "google/gemini-2.0-flash-001"
+        
         with gr.Row():
             # Left column: Controls and uploads
             with gr.Column(scale=1):
@@ -195,12 +168,11 @@ def create_demo():
                     file_count="multiple"
                 )
                 
-                # Model dropdown (will be updated dynamically)
+                # Model dropdown
                 model_choice = gr.Dropdown(
-                    choices=PREFERRED_MODELS, 
+                    choices=preferred_models, 
                     label="Select Model",
-                    value=DEFAULT_MODEL, 
-                    visible=True
+                    value=default_model
                 )
                 
                 length_choice = gr.Radio(
@@ -224,13 +196,10 @@ def create_demo():
                         value="Museum Object"
                     )
                     
-                    # Display current model info - initial value
-                    initial_model_info = f"""**Current Model**: Gemini 2.0 Flash (default)  
-                    **Cost per 100 Images**: {MODEL_PRICING[DEFAULT_MODEL]["cost"]}"""
-                    
+                    # Display current model info
                     model_info = gr.Markdown(
-                        initial_model_info,
-                        label="Model Information"
+                        f"""**Current Model**: Gemini 2.0 Flash (default)  
+                        **Cost per 100 Images**: {MODEL_PRICING[default_model]}"""
                     )
                 
                 gr.Markdown("### Uploaded Images")
@@ -248,7 +217,7 @@ def create_demo():
                 current_image = gr.Image(
                     label="Current Image",
                     type="filepath",
-                    elem_id="current-image-display", # ADDED - for CSS targeting
+                    elem_id="current-image-display",
                     show_fullscreen_button=True,
                     show_download_button=False,
                     show_share_button=False,
@@ -269,15 +238,41 @@ def create_demo():
                 current_index = gr.State(0)
                 all_images = gr.State([])
                 all_results = gr.State([])
-
-        # Connect checkbox to update dropdown
+        
+        # Define functions within the demo function to avoid scope issues
+        
+        # Handle checkbox change to update model dropdown
+        def toggle_models(show_all):
+            if show_all:
+                return gr.Dropdown.update(choices=all_models)
+            else:
+                return gr.Dropdown.update(choices=preferred_models)
+        
+        # Update model info when model selection changes
+        def update_model_info(model_value):
+            # Find display name
+            for name, value in all_models:
+                if value == model_value:
+                    model_name = name
+                    break
+            else:
+                model_name = "Unknown Model"
+            
+            # Get cost
+            cost = MODEL_PRICING.get(model_value, "Unknown")
+            
+            # Create markdown
+            return f"""**Current Model**: {model_name}  
+                   **Cost per 100 Images**: {cost}"""
+                
+        # Connect checkbox to toggle model choices
         show_all_models.change(
-            fn=update_model_dropdown,
-            inputs=[show_all_models, model_choice],
+            fn=toggle_models,
+            inputs=[show_all_models],
             outputs=[model_choice]
         )
         
-        # Connect model dropdown to update info display
+        # Connect model selection to update info
         model_choice.change(
             fn=update_model_info,
             inputs=[model_choice],
@@ -318,10 +313,6 @@ def create_demo():
                     prompt0 = prompt_new()
                     model_name = model_choice
                     client_to_use = OR # Default client
-                    # Add logic here if you need to switch between OR and gemini clients based on model_name
-                    # Example:
-                    # if model_name.startswith("google/gemini") and gemini:
-                    #      client_to_use = gemini
 
                     result = client_to_use.generate_caption(
                         img, model=model_name, max_image_size=512,