raise gr.Error("網路塞車，或是內容有誤，請稍後重新嘗試！")

app.py

@@ -618,6 +618,7 @@ def generate_paragraph_history(
         log_type_name = "jutor_write_paragraph_practice"
         file_name = f"{encoded_user_id_url}/{log_type_name}/{session_timestamp}.json"
         content = {
+            "content_type": "english_paragraph_practice",
             "session_timestamp": session_timestamp,
             "request_origin": request_origin,
             "scenario_input": scenario_input,
@@ -745,8 +746,10 @@ def get_paragraph_practice_log_session_content(file_name):
 # 全文批改歷史紀錄
 def generate_paragraph_evaluate_history(
         user_data,
+        user_nickname,
         session_timestamp,
         request_origin,
+        assignment_id_input,
         full_paragraph_input,
         full_paragraph_evaluate_output,
         full_paragraph_correct_grammatical_spelling_errors_input,
@@ -767,8 +770,10 @@ def generate_paragraph_evaluate_history(
         log_type_name = "jutor_write_full_paragraph_evaluation"
         file_name = f"{encoded_user_id_url}/{log_type_name}/{session_timestamp}.json"
         content = {
+            "content_type": "english_full_paragraph_evaluation",
             "session_timestamp": session_timestamp,
             "request_origin": request_origin,
+            "assignment_id": assignment_id_input,
             "full_paragraph_input": full_paragraph_input,
             "full_paragraph_evaluate_output": full_paragraph_evaluate_output.to_dict(orient='records'),
             "full_paragraph_correct_grammatical_spelling_errors_input": full_paragraph_correct_grammatical_spelling_errors_input,
@@ -782,6 +787,15 @@ def generate_paragraph_evaluate_history(
         print(content)
         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)
+            if submission_id:
+                print(f"Assignment submitted successfully. Submission ID: {submission_id}")
+            else:
+                print("Failed to submit assignment.")
+    else:
+        gr.Error("請先登入")
+
     return full_paragraph_input, \
             full_paragraph_evaluate_output, \
             full_paragraph_correct_grammatical_spelling_errors_input, \
@@ -849,6 +863,7 @@ def generate_past_exam_history(
         log_type_name = "jutor_write_past_exam"
         file_name = f"{encoded_user_id_url}/{log_type_name}/{session_timestamp}.json"
         content = {
+            "content_type": "english_past_exam",
             "session_timestamp": session_timestamp,
             "request_origin": request_origin,
             "past_exam_title": past_exam_title,
@@ -942,6 +957,7 @@ def generate_chinese_paragraph_practice_history(
         log_type_name = "jutor_write_chinese_full_paragraph_evaluation"
         file_name = f"{encoded_user_id_url}/{log_type_name}/{session_timestamp}.json"
         content = {
+            "content_type": "chinese_full_paragraph_evaluation",
             "session_timestamp": session_timestamp,
             "request_origin": request_origin,
             "chinese_full_paragraph_input": chinese_full_paragraph_input,
@@ -1142,6 +1158,9 @@ def get_chinese_paragraph_evaluate_content(thread_id, model, user_content):
     print(f"====generate_paragraph_evaluate====")
     print(content)
 
+    if "```json" not in content:
+        raise gr.Error("網路塞車，或是內容有誤，請稍後重新嘗試！")
+
     content_list = content.split("```json")
     content_text = content_list[0]
     print(f"content_text: {content_text}")
@@ -2542,8 +2561,10 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_paragraph_evaluate_history,
                         inputs=[
                             user_data,
+                            user_nickname,
                             session_timestamp,
                             request_origin,
+                            assignment_id_input,
                             full_paragraph_input,
                             full_paragraph_evaluate_output,
                             full_paragraph_correct_grammatical_spelling_errors_input,
@@ -2675,7 +2696,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                             with gr.Row():
                                 gr.Markdown("# 建立歷程回顧")
                             with gr.Row():
-                                past_exam＿history_save_button = gr.Button("建立歷程回顧", variant="primary")
+                                past_exam_history_save_button = gr.Button("建立歷程回顧", variant="primary")
                             with gr.Row():
                                 with gr.Accordion("歷程回顧", open=False) as past_exam_history_accordion:
                                     gr.Markdown("<span style='color:#4e80ee'>考古題</span>")
@@ -2702,7 +2723,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     past_exam_save_output_history = gr.Markdown()
 
 
-                                past_exam＿history_save_button.click(  
+                                past_exam_history_save_button.click(  
                                     fn=generate_past_exam_history,
                                     inputs=[
                                         user_data,
@@ -3130,7 +3151,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                     user_generate_chinese_full_paragraph_refine_evaluate_prompt = gr.Textbox(label="Paragraph evaluate Prompt", value=default_user_generate_chinese_full_paragraph_refine_evaluate_prompt)
                 with gr.Row():
                     with gr.Column():
-                        chinese_full_paragraph＿refine_input = gr.TextArea(label="這是你的原始寫作內容，參考建議，你可以選擇是否修改：", show_copy_button=True)
+                        chinese_full_paragraph_refine_input = gr.TextArea(label="這是你的原始寫作內容，參考建議，你可以選擇是否修改：", show_copy_button=True)
                     with gr.Column():
                         with gr.Row():
                             generate_chinese_full_paragraph_refine_button = gr.Button("段落全文分析", variant="primary")
@@ -3160,7 +3181,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         
                         # 根據建議修改文章
                         gr.Markdown("<span style='color:#4e80ee'>根據建議修改文章 輸入</span>")
-                        chinese_full_paragraph＿refine_input_history = gr.Markdown()
+                        chinese_full_paragraph_refine_input_history = gr.Markdown()
                         gr.Markdown("<span style='color:#4e80ee'>全文分析</span>")
                         chinese_full_paragraph_refine_output_text_history = gr.Markdown()
                         chinese_full_paragraph_refine_output_table_history = gr.Dataframe(interactive=False, wrap=True, column_widths=[30, 30, 40])

assignment_service.py

@@ -19,16 +19,16 @@ class AssignmentService:
                 return assignment_id
             
     def create_assignment_metadata(self, assignment_type, grade, topic, introduction, description, attach_materials, submission_deadline):
-        if assignment_type == "中文寫作 AI 批改":
-            metadata = {
-                "assignment_type": assignment_type,
-                "grade": grade,
-                "topic": topic,
-                "introduction": introduction,
-                "description": description,
-                "attach_materials": attach_materials,
-                "submission_deadline": submission_deadline
-            }
+        # if assignment_type == ["中文寫作 AI 批改", "英文寫作 AI 批改"]:
+        metadata = {
+            "assignment_type": assignment_type,
+            "grade": grade,
+            "topic": topic,
+            "introduction": introduction,
+            "description": description,
+            "attach_materials": attach_materials,
+            "submission_deadline": submission_deadline
+        }
         
         return metadata
 

assignment_ui.py

@@ -145,13 +145,14 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
             def generate_submission_html(submission_json):
                 submission_data = submission_json.get('submission_data', {})
                 content = submission_data.get('content', {})
-                
+                content_type = content.get('content_type', '')
+
                 html = f"""
                 <div style="background-color: #f8f9fa; padding: 30px; border-radius: 15px; font-family: 'Helvetica', sans-serif;">
                     <h2 style="color: #007bff; font-size: 28px; margin-bottom: 20px;">📝 學生回傳作業</h2>
                     <div style="background-color: white; border-radius: 10px; padding: 20px; box-shadow: 0 2px 4px rgba(0,0,0,0.05);">
                         <details>
-                            <summary style="cursor: pointer; font-weight: bold; color: #6c757d; padding: 10px; background-color: #e9ecef; border-radius: 5px;">學生資訊</summary>
+                            <summary style="cursor: pointer; font-weight: bold; color: #6c757d; padding: 10px; background-color: #e9ecef; border-radius: 5px;">學生资讯</summary>
                             <div style="margin-top: 10px;">
                                 <div style="margin-bottom: 20px;">
                                     <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">👤 學生姓名</div>
@@ -166,108 +167,180 @@ def create_assignment_ui(user_data, assignment_service, submission_service):
                                     </div>
                                 </div>
                                 <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">🕒 繳交時間</div>
+                                    <div style="font-weight: bold; color: #6c757d; margin-bottom: 5px;">🕒 缴交时间</div>
                                     <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">{submission_json.get('timestamp', '未提供')}</div>
                                 </div>
                             </div>
                         </details>
-                        
-                        <details open>
-                            <summary style="cursor: pointer; font-weight: bold; color: #28a745; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">原文</summary>
-                            <div style="margin-top: 10px;">
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #28a745; margin-bottom: 5px;">📄 輸入段落全文</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_input', '未提供')}</div>
-                                </div>
-                                
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">📊 段落全文分析</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_evaluate_output_text', '未提供')}</div>
-                                </div>
                 """
 
-                if 'chinese_full_paragraph_evaluate_output_table' in content:
-                    html += """
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #dc3545; margin-bottom: 5px;">📊 評分結果</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">
-                                        <table style="width: 100%; border-collapse: collapse;">
-                                            <tr style="background-color: #e9ecef;">
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">評分項目</th>
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">分數</th>
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">評語</th>
-                                            </tr>
-                    """
-                    for item in content['chinese_full_paragraph_evaluate_output_table']:
-                        html += f"""
-                                            <tr>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('架構', '')}</td>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('評分', '')}</td>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('解釋', '')}</td>
-                                            </tr>
-                        """
-                    html += """
-                                        </table>
-                                    </div>
-                                </div>
-                    """
+                if content_type == 'chinese_full_paragraph_evaluation':
+                    html += generate_chinese_full_paragraph_html(content)
+                elif content_type == 'english_full_paragraph_evaluation':
+                    html += generate_english_full_paragraph_html(content)
+                else:
+                    html += "<p>不支持的内容类型</p>"
 
                 html += """
+                    </div>
+                </div>
+                """
+                return html
+
+            def generate_chinese_full_paragraph_html(content):
+                html = """
+                    <details open>
+                        <summary style="cursor: pointer; font-weight: bold; color: #28a745; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">原文評估</summary>
+                        <div style="margin-top: 10px;">
+                """
+
+                html += f"""
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #28a745; margin-bottom: 5px;">📄 输入段落全文</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_input', '未提供')}</div>
                             </div>
-                        </details>
-                        
-                        <details>
-                            <summary style="cursor: pointer; font-weight: bold; color: #6610f2; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">第二次修改</summary>
-                            <div style="margin-top: 10px;">
+                            
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #17a2b8; margin-bottom: 5px;">📊 段落全文分析</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_evaluate_output_text', '未提供')}</div>
+                            </div>
+                """
+
+                if 'chinese_full_paragraph_evaluate_output_table' in content:
+                    html += generate_table_html(content['chinese_full_paragraph_evaluate_output_table'], "📊 评分结果", "#dc3545")
+
+                html += """
+                        </div>
+                    </details>
+                    
+                    <details>
+                        <summary style="cursor: pointer; font-weight: bold; color: #6610f2; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">第二次修改</summary>
+                        <div style="margin-top: 10px;">
                 """
 
                 html += f"""
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #6610f2; margin-bottom: 5px;">🔄 段落改善建議 輸入</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_refine_input', '未提供')}</div>
-                                </div>
-                                
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #fd7e14; margin-bottom: 5px;">🔄 段落改善建議</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_refine_output_text', '未提供')}</div>
-                                </div>
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #6610f2; margin-bottom: 5px;">🔄 段落改善建议 输入</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_refine_input', '未提供')}</div>
+                            </div>
+                            
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #fd7e14; margin-bottom: 5px;">🔄 段落改善建议</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_refine_output_text', '未提供')}</div>
+                            </div>
                 """
 
                 if 'chinese_full_paragraph_refine_output_table' in content:
-                    html += """
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #20c997; margin-bottom: 5px;">📊 修改後評分</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px;">
-                                        <table style="width: 100%; border-collapse: collapse;">
-                                            <tr style="background-color: #e9ecef;">
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">評分項目</th>
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">分數</th>
-                                                <th style="padding: 10px; border: 1px solid #dee2e6;">評語</th>
-                                            </tr>
-                    """
-                    for item in content['chinese_full_paragraph_refine_output_table']:
-                        html += f"""
-                                            <tr>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('架構', '')}</td>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('評分', '')}</td>
-                                                <td style='padding: 10px; border: 1px solid #dee2e6;'>{item.get('解釋', '')}</td>
-                                            </tr>
-                        """
-                    html += """
-                                        </table>
-                                    </div>
-                                </div>
-                    """
+                    html += generate_table_html(content['chinese_full_paragraph_refine_output_table'], "📊 修改后评分", "#20c997")
 
                 html += f"""
-                                <div style="margin-bottom: 20px;">
-                                    <div style="font-weight: bold; color: #20c997; margin-bottom: 5px;">📝 修改結果</div>
-                                    <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_save_output', '未提供')}</div>
-                                </div>
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #20c997; margin-bottom: 5px;">📝 修改结果</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('chinese_full_paragraph_save_output', '未提供')}</div>
                             </div>
-                        </details>
+                        </div>
+                    </details>
+                """
+
+                return html
+
+            def generate_english_full_paragraph_html(content):
+                html = """
+                    <details open>
+                        <summary style="cursor: pointer; font-weight: bold; color: #28a745; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">原文</summary>
+                        <div style="margin-top: 10px;">
+                """
+
+                html += f"""
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #28a745; margin-bottom: 5px;">📄 輸入段落全文</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('full_paragraph_input', '未提供')}</div>
+                            </div>
+                """
+
+                if 'full_paragraph_evaluate_output' in content:
+                    html += generate_table_html(content['full_paragraph_evaluate_output'], "📊 評分結果", "#dc3545")
+
+                html += """
+                        </div>
+                    </details>
+                    
+                    <details>
+                        <summary style="cursor: pointer; font-weight: bold; color: #6610f2; padding: 10px; background-color: #e9ecef; border-radius: 5px; margin-top: 20px;">修訂結果</summary>
+                        <div style="margin-top: 10px;">
+                """
+
+                html += f"""
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #6610f2; margin-bottom: 5px;">🔄 修訂文法與拼字錯誤 輸入</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('full_paragraph_correct_grammatical_spelling_errors_input', '未提供')}</div>
+                            </div>
+                """
+
+                if 'full_paragraph_correct_grammatical_spelling_errors_output_table' in content:
+                    html += generate_table_html(content['full_paragraph_correct_grammatical_spelling_errors_output_table'], "📊 修訂文法與拼字錯誤", "#20c997")
+
+                html += f"""
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #6610f2; margin-bottom: 5px;">🔄 段落改善建議 輸入</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('full_paragraph_refine_input', '未提供')}</div>
+                            </div>
+                """
+
+                if 'full_paragraph_refine_output_table' in content:
+                    html += generate_table_html(content['full_paragraph_refine_output_table'], "📊 段落改善建議", "#20c997")
+
+                html += f"""
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #fd7e14; margin-bottom: 5px;">🔄 修改建議</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('full_paragraph_refine_output', '未提供')}</div>
+                            </div>
+
+                            <div style="margin-bottom: 20px;">
+                                <div style="font-weight: bold; color: #20c997; margin-bottom: 5px;">📝 修改結果</div>
+                                <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; white-space: pre-wrap;">{content.get('full_paragraph_save_output', '未提供')}</div>
+                            </div>
+                        </div>
+                    </details>
+                """
+
+                return html
+
+            def generate_table_html(table_data, title, color):
+                if not table_data or not isinstance(table_data, list):
+                    return ""
+
+                html = f"""
+                    <div style="margin-bottom: 20px;">
+                        <div style="font-weight: bold; color: {color}; margin-bottom: 5px;">{title}</div>
+                        <div style="background-color: #f8f9fa; padding: 10px 15px; border-radius: 5px; overflow-x: auto;">
+                            <table style="width: 100%; border-collapse: collapse; table-layout: fixed;">
+                                <tr style="background-color: #e9ecef;">
+                """
+
+                # 動態生成表頭
+                headers = table_data[0].keys()
+                for header in headers:
+                    if header.lower() == '評分' or header.lower() == 'score':
+                        html += f'<th style="padding: 10px; border: 1px solid #dee2e6; width: 80px;">{header}</th>'
+                    else:
+                        html += f'<th style="padding: 10px; border: 1px solid #dee2e6;">{header}</th>'
+                html += '</tr>'
+
+                # 動態生成表格內容
+                for item in table_data:
+                    html += '<tr>'
+                    for key, value in item.items():
+                        if key.lower() == '評分' or key.lower() == 'score':
+                            html += f'<td style="padding: 10px; border: 1px solid #dee2e6; width: 80px; text-align: center;">{value}</td>'
+                        else:
+                            html += f'<td style="padding: 10px; border: 1px solid #dee2e6;">{value}</td>'
+                    html += '</tr>'
+
+                html += """
+                            </table>
+                        </div>
                     </div>
-                </div>
                 """
                 return html