feat: add display diff feature

app.py

@@ -23,6 +23,7 @@ from json_repair import repair_json
 import json_repair  # enable streaming
 
 from chat_history_manager import ChatHistoryManager
+from diff_text import compare_text, extract_modified_sections
 
 # Initialize OpenAI client
 OPENAI_API_KEY = os.getenv('OPENAI_API_KEY')
@@ -402,14 +403,17 @@ def handle_response(message, history, textbox_content):
     handle_response.current_chat_id = chat_id
         
     integrated_message = message
+
+    just_modifications = extract_modified_sections(textbox_content)
+    prev_lesson_plan = just_modifications if just_modifications else textbox_content
     
-    if not (message == CONVERSATION_STARTER or textbox_content == ""):
+    if not (message == CONVERSATION_STARTER or prev_lesson_plan == ""):
         integrated_message = f"""
         用戶當前的需求：
         {message}
 
         用戶對您生成的教案進行了以下修改：
-        {textbox_content}
+        {prev_lesson_plan}
 
         請根據用戶的需求和修改內容，更新教案，並依照步驟生成下一部分內容。
         確保您：
@@ -426,7 +430,7 @@ def handle_response(message, history, textbox_content):
     full_response = ""
     current_lesson_plan = ""
     suggestion = ""
-    next_step_prompt = [[]]
+    next_step_prompt = [[]]    
 
     try:
         with client.beta.threads.runs.stream(
@@ -454,7 +458,7 @@ def handle_response(message, history, textbox_content):
                 # for text in stream.text_deltas:                          
                     # full_response += text                                        
                         
-                    # Debug: Print accumulated response
+                    # Debug: Print accumulated response length
                     print(f"Accumulated response length: {len(full_response)}", flush=True)
                     
                     # Skip if response is too short to be valid JSON
@@ -500,8 +504,13 @@ def handle_response(message, history, textbox_content):
     msg_records.append({'role': 'user', 'content': message})
     msg_records.append({'role': 'assistant', 'content': suggestion})
     chat_manager.save_chat(user_id, chat_id, msg_records, current_lesson_plan)
+    
+    
+    # Compare textbox_content with current_lesson_plan to show differences    
+    compared_lesson_plan = compare_text(prev_lesson_plan, current_lesson_plan) if prev_lesson_plan else current_lesson_plan
+    
 
-    yield suggestion, current_lesson_plan, next_step_prompt
+    yield suggestion, compared_lesson_plan, next_step_prompt
 
 
 def handle_quick_response_click(selected):
@@ -538,11 +547,11 @@ def clear_input():
     return gr.update(value="")
 
 # Handle chat submission
-def chat_submit(message, history):
+def chat_submit(message, history, textbox):
     if message:
         msg_records = [{'role': msg['role'], 'content': msg['content']} for msg in history]
         msg_records.append({'role': 'user', 'content': message})
-        response_generator = handle_response(message, history, textbox.value)
+        response_generator = handle_response(message, history, textbox)
         for suggestion, current_lesson_plan, next_step_prompt in response_generator:            
             yield msg_records + [{'role': 'assistant', 'content': suggestion}], current_lesson_plan, [[]]
     yield msg_records + [{'role': 'assistant', 'content': suggestion}], current_lesson_plan, next_step_prompt
@@ -588,7 +597,7 @@ with gr.Blocks(css="""
 
     prompt_input.submit(
         chat_submit,        
-        inputs=[prompt_input, chatbot],
+        inputs=[prompt_input, chatbot, textbox],
         outputs=[chatbot, textbox, hidden_list]
     ).then(
         clear_input,

diff_text.py

@@ -0,0 +1,80 @@
+# from difflib import unified_diff
+from difflib import SequenceMatcher
+
+SEPERATOR = "\n\n\n=====# 教案變更=====\n\n\n"
+
+def compare_text(text1, text2):
+    """
+    Compare two text strings and return their differences in a human-readable format.
+    
+    Args:
+        text1 (str): Original text string
+        text2 (str): New text string
+        
+    Returns:
+        str: Human-readable formatted differences
+    """
+    if not text1:
+        return text2
+    
+    if text1 == text2:
+        return text2
+    
+    # Split the texts into lines
+    text1_lines = text1.splitlines()
+    text2_lines = text2.splitlines()
+    
+    # Create a more readable diff output
+    output = []
+    # Add the full text2 content
+    output.append(text2)
+    
+    # Add a separator line
+    output.append(SEPERATOR)
+    
+    
+    matcher = SequenceMatcher(None, text1_lines, text2_lines)
+    for op, i1, i2, j1, j2 in matcher.get_opcodes():
+        # if op == 'equal':
+        #     # For unchanged sections, just add them without markers
+        #     for line in text2_lines[j1:j2]:
+        #         output.append(line)
+        if op == 'replace':
+            # Show both removed and added content
+            output.append("\n【修改前】")
+            for line in text1_lines[i1:i2]:
+                output.append(f"- {line}")
+            output.append("\n【修改後】")
+            for line in text2_lines[j1:j2]:
+                output.append(f"+ {line}")
+        elif op == 'delete':
+            # Show removed content
+            output.append("\n【已移除】")
+            for line in text1_lines[i1:i2]:
+                output.append(f"- {line}")
+        elif op == 'insert':
+            # Show added content
+            output.append("\n【新增內容】")
+            for line in text2_lines[j1:j2]:
+                output.append(f"+ {line}")
+    
+    return "\n".join(output)
+
+def extract_modified_sections(compared_text):
+    """
+    Extract the part of the compared text that appears before the SEPERATOR line.
+    
+    Args:
+        compared_text (str): The text returned by compare_text function
+        
+    Returns:
+        str: The content before the SEPERATOR line
+    """
+    if not compared_text:
+        return ""
+    
+    # Split by the separator and return the first part
+    parts = compared_text.split(SEPERATOR, 1)
+    if len(parts) > 0:
+        return parts[0]
+    return ""