Update generateQuestion.py

generateQuestion.py

@@ -2,29 +2,17 @@
 from flask import Flask, Blueprint, jsonify, send_file, abort, make_response, request, current_app
 
 from flask_cors import CORS
-# from moviepy.editor import VideoFileClip
-# from google.cloud import speech
 import os
 print(f"GOOGLE_APPLICATION_CREDENTIALS: {os.getenv('GOOGLE_APPLICATION_CREDENTIALS')}")
 import io
 import uuid
 import requests
-# from pydub import AudioSegment
-# import ffmpeg
 import re 
 
-
-
-
 questions_bp = Blueprint("questions", __name__)
 
-
-
-
-
 app = Flask(__name__)
 CORS(app)
-# CORS(app, resources={r"/*": {"origins": "*"}})
 
 @app.route('/')
 def home():
@@ -46,22 +34,23 @@ def _cohere_headers():
         "Content-Type": "application/json",
     }
 
-# API configuration for AI-based question generation
-# COHERE_API_KEY = 'WjnDKknACe0zxHvczdo7q4vwF4WAXn2429hcPHIB'
-COHERE_API_URL = 'https://api.cohere.ai/v1/generate'
-
-# Google Cloud Speech-to-Text Configuration
-# speech_client = speech.SpeechClient()
-
-
-
-
-
-
+# (1) UPDATED: Cohere v2 Chat endpoint
+COHERE_API_URL = 'https://api.cohere.com/v2/chat'
 
+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 ""
 
 def validate_topic(topic):
-
     validation_prompt = f"""
    ou are a highly knowledgeable AI grammar expert. Your task is to evaluate whether the given topic relates to **English grammar** or not.
 
@@ -82,61 +71,44 @@ def validate_topic(topic):
     No extra text or explanation.
     """
 
-
-
-    
-
-
-    # headers = {
-    #     'Authorization': f'Bearer {COHERE_API_KEY}',
-    #     'Content-Type': 'application/json'
-    # }
     headers = _cohere_headers()
     if not headers:
         return "Error: COHERE_API_KEY not set"
 
+    # (2) UPDATED: messages payload
     payload = {
         'model': 'command-r-08-2024',
-        'prompt': validation_prompt,
-        'max_tokens': 5  # Minimal token usage for classification
+        'messages': [
+            {'role': 'user', 'content': validation_prompt}
+        ],
+        'max_tokens': 5
     }
 
     try:
         response = requests.post(COHERE_API_URL, json=payload, headers=headers)
-        validation_result = response.json().get('generations', [{}])[0].get('text', '').strip()
-        
-        # Ensure the response is strictly "Grammar" or "Not Grammar"
-        if validation_result not in ["Grammar", "Not Grammar"]:
-            return "Not Grammar"  # Fallback to avoid incorrect responses
+        # (3) UPDATED: v2 parsing
+        validation_result = _extract_text_v2(response.json())
 
+        if validation_result not in ["Grammar", "Not Grammar", "ask grammar topics"]:
+            return "Not Grammar"
         return validation_result
 
     except Exception as e:
         return f"Error: {str(e)}"
 
 @questions_bp.post('/generate-questions')
-# @app.route('/generate-questions', methods=['POST'])
 def generate_questions_test():
     try:
         data = request.get_json()
-        topic = data.get('topic', '').strip() # Default to "grammar" if no topic is provided
-        # levels = data.get('levels', ['basic', 'medium', 'hard'])
-
-
+        topic = data.get('topic', '').strip()
         validation_result = validate_topic(topic)
 
         if validation_result != "Grammar":
             return jsonify({"message": "Please enter a valid **grammar topic**, not a general word or unrelated question."}), 400
 
-
         difficulty = data.get('difficulty', 'basic')
-
-
-         # Debugging output
         print(f"Generating {difficulty} questions for topic: {topic}")
 
-
-
         if difficulty == 'basic':
             prompt = f"""
             Generate five **completely new and unique** very basic-level fill-in-the-blank grammar questions **every time** on the topic '{topic}'. 
@@ -151,7 +123,6 @@ def generate_questions_test():
             - Each question must include the correct answer in parentheses at the end.
             - Do not include any explanations or instructions—only the five questions.
             """
-
         elif difficulty == 'intermediate':
             prompt = f"""
             Generate five **completely new and unique** intermediate-level fill-in-the-blank grammar questions **every time** on the topic '{topic}'.
@@ -166,7 +137,6 @@ def generate_questions_test():
             - Each question must include the correct answer in parentheses at the end.
             - Do not include any explanations or instructions—only the five questions.
             """
-
         elif difficulty == 'expert':
             prompt = f"""
             Generate five **completely new and unique** advanced-level (C1) fill-in-the-blank grammar questions **every time** on the topic '{topic}'.
@@ -181,56 +151,47 @@ def generate_questions_test():
             - Each question must include the correct answer in parentheses at the end.
             - Do not include any explanations or instructions—only the five questions.
             """
-
- 
-
         else:
             return jsonify({"error": "Invalid difficulty level"}), 400
 
-        # headers = {
-        #     'Authorization': f'Bearer {COHERE_API_KEY}',
-        #     'Content-Type': 'application/json'
-        # }
         headers = _cohere_headers()
         if not headers:
             return jsonify({"error": "COHERE_API_KEY not set on the server"}), 500
 
+        # (2) UPDATED: messages payload
         payload = {
-            'model': 'command-r-08-2024',  # Ensure you're using the right model
-            'prompt': prompt,
-            'max_tokens': 1000  # Increase the token limit if needed
+            'model': 'command-r-08-2024',
+            'messages': [
+                {'role': 'user', 'content': prompt}
+            ],
+            'max_tokens': 1000
         }
 
-        # Make the API request
         response = requests.post(COHERE_API_URL, json=payload, headers=headers)
-
-        # Log the full response for debugging
         print("Response status code:", response.status_code)
         print("Response content:", response.text)
 
         if response.status_code == 200:
-            return jsonify(response.json())  # Return the response from Cohere API
+            # (3) UPDATED: v2 parsing
+            text = _extract_text_v2(response.json())
+            # Return same style as before but adapted (text content)
+            return jsonify({"text": text})
         else:
             return jsonify({"error": "Failed to fetch questions", "details": response.text}), 500
     except Exception as e:
         return jsonify({"error": str(e)}), 500
 
-# Endpoint to validate answers
 @questions_bp.post('/validate-answer')
-# @app.route('/validate-answer', methods=['POST'])
 def validate_answer():
     try:
-        # Get the data from the request
         data = request.get_json()
-        topic = data.get('topic', '')  # Get the topic
+        topic = data.get('topic', '')
         question = data.get('question', '')
         user_answer = data.get('user_answer', '')
 
-        # Validate if the required fields are present
         if not question or not user_answer or not topic:
-         return jsonify({'error': 'Topic, question, and user answer are required'}), 400
+            return jsonify({'error': 'Topic, question, and user answer are required'}), 400
 
-        # Construct the prompt for Cohere API
         prompt = f"""
         You are a highly knowledgeable grammar assistant. Validate whether the user's answer to the following question is correct or not based on {topic}. If the answer is incorrect, provide a helpful hint.
         
@@ -241,48 +202,37 @@ def validate_answer():
         Is the answer correct? If not, please explain why and give a hint.
         """
 
-        # Headers and payload for the Cohere API request
-        # headers = {
-        #     'Authorization': f'Bearer {COHERE_API_KEY}',
-        #     'Content-Type': 'application/json'
-        # }
-
         headers = _cohere_headers()
         if not headers:
             return jsonify({"error": "COHERE_API_KEY not set on the server"}), 500
 
+        # (2) UPDATED: messages payload
         payload = {
-            'model': 'command-r-08-2024',  # Use your model name here
-            'prompt': prompt,
+            'model': 'command-r-08-2024',
+            'messages': [
+                {'role': 'user', 'content': prompt}
+            ],
             'max_tokens': 100,
             'temperature': 0.7
         }
 
-        # Make the API call to Cohere
         response = requests.post(COHERE_API_URL, headers=headers, json=payload)
-
-        # Debugging: Log response status and body
         print(f"Status Code: {response.status_code}")
         print(f"Response Body: {response.text}")
 
-        # Check if the request was successful
         if response.status_code == 200:
-            data = response.json()
-            return jsonify(data)
+            # (3) UPDATED: v2 parsing
+            text = _extract_text_v2(response.json())
+            return jsonify({"text": text})
         else:
             return jsonify({'error': 'Failed to fetch data from Cohere API'}), 500
 
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
-
-
-# // for validating Multiple answer:
-
 # Function to validate an individual answer using Cohere API
 def validate_answer_with_ai(topic, question, user_answer):
     try:
-        # Construct the prompt for Cohere API
         prompt = f"""
         You are a highly knowledgeable grammar assistant. Validate whether the user's answer to the following question is correct or not based on {topic}. If the answer is incorrect, provide a helpful hint.
 
@@ -293,47 +243,35 @@ def validate_answer_with_ai(topic, question, user_answer):
         Is the answer correct? If not, please explain why and give a hint.
         """
 
-        # Headers for the API request
-        # headers = {
-        #     'Authorization': f'Bearer {COHERE_API_KEY}',
-        #     'Content-Type': 'application/json'
-        # }
-
         headers = _cohere_headers()
         if not headers:
             return "Error: COHERE_API_KEY not set"
 
-        # Construct the payload for Cohere API request
+        # (2) UPDATED: messages payload
         payload = {
-            'model': 'command-r-08-2024',  # You can use a different model depending on your needs
-            'prompt': prompt,
+            'model': 'command-r-08-2024',
+            'messages': [
+                {'role': 'user', 'content': prompt}
+            ],
             'max_tokens': 200,
-            'temperature': 0.7,
-            'stop_sequences': ['\n']
+            'temperature': 0.7
         }
 
-        # Make the POST request to the Cohere API
-        response = requests.post('https://api.cohere.ai/v1/generate', headers=headers, json=payload)
+        # (1) UPDATED URL used here too
+        response = requests.post(COHERE_API_URL, headers=headers, json=payload)
 
         if response.status_code == 200:
-            result = response.json()
-            # Extract and return the relevant part of the response
-            validation_response = result['generations'][0]['text'].strip()
-            return validation_response
+            # (3) UPDATED: v2 parsing
+            return _extract_text_v2(response.json())
         else:
             return f"Error: {response.status_code} - {response.text}"
 
     except Exception as e:
         return f"An error occurred: {str(e)}"
 
-
-
 @questions_bp.post('/validate-all-answers')
-# Endpoint to validate multiple answers at once
-# @app.route('/validate-all-answers', methods=['POST'])
 def validate_all_answers():
     try:
-        # Get the list of questions and answers from the request body
         data = request.get_json()
         questions = data.get('questions', [])
 
@@ -342,7 +280,6 @@ def validate_all_answers():
 
         validation_results = []
 
-        # Iterate over the list of questions and validate each answer
         for item in questions:
             topic = item.get('topic', '')
             question = item.get('question', '')
@@ -355,20 +292,19 @@ def validate_all_answers():
                 })
                 continue
 
-            # Validate the answer with the Cohere API
             validation_response = validate_answer_with_ai(topic, question, user_answer)
 
-            # If the answer is incorrect, generate a hint
             hint = None
-            if "incorrect" in validation_response.lower() or "not correct" in validation_response.lower():
-                # Generate the hint for the incorrect answer
+            if isinstance(validation_response, str) and (
+                "incorrect" in validation_response.lower() or "not correct" in validation_response.lower()
+            ):
                 hint = generate_hint(topic, question, user_answer)
 
             validation_results.append({
                 'question': question,
                 'user_answer': user_answer,
                 'validation_response': validation_response,
-                'hint': hint  # Add hint to the result
+                'hint': hint
             })
 
         return jsonify({'results': validation_results})
@@ -376,11 +312,8 @@ def validate_all_answers():
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
-
-
 def generate_hint(topic, question, user_answer):
     try:
-        # Construct the prompt for Cohere API to generate a hint for incorrect answers
         prompt = f"""
         You are a highly skilled grammar assistant. Your task is to generate a helpful hint for the user to improve their answer based on the following question.
 
@@ -397,39 +330,31 @@ def generate_hint(topic, question, user_answer):
         Please make sure the hint is **clear** and **helpful** for the user, **without revealing the correct answer**.
         """
 
-        # headers = {
-        #     'Authorization': f'Bearer {COHERE_API_KEY}',
-        #     'Content-Type': 'application/json'
-        # }
-
         headers = _cohere_headers()
         if not headers:
             return "Error: COHERE_API_KEY not set"
 
+        # (2) UPDATED: messages payload
         payload = {
-            'model': 'command-r-08-2024',  # Replace with the model you're using
-            'prompt': prompt,
-            'max_tokens': 250,  # Adjust token size as needed
-            'temperature': 0.7,  # Use temperature to control creativity
+            'model': 'command-r-08-2024',
+            'messages': [
+                {'role': 'user', 'content': prompt}
+            ],
+            'max_tokens': 250,
+            'temperature': 0.7
         }
 
-        # Make the POST request to Cohere API
         response = requests.post(COHERE_API_URL, headers=headers, json=payload)
 
         if response.status_code == 200:
-            result = response.json()
-            # Extract and return the relevant hint from the response
-            hint = result['generations'][0]['text'].strip()
-            return hint
+            # (3) UPDATED: v2 parsing
+            return _extract_text_v2(response.json())
         else:
             return f"Error: {response.status_code} - {response.text}"
 
     except Exception as e:
         return f"An error occurred: {str(e)}"
 
-
 if __name__ == '__main__':
-    # app.run(debug=True)
-    app.register_blueprint(questions_bp, url_prefix='')  # expose /explain-grammar locally
+    app.register_blueprint(questions_bp, url_prefix='')  # local exposure
     app.run(host='0.0.0.0', port=5012, debug=True)
-