working2

app.py

@@ -88,6 +88,7 @@ def generate_flashcard():
                 else:
                     raise ValueError("No JSON object found in response")
             except Exception as parse_err:
+                print("JSON parsing error in language mode: ", parse_err)
                 return jsonify({'error': 'JSON parsing error in language mode: ' + str(parse_err)})
         elif mode == 'flashcard':
             try:

llm_utils.py

@@ -32,15 +32,22 @@ def generate_completion(prompt: str, model: str = None, api_key: str = None) ->
         first_env_var = list(config['models'][0].keys())[0]
         model = config['models'][0][first_env_var][0]
 
+    # Get the correct environment variable for the model.
     env_var = model_to_env.get(model)
     if not env_var:
-        raise ValueError("Model is not supported.")
+        raise ValueError(f"Model '{model}' is not supported. Available models: {list(model_to_env.keys())}")
+
+    # First, check if the environment variable is set.
+    env_api_key = os.getenv(env_var)
+    if env_api_key:
+        # Use the API key from environment if available
+        api_key = env_api_key
+    elif api_key:
+        # Fallback to the API key provided by the user
+        pass
+    else:
+        raise ValueError(f"Please set {env_var} environment variable or provide the API key.")
 
-    if api_key is None:
-        api_key = os.getenv(env_var)
-    if not api_key:
-        raise ValueError(f"Please set {env_var} environment variable")
-    
     messages = [{"role": "user", "content": prompt}]
     
     response = completion(

models.yaml

@@ -1,6 +1,10 @@
 models:
   - GEMINI_API_KEY:
       - "gemini/gemini-exp-1206"
+      - "gemini/gemini-2.0-flash-lite-preview-02-05"
+      - "gemini/gemini-2.0-flash"
+      - "gemini/gemini-2.0-pro-exp-02-05"
+      - "gemini/gemini-2.0-flash-thinking-exp-01-21"
 
   - OPENROUTER_API_KEY:
       - "openrouter/google/gemini-exp-1206:free"

static/js/models.js

@@ -1,9 +1,9 @@
 const MODEL_API_KEY_MAPPING = {
+  "gemini/gemini-2.0-flash": "GEMINI_API_KEY",
   "gemini/gemini-exp-1206": "GEMINI_API_KEY",
-//   "gemini/gemini-2.0-flash": "GEMINI_API_KEY",
-//   "gemini/gemini-2.0-flash-lite-preview-02-05": "GEMINI_API_KEY",
-//   "gemini/gemini-2.0-pro-exp-02-05": "GEMINI_API_KEY",
-//   "gemini/gemini-2.0-flash-thinking-exp-01-21": "GEMINI_API_KEY",
+  "gemini/gemini-2.0-flash-lite-preview-02-05": "GEMINI_API_KEY",
+  "gemini/gemini-2.0-pro-exp-02-05": "GEMINI_API_KEY",
+  "gemini/gemini-2.0-flash-thinking-exp-01-21": "GEMINI_API_KEY",
   "openrouter/google/gemini-exp-1206:free": "OPENROUTER_API_KEY",
   "openrouter/anthropic/claude-3-haiku-20240307": "OPENROUTER_API_KEY",
   "openrouter/anthropic/claude-3-sonnet-20240229": "OPENROUTER_API_KEY"

templates/index.html

@@ -461,11 +461,6 @@
         }
 
         async function generateLanguageFlashcard(word, phrase, targetLanguage) {
-            if (!apiKey) {
-                alert('Please enter your API key first.');
-                return;
-            }
-
             const prompt = document.getElementById('language-prompt').value
                 .replace('{word}', word)
                 .replace('{phrase}', phrase)
@@ -493,11 +488,6 @@
         }
 
         async function generateContent() {
-            if (!apiKey) {
-                alert('Please enter your API key first.');
-                return;
-            }
-
             const selection = window.getSelection();
             if (selection.rangeCount > 0 && selection.toString().trim() !== '') {
                 const selectedText = selection.toString();
@@ -511,7 +501,7 @@
                 } else {
                     return;
                 }
-
+                
                 // Disable the button and show notification
                 submitBtn.disabled = true;
                 submitBtn.style.backgroundColor = '#808080';
@@ -1367,19 +1357,20 @@
                 modelSelect.appendChild(option);
             });
 
-            // Set default model to Gemini
-            modelSelect.value = "gemini/gemini-exp-1206";
-            selectedModel = "gemini/gemini-exp-1206";
+            // Set default model to the first one in the list instead of hard-coding Gemini
+            const firstModel = availableModels[0]; // New: use the first model from availableModels
+            modelSelect.value = firstModel;          // Update the select element
+            selectedModel = firstModel;              // Update the global selectedModel value
 
-            // Update API key placeholder based on selected model
+            // Update API key placeholder based on selected model on change
             modelSelect.addEventListener('change', function() {
                 selectedModel = this.value;
                 const requiredKey = MODEL_API_KEY_MAPPING[selectedModel];
                 apiKeyInput.placeholder = `Enter ${requiredKey}`;
             });
 
-            // Set initial API key placeholder
-            const initialKey = MODEL_API_KEY_MAPPING["gemini/gemini-exp-1206"];
+            // Set initial API key placeholder based on the first model
+            const initialKey = MODEL_API_KEY_MAPPING[firstModel]; // Updated to use firstModel
             apiKeyInput.placeholder = `Enter ${initialKey}`;
         });
     </script>