update

app.py

@@ -718,7 +718,7 @@ def get_reading_passage(video_id, df_string, source):
         print("===get_reading_passage on gcs===")
         gcs_client = GCS_CLIENT
         bucket_name = 'video_ai_assistant'
-        file_name = f'{video_id}_reading_passage.json'
+        file_name = f'{video_id}_reading_passage_latex.json'
         blob_name = f"{video_id}/{file_name}"
         # 检查 reading_passage 是否存在
         is_file_exists = GCS_SERVICE.check_file_exists(bucket_name, blob_name)
@@ -883,7 +883,7 @@ def get_video_id_summary(video_id, df_string, source):
         print("===get_video_id_summary on gcs===")
         gcs_client = GCS_CLIENT
         bucket_name = 'video_ai_assistant'
-        file_name = f'{video_id}_summary.json'
+        file_name = f'{video_id}_summary_markdown.json'
         summary_file_blob_name = f"{video_id}/{file_name}"
         # 检查 summary_file 是否存在
         is_summary_file_exists = GCS_SERVICE.check_file_exists(bucket_name, summary_file_blob_name)
@@ -1448,9 +1448,9 @@ def get_LLM_content(video_id, kind):
     if is_file_exists:
         content = download_blob_to_string(gcs_client, bucket_name, blob_name)
         content_json = json.loads(content)
-        if kind == "reading_passage":
+        if kind == "reading_passage_latex":
             content_text = content_json["reading_passage"]
-        elif kind == "summary":
+        elif kind == "summary_markdown":
             content_text = content_json["summary"]
         else:
             content_text = json.dumps(content_json, ensure_ascii=False, indent=2)
@@ -1481,14 +1481,14 @@ def update_LLM_content(video_id, new_content, kind):
     file_name = f'{video_id}_{kind}.json'
     blob_name = f"{video_id}/{file_name}"
 
-    if kind == "reading_passage":
+    if kind == "reading_passage_latex":
         print("=========reading_passage=======")
         print(new_content)
         reading_passage_json = {"reading_passage": str(new_content)}
         reading_passage_text = json.dumps(reading_passage_json, ensure_ascii=False, indent=2)
         upload_file_to_gcs_with_json_string(gcs_client, bucket_name, blob_name, reading_passage_text)
         updated_content = new_content
-    elif kind == "summary":
+    elif kind == "summary_markdown":
         summary_json = {"summary": str(new_content)}
         summary_text = json.dumps(summary_json, ensure_ascii=False, indent=2)
         upload_file_to_gcs_with_json_string(gcs_client, bucket_name, blob_name, summary_text)
@@ -1535,10 +1535,10 @@ def create_LLM_content(video_id, df_string, kind):
     print(f"===create_{kind}===")
     print(f"video_id: {video_id}")
 
-    if kind == "reading_passage":
+    if kind == "reading_passage_latex":
         content = generate_reading_passage(df_string)
         update_LLM_content(video_id, content, kind)
-    elif kind == "summary":
+    elif kind == "summary_markdown":
         content = generate_summarise(df_string)
         update_LLM_content(video_id, content, kind)
     elif kind == "mind_map":
@@ -1975,11 +1975,27 @@ def chat_with_opan_ai_assistant(password, youtube_id, user_data, thread_id, tras
 
         # 创建线程
         if not thread_id:
-            thread = client.beta.threads.create()
+            thread = client.beta.threads.create(
+
+            )
             thread_id = thread.id
         else:
             thread = client.beta.threads.retrieve(thread_id)
         
+        # add meta data to thread
+        client.beta.threads.update(
+            thread_id=thread_id,
+            metadata={
+                "youtube_id": youtube_id,
+                "user_data": user_data,
+                "content_subject": content_subject,
+                "content_grade": content_grade,
+                "socratic_mode": socratic_mode,
+                "assistant_id": assistant_id,
+                "is_streaming": "false",
+            }
+        )           
+
         # 向线程添加用户的消息
         client.beta.threads.messages.create(
             thread_id=thread.id,
@@ -2088,7 +2104,7 @@ def poll_run_status(run_id, thread_id, timeout=600, poll_interval=5):
     
     return run.status
 
-def streaming_chat_with_open_ai(user_message, chat_history, password, user_data, thread_id, trascript, key_moments, content_subject, content_grade):
+def streaming_chat_with_open_ai(user_message, chat_history, password, video_id, user_data, thread_id, trascript, key_moments, content_subject, content_grade):
     verify_password(password)
 
     print("=====user_data=====")
@@ -2127,6 +2143,8 @@ def streaming_chat_with_open_ai(user_message, chat_history, password, user_data,
         # key_moments_json remove images
         for moment in key_moments_json:
             moment.pop('images', None)
+            moment.pop('end', None)
+            moment.pop('transcript', None)
         key_moments_text = json.dumps(key_moments_json, ensure_ascii=False)
 
         instructions = get_instructions(content_subject, content_grade, key_moments_text)
@@ -2139,6 +2157,18 @@ def streaming_chat_with_open_ai(user_message, chat_history, password, user_data,
             thread = client.beta.threads.retrieve(thread_id)
             print(f"old thread_id: {thread_id}")
         
+        client.beta.threads.update(
+            thread_id=thread_id,
+            metadata={
+                "youtube_id": video_id,
+                "user_data": user_data,
+                "content_subject": content_subject,
+                "content_grade": content_grade,
+                "assistant_id": assistant_id,
+                "is_streaming": "true",
+            }
+        )    
+        
         # 向线程添加用户的消息
         client.beta.threads.messages.create(
             thread_id=thread.id,
@@ -2438,7 +2468,7 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                     🔠 鍵盤輸入你的問題，我會盡力回答你的問題喔！\n
                     💤 我還在成長，體力有限，每一次學習只能回答十個問題，請讓我休息一下再問問題喔！
                     """
-                additional_inputs = [password, user_data, streaming_chat_thread_id_state, trascript_state, key_moments_state, content_subject_state, content_grade_state]
+                additional_inputs = [password, video_id, user_data, streaming_chat_thread_id_state, trascript_state, key_moments_state, content_subject_state, content_grade_state]
                 streaming_chat = gr.ChatInterface(
                     fn=streaming_chat_with_open_ai,
                     additional_inputs=additional_inputs,
@@ -2577,37 +2607,37 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                 transcript_edit_button = gr.Button("編輯", size="sm", variant="primary")
                 transcript_update_button = gr.Button("儲存", size="sm", variant="primary")
                 transcript_delete_button = gr.Button("刪除", size="sm", variant="primary")
-                transcript_create_button = gr.Button("建立", size="sm", variant="primary")
+                transcript_create_button = gr.Button("重建", size="sm", variant="primary")
             with gr.Row():
                 df_string_output = gr.Textbox(lines=40, label="Data Text", interactive=False, show_copy_button=True)
         with gr.Tab("文章本文"):
             with gr.Row() as reading_passage_admin:
                 with gr.Column():
                     with gr.Row():
-                        reading_passage_kind = gr.Textbox(value="reading_passage", show_label=False)
+                        reading_passage_kind = gr.Textbox(value="reading_passage_latex", show_label=False)
                     with gr.Row():
-                        reading_passage_text_to_latex = gr.Button("新增 LaTeX", size="sm", variant="primary")
+                        # reading_passage_text_to_latex = gr.Button("新增 LaTeX", size="sm", variant="primary")
                         reading_passage_get_button = gr.Button("取得", size="sm", variant="primary")
                         reading_passage_edit_button = gr.Button("編輯", size="sm", variant="primary")
-                        reading_passage_update_button = gr.Button("更新", size="sm", variant="primary")
+                        reading_passage_update_button = gr.Button("儲存", size="sm", variant="primary")
                         reading_passage_delete_button = gr.Button("刪除", size="sm", variant="primary")
-                        reading_passage_create_button = gr.Button("建立", size="sm", variant="primary")
+                        reading_passage_create_button = gr.Button("重建", size="sm", variant="primary")
             with gr.Row():
-                reading_passage_text = gr.Textbox(label="reading_passage", lines=40, interactive=False, show_copy_button=True)
+                reading_passage_text = gr.Textbox(label="reading_passage_latex", lines=40, interactive=False, show_copy_button=True)
         with gr.Tab("重點摘要本文"):
             with gr.Row() as summary_admmin:
                 with gr.Column():
                     with gr.Row():
-                        summary_kind = gr.Textbox(value="summary", show_label=False)
+                        summary_kind = gr.Textbox(value="summary_markdown", show_label=False)
                     with gr.Row():
-                        summary_to_markdown = gr.Button("新增 Markdown", size="sm", variant="primary")
+                        # summary_to_markdown = gr.Button("新增 Markdown", size="sm", variant="primary")
                         summary_get_button = gr.Button("取得", size="sm", variant="primary")
                         summary_edit_button = gr.Button("編輯", size="sm", variant="primary")
-                        summary_update_button = gr.Button("更新", size="sm", variant="primary")
+                        summary_update_button = gr.Button("儲存", size="sm", variant="primary")
                         summary_delete_button = gr.Button("刪除", size="sm", variant="primary")
-                        summary_create_button = gr.Button("建立", size="sm", variant="primary")
+                        summary_create_button = gr.Button("重建", size="sm", variant="primary")
             with gr.Row():
-                summary_text = gr.Textbox(label="Summary", lines=40, interactive=False, show_copy_button=True)
+                summary_text = gr.Textbox(label="summary_markdown", lines=40, interactive=False, show_copy_button=True)
         with gr.Tab("關鍵時刻本文"):
             with gr.Row() as key_moments_admin:
                 key_moments_kind = gr.Textbox(value="key_moments", show_label=False)
@@ -2615,7 +2645,7 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
                 key_moments_edit_button = gr.Button("編輯", size="sm", variant="primary")
                 key_moments_update_button = gr.Button("儲存", size="sm", variant="primary")
                 key_moments_delete_button = gr.Button("刪除", size="sm", variant="primary")
-                key_moments_create_button = gr.Button("建立", size="sm", variant="primary")
+                key_moments_create_button = gr.Button("重建", size="sm", variant="primary")
             with gr.Row():
                 key_moments = gr.Textbox(label="Key Moments", lines=40, interactive=False, show_copy_button=True)
         with gr.Tab("問題本文"):
@@ -2806,11 +2836,11 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
     # web_link.change(process_web_link, inputs=web_link, outputs=[btn_1, btn_2, btn_3, df_summarise, df_string_output])
 
     # reading_passage event
-    reading_passage_text_to_latex.click(
-        reading_passage_add_latex_version,
-        inputs=[video_id],
-        outputs=[reading_passage_text]
-    )
+    # reading_passage_text_to_latex.click(
+    #     reading_passage_add_latex_version,
+    #     inputs=[video_id],
+    #     outputs=[reading_passage_text]
+    # )
     reading_passage_get_button.click(
         get_LLM_content,
         inputs=[video_id, reading_passage_kind],
@@ -2838,11 +2868,11 @@ with gr.Blocks(theme=gr.themes.Base(primary_hue=gr.themes.colors.orange, seconda
     )
 
     # summary event
-    summary_to_markdown.click(
-        summary_add_markdown_version,
-        inputs=[video_id],
-        outputs=[summary_text]
-    )
+    # summary_to_markdown.click(
+    #     summary_add_markdown_version,
+    #     inputs=[video_id],
+    #     outputs=[summary_text]
+    # )
     summary_get_button.click(
         get_LLM_content,
         inputs=[video_id, summary_kind],