gr.Markdown("# 📚 歷程回顧")

app.py

@@ -5,11 +5,15 @@ from openai import OpenAI
 
 import random
 import uuid
+import json
+from datetime import datetime
 
 
 import json
 import tempfile
-import pandas as pd
+
+from storage_service import GoogleCloudStorage
+
 
 
 is_env_local = os.getenv("IS_ENV_LOCAL", "false") == "true"
@@ -21,11 +25,17 @@ if is_env_local:
         config = json.load(f)
         IS_ENV_PROD = "False"
         OPEN_AI_KEY = config["OPEN_AI_KEY"]
+        GCS_KEY = json.dumps(config["GOOGLE_APPLICATION_CREDENTIALS_JSON"])
 else:
     OPEN_AI_KEY = os.getenv("OPEN_AI_KEY")
+    GCS_KEY = os.getenv("GOOGLE_APPLICATION_CREDENTIALS_JSON")
 
 OPEN_AI_CLIENT = OpenAI(api_key=OPEN_AI_KEY)
 
+# 设置 Google Cloud Storage 客户端
+GCS_SERVICE = GoogleCloudStorage(GCS_KEY)
+GCS_CLIENT = GCS_SERVICE.client
+
 def update_scenario_input(scenario_radio):
     return scenario_radio
 
@@ -182,8 +192,6 @@ def generate_points(model, max_tokens, sys_content, scenario, eng_level, topic,
 def update_points_input(points):
     return points
 
-
-
 def generate_topic_sentences(model, max_tokens, sys_content, scenario, eng_level, topic, points, user_generate_topic_sentences_prompt):
     """
     根据系统提示和用户输入的情境及要点，调用OpenAI API生成相关的主题句及其合理性解释。
@@ -405,7 +413,6 @@ def generate_paragraph_evaluate(model, sys_content, paragraph, user_generate_par
 
     return gr_update
 
-
 def generate_correct_grammatical_spelling_errors(model, sys_content, eng_level, paragraph, user_correct_grammatical_spelling_errors_prompt):
     """
     根据用户输入的段落，调用OpenAI API生成相关的文法和拼字错误修正。
@@ -511,20 +518,47 @@ def generate_refine_paragraph(model, sys_content, eng_level, paragraph, user_ref
 def update_paragraph_refine_input(text):
     return text
 
-def generate_paragraph_history(scenario_input,
-                        topic_output,
-                        points_output,
-                        topic_sentence_input,
-                        supporting_sentences_input,
-                        conclusion_sentence_input,
-                        paragraph_output,
-                        paragraph_evaluate_output,
-                        correct_grammatical_spelling_errors_output_table,
-                        refine_output_table,
-                        refine_output):
+def generate_paragraph_history(
+        user_data,
+        session_timestamp,
+        request_origin,
+        scenario_input,
+        topic_output,
+        points_output,
+        topic_sentence_input,
+        supporting_sentences_input,
+        conclusion_sentence_input,
+        paragraph_output,
+        paragraph_evaluate_output,
+        correct_grammatical_spelling_errors_output_table,
+        refine_output_table,
+        refine_output
+    ):
     """
     生成段落歷史紀錄
     """
+    if user_data:
+        file_name = f"{user_data}/jutor_write_paragraph/{session_timestamp}.json"
+        content = {
+            "session_timestamp": session_timestamp,
+            "request_origin": request_origin,
+            "scenario_input": scenario_input,
+            "topic_output": topic_output,
+            "points_output": points_output,
+            "topic_sentence_input": topic_sentence_input,
+            "supporting_sentences_input": supporting_sentences_input,
+            "conclusion_sentence_input": conclusion_sentence_input,
+            "paragraph_output": paragraph_output,
+            "paragraph_evaluate_output": paragraph_evaluate_output.to_dict(orient='records'),
+            "correct_grammatical_spelling_errors_output_table": correct_grammatical_spelling_errors_output_table.to_dict(orient='records'),
+            "refine_output_table": refine_output_table.to_dict(orient='records'),
+            "refine_output": refine_output
+        }
+        print(file_name)
+        print(content)
+        GCS_SERVICE.upload_json_string("jutor_logs", file_name, json.dumps(content))
+    else:
+        pass
 
     return scenario_input, \
             topic_output, \
@@ -537,7 +571,6 @@ def generate_paragraph_history(scenario_input,
             correct_grammatical_spelling_errors_output_table, \
             refine_output_table, \
             refine_output
-        
 
 def paragraph_save_and_tts(paragraph_text):
     """
@@ -569,7 +602,37 @@ def update_history_accordion():
     history_accordion_gr_update = gr.update(open=True)
     return history_accordion_gr_update
 
+def get_logs_sessions(user_data, log_type):
+    if user_data and log_type:
+        file_name_prefix = f"{user_data}/{log_type}"
+        print(f"file_name_prefix: {file_name_prefix}")
+        file_names = GCS_SERVICE.list_files("jutor_logs", file_name_prefix)
+        print(f"file_names: {file_names}")
+    else:
+        file_names = []
+
+    
+    # (name, value) name 取 最後 ../ {}.json
+    choices = [
+        (file_name.split("/")[-1].split(".")[0], file_name) for file_name in file_names
+    ]
+
+    paragraph_logs_session_list = gr.update(choices=choices, interactive=True, visible=True)
+
+    return paragraph_logs_session_list
+
+def get_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)
+    else:
+        content_json = None
+
+    return content_json
 
+
+# === 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
 
@@ -693,6 +756,14 @@ def init_params(request: gr.Request):
         else:
             raise gr.Error("Invalid origin")
         
+        # admin_group visible in local
+        if is_env_local:
+            admin_group = gr.update(visible=True)
+
+        # session timestamp 用 2024-01-01-12-00-00 格式
+        session_timestamp = datetime.now().strftime('%Y-%m-%d-%H-%M-%S')
+
+        
         if "language" in query_params:
             if query_params["language"] == "english":
                 print(f"language: english")
@@ -703,39 +774,7 @@ def init_params(request: gr.Request):
                 english_group = gr.update(visible=False)
                 chinese_group = gr.update(visible=True)
         
-    return request_origin, english_group, chinese_group
-
-def update_english_grapragh_practice_rows(selected_tab):    
-    if selected_tab == "📝 英文段落寫作練習":
-        gr_update_english_grapragh_practice_row = gr.update(visible=True)
-        gr_update_english_grapragh_evaluate_row = gr.update(visible=False)
-        gr_update_english_exam_practice_row = gr.update(visible=False)
-        gr_update_english_grapragh_practice_button = gr.update(variant="primary")
-        gr_update_english_grapragh_evaluate_button = gr.update(variant="secondary")
-        gr_update_english_exam_practice_tab_button = gr.update(variant="secondary")
-        
-    elif selected_tab == "📊 英文段落寫作評分":
-        gr_update_english_grapragh_practice_row = gr.update(visible=False)
-        gr_update_english_grapragh_evaluate_row = gr.update(visible=True)
-        gr_update_english_exam_practice_row = gr.update(visible=False)
-        gr_update_english_grapragh_practice_button = gr.update(variant="secondary")
-        gr_update_english_grapragh_evaluate_button = gr.update(variant="primary")
-        gr_update_english_exam_practice_tab_button = gr.update(variant="secondary")
-        
-    elif selected_tab == "🎯 英文考古題寫作練習":
-        gr_update_english_grapragh_practice_row = gr.update(visible=False)
-        gr_update_english_grapragh_evaluate_row = gr.update(visible=False)
-        gr_update_english_exam_practice_row = gr.update(visible=True)
-        gr_update_english_grapragh_practice_button = gr.update(variant="secondary")
-        gr_update_english_grapragh_evaluate_button = gr.update(variant="secondary")
-        gr_update_english_exam_practice_tab_button = gr.update(variant="primary")
-        
-    return  gr_update_english_grapragh_practice_row, \
-            gr_update_english_grapragh_evaluate_row, \
-            gr_update_english_exam_practice_row, \
-            gr_update_english_grapragh_practice_button, \
-            gr_update_english_grapragh_evaluate_button, \
-            gr_update_english_exam_practice_tab_button
+    return admin_group, session_timestamp, request_origin, english_group, chinese_group
 
 CSS = """
     .accordion-prompts {
@@ -748,9 +787,11 @@ english_grapragh_practice_button_js = """
         document.getElementById("english_grapragh_practice_row").style.display = "block";
         document.getElementById("english_grapragh_evaluate_row").style.display = "none";
         document.getElementById("english_exam_practice_row").style.display = "none";
+        document.getElementById("english_logs_row").style.display = "none";
         document.getElementById("english_grapragh_practice_button").classList.add("primary");
         document.getElementById("english_grapragh_evaluate_button").classList.remove("primary");
         document.getElementById("english_exam_practice_tab_button").classList.remove("primary");
+        document.getElementById("english_logs_tab_button").classList.remove("primary");
 
         return true;
     }
@@ -761,9 +802,11 @@ english_grapragh_evaluate_button_js = """
         document.getElementById("english_grapragh_practice_row").style.display = "none";
         document.getElementById("english_grapragh_evaluate_row").style.display = "block";
         document.getElementById("english_exam_practice_row").style.display = "none";
+        document.getElementById("english_logs_row").style.display = "none";
         document.getElementById("english_grapragh_practice_button").classList.remove("primary");
         document.getElementById("english_grapragh_evaluate_button").classList.add("primary");
         document.getElementById("english_exam_practice_tab_button").classList.remove("primary");
+        document.getElementById("english_logs_tab_button").classList.remove("primary");
     
         return true;
     }
@@ -774,9 +817,26 @@ english_exam_practice_tab_button_js = """
         document.getElementById("english_grapragh_practice_row").style.display = "none";
         document.getElementById("english_grapragh_evaluate_row").style.display = "none";
         document.getElementById("english_exam_practice_row").style.display = "block";
+        document.getElementById("english_logs_row").style.display = "none";
         document.getElementById("english_grapragh_practice_button").classList.remove("primary");
         document.getElementById("english_grapragh_evaluate_button").classList.remove("primary");
         document.getElementById("english_exam_practice_tab_button").classList.add("primary");
+        document.getElementById("english_logs_tab_button").classList.remove("primary");
+
+        return true;
+    }
+"""
+
+english_logs_tab_button_js = """
+    function english_logs_tab_button_click() {
+        document.getElementById("english_grapragh_practice_row").style.display = "none";
+        document.getElementById("english_grapragh_evaluate_row").style.display = "none";
+        document.getElementById("english_exam_practice_row").style.display = "none";
+        document.getElementById("english_logs_row").style.display = "block";
+        document.getElementById("english_grapragh_practice_button").classList.remove("primary");
+        document.getElementById("english_grapragh_evaluate_button").classList.remove("primary");
+        document.getElementById("english_exam_practice_tab_button").classList.remove("primary");
+        document.getElementById("english_logs_tab_button").classList.add("primary");
 
         return true;
     }
@@ -786,6 +846,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
 
     with gr.Row(visible=False) as admin_group:
         user_data = gr.Textbox(label="User Data", value="", elem_id="jutor_user_data_input")
+        session_timestamp = gr.Textbox(label="Session Timestamp", value="", elem_id="jutor_session_timestamp_input")
         request_origin = gr.Textbox(label="Request Domain", value="")
 
     with gr.Row(visible=False) as english_group:
@@ -808,6 +869,8 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                             english_grapragh_evaluate_button = gr.Button("📊 英文段落寫作評分", variant="", elem_id="english_grapragh_evaluate_button")
                         with gr.Column():
                             english_exam_practice_tab_button = gr.Button("🎯 英文考古題寫作練習", variant="", elem_id="english_exam_practice_tab_button")
+                        with gr.Column():
+                            english_logs_tab_button = gr.Button("📚 歷程回顧", variant="", elem_id="english_logs_tab_button")
             # ===== 英文段落寫作練習 =====
             with gr.Row(visible=True, elem_id="english_grapragh_practice_row") as english_grapragh_practice_row:
                 with gr.Column():
@@ -1662,6 +1725,9 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                                 paragraph_save_button.click(
                                     fn=generate_paragraph_history,
                                     inputs=[
+                                        user_data,
+                                        session_timestamp,
+                                        request_origin,
                                         scenario_input,
                                         topic_input,
                                         points_input,
@@ -1922,61 +1988,57 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                                     outputs=past_exam_refine_output_diff
                                 )
                 
-            # english_grapragh_practice_button.click(
-            #     fn=update_english_grapragh_practice_rows,
-            #     inputs=[english_grapragh_practice_button],
-            #     outputs=[
-            #         english_grapragh_practice_row,
-            #         english_grapragh_evaluate_row,
-            #         english_exam_practice_row,
-            #         english_grapragh_practice_button,
-            #         english_grapragh_evaluate_button,
-            #         english_exam_practice_tab_button
-            #     ]
-            # )
+            # ===== 英文歷程 ====
+            with gr.Row(visible=False, elem_id="english_logs_row") as english_logs_row:
+                with gr.Column():
+                    with gr.Row():
+                        gr.Markdown("# 📚 歷程回顧")
+                    with gr.Row():
+                        with gr.Column(scale=1):
+                            # 取得英文段落練習 log from GCS
+                            paragraph_logs_type = gr.State("jutor_write_paragraph")
+                            get_paragraph_logs_button = gr.Button("取得英文段落練習歷程")
+                            paragraph_logs_session_list = gr.Radio(label="歷程時間列表")
+                        with gr.Column(scale=3):
+                            paragraph_logs_session_content = gr.JSON()
+
+                            get_paragraph_logs_button.click(
+                                fn=get_logs_sessions,
+                                inputs=[user_data, paragraph_logs_type],
+                                outputs=[paragraph_logs_session_list]
+                            )
+
+                            paragraph_logs_session_list.select(
+                                fn=get_log_session_content,
+                                inputs=[paragraph_logs_session_list],
+                                outputs=[paragraph_logs_session_content]
+                            )
+
+
             english_grapragh_practice_button.click(
                 None,
                 None,
                 None,
                 js=english_grapragh_practice_button_js
             )
-
-            # english_grapragh_evaluate_button.click(
-            #     fn=update_english_grapragh_practice_rows,
-            #     inputs=[english_grapragh_evaluate_button],
-            #     outputs=[
-            #         english_grapragh_practice_row,
-            #         english_grapragh_evaluate_row,
-            #         english_exam_practice_row,
-            #         english_grapragh_practice_button,
-            #         english_grapragh_evaluate_button,
-            #         english_exam_practice_tab_button
-            #     ]
-            # )
             english_grapragh_evaluate_button.click(
                 None,
                 None,
                 None,
                 js=english_grapragh_evaluate_button_js
             )
-            # english_exam_practice_tab_button.click(
-            #     fn=update_english_grapragh_practice_rows,
-            #     inputs=[english_exam_practice_tab_button],
-            #     outputs=[
-            #         english_grapragh_practice_row,
-            #         english_grapragh_evaluate_row,
-            #         english_exam_practice_row,
-            #         english_grapragh_practice_button,
-            #         english_grapragh_evaluate_button,
-            #         english_exam_practice_tab_button
-            #     ]
-            # )
             english_exam_practice_tab_button.click(
                 None,
                 None,
                 None,
                 js=english_exam_practice_tab_button_js
             )
+            english_logs_tab_button.click(
+                None,
+                None,
+                None,
+                js=english_logs_tab_button_js
+            )
 
 
     with gr.Row(visible=False) as chinese_group:
@@ -2158,6 +2220,8 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
         init_params, 
         inputs =[],
         outputs = [
+            admin_group,
+            session_timestamp,
             request_origin,
             english_group,
             chinese_group

storage_service.py

@@ -0,0 +1,59 @@
+import json
+from google.cloud import storage
+from google.oauth2 import service_account
+from googleapiclient.http import MediaIoBaseDownload
+
+
+class GoogleCloudStorage:
+    def __init__(self, service_account_key_string):
+        credentials_dict = json.loads(service_account_key_string)
+        credentials = service_account.Credentials.from_service_account_info(credentials_dict)
+        self.client = storage.Client(credentials=credentials, project=credentials_dict['project_id'])
+
+    def check_file_exists(self, bucket_name, file_name):
+        blob = self.client.bucket(bucket_name).blob(file_name)
+        return blob.exists()
+
+    def upload_file(self, bucket_name, destination_blob_name, file_path):
+        blob = self.client.bucket(bucket_name).blob(destination_blob_name)
+        blob.upload_from_filename(file_path)
+        print(f"File {file_path} uploaded to {destination_blob_name} in GCS.")
+
+    def upload_file_as_string(self, bucket_name, destination_blob_name, content):
+        blob = self.client.bucket(bucket_name).blob(destination_blob_name)
+        blob.upload_from_string(content)
+        print(f"String content uploaded to {destination_blob_name} in GCS.")
+        return None
+    
+    def upload_json_string(self, bucket_name, destination_blob_name, json_data):
+        """Uploads a JSON string to a specified GCS bucket."""
+        blob = self.client.bucket(bucket_name).blob(destination_blob_name)
+        blob.upload_from_string(json_data, content_type='application/json')
+        print(f"JSON string uploaded to {destination_blob_name} in GCS.")
+
+    def download_as_string(self, bucket_name, source_blob_name):
+        blob = self.client.bucket(bucket_name).blob(source_blob_name)
+        return blob.download_as_text()
+
+    def make_blob_public(self, bucket_name, blob_name):
+        blob = self.client.bucket(bucket_name).blob(blob_name)
+        blob.make_public()
+        print(f"Blob {blob_name} is now publicly accessible at {blob.public_url}")
+
+    def get_public_url(self, bucket_name, blob_name):
+        blob = self.client.bucket(bucket_name).blob(blob_name)
+        return blob.public_url
+
+    def upload_image_and_get_public_url(self, bucket_name, file_name, file_path):
+        self.upload_file(bucket_name, file_name, file_path)
+        self.make_blob_public(bucket_name, file_name)
+        return self.get_public_url(bucket_name, file_name)
+    
+    def delete_blob(self, bucket_name, blob_name):
+        blob = self.client.bucket(bucket_name).blob(blob_name)
+        blob.delete()
+        print(f"Blob {blob_name} deleted from {bucket_name}.")
+
+    def list_files(self, bucket_name, prefix=None):
+        blobs = self.client.bucket(bucket_name).list_blobs(prefix=prefix)
+        return [blob.name for blob in blobs]