OAuth

.ipynb_checkpoints/app-checkpoint.py

@@ -1,7 +1,6 @@
 import gradio as gr
 import numpy as np
 from PIL import Image
-import io
 import os
 import requests
 import json
@@ -12,16 +11,6 @@ import csv
 import tempfile
 import datetime
 
-# Load environment variables from .env file if it exists (for local development)
-# On Hugging Face Spaces, the secrets are automatically available as environment variables
-if os.path.exists(".env"):
-    load_dotenv()
-
-from io import BytesIO
-import numpy as np
-import requests
-from PIL import Image
-
 # import libraries
 from library.utils_model import *
 from library.utils_html import *
@@ -29,12 +18,6 @@ from library.utils_prompt import *
 
 OR = OpenRouterAPI()
 
-# Path for storing user preferences
-PREFERENCES_FILE = "data/user_preferences.csv"
-
-# Ensure directory exists
-os.makedirs(os.path.dirname(PREFERENCES_FILE), exist_ok=True)
-
 # Define model pricing information (approximate costs per 100 image API calls)
 MODEL_PRICING = {
     "google/gemini-2.0-flash-001": "$0.03",
@@ -94,7 +77,6 @@ def get_base_filename(filepath):
 
 # Define the Gradio interface
 def create_demo():
-    # --- Updated CSS with model info styling ---
     custom_css = """
     /* Container for the image component (#current-image-display is the elem_id of gr.Image) */
         #current-image-display {
@@ -134,11 +116,11 @@ def create_demo():
                 gr.Markdown("Developed by the Natural History Museum in Partnership with National Museums Liverpool. Funded by the DCMS Pilot Scheme")
             with gr.Column(scale=1):
                 with gr.Row():
-                    gr.Image("images/nhm_logo.png", show_label=False, height=120,
+                    gr.Image("images/nhm_logo.png", show_label=False, height=100,
                              interactive=False, show_download_button=False,
                              show_share_button=False, show_fullscreen_button=False,
                              container=False, elem_id="nhm-logo")
-                    gr.Image("images/nml_logo.png", show_label=False, height=120,
+                    gr.Image("images/nml_logo.png", show_label=False, height=100,
                              interactive=False, show_download_button=False,
                              show_share_button=False, show_fullscreen_button=False,
                              container=False, elem_id="nml-logo")

app-Copy1.py

@@ -1,7 +1,6 @@
 import gradio as gr
 import numpy as np
 from PIL import Image
-import io
 import os
 import requests
 import json
@@ -12,16 +11,6 @@ import csv
 import tempfile
 import datetime
 
-# Load environment variables from .env file if it exists (for local development)
-# On Hugging Face Spaces, the secrets are automatically available as environment variables
-if os.path.exists(".env"):
-    load_dotenv()
-
-from io import BytesIO
-import numpy as np
-import requests
-from PIL import Image
-
 # import libraries
 from library.utils_model import *
 from library.utils_html import *
@@ -29,12 +18,6 @@ from library.utils_prompt import *
 
 OR = OpenRouterAPI()
 
-# Path for storing user preferences
-PREFERENCES_FILE = "data/user_preferences.csv"
-
-# Ensure directory exists
-os.makedirs(os.path.dirname(PREFERENCES_FILE), exist_ok=True)
-
 # Define model pricing information (approximate costs per 100 image API calls)
 MODEL_PRICING = {
     "google/gemini-2.0-flash-001": "$0.03",
@@ -67,7 +50,6 @@ def get_sys_prompt(length="medium", photograph=False):
         dev_prompt += " Repsonses should be a maximum of 450 characters."
     return dev_prompt + extra_prompt
 
-
 def create_csv_file_simple(results):
     """Create a CSV file from the results and return the path"""
     try:
@@ -133,11 +115,11 @@ def create_demo():
                 gr.Markdown("Developed by the Natural History Museum in Partnership with National Museums Liverpool. Funded by the DCMS Pilot Scheme")
             with gr.Column(scale=1):
                 with gr.Row():
-                    gr.Image("images/nhm_logo.png", show_label=False, height=120,
+                    gr.Image("images/nhm_logo.png", show_label=False, height=100,
                              interactive=False, show_download_button=False,
                              show_share_button=False, show_fullscreen_button=False,
                              container=False, elem_id="nhm-logo")
-                    gr.Image("images/nml_logo.png", show_label=False, height=120,
+                    gr.Image("images/nml_logo.png", show_label=False, height=100,
                              interactive=False, show_download_button=False,
                              show_share_button=False, show_fullscreen_button=False,
                              container=False, elem_id="nml-logo")

app.py

@@ -16,15 +16,9 @@ from library.utils_model import *
 from library.utils_html import *
 from library.utils_prompt import *
 
-# Get authorized users from environment variable/secret
-authorized_users_str = os.environ.get("AUTHORIZED_USER_IDS", "")
-AUTHORIZED_USER_IDS = set(authorized_users_str.split(',') if authorized_users_str and authorized_users_str.strip() else [])
-
-
-#Api sdk
 OR = OpenRouterAPI()
 
-# At the top of your script, modify MODEL_PRICING:
+# Define model pricing information (approximate costs per 100 image API calls)
 MODEL_PRICING = {
     "google/gemini-2.0-flash-001": "$0.03",
     "gpt-4.1-mini": "$0.07",
@@ -34,29 +28,9 @@ MODEL_PRICING = {
     "google/gemini-2.5-flash-preview:thinking": "$0.35",
     "gpt-4.1-nano": "$0.02",
     "openai/chatgpt-4o-latest": "$0.75",
-    "meta-llama/llama-4-maverick": "$0.04",
-    "meta-llama/llama-4-maverick:free": "$0.00"  # Added for the free tier
+    "meta-llama/llama-4-maverick": "$0.04"
 }
 
-# Define choices and default for unauthenticated users
-UNAUTHENTICATED_MODEL_CHOICES = [("Llama 4 Maverick (Free Tier)", "meta-llama/llama-4-maverick:free")]
-UNAUTHENTICATED_DEFAULT_MODEL_ID = "meta-llama/llama-4-maverick:free"
-
-# Your existing default for authenticated users
-AUTHENTICATED_DEFAULT_MODEL_ID = "google/gemini-2.0-flash-001"
-
-# New function to check if current user is authorized
-def check_authorization(profile: gr.OAuthProfile | None):
-    if not AUTHORIZED_USER_IDS: # If the set is empty, no one is authorized by this list
-        return False
-    if profile is None:
-        return False #"Not logged in. Please Login for full access."
-    
-    if profile.username in AUTHORIZED_USER_IDS:
-        return True
-    else:
-        return False
-
 def get_sys_prompt(length="medium", photograph=False):
     extra_prompt = ""
 
@@ -101,18 +75,6 @@ def get_base_filename(filepath):
     filename = os.path.splitext(basename)[0]
     return filename
 
-# Helper function to generate model info markdown
-def get_model_info_markdown(model_id, is_authorized):
-    models_to_search = all_models_list if is_authorized else UNAUTHENTICATED_MODEL_CHOICES
-    model_name = "Unknown Model"
-    for name, value in models_to_search:
-        if value == model_id:
-            model_name = name
-            break
-    cost = MODEL_PRICING.get(model_id, "N/A")
-    return f"""**Current Model**: {model_name}  
-           **Estimated cost per 100 Images**: {cost}"""
-
 # Define the Gradio interface
 def create_demo():
     custom_css = """
@@ -162,8 +124,11 @@ def create_demo():
                              interactive=False, show_download_button=False,
                              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 model lists (these will be used by the auth logic)
+        # Define preferred and additional models directly in the function
         preferred_models = [
             ("Gemini 2.0 Flash (cheap)", "google/gemini-2.0-flash-001"),
             ("GPT-4.1 Mini", "gpt-4.1-mini"),
@@ -172,52 +137,106 @@ def create_demo():
             ("Gemini 2.5 Pro", "google/gemini-2.5-pro-preview-03-25"),
             ("Gemini 2.5 Flash Thinking (Recommended)", "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_list = preferred_models + additional_models
-
-        # State variables
-        auth_status_state = gr.State(False) # True if authorized
-        user_show_all_models_preference_state = gr.State(False) # User's preference for showing all 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):
-                upload_button = gr.UploadButton("Click to Upload Images", file_types=["image"], file_count="multiple")
+
+               ###########################################################################################
+
+                # Function to check authorization
+                def check_authorization(profile: gr.OAuthProfile | None):
+                    if profile is None:
+                        return False, "Not logged in. Please Login for full access.", False
+                    
+                    is_authorized = profile.username in AUTHORIZED_USER_IDS
+                    return is_authorized
+            
+                #new bit with authroisation
+                # define it false to begin with
+                auth_state = gr.State(False)
+        
+                demo.load(check_authorization, inputs=None, outputs=[auth_state])
+        
+                if auth_state == False:
+                    # free version - yeah baby
+                    login_button = gr.LoginButton()
+
+                    # Define preferred and additional models directly in the function
+                    preferred_models = [
+                        ("llama-4-maverick (free)", "meta-llama/llama-4-maverick:free")
+                    ]
+
+                    all_models_list = preferred_models
+        
+                    # Default model value
+                    default_model = preferred_models[0]
+
+                ################################## normal stuff below  
+                upload_button = gr.UploadButton(
+                    "Click to Upload Images",
+                    file_types=["image"],
+                    file_count="multiple"
+                )
                 
+                # Model dropdown
                 model_choice = gr.Dropdown(
-                    choices=UNAUTHENTICATED_MODEL_CHOICES, # Initial default for unauth
-                    value=UNAUTHENTICATED_DEFAULT_MODEL_ID,
+                    choices=preferred_models, 
                     label="Select Model",
-                    interactive=True 
+                    value=default_model
                 )
                 
                 length_choice = gr.Radio(
                     choices=["short", "medium", "long"], 
-                    label="Response Length", value="medium", 
+                    label="Response Length",
+                    value="medium", 
                     info="Short: max 130 chars | Medium: 250-300 chars | Long: max 450 chars"
                 )
                 
-                # Accordion for advanced settings - visibility controlled by auth
-                with gr.Accordion("Advanced Settings", open=False, visible=False) as advanced_settings_accordion:
-                    show_all_models_checkbox = gr.Checkbox(
+                # Advanced settings accordion
+                with gr.Accordion("Advanced Settings", open=False):
+                    show_all_models = gr.Checkbox(
                         label="Show Additional Models", 
-                        value=False, # Will be updated by auth logic
-                        info="Display additional model options in the dropdown above",
-                        interactive=False # Will be updated by auth logic
+                        value=False,
+                        info="Display additional model options in the dropdown above"
                     )
+                    
                     content_type = gr.Radio(
                         choices=["Museum Object", "Photography"], 
-                        label="Content Type", value="Museum Object"
+                        label="Content Type",
+                        value="Museum Object"
                     )
                 
-                initial_model_info = get_model_info_markdown(UNAUTHENTICATED_DEFAULT_MODEL_ID, False)
-                model_info = gr.Markdown(initial_model_info, elem_id="model-info-display")
+                # Find the default model's display name
+                default_model_name = "Unknown Model"
+                for name, value in preferred_models:
+                    if value == default_model:
+                        default_model_name = name
+                        break
+                
+                model_info = gr.Markdown(
+                    f"""**Current Model**: {default_model_name}  
+                    **Estimated cost per 100 Images**: {MODEL_PRICING[default_model]}""",
+                    elem_id="model-info-display"
+                )
                 
                 gr.Markdown("### Uploaded Images")
-                input_gallery = gr.Gallery(label="Uploaded Image Previews", columns=3, height=150, object_fit="contain", show_label=False)
+                input_gallery = gr.Gallery(
+                    label="Uploaded Image Previews", columns=3, height=150,
+                    object_fit="contain", show_label=False
+                )
                 analyze_button = gr.Button("Generate Alt-Text", variant="primary", size="lg")
                 image_state = gr.State([])
                 filename_state = gr.State([])
@@ -225,98 +244,83 @@ def create_demo():
 
             # Right column: Display area
             with gr.Column(scale=2):
-                # right column UI: current_image, navigation, analysis_text
                 current_image = gr.Image(
-                    label="Current Image", type="filepath", elem_id="current-image-display",
-                    show_fullscreen_button=True, show_download_button=False,
-                    show_share_button=False, show_label=False
+                    label="Current Image",
+                    type="filepath",
+                    elem_id="current-image-display",
+                    show_fullscreen_button=True,
+                    show_download_button=False,
+                    show_share_button=False,
+                    show_label=False
                  )
+
                 with gr.Row():
                     prev_button = gr.Button("← Previous", size="sm")
                     image_counter = gr.Markdown("0 of 0", elem_id="image-counter")
                     next_button = gr.Button("Next →", size="sm")
+
                 gr.Markdown("### Generated Alt-text")
                 analysis_text = gr.Textbox(
-                    label="Generated Text", value="Upload images and click 'Generate Alt-Text'.",
+                    label="Generated Text",
+                    value="Upload images and click 'Generate Alt-Text'.",
                     lines=6, max_lines=10, interactive=True, show_label=False
                 )
                 current_index = gr.State(0)
                 all_images = gr.State([])
                 all_results = gr.State([])
-
-        # Function to update UI based on authentication status (called on demo.load)
-        def handle_auth_change_and_ui_setup(profile: gr.OAuthProfile | None, current_user_pref_show_all: bool):
-            is_authorized = check_authorization(profile)
+        
+        # Handle checkbox change to update model dropdown - modern version
+        def toggle_models(show_all, current_model):
+            # Make a fresh copy of the models lists to avoid any reference issues
+            preferred_choices = list(preferred_models)
+            all_choices = list(all_models_list)
             
-            if is_authorized:
-                # Authorized User
-                current_choices = list(all_models_list) if current_user_pref_show_all else list(preferred_models)
-                current_value = AUTHENTICATED_DEFAULT_MODEL_ID # Reset to default for authed user
-                # You could add logic here to try and preserve model_choice.value if it's valid in current_choices
-
-                model_dropdown_update = gr.Dropdown.update(choices=current_choices, value=current_value, label="Select Model", interactive=True)
-                accordion_update = gr.Accordion.update(visible=True)
-                model_info_text_update = get_model_info_markdown(current_value, True)
-                show_all_checkbox_update = gr.Checkbox.update(value=current_user_pref_show_all, interactive=True)
+            if show_all:
+                # When showing all models, use the fresh copy of all models
+                return gr.Dropdown(choices=all_choices, value=current_model)
             else:
-                # Unauthenticated User
-                model_dropdown_update = gr.Dropdown.update(choices=UNAUTHENTICATED_MODEL_CHOICES, value=UNAUTHENTICATED_DEFAULT_MODEL_ID, label="Select Model (Free Tier)", interactive=True)
-                accordion_update = gr.Accordion.update(visible=False)
-                model_info_text_update = get_model_info_markdown(UNAUTHENTICATED_DEFAULT_MODEL_ID, False)
-                show_all_checkbox_update = gr.Checkbox.update(value=False, interactive=False)
+                # Check if current model is in preferred models list
+                preferred_values = [value for _, value in preferred_choices]
+                
+                if current_model in preferred_values:
+                    # Keep the current model if it's in preferred models
+                    return gr.Dropdown(choices=preferred_choices, value=current_model)
+                else:
+                    # Reset to default model if current model is not in preferred models
+                    return gr.Dropdown(choices=preferred_choices, value=default_model)
+
+        # Update model info when model selection changes
+        def update_model_info(model_value):
+            # Find display name
+            model_name = "Unknown Model"
+            for name, value in all_models_list:
+                if value == model_value:
+                    model_name = name
+                    break
             
-            return is_authorized, model_dropdown_update, accordion_update, model_info_text_update, show_all_checkbox_update
-
-        demo.load(
-            fn=handle_auth_change_and_ui_setup,
-            inputs=[user_show_all_models_preference_state], # Pass the state that holds user's preference
-            outputs=[
-                auth_status_state,
-                model_choice,
-                advanced_settings_accordion,
-                model_info,
-                show_all_models_checkbox
-            ]
-        )
-        
-        # Handle "Show Additional Models" checkbox change
-        def persist_preference_and_toggle_models_visibility(show_all_checkbox_val: bool, current_model_id: str, is_authorized: bool):
-            if not is_authorized: # Should not be triggered if checkbox is not interactive
-                mdl_choice_update = gr.Dropdown.update(choices=UNAUTHENTICATED_MODEL_CHOICES, value=UNAUTHENTICATED_DEFAULT_MODEL_ID)
-                return show_all_checkbox_val, mdl_choice_update # Persist the (likely False) checkbox value
-
-            # Authorized user
-            new_choices = list(all_models_list) if show_all_checkbox_val else list(preferred_models)
+            # Get cost
+            cost = MODEL_PRICING.get(model_value, "Unknown")
             
-            new_model_value = current_model_id
-            if not any(val == current_model_id for _, val in new_choices): # If current model not in new list
-                new_model_value = AUTHENTICATED_DEFAULT_MODEL_ID # Revert to default
-                if not any(val == new_model_value for _, val in new_choices): # If default not in new list (edge case)
-                    new_model_value = new_choices[0][1] if new_choices else None
-
-
-            mdl_choice_update = gr.Dropdown.update(choices=new_choices, value=new_model_value)
-            return show_all_checkbox_val, mdl_choice_update # Return new preference and dropdown update
-
-        show_all_models_checkbox.change(
-            fn=persist_preference_and_toggle_models_visibility,
-            inputs=[show_all_models_checkbox, model_choice, auth_status_state],
-            outputs=[user_show_all_models_preference_state, model_choice]
+            # Create markdown
+            return f"""**Current Model**: {model_name}  
+                   **Estimated cost per 100 Images**: {cost}"""
+                
+        # Connect checkbox to toggle model choices
+        show_all_models.change(
+            fn=toggle_models,
+            inputs=[show_all_models, model_choice],
+            outputs=[model_choice]
         )
-
-        # Update model info when model selection changes
-        def update_model_info_display(selected_model_id: str, is_authorized: bool):
-            return get_model_info_markdown(selected_model_id, is_authorized)
-
+        
+        # Connect model selection to update info
         model_choice.change(
-            fn=update_model_info_display,
-            inputs=[model_choice, auth_status_state],
+            fn=update_model_info,
+            inputs=[model_choice],
             outputs=[model_info]
         )
         
         # Handle file uploads
         def handle_upload(files, current_paths, current_filenames):
-            # ... (your existing function, no changes needed here)
             file_paths = []
             file_names = []
             if files:
@@ -325,7 +329,6 @@ def create_demo():
                     file_names.append(get_base_filename(file.name))
             return file_paths, file_paths, file_names, 0, None, "0 of 0", "Upload images and click 'Generate Alt-Text'."
 
-
         upload_button.upload(
             fn=handle_upload,
             inputs=[upload_button, image_state, filename_state],
@@ -334,8 +337,7 @@ def create_demo():
         )
 
         # Analyze images
-        def analyze_images(image_paths, current_model_choice_id, length_choice, filenames, content_type_choice):
-            # Note: current_model_choice_id will be correctly set based on auth status by the UI
+        def analyze_images(image_paths, model_choice, length_choice, filenames, content_type_choice):
             if not image_paths:
                 return [], [], 0, None, "0 of 0", "No images uploaded to analyze.", None
 
@@ -348,10 +350,9 @@ def create_demo():
                 image_id = filenames[i] if i < len(filenames) and filenames[i] else f"Image_{i+1}_{os.path.basename(image_path)}"
                 try:
                     img = Image.open(image_path)
-                    prompt0 = prompt_new() # Assuming prompt_new() is defined in your utils
-                    model_name = current_model_choice_id 
-                    client_to_use = OR # Ensure OR can handle "meta-llama/llama-4-maverick:free"
-                                     # Or add logic here: if model_name == UNAUTHENTICATED_DEFAULT_MODEL_ID: client_to_use = DifferentClient()
+                    prompt0 = prompt_new()
+                    model_name = model_choice
+                    client_to_use = OR # Default client
 
                     result = client_to_use.generate_caption(
                         img, model=model_name, max_image_size=512,
@@ -430,7 +431,7 @@ def create_demo():
             """)
 
     return demo
-    
+
 # Launch the app
 if __name__ == "__main__":
     app = create_demo()