Update vocabularyBuilder.py

vocabularyBuilder.py

@@ -6,6 +6,7 @@ import random
 import requests
 import json  # Add this at the top
 import logging
+import re  # used below
 
 # ---------- Blueprint ----------
 vocab_bp = Blueprint("vocab", __name__)
@@ -16,17 +17,12 @@ logging.basicConfig(
     format='%(asctime)s - %(levelname)s - %(message)s'
 )
 
-
-
 app = Flask(__name__)
 CORS(app)
 
-# OpenAI API Key for AI-based validation
-# openai.api_key = "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"
-
-# Cohere API Configuration (for generating vocabulary words)
-# COHERE_API_KEY = "WgEAxQyfUXoC3mTTywigL8kNmBH0CmCFtvhdpnC0"
-COHERE_API_URL = "https://api.cohere.ai/v1/generate"
+# Cohere + OpenAI config
+# (1) UPDATED: Cohere v2 Chat endpoint
+COHERE_API_URL = "https://api.cohere.com/v2/chat"
 _OPENAI_API_KEY_FALLBACK = os.getenv("OPENAI_API_KEY", "")
 _COHERE_API_KEY_FALLBACK = os.getenv("COHERE_API_KEY", "")
 
@@ -46,22 +42,22 @@ def _cohere_headers():
         "Content-Type": "application/json"
     }
 
-@vocab_bp.route('/')  # redirect to /vocapp (same behaviour)
-# @app.route('/') #Add this route
-def root():
-    return redirect(url_for('home'))
-
-@vocab_bp.route('/vocapp')
-# @app.route('/vocapp')
-def home():
-    return "Welcome to the Flask app! The server is running."
+def _extract_text_v2(resp_json: dict) -> str:
+    """
+    v2 /chat returns:
+    { "message": { "content": [ { "type": "text", "text": "..." } ] } }
+    """
+    msg = resp_json.get("message", {})
+    content = msg.get("content", [])
+    if isinstance(content, list) and content:
+        block = content[0]
+        if isinstance(block, dict):
+            return (block.get("text") or "").strip()
+    return ""
 
 @vocab_bp.route('/generate-word-association', methods=['GET'])
-# @app.route('/generate-word-association', methods=['GET'])
 def generate_word_association():
     try:
-        import re
-
         # -----------------------------
         # 1️⃣ Generate Vocabulary Word + 3 Related Words
         # -----------------------------
@@ -75,29 +71,27 @@ def generate_word_association():
           "options": ["word1", "word2", "word3"]
         }
         """
+
         headers = _cohere_headers()
         if not headers:
             return jsonify({"error": "COHERE_API_KEY not set"}), 500
 
-        # headers = {
-        #     "Authorization": f"Bearer {COHERE_API_KEY}",
-        #     "Content-Type": "application/json"
-        # }
-
+        # (2) UPDATED: messages payload
         data_related = {
             "model": "command-r-08-2024",
-            "prompt": prompt_related,
+            "messages": [
+                {"role": "user", "content": prompt_related}
+            ],
             "max_tokens": 100,
-            "temperature": 1.0,
-            "stop_sequences": ["}"]
+            "temperature": 1.0
         }
 
-        response_related = requests.post(COHERE_API_URL, json=data_related, headers=headers)
-
-        if response_related.status_code != 200 or not response_related.text.strip():
+        r_related = requests.post(COHERE_API_URL, json=data_related, headers=headers)
+        if r_related.status_code != 200 or not r_related.text.strip():
             return jsonify({"error": "Failed to generate vocabulary."}), 500
 
-        raw_text = response_related.json().get("generations", [{}])[0].get("text", "").strip()
+        # (3) UPDATED: v2 parsing
+        raw_text = _extract_text_v2(r_related.json())
         match = re.search(r'\{.*\}', raw_text, re.DOTALL)
         if not match:
             return jsonify({"error": "Invalid JSON from related words API"}), 500
@@ -123,17 +117,22 @@ def generate_word_association():
         }}
         """
 
+        # (2) UPDATED: messages payload
         data_unrelated = {
             "model": "command-r-08-2024",
-            "prompt": prompt_unrelated,
+            "messages": [
+                {"role": "user", "content": prompt_unrelated}
+            ],
             "max_tokens": 50,
-            "temperature": 1.0,
-            "stop_sequences": ["}"]
+            "temperature": 1.0
         }
 
-        response_unrelated = requests.post(COHERE_API_URL, json=data_unrelated, headers=headers)
-        raw_unrelated_text = response_unrelated.json().get("generations", [{}])[0].get("text", "").strip()
+        r_unrelated = requests.post(COHERE_API_URL, json=data_unrelated, headers=headers)
+        raw_unrelated_text = _extract_text_v2(r_unrelated.json())
         match_unrelated = re.search(r'\{.*\}', raw_unrelated_text, re.DOTALL)
+        if not match_unrelated:
+            return jsonify({"error": "Invalid JSON from unrelated words API"}), 500
+
         json_str_unrelated = match_unrelated.group(0)
         unrelated_options = json.loads(json_str_unrelated).get("options", [])
 
@@ -147,7 +146,7 @@ def generate_word_association():
         random.shuffle(all_options)
 
         # -----------------------------
-        # 4️⃣ Generate Image for the Word
+        # 4️⃣ Generate Image for the Word (OpenAI — unchanged)
         # -----------------------------
         prompt_image = (
             f"A conceptual, symbolic, high-quality illustration representing the meaning of the word '{word}'. "
@@ -155,6 +154,7 @@ def generate_word_association():
         )
 
         try:
+            _ensure_openai_key()
             image_response = openai.images.generate(
                 model="dall-e-3",
                 prompt=prompt_image,
@@ -181,11 +181,9 @@ def generate_word_association():
         return jsonify({"error": f"Internal Server Error: {str(e)}"}), 500
 
 # ----------------------------
-# 2️⃣ Validate User's Selected Words (Check Correct Answers)
+# 2️⃣ Validate User's Selected Words (OpenAI — unchanged)
 # ----------------------------
-
 @vocab_bp.route('/validate-selection', methods=['POST'])
-# @app.route('/validate-selection', methods=['POST'])
 def validate_selection():
     try:
         data = request.json
@@ -235,7 +233,6 @@ def validate_selection():
             feedback_json = json.loads(feedback_text)
             structured_feedback = feedback_json.get("feedback", [])
 
-        # Sanity check
         if not isinstance(structured_feedback, list):
             return jsonify({"error": "Unexpected feedback format from AI."}), 500
 
@@ -251,10 +248,9 @@ def validate_selection():
         return jsonify({"error": "An error occurred while validating the selection."}), 500
 
 # ----------------------------
-# 3️⃣ Validate User's Sentence Using AI
+# 3️⃣ Validate User's Sentence Using AI (OpenAI — unchanged)
 # ----------------------------
 @vocab_bp.route('/validate-sentence', methods=['POST'])
-# @app.route('/validate-sentence', methods=['POST'])
 def validate_sentence():
     try:
         data = request.json
@@ -286,7 +282,6 @@ def validate_sentence():
         return jsonify({"error": "An error occurred while validating the sentence."}), 500
 
 @vocab_bp.route('/generate-image', methods=['POST'])
-# @app.route('/generate-image', methods=['POST'])
 def generate_image():
     try:
         data = request.json
@@ -295,7 +290,6 @@ def generate_image():
         if not word:
             return jsonify({"error": "Word is required to generate image"}), 400
 
-        # Adjust prompt to create meaningful, visual examples of the word
         prompt = (
             f"A conceptual, high-quality illustration that visually explains the word '{word}'. "
             "Use realistic or symbolic elements to represent its meaning clearly. No text in the image."
@@ -303,7 +297,7 @@ def generate_image():
 
         _ensure_openai_key()
         response = openai.images.generate(
-            model="dall-e-3",  # or "dall-e-2" if you don’t have access
+            model="dall-e-3",
             prompt=prompt,
             n=1,
             size="1024x1024"
@@ -315,10 +309,6 @@ def generate_image():
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-
-# if __name__ == '__main__':
-#     app.run(host='0.0.0.0', port=5002, debug=True)
-
 # ---------- Standalone (local testing) ----------
 if __name__ == '__main__':
     app = Flask(__name__)