Add Free Models tier with GPT-4o, Gemini, Qwen, DeepSeek, Llama

app.py

@@ -18,24 +18,36 @@ except ImportError as e:
 MAX_CATEGORIES = 10
 INITIAL_CATEGORIES = 3
 
-MODEL_CHOICES = [
-    "Qwen/Qwen3-VL-235B-A22B-Instruct:novita (Free)",
-    "deepseek-ai/DeepSeek-V3.1:novita (Free)",
-    "meta-llama/Llama-4-Maverick-17B-128E-Instruct:groq (Free)",
+# Free models (uses Space secrets - no user API key needed)
+FREE_MODEL_CHOICES = [
+    "Qwen/Qwen3-VL-235B-A22B-Instruct:novita",
+    "deepseek-ai/DeepSeek-V3.1:novita",
+    "meta-llama/Llama-4.1-8B-Instruct:novita",
+    "gemini-2.5-flash",
     "gpt-4o",
+]
+
+# Paid models (user provides their own API key)
+PAID_MODEL_CHOICES = [
+    "gpt-4o",
+    "gpt-4o-mini",
     "claude-sonnet-4-5-20250929",
+    "claude-3-5-haiku-20241022",
     "gemini-2.5-flash",
+    "gemini-2.0-flash",
 ]
 
-HF_FREE_MODELS = {
-    "Qwen/Qwen3-VL-235B-A22B-Instruct:novita (Free)": "Qwen/Qwen3-VL-235B-A22B-Instruct:novita",
-    "deepseek-ai/DeepSeek-V3.1:novita (Free)": "deepseek-ai/DeepSeek-V3.1:novita",
-    "meta-llama/Llama-4-Maverick-17B-128E-Instruct:groq (Free)": "meta-llama/Llama-4-Maverick-17B-128E-Instruct:groq",
-}
+# Models routed through HuggingFace
+HF_ROUTED_MODELS = [
+    "Qwen/Qwen3-VL-235B-A22B-Instruct:novita",
+    "deepseek-ai/DeepSeek-V3.1:novita",
+    "meta-llama/Llama-4.1-8B-Instruct:novita",
+]
 
 
-def is_free_model(model):
-    return "(Free)" in model
+def is_free_model(model, model_tier):
+    """Check if using free tier (Space pays for API)."""
+    return model_tier == "Free Models"
 
 
 def get_model_source(model):
@@ -77,7 +89,7 @@ def load_columns(file):
 
 def classify_data(spreadsheet_file, spreadsheet_column,
                   cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10,
-                  model, model_source_input, api_key_input):
+                  model_tier, model, model_source_input, api_key_input):
     """Main classification function."""
     if not CATLLM_AVAILABLE:
         return None, None, "**Error:** catllm package not available"
@@ -88,30 +100,31 @@ def classify_data(spreadsheet_file, spreadsheet_column,
     if not categories:
         return None, None, "**Error:** Please enter at least one category"
 
-    # Get API key - priority: user input > environment variable
-    if is_free_model(model):
-        actual_api_key = os.environ.get("HF_API_KEY", "")
-        actual_model = HF_FREE_MODELS.get(model, model.replace(" (Free)", ""))
-        if not actual_api_key:
-            return None, None, "**Error:** HuggingFace API key not configured in Space secrets"
+    actual_model = model
+
+    # Get API key based on tier
+    if is_free_model(model, model_tier):
+        # Free tier - use Space secrets
+        if model in HF_ROUTED_MODELS:
+            actual_api_key = os.environ.get("HF_API_KEY", "")
+            if not actual_api_key:
+                return None, None, "**Error:** HuggingFace API key not configured in Space secrets"
+        elif "gpt" in model.lower():
+            actual_api_key = os.environ.get("OPENAI_API_KEY", "")
+            if not actual_api_key:
+                return None, None, "**Error:** OpenAI API key not configured in Space secrets"
+        elif "gemini" in model.lower():
+            actual_api_key = os.environ.get("GOOGLE_API_KEY", "")
+            if not actual_api_key:
+                return None, None, "**Error:** Google API key not configured in Space secrets"
+        else:
+            actual_api_key = os.environ.get("HF_API_KEY", "")
     else:
-        # For paid models, check user input first, then environment
-        actual_model = model
+        # Paid tier - user provides their own API key
         if api_key_input and api_key_input.strip():
             actual_api_key = api_key_input.strip()
         else:
-            # Try to get from environment based on model
-            if "gpt" in model.lower():
-                actual_api_key = os.environ.get("OPENAI_API_KEY", "")
-            elif "claude" in model.lower():
-                actual_api_key = os.environ.get("ANTHROPIC_API_KEY", "")
-            elif "gemini" in model.lower():
-                actual_api_key = os.environ.get("GOOGLE_API_KEY", "")
-            else:
-                actual_api_key = ""
-
-            if not actual_api_key:
-                return None, None, f"**Error:** Please provide an API key for {model}"
+            return None, None, f"**Error:** Please provide your API key for {model}"
 
     # Use user-selected model_source, or auto-detect if "auto"
     if model_source_input == "auto":
@@ -167,16 +180,12 @@ def add_category_field(current_count):
 
 def generate_code(spreadsheet_file, spreadsheet_column,
                   cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10,
-                  model, model_source_input):
+                  model_tier, model, model_source_input):
     """Generate Python code snippet based on user inputs."""
     all_cats = [cat1, cat2, cat3, cat4, cat5, cat6, cat7, cat8, cat9, cat10]
     categories = [c.strip() for c in all_cats if c and c.strip()]
 
-    # Get the actual model name (strip " (Free)" suffix)
-    if is_free_model(model):
-        actual_model = HF_FREE_MODELS.get(model, model.replace(" (Free)", ""))
-    else:
-        actual_model = model
+    actual_model = model
 
     # Determine model source
     if model_source_input == "auto":
@@ -284,9 +293,16 @@ https://github.com/chrissoria/cat-llm
             add_category_btn = gr.Button("+ Add More Categories", variant="secondary", size="sm")
 
             gr.Markdown("### Model")
+            model_tier = gr.Radio(
+                choices=["Free Models", "Bring Your Own Key"],
+                value="Free Models",
+                label="Model Tier",
+                info="Free models use our API keys. 'Bring Your Own Key' lets you use your own API key."
+            )
+
             model = gr.Dropdown(
-                choices=MODEL_CHOICES,
-                value="Qwen/Qwen3-VL-235B-A22B-Instruct:novita (Free)",
+                choices=FREE_MODEL_CHOICES,
+                value="Qwen/Qwen3-VL-235B-A22B-Instruct:novita",
                 label="Model",
                 allow_custom_value=True
             )
@@ -295,17 +311,18 @@ https://github.com/chrissoria/cat-llm
                 choices=["auto", "openai", "anthropic", "google", "mistral", "xai", "huggingface", "perplexity"],
                 value="auto",
                 label="Model Source",
-                info="Auto-detects from model name, or select manually. Use 'huggingface' for Qwen/Llama/DeepSeek models."
+                info="Auto-detects from model name, or select manually."
             )
 
             api_key = gr.Textbox(
-                label="API Key (optional)",
+                label="API Key",
                 type="password",
-                placeholder="Enter your API key, or leave blank to use Space secrets",
-                info="For paid models, enter your key or configure in Space secrets"
+                placeholder="Enter your API key",
+                info="Required for 'Bring Your Own Key' tier",
+                visible=False
             )
 
-            api_key_status = gr.Markdown("**Free model selected** - no API key required!")
+            api_key_status = gr.Markdown("**Free tier** - no API key required! We cover the cost while CatLLM is in review.")
 
             with gr.Row():
                 classify_btn = gr.Button("Classify", variant="primary")
@@ -322,22 +339,25 @@ https://github.com/chrissoria/cat-llm
             )
 
     # Event handlers
-    def update_api_key_status(selected_model):
-        if is_free_model(selected_model):
-            return "**Free model selected** - no API key required!"
-        elif "gpt" in selected_model.lower():
-            return "**OpenAI model** - using OPENAI_API_KEY from secrets (or enter your own)"
-        elif "claude" in selected_model.lower():
-            return "**Anthropic model** - using ANTHROPIC_API_KEY from secrets (or enter your own)"
-        elif "gemini" in selected_model.lower():
-            return "**Google model** - using GOOGLE_API_KEY from secrets (or enter your own)"
+    def update_model_tier(tier):
+        """Update model choices and API key visibility based on tier."""
+        if tier == "Free Models":
+            return (
+                gr.update(choices=FREE_MODEL_CHOICES, value=FREE_MODEL_CHOICES[0]),
+                gr.update(visible=False),
+                "**Free tier** - no API key required! We cover the cost while CatLLM is in review."
+            )
         else:
-            return "**Paid model** - enter your API key or configure in Space secrets"
+            return (
+                gr.update(choices=PAID_MODEL_CHOICES, value=PAID_MODEL_CHOICES[0]),
+                gr.update(visible=True),
+                "**Bring Your Own Key** - enter your API key below."
+            )
 
-    model.change(
-        fn=update_api_key_status,
-        inputs=[model],
-        outputs=[api_key_status]
+    model_tier.change(
+        fn=update_model_tier,
+        inputs=[model_tier],
+        outputs=[model, api_key, api_key_status]
     )
 
     load_cols_btn.click(
@@ -354,13 +374,13 @@ https://github.com/chrissoria/cat-llm
 
     classify_btn.click(
         fn=classify_data,
-        inputs=[spreadsheet_file, spreadsheet_column] + category_inputs + [model, model_source, api_key],
+        inputs=[spreadsheet_file, spreadsheet_column] + category_inputs + [model_tier, model, model_source, api_key],
         outputs=[results, download_file, status]
     )
 
     see_code_btn.click(
         fn=generate_code,
-        inputs=[spreadsheet_file, spreadsheet_column] + category_inputs + [model, model_source],
+        inputs=[spreadsheet_file, spreadsheet_column] + category_inputs + [model_tier, model, model_source],
         outputs=[code_output]
     )