fn=get_past_exam_practice_log_session_content,

app.py

@@ -758,6 +758,92 @@ def get_full_paragraph_evaluate_log_session_content(file_name):
             full_paragraph_save_output
 
 
+# # 考古題練習歷史紀錄
+def generate_past_exam_history(
+        user_data,
+        session_timestamp,
+        request_origin,
+        past_exam_title,
+        past_exam_evaluation_input,
+        past_exam_evaluation_output,
+        past_exam_correct_grammatical_spelling_errors_input,
+        past_exam_correct_grammatical_spelling_errors_output_table,
+        past_exam_refine_input,
+        past_exam_refine_output_table,
+        past_exam_refine_output,
+        past_exam_save_output
+    ):
+    print("====生成考古題練習歷史紀錄====")
+    print(f"user_data: {user_data}")
+    print(f"session_timestamp: {session_timestamp}")
+    print(f"request_origin: {request_origin}")
+
+    if user_data:
+        encoded_user_id_url = urllib.parse.quote(user_data, safe='')
+        log_type_name = "jutor_write_past_exam"
+        file_name = f"{encoded_user_id_url}/{log_type_name}/{session_timestamp}.json"
+        content = {
+            "session_timestamp": session_timestamp,
+            "request_origin": request_origin,
+            "past_exam_title": past_exam_title,
+            "past_exam_evaluation_input": past_exam_evaluation_input,
+            "past_exam_evaluation_output": past_exam_evaluation_output.to_dict(orient='records'),
+            "past_exam_correct_grammatical_spelling_errors_input": past_exam_correct_grammatical_spelling_errors_input,
+            "past_exam_correct_grammatical_spelling_errors_output_table": past_exam_correct_grammatical_spelling_errors_output_table.to_dict(orient='records'),
+            "past_exam_refine_input": past_exam_refine_input,
+            "past_exam_refine_output_table": past_exam_refine_output_table.to_dict(orient='records'),
+            "past_exam_refine_output": past_exam_refine_output,
+            "past_exam_save_output": past_exam_save_output
+        }
+        print(file_name)
+        print(content)
+        GCS_SERVICE.upload_json_string("jutor_logs", file_name, json.dumps(content))
+    
+    return past_exam_title, \
+            past_exam_evaluation_input, \
+            past_exam_evaluation_output, \
+            past_exam_correct_grammatical_spelling_errors_input, \
+            past_exam_correct_grammatical_spelling_errors_output_table, \
+            past_exam_refine_input, \
+            past_exam_refine_output_table, \
+            past_exam_refine_output, \
+            past_exam_save_output
+
+def get_past_exam_practice_log_session_content(file_name):
+    if file_name:
+        content = GCS_SERVICE.download_as_string("jutor_logs", file_name)
+        print(f"content: {content}")
+        content_json = json.loads(content)
+        past_exam_title = content_json["past_exam_title"]
+        past_exam_evaluation_input = content_json["past_exam_evaluation_input"]
+        past_exam_evaluation_output = pd.DataFrame(content_json["past_exam_evaluation_output"])
+        past_exam_correct_grammatical_spelling_errors_input = content_json["past_exam_correct_grammatical_spelling_errors_input"]
+        past_exam_correct_grammatical_spelling_errors_output_table = pd.DataFrame(content_json["past_exam_correct_grammatical_spelling_errors_output_table"])
+        past_exam_refine_input = content_json["past_exam_refine_input"]
+        past_exam_refine_output_table = pd.DataFrame(content_json["past_exam_refine_output_table"])
+        past_exam_refine_output = content_json["past_exam_refine_output"]
+        past_exam_save_output = content_json["past_exam_save_output"]
+    else:
+        past_exam_title = ""
+        past_exam_evaluation_input = ""
+        past_exam_evaluation_output = pd.DataFrame()
+        past_exam_correct_grammatical_spelling_errors_input = ""
+        past_exam_correct_grammatical_spelling_errors_output_table = pd.DataFrame()
+        past_exam_refine_input = ""
+        past_exam_refine_output_table = pd.DataFrame()
+        past_exam_refine_output = ""
+        past_exam_save_output = ""
+
+    return past_exam_title, \
+            past_exam_evaluation_input, \
+            past_exam_evaluation_output, \
+            past_exam_correct_grammatical_spelling_errors_input, \
+            past_exam_correct_grammatical_spelling_errors_output_table, \
+            past_exam_refine_input, \
+            past_exam_refine_output_table, \
+            past_exam_refine_output, \
+            past_exam_save_output
+
 # === Chinese ===
 def generate_chinese_evaluation_table(model, sys_content, user_prompt, text):
     # https://www.ceec.edu.tw/files/file_pool/1/0j052575870800204600/1216%E5%9C%8B%E6%96%87%E4%BD%9C%E6%96%87%E5%88%86%E9%A0%85%E5%BC%8F%E8%A9%95%E5%88%86%E6%8C%87%E6%A8%99.pdf
@@ -2138,7 +2224,88 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                                         gr.Markdown("## 修改結果")
                                     with gr.Row():
                                         past_exam_refine_output_diff = gr.HTML()
+
+                            # 最後成果
+                            with gr.Row():
+                                gr.Markdown("# 寫作完成")
+                            with gr.Row():
+                                past_exam_save_button = gr.Button("輸出結果", variant="primary")
+                            with gr.Row():
+                                with gr.Column():
+                                    past_exam_save_output = gr.Textbox(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]
+                                )
+
+                            # 建立歷程回顧
+                            with gr.Row():
+                                gr.Markdown("# 建立歷程回顧")
+                            with gr.Row():
+                                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>")
+                                    past_exam_dropdown_history = gr.Markdown()
+
+                                    gr.Markdown("<span style='color:#4e80ee'>段落全文</span>")
+                                    past_exam_input_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>段落全文分析</span>")
+                                    past_exam_evaluate_output_history = gr.Dataframe(wrap=True, column_widths=[35, 15, 50], interactive=False)
+                                    
+                                    gr.Markdown("<span style='color:#4e80ee'>文法與拼字錯誤</span>")
+                                    past_exam_correct_grammatical_spelling_errors_input_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>修訂文法與拼字錯誤</span>")
+                                    past_exam_correct_grammatical_spelling_errors_output_table_history = gr.Dataframe(interactive=False, wrap=True, column_widths=[30, 30, 40])
+                                    
+                                    gr.Markdown("<span style='color:#4e80ee'>段落改善</span>")
+                                    past_exam_refine_input_history = gr.Markdown()
+                                    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>")
+                                    past_exam_refine_output_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>修改結果</span>")
+                                    past_exam_save_output_history = gr.Markdown()
+
+
+                                past_exam＿history_save_button.click(  
+                                    fn=generate_past_exam_history,
+                                    inputs=[
+                                        user_data,
+                                        session_timestamp,
+                                        request_origin,
+                                        past_exam_dropdown,
+                                        past_exam_evaluation_input,
+                                        past_exam_evaluation_output,
+                                        past_exam_correct_grammatical_spelling_errors_input,
+                                        past_exam_correct_grammatical_spelling_errors_output_table,
+                                        past_exam_refine_input,
+                                        past_exam_refine_output_table,
+                                        past_exam_refine_output,
+                                        past_exam_save_output
+                                    ],
+                                    outputs=[
+                                        past_exam_dropdown_history,
+                                        past_exam_input_history,
+                                        past_exam_evaluate_output_history,
+                                        past_exam_correct_grammatical_spelling_errors_input_history,
+                                        past_exam_correct_grammatical_spelling_errors_output_table_history,
+                                        past_exam_refine_input_history,
+                                        past_exam_refine_output_table_history,
+                                        past_exam_refine_output_history,
+                                        past_exam_save_output_history
+                                    ]
+                                ).then(
+                                    fn=update_history_accordion,
+                                    inputs=[],
+                                    outputs=past_exam_history_accordion
+                                )
+
                                 past_exam_evaluation_button.click(
                                     fn=generate_paragraph_evaluate,
                                     inputs=[model, past_exam_evaluation_sys_content_prompt, past_exam_evaluation_input, past_exam_evaluation_user_prompt],
@@ -2279,8 +2446,56 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                                             log_full_paragraph_save_output_history
                                         ]
                                     )
-                                            
+                    with gr.Row():
+                        with gr.Accordion("英文考古題寫作練習歷程回顧", open=False) as english_exam_practice_logs_accordion:
+                            with gr.Row():
+                                with gr.Column(scale=1):
+                                    # 取得英文段落練習 log from GCS
+                                    past_exam_logs_type = gr.State("jutor_write_past_exam")
+                                    get_past_exam_logs_button = gr.Button("取得英文考古題寫作練習歷程")
+                                    past_exam_logs_session_list = gr.Radio(label="歷程時間列表")
+                                with gr.Column(scale=3, variant="compact"):
+                                    gr.Markdown("<span style='color:#4e80ee'>考古題</span>")
+                                    past_exam_log_dropdown_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>段落全文</span>")
+                                    past_exam_log_input_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>段落全文分析</span>")
+                                    past_exam_log_evaluate_output_history = gr.Dataframe(wrap=True, column_widths=[35, 15, 50], interactive=False)
+                                    
+                                    gr.Markdown("<span style='color:#4e80ee'>文法與拼字錯誤</span>")
+                                    past_exam_log_correct_grammatical_spelling_errors_input_history = gr.Markdown()
+                                    gr.Markdown("<span style='color:#4e80ee'>修訂文法與拼字錯誤</span>")
+                                    past_exam_log_correct_grammatical_spelling_errors_output_table_history = gr.Dataframe(interactive=False, wrap=True, column_widths=[30, 30, 40])
+                                    
+                                    gr.Markdown("<span style='color:#4e80ee'>段落改善</span>")
+                                    past_exam_log_refine_input_history = gr.Markdown()
+                                    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>")
+                                    past_exam_log_save_output_history = gr.Markdown()
 
+                                    get_past_exam_logs_button.click(
+                                        fn=get_logs_sessions,
+                                        inputs=[user_data, past_exam_logs_type],
+                                        outputs=[past_exam_logs_session_list]
+                                    )
+
+                                    past_exam_logs_session_list.select(
+                                        fn=get_past_exam_practice_log_session_content,
+                                        inputs=[past_exam_logs_session_list],
+                                        outputs=[
+                                            past_exam_log_dropdown_history,
+                                            past_exam_log_input_history,
+                                            past_exam_log_evaluate_output_history,
+                                            past_exam_log_correct_grammatical_spelling_errors_input_history,
+                                            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_save_output_history
+                                        ]
+                                    )
+                                                
             english_grapragh_practice_button.click(
                 None,
                 None,