fix past_exam_logs_session_list.select(

app.py

@@ -3268,8 +3268,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     generate_full_paragraph_correct_grammatical_spelling_errors_button = gr.Button("✨ JUTOR 修訂文法與拼字錯誤", variant="primary", visible=False)
                                     full_paragraph_correct_grammatical_spelling_errors_output_table = gr.Dataframe(label="修訂文法與拼字錯誤", interactive=False, column_widths=[30, 30, 40])
                                     revised_full_paragraph_output = gr.Textbox(label="Revised Paragraph", show_copy_button=True, visible=False)
-                                    gr.Markdown("## 修訂建議")
-                                    revised_full_paragraph_diff = gr.HTML()
                         with gr.TabItem("JUTOR 段落改善建議"):
                             # JUTOR 段落批改與整體建議
                             with gr.Row():
@@ -3353,10 +3351,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                             full_paragraph_correct_grammatical_spelling_errors_output_table,
                             revised_full_paragraph_output
                         ]
-                    ).then(
-                        fn=highlight_diff_texts,
-                        inputs=[full_paragraph_correct_grammatical_spelling_errors_output_table, revised_full_paragraph_output],
-                        outputs=revised_full_paragraph_diff
                     ).then(
                         # 段落改善建議
                         fn=generate_refine_paragraph,
@@ -3407,10 +3401,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                             full_paragraph_correct_grammatical_spelling_errors_input, 
                         ],
                         outputs=[full_paragraph_correct_grammatical_spelling_errors_output_table, revised_full_paragraph_output]
-                    ).then(
-                        fn=highlight_diff_texts,
-                        inputs=[full_paragraph_correct_grammatical_spelling_errors_output_table, revised_full_paragraph_output],
-                        outputs=revised_full_paragraph_diff
                     ).then(
                         fn=update_paragraph_refine_input,
                         inputs=[full_paragraph_correct_grammatical_spelling_errors_input],
@@ -3502,17 +3492,13 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                 with gr.Column():
                                     past_exam_image = gr.Image(show_label=False)
                             # 評分
+
                             with gr.Row():
-                                with gr.Column():
-                                    with gr.Row():
-                                        past_exam_evaluation_sys_content_prompt = gr.Textbox(label="System Prompt", value="You are an English teacher who is practicing with me to improve my English writing skill.", visible=False)
-                                        past_exam_evaluation_input = gr.TextArea("",label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：")
-                                with gr.Column():
-                                    with gr.Row():
-                                        past_exam_evaluation_button = gr.Button("全文分析", variant="primary")
-                                    with gr.Row():
-                                        past_exam_evaluation_output = gr.Dataframe(label="全文分析結果", wrap=True, column_widths=[20, 15, 65], interactive=False)
-                                
+                                past_exam_evaluation_sys_content_prompt = gr.Textbox(label="System Prompt", value="You are an English teacher who is practicing with me to improve my English writing skill.", visible=False)
+                                past_exam_evaluation_input = gr.TextArea("",label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：")
+                            with gr.Row():
+                                past_exam_evaluation_analysis_button = gr.Button("✨ 全文分析", variant="primary", visible=True)
+                            
                             past_exam_dropdown.select(
                                 fn=update_exam_contents,
                                 inputs=[past_exam_dropdown],
@@ -3531,54 +3517,43 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                 outputs=past_exam_evaluation_sys_content_prompt
                             )
                             
-                            # 修正錯字、語法
-                            with gr.Row():
-                                with gr.Column():
-                                    past_exam_correct_grammatical_spelling_errors_input = gr.TextArea(label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：",lines= 10, show_copy_button=True)
-                                with gr.Column():
+                            with gr.Tabs():
+                                with gr.TabItem("JUTOR 段落全文分析"):  
                                     with gr.Row():
-                                        past_exam_generate_correct_grammatical_spelling_errors_button = gr.Button("修訂文法與拼字錯誤", variant="primary")
+                                        past_exam_evaluation_button = gr.Button("✨ 全文分析", variant="primary", visible=False)
                                     with gr.Row():
-                                        past_exam_correct_grammatical_spelling_errors_output_table = gr.Dataframe(label="修訂文法與拼字錯誤", interactive=False, column_widths=[30, 30, 40])
+                                        past_exam_evaluation_output = gr.Dataframe(label="全文分析結果", wrap=True, column_widths=[20, 15, 65], interactive=False)
+                                
+                                with gr.TabItem("JUTOR 修正錯字、語法"): 
+                                    # 修正錯字、語法
                                     with gr.Row():
-                                        past_exam_revised_output = gr.Textbox(label="Revised Paragraph", show_copy_button=True, visible=False)
+                                        past_exam_correct_grammatical_spelling_errors_input = gr.TextArea(label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：",lines= 10, show_copy_button=True, visible=False)
                                     with gr.Row():
-                                        gr.Markdown("## 修訂結果")
+                                        past_exam_generate_correct_grammatical_spelling_errors_button = gr.Button("✨ 修訂文法與拼字錯誤", variant="primary", visible=False)
+                                    with gr.Row():
+                                        past_exam_correct_grammatical_spelling_errors_output_table = gr.Dataframe(label="修訂文法與拼字錯誤", interactive=False, column_widths=[30, 30, 40])
                                     with gr.Row():
-                                        past_exam_revised_diff = gr.HTML()
+                                        past_exam_revised_output = gr.Textbox(label="Revised Paragraph", show_copy_button=True, visible=False)
 
-                            # 修正段落
-                            with gr.Row():
-                                with gr.Column():
-                                    past_exam_refine_input = gr.TextArea(label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：", show_copy_button=True)
-                                with gr.Column():
+                                with gr.TabItem("JUTOR 修正段落"): 
+                                    # 修正段落
                                     with gr.Row():
-                                        past_exam_generate_refine_button = gr.Button("段落改善建議", variant="primary")
+                                        past_exam_refine_input = gr.TextArea(label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：", show_copy_button=True, visible=False)
                                     with gr.Row():
-                                        past_exam_refine_output_table = gr.DataFrame(label="Refine Paragraph 段落改善建議", wrap=True, interactive=False)
+                                        past_exam_generate_refine_button = gr.Button("✨ 段落改善建議", variant="primary", visible=False)
                                     with gr.Row():
-                                        past_exam_refine_output = gr.HTML(label="修改建議", visible=False)
+                                        past_exam_refine_output_table = gr.DataFrame(label="Refine Paragraph 段落改善建議", wrap=True, interactive=False)
                                     with gr.Row():
-                                        gr.Markdown("## 修改結果")
+                                        gr.Markdown("## AI 修改建議")
                                     with gr.Row():
-                                        past_exam_refine_output_diff = gr.HTML()
+                                        past_exam_refine_output = gr.HTML(label="修改建議", visible=True)
+                                        past_exam_refine_audio_output = gr.Audio(label="音檔", type="filepath")
 
                             # 最後成果
                             with gr.Row():
-                                gr.Markdown("# 寫作完成")
+                                gr.Markdown("# 自行根據建議修改")
                             with gr.Row():
-                                past_exam_save_button = gr.Button("輸出結果", variant="primary")
-                            with gr.Row():
-                                with gr.Column():
-                                    past_exam_save_output = gr.TextArea(label="最後結果")
-                                with gr.Column():
-                                    past_exam_audio_output = gr.Audio(label="音檔", type="filepath")
-                                
-                                past_exam_save_button.click(
-                                    fn=paragraph_save_and_tts,
-                                    inputs=[past_exam_refine_input],
-                                    outputs=[past_exam_save_output, past_exam_audio_output]
-                                )
+                                past_exam_save_output = gr.TextArea(label="自行修改結果")
 
                             # 建立歷程回顧
                             with gr.Row():
@@ -3605,9 +3580,9 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     gr.Markdown("<span style='color:#4e80ee'>段落改善建議</span>")
                                     past_exam_refine_output_table_history = gr.Dataframe(wrap=True, interactive=False, column_widths=[30, 30, 40])
                         
-                                    gr.Markdown("<span style='color:#4e80ee'>修改建議</span>")
+                                    gr.Markdown("<span style='color:#4e80ee'>AI 修改建議</span>")
                                     past_exam_refine_output_history = gr.Markdown()
-                                    gr.Markdown("<span style='color:#4e80ee'>修改結果</span>")
+                                    gr.Markdown("<span style='color:#4e80ee'>自行修改結果</span>")
                                     past_exam_save_output_history = gr.Markdown()
 
 
@@ -3644,6 +3619,59 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     outputs=past_exam_history_accordion
                                 )
 
+                                # 總分析
+                                past_exam_evaluation_analysis_button.click(
+                                    fn=duplicate_element,
+                                    inputs=past_exam_evaluation_input,
+                                    outputs=past_exam_correct_grammatical_spelling_errors_input,
+                                ).then(
+                                    fn=duplicate_element,
+                                    inputs=past_exam_evaluation_input,
+                                    outputs=past_exam_refine_input
+                                ).then(
+                                    fn=generate_paragraph_evaluate,
+                                    inputs=[
+                                        model,
+                                        max_tokens,
+                                        past_exam_evaluation_sys_content_prompt, 
+                                        past_exam_evaluation_input
+                                    ],
+                                    outputs=past_exam_evaluation_output
+                                ).then(
+                                    fn=generate_correct_grammatical_spelling_errors,
+                                    inputs=[
+                                        model,
+                                        max_tokens,
+                                        past_exam_evaluation_sys_content_prompt, 
+                                        eng_level_input, 
+                                        past_exam_correct_grammatical_spelling_errors_input, 
+                                    ],
+                                    outputs=[
+                                        past_exam_correct_grammatical_spelling_errors_output_table, 
+                                        past_exam_revised_output
+                                    ]
+                                ).then(
+                                    fn=generate_refine_paragraph,
+                                    inputs=[
+                                        model,
+                                        max_tokens,
+                                        past_exam_evaluation_sys_content_prompt,
+                                        eng_level_input,
+                                        past_exam_refine_input,
+                                    ],
+                                    outputs=[
+                                        past_exam_refine_output_table,
+                                        past_exam_refine_output
+                                    ]
+                                ).then(
+                                    fn=paragraph_save_and_tts,
+                                    inputs=[past_exam_refine_output],
+                                    outputs=[
+                                        past_exam_refine_output,
+                                        past_exam_refine_audio_output
+                                    ]
+                                )
+
                                 past_exam_evaluation_button.click(
                                     fn=generate_paragraph_evaluate,
                                     inputs=[
@@ -3668,11 +3696,10 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                         eng_level_input, 
                                         past_exam_correct_grammatical_spelling_errors_input, 
                                     ],
-                                    outputs=[past_exam_correct_grammatical_spelling_errors_output_table, past_exam_revised_output]
-                                ).then(
-                                    fn=highlight_diff_texts,
-                                    inputs=[past_exam_correct_grammatical_spelling_errors_output_table, past_exam_revised_output],
-                                    outputs=past_exam_revised_diff
+                                    outputs=[
+                                        past_exam_correct_grammatical_spelling_errors_output_table,
+                                        past_exam_revised_output
+                                    ]
                                 ).then(
                                     fn=update_paragraph_refine_input,
                                     inputs=[past_exam_correct_grammatical_spelling_errors_input],
@@ -3688,11 +3715,10 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                         eng_level_input,
                                         past_exam_refine_input,
                                     ],
-                                    outputs=[past_exam_refine_output_table, past_exam_refine_output]
-                                ).then(
-                                    fn=highlight_diff_texts,
-                                    inputs=[past_exam_refine_output_table, past_exam_refine_output],
-                                    outputs=past_exam_refine_output_diff
+                                    outputs=[
+                                        past_exam_refine_output_table,
+                                        past_exam_refine_output
+                                    ]
                                 )
                 
             # ===== 英文歷程 ====
@@ -3724,10 +3750,10 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     paragraph_log_paragraph_evaluate_output_history = gr.Dataframe(label="完整段落分析", wrap=True, column_widths=[35, 15, 50], interactive=False)
                                     paragraph_log_correct_grammatical_spelling_errors_output_table_history = gr.Dataframe(label="修訂文法與拼字錯誤", interactive=False, wrap=True, column_widths=[30, 30, 40])
                                     paragraph_log_refine_output_table_history = gr.Dataframe(label="段落改善建議", wrap=True, interactive=False, column_widths=[30, 30, 40])
-                                    gr.Markdown("<span style='color:#4e80ee'>修改建議</span>")
-                                    paragraph_log_refine_output_history = gr.Markdown(label="修改建議")
-                                    gr.Markdown("<span style='color:#4e80ee'>修改結果</span>")
-                                    paragraph_log_paragraph_save_output = gr.Markdown(label="最後結果")
+                                    gr.Markdown("<span style='color:#4e80ee'>AI 修改建議</span>")
+                                    paragraph_log_refine_output_history = gr.Markdown(label="AI 修改建議")
+                                    gr.Markdown("<span style='color:#4e80ee'>自行修改結果</span>")
+                                    paragraph_log_paragraph_save_output = gr.Markdown(label="自行修改結果")
 
                                     get_paragraph_practice_logs_button.click(
                                         fn=get_logs_sessions,
@@ -3776,9 +3802,9 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     gr.Markdown("<span style='color:#4e80ee'>段落改善建議</span>")
                                     log_full_paragraph_refine_output_table_history = gr.Dataframe(wrap=True, interactive=False, column_widths=[30, 30, 40])
                                     
-                                    gr.Markdown("<span style='color:#4e80ee'>修改建議</span>")
+                                    gr.Markdown("<span style='color:#4e80ee'>AI 修改建議</span>")
                                     log_full_paragraph_refine_output_history = gr.Markdown()
-                                    gr.Markdown("<span style='color:#4e80ee'>修改結果</span>")
+                                    gr.Markdown("<span style='color:#4e80ee'>自行修改結果</span>")
                                     log_full_paragraph_save_output_history = gr.Markdown()
 
                                     get_full_paragraph_evaluate_logs_button.click(
@@ -3827,7 +3853,9 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     gr.Markdown("<span style='color:#4e80ee'>段落改善建議</span>")
                                     past_exam_log_refine_output_table_history = gr.Dataframe(wrap=True, interactive=False, column_widths=[30, 30, 40])
                                     
-                                    gr.Markdown("<span style='color:#4e80ee'>最後結果</span>")
+                                    gr.Markdown("<span style='color:#4e80ee'>AI 修改建議</span>")
+                                    past_exam_log_refine_output_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>自行修改結果</span>")
                                     past_exam_log_save_output_history = gr.Markdown()
 
                                     get_past_exam_logs_button.click(
@@ -3847,6 +3875,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                             past_exam_log_correct_grammatical_spelling_errors_output_table_history,
                                             past_exam_log_refine_input_history,
                                             past_exam_log_refine_output_table_history,
+                                            past_exam_log_refine_output_history,
                                             past_exam_log_save_output_history
                                         ]
                                     )