add user_email

app.py

@@ -758,6 +758,7 @@ def get_paragraph_practice_log_session_content(file_name):
 # 全文批改歷史紀錄
 def generate_paragraph_evaluate_history(
         user_data,
+        user_email,
         user_nickname,
         session_timestamp,
         request_origin,
@@ -774,6 +775,7 @@ def generate_paragraph_evaluate_history(
 
     print("====生成全文批改歷史紀錄====")
     print(f"user_data: {user_data}")
+    print(f"user_email: {user_email}")
     print(f"session_timestamp: {session_timestamp}")
     print(f"request_origin: {request_origin}")
 
@@ -800,7 +802,7 @@ def generate_paragraph_evaluate_history(
         GCS_SERVICE.upload_json_string("jutor_logs", file_name, json.dumps(content))
 
         if assignment_id_input:
-            submission_id = submit_assignment(assignment_id_input, user_data, user_nickname, content, file_name)
+            submission_id = submit_assignment(assignment_id_input, user_data, user_email, user_nickname, content, file_name)
             if submission_id:
                 print(f"Assignment submitted successfully. Submission ID: {submission_id}")
             else:
@@ -952,6 +954,7 @@ def update_exam_contents(selected_title):
 # === Chinese ===
 def generate_chinese_paragraph_practice_history(
     user_data,
+    user_email,
     user_nickname,
     session_timestamp,
     request_origin,
@@ -984,7 +987,7 @@ def generate_chinese_paragraph_practice_history(
         GCS_SERVICE.upload_json_string("jutor_logs", file_name, json.dumps(content))
 
         if assignment_id_input:
-            submission_id = submit_assignment(assignment_id_input, user_data, user_nickname, content, file_name)
+            submission_id = submit_assignment(assignment_id_input, user_data, user_email, user_nickname, content, file_name)
             if submission_id:
                 print(f"Assignment submitted successfully. Submission ID: {submission_id}")
             else:
@@ -1000,11 +1003,12 @@ def generate_chinese_paragraph_practice_history(
             chinese_full_paragraph_refine_output_table, \
             chinese_full_paragraph_save_output
 
-def submit_assignment(assignment_id, user_data, user_nickname, submission_content, file_name):
+def submit_assignment(assignment_id, user_data, user_email, user_nickname, submission_content, file_name):
     try:
         submission_id = _SubmissionService.submit_assignment(
             assignment_id=assignment_id,
             student_id=user_data,
+            student_email=user_email,
             student_name=user_nickname,
             submission_content=submission_content,
             file_name=file_name,
@@ -1575,7 +1579,10 @@ def init_params(request: gr.Request):
         assignment_group = gr.update(visible=False)
 
         user_data = gr.update(value="")
+        user_email = gr.update(value="")
+        user_nickname = gr.update(value="")
 
+        # check if origin is from junyiacademy
         # check if origin is from junyiacademy
         query_params = dict(request.query_params)
         request_origin = request.headers.get("origin", "").replace("https://", "").replace("http://", "")
@@ -1595,10 +1602,14 @@ def init_params(request: gr.Request):
         if is_env_local:
             admin_group = gr.update(visible=True)
             user_data = gr.update(value="aa")
+            user_email = gr.update(value="[email protected]")
+            user_nickname = gr.update(value="aa_name")
 
         if "hf.space" in request_origin:
             admin_group = gr.update(visible=True)
             user_data = gr.update(value="aa")
+            user_email = gr.update(value="[email protected]")
+            user_nickname = gr.update(value="aa_name")
 
         # session timestamp 用 2024-01-01-12-00-00 格式, 要用 UTC+8 時間
         session_timestamp = datetime.now(pytz.utc).astimezone(pytz.timezone('Asia/Taipei')).strftime("%Y-%m-%d-%H-%M-%S")
@@ -1659,7 +1670,7 @@ def init_params(request: gr.Request):
             assignment_id_input = gr.update(value=None)
             assignment_json = gr.update(value=None)
         
-    return user_data, \
+    return user_data, user_email, user_nickname, \
             admin_group, session_timestamp, request_origin, \
             assignment_id_input, assignment_json, \
             chinese_assignment_row, \
@@ -1749,6 +1760,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
 
     with gr.Row(visible=False) as admin_group:
         user_data = gr.Textbox(label="User Data", value="", elem_id="jutor_user_data_input")
+        user_email = gr.Textbox(label="User Email", value="", elem_id="jutor_user_email_input")
         user_nickname = gr.Textbox(label="User Nickname", value="", elem_id="jutor_user_nickname_input")
         session_timestamp = gr.Textbox(label="Session Timestamp", value="", elem_id="jutor_session_timestamp_input")
         request_origin = gr.Textbox(label="Request Domain", value="")
@@ -2817,6 +2829,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_paragraph_evaluate_history,
                         inputs=[
                             user_data,
+                            user_email,
                             user_nickname,
                             session_timestamp,
                             request_origin,
@@ -3439,6 +3452,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_chinese_paragraph_practice_history,
                         inputs=[
                             user_data,
+                            user_email,
                             user_nickname,
                             session_timestamp,
                             request_origin,
@@ -3632,6 +3646,8 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
         inputs =[],
         outputs = [
             user_data,
+            user_email,
+            user_nickname,
             admin_group,
             session_timestamp,
             request_origin,

assignment_ui.py

@@ -266,6 +266,12 @@ def create_assignment_ui(user_data, assignment_service, submission_service, dash
                                 {submission_json.get('student_name', '未提供')}
                             </div>
                         </div>
+                        <div style="margin-bottom: 20px;">
+                            <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">📧 學生Email</div>
+                            <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">
+                                {submission_json.get('student_email', '未提供')}
+                            </div>
+                        </div>
                         <div style="margin-bottom: 20px;">
                             <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">🆔 學生ID</div>
                             <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">

dashboard_service.py

@@ -41,6 +41,7 @@ class DashboardService:
                 submissions.append({
                     "submission_id": submission_id,
                     "student_id": submission_data["student_id"],
+                    "student_email": submission_data.get("student_email", "未提供"),
                     "student_name": submission_data["student_name"],
                     "submission_date": submission_data["timestamp"]
                 })
@@ -76,7 +77,8 @@ class DashboardService:
                     all_submissions.append({
                         "作業名稱": assignment_data["metadata"]["topic"],
                         "作業類型": assignment_data["assignment_type"],
-                        "學生_id": submission_data["student_id"],
+                        # "學生_id": submission_data["student_id"],
+                        "學生Email": submission_data.get("student_email", "未提供"),
                         "學生姓名": submission_data["student_name"],
                         "繳交日期": submission_data["timestamp"],
                         "分數": score
@@ -87,17 +89,41 @@ class DashboardService:
 
     def extract_score(self, submission_data):
         try:
-            content = submission_data.get("submission_data", {}).get("content", {})
+            content = submission_data.get("submission_data", {})
             if isinstance(content, str):
                 content = json.loads(content)
             
-            output_table = content.get("chinese_full_paragraph_evaluate_output_table", [])
+            if not isinstance(content, dict):
+                print(f"內容格式不正確：{type(content)}")
+                return "N/A"
             
-            for item in output_table:
-                if item.get("架構") == "綜合評分":
-                    return item.get("評分", "N/A")
+            content = content.get("content", {})
+            if isinstance(content, str):
+                content = json.loads(content)
+            
+            output_tables = content.get("chinese_full_paragraph_refine_output_table", [])
+            print(f"output_tables: {output_tables}")  # 調試輸出
+            last_score = "N/A"
+            
+            # 只取最後一個「綜合評分」
+            for table in reversed(output_tables):
+                print(f"檢查 table: {table}")  # 調試輸出
+                if isinstance(table, str):
+                    try:
+                        table = json.loads(table)
+                    except json.JSONDecodeError:
+                        continue
+                if isinstance(table, dict) and table.get("架構") == "綜合評分":
+                    last_score = table.get("評分", "N/A")
+                    print(f"找到最後的評分: {last_score}")  # 調試輸出
+                    break
+            
+            return last_score
+            
+        except json.JSONDecodeError as e:
+            print(f"JSON 解析錯誤：{str(e)}")
         except Exception as e:
             print(f"提取分數時出錯：{str(e)}")
-            print(f"提交數據：{submission_data}")
         
+        print(f"提交數據：{submission_data}")
         return "N/A"

submission_service.py

@@ -19,7 +19,7 @@ class SubmissionService:
             if not self.gcs_service.check_file_exists(self.bucket_name, file_name):
                 return submission_id
 
-    def submit_assignment(self, assignment_id, student_id, student_name, submission_content, file_name=None, bucket_name=None):
+    def submit_assignment(self, assignment_id, student_id, student_name, student_email, submission_content, file_name=None, bucket_name=None):
         submission_id = self.create_submission_id()
         timestamp_now = datetime.now(pytz.utc).astimezone(pytz.timezone('Asia/Taipei')).strftime("%Y-%m-%d %H:%M:%S")
         submission_data = {
@@ -31,6 +31,7 @@ class SubmissionService:
             "submission_id": submission_id,
             "assignment_id": assignment_id,
             "student_id": student_id,
+            "student_email": student_email,
             "student_name": student_name,
             "submission_data": submission_data,
             "timestamp": timestamp_now