Update app.py

app.py

@@ -1,68 +1,54 @@
 import streamlit as st
 import openai
+from openai import OpenAI
 import time
 import gspread
 from oauth2client.service_account import ServiceAccountCredentials
 
-# ตั้งค่า Google Sheets API
+# Set up OpenAI client
+client = OpenAI(api_key=st.secrets["OPENAI_API_KEY"])
+
+# Google Sheets setup remains the same
 scope = ["https://spreadsheets.google.com/feeds", "https://www.googleapis.com/auth/drive"]
-creds = ServiceAccountCredentials.from_json_keyfile_name("genexam-2c8c645ecc0d.json", scope)  # เปลี่ยนเป็นชื่อไฟล์ JSON ของคุณ
+creds = ServiceAccountCredentials.from_json_keyfile_name("genexam-2c8c645ecc0d.json", scope)
 client_gs = gspread.authorize(creds)
+sheet = client_gs.open("GeneXam user").sheet1
 
-# เปิด Google Sheets โดยใช้ชื่อของ sheet
-sheet = client_gs.open("GeneXam user").sheet1  # ใส่ชื่อจริงของ Google Sheet
-
-# ฟังก์ชันตรวจสอบ username ใน Google Sheets
 def check_user_in_sheet(username):
     try:
-        users_list = sheet.col_values(1)  # สมมติว่า usernames อยู่ในคอลัมน์แรก
+        users_list = sheet.col_values(1)
         if username in users_list:
             return True
-        else:
-            return False
+        return False
     except Exception as e:
         st.error(f"Error checking user: {str(e)}")
         return False
 
-# ฟังก์ชันอัปเดตการใช้ API ของผู้ใช้
 def update_api_usage(username):
     try:
         users_list = sheet.col_values(1)
-        row_number = users_list.index(username) + 1  # หาตำแหน่งของ user
-        api_usage = int(sheet.cell(row_number, 2).value)  # คอลัมน์ที่ 2 เป็นจำนวนการใช้ API
+        row_number = users_list.index(username) + 1
+        api_usage = int(sheet.cell(row_number, 2).value)
         api_usage += 1
         sheet.update_cell(row_number, 2, api_usage)
     except Exception as e:
         st.error(f"Error updating API usage: {str(e)}")
 
-# รีเซ็ตการใช้ API เมื่อถึงเวลารีเซ็ตทุกวัน (ถ้าจำเป็น)
-def reset_api_usage_daily():
-    try:
-        users_list = sheet.col_values(1)
-        for i, user in enumerate(users_list):
-            sheet.update_cell(i + 1, 2, 0)  # รีเซ็ตคอลัมน์ที่ 2 (การใช้ API) เป็น 0
-    except Exception as e:
-        st.error(f"Error resetting API usage: {str(e)}")
-
-# ตั้งค่า OpenAI API key จาก Hugging Face Secrets
-openai.api_key = st.secrets["OPENAI_API_KEY"]
-
-# ฟังก์ชันการสร้างข้อสอบโดยใช้ OpenAI API และมี retry logic
 def generate_questions_with_retry(knowledge_material, question_type, cognitive_level, extra_instructions, case_based, num_choices=None, max_retries=3):
-    # Adjust the number of questions based on the type
+    # Adjust number of questions based on type
     if question_type == "Multiple Choice":
         num_questions = 3
     elif question_type == "Fill in the Blank":
         num_questions = 10
     elif question_type == "True/False":
-        num_questions = 5  # Generate 5 true/false questions
+        num_questions = 5
     else:  # Open-ended
         num_questions = 3
 
     # Base prompt
     prompt = f"Generate {num_questions} {question_type.lower()} exam questions based on {cognitive_level.lower()} level from the following material: {knowledge_material}. {extra_instructions}"
 
-    # If case-based medical situation is selected, modify the prompt
+    # Modify prompt for case-based medical situations
     if case_based:
         prompt = f"Generate {num_questions} {question_type.lower()} exam questions based on {cognitive_level.lower()} level from the following medical material: {knowledge_material}. The questions should be based on case-based medical situations, such as patient scenarios. {extra_instructions}"
         if question_type != "Fill in the Blank":
@@ -78,20 +64,20 @@ def generate_questions_with_retry(knowledge_material, question_type, cognitive_l
     retries = 0
     while retries < max_retries:
         try:
-            response = openai.ChatCompletion.create(
-                model="gpt-4o-mini",
+            response = client.chat.completions.create(
+                model="GPT-4o mini",  # or your preferred model
                 messages=[
                     {"role": "system", "content": "You are a helpful assistant for generating exam questions."},
                     {"role": "user", "content": prompt}
                 ]
             )
             return response.choices[0].message.content
-        except openai.APIConnectionError: 
+        except Exception as e:
             retries += 1
-            time.sleep(2)  # Wait for 2 seconds before retrying
             if retries == max_retries:
-                st.error("Failed to connect to OpenAI API after several attempts.")
+                st.error(f"Failed to generate questions after {max_retries} attempts. Error: {str(e)}")
                 return None
+            time.sleep(2)  # Wait before retrying
 
 # ระบบ login
 if 'username' not in st.session_state: