generate_paragraph_evaluate_button.click(

app.py

@@ -548,7 +548,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     gr.Markdown("# Step 1. 確定段落主題")
                 with gr.Row():
                     with gr.Column():
-                        gr.Markdown("""## 主題是整個段落要探討、闡述的主要議題。確定主題對於段落的架構、內容非常重要，幫助讀者預期段落的內容，增加閱讀的速度及理解度。寫作過程中，掌握主題可以幫助作者有效傳達自己的想法和觀點，幫助讀者更容易理解。""")
+                        gr.Markdown("""## 主題是整個段落要探討、闡述的主要議題。確定主題對於段落的架構、內容非常重要。""")
                     with gr.Column():
                         with gr.Accordion("參考指引：情境與主題如何搭配呢？", open=False):
                             gr.Markdown("""
@@ -611,11 +611,11 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     """  
                     user_generate_points_prompt = gr.Textbox(label="Points Prompt", value=default_generate_points_prompt, visible=False)
                 with gr.Row() as points_html:
-                    gr.Markdown("# Step 2. 寫出關鍵字")
+                    gr.Markdown("# Step 2. 找關鍵字")
                 with gr.Row():
-                    gr.Markdown("## 根據主題，試著寫出 1-3 個關鍵字。關鍵字務必選擇比較相關的，才好寫入一個段落。不相關的關鍵字會讓段落缺乏連貫一致性。")
+                    gr.Markdown("## 根據主題，思考段落的方向及內容，然後用兩個要點／關鍵字來呈現。例如主題：「The Benefits of Learning a Second Language 學習第二種語言的好處」，內容及方向：因為學習第二種語言，例如日語，就可以和日本人溝通，進而學習瞭解日本文化，因而要點／關鍵字就是「Improving communication skills 提升溝通能力」及「Understanding other cultures 瞭解其他文化」。")
                 with gr.Row():
-                    gr.Markdown("### 基礎級使用者先從 1 個要點開始練習，比較好掌握；等熟悉之後再選擇 2-3 個要點來發揮。")
+                    gr.Markdown("### 如果不知道要寫什麼，也可以讓Jutor提供要點／關鍵字，以兩個要點／關鍵字為限。")
                 with gr.Row():
                     with gr.Column():
                         points_input = gr.Textbox(label="#1 關鍵字")
@@ -674,12 +674,12 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     user_generate_topic_sentences_prompt = gr.Textbox(label="Topic Sentences Prompt", value=default_generate_topic_sentences_prompt, visible=False)
 
                 with gr.Row() as topic_sentences_html:    
-                    gr.Markdown("# Step 4. 選定主題句")
+                    gr.Markdown("# Step 4. 寫主題句")
                 with gr.Row():      
                     with gr.Column():
-                        gr.Markdown("## 主題句（Topic Sentence）是一個段落中最重要的句子，它介紹主題並含括該段落的所有要點，引起讀者的興趣。就像藍圖一樣，指出客廳、廚房、臥室等位置。")
-                        gr.Markdown("## 主題句通常位於段落的開頭，幫助讀者迅速理解段落的內容。如果沒有主題句，段落的架構及內容的一致性及連貫性就會受影響。")
-                        gr.Markdown("## 主題句的範圍，應能適當含括你剛才決定的各個要點，範圍不要太大，以致無法在一個段落清楚説明，也不能太小，無法含括段落的所有要點。")
+                        gr.Markdown("## 主題句（Topic Sentence）通常位於段落的開頭，幫助讀者迅速理解段落的內容。是段落中最重要的句子，介紹主題並含括段落的所有要點／關鍵字。")
+                        gr.Markdown("## 例如：「Learning a second language improves communication skills and helps you understand other cultures better. Learning a second language」 是主題， 「improving communication skills 和 understanding other cultures」 則是兩個要點／關鍵字。")
+                        gr.Markdown("## 書寫段落時，必須確保每個句子都支持和闡述主題句，避免引入無關或偏離主題的討論，否則就會影響段落的架構及內容的一致性及連貫性。")
                     with gr.Column():
                         with gr.Accordion("參考指引：合適的主題句？", open=False):
                             gr.Markdown("""舉例，情境是 `School & Learning`，段落主題是 `Time Management`，那麼 `Balancing school work and leisure time is a crucial aspect of effective time management` 就是合適的主題句，因為它清楚點出該段落將説明有效運用時間來讓課業及娛樂取得平衡。""")
@@ -830,7 +830,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     user_generate_conclusion_sentence_prompt = gr.Textbox(label="Conclusion Sentence Prompt", value=default_generate_conclusion_sentence_prompt, visible=False)
                 
                 with gr.Row() as conclusion_sentences_html:
-                    gr.Markdown("# Step 6. 寫出結論句")
+                    gr.Markdown("# Step 5. 寫出結論句")
                 with gr.Row():
                     with gr.Column():
                         gr.Markdown("## 總結主要觀點，強化整個資訊的傳遞。重述、摘要、回應或評論主題句。")
@@ -1003,17 +1003,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                 with gr.Row():
                     paragraph_evaluate_output = gr.Dataframe(label="完整段落分析", wrap=True, column_widths=[35, 15, 50], interactive=False)
 
-                    generate_paragraph_evaluate_button.click(
-                        fn=generate_paragraph_evaluate,
-                        inputs=[
-                            model,
-                            sys_content_input,
-                            paragraph_output,
-                            user_generate_paragraph_evaluate_prompt
-                        ],
-                        outputs=paragraph_evaluate_output
-                    )
-        
         # 修訂文法與拼字錯誤
         with gr.Row():
             with gr.Column():
@@ -1058,7 +1047,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     user_correct_grammatical_spelling_errors_prompt = gr.Textbox(label="Correct Grammatical and Spelling Errors Prompt", value=default_user_correct_grammatical_spelling_errors_prompt, visible=False)
                 
                 with gr.Row() as paragraph_correct_grammatical_spelling_errors_html:
-                    gr.Markdown("# Step 8. 修訂文法與拼字錯誤")
+                    gr.Markdown("# Step 7. 修訂文法與拼字錯誤")
                 with gr.Row():
                     with gr.Column():
                         gr.Markdown("## 修訂文法與拼字錯誤（Correct Grammatical and Spelling Errors）")
@@ -1078,29 +1067,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                         gr.Markdown("## 修訂結果")
                         revised_paragraph_diff = gr.HTML()
 
-                        generate_correct_grammatical_spelling_errors_button.click(
-                            fn=generate_correct_grammatical_spelling_errors,
-                            inputs=[
-                                model,
-                                sys_content_input,
-                                eng_level_input,
-                                paragraph_output,
-                                user_correct_grammatical_spelling_errors_prompt,
-                            ],
-                            outputs=[
-                                correct_grammatical_spelling_errors_output_table, 
-                                revised_paragraph_output
-                            ]
-                        ).then(
-                            fn=highlight_diff_texts,
-                            inputs=[correct_grammatical_spelling_errors_output_table, revised_paragraph_output],
-                            outputs=revised_paragraph_diff
-                        ).then(
-                            fn=update_paragraph_correct_grammatical_spelling_errors_input,
-                            inputs=[paragraph_output],
-                            outputs=paragraph_correct_grammatical_spelling_errors_input
-                        )
-
         # 段落改善建議
         with gr.Row():
             with gr.Column():
@@ -1136,7 +1102,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                     user_refine_paragraph_prompt = gr.Textbox(label="Refine Paragraph Prompt", value=default_user_refine_paragraph_prompt, visible=False)
                 
                 with gr.Row() as paragraph_refine_html:
-                    gr.Markdown("# Step 9. 段落改善建議（Refine Paragraph）")
+                    gr.Markdown("# Step 8. 段落改善建議（Refine Paragraph）")
                     with gr.Accordion("參考指引：段落改善建議？", open=False ):
                         gr.Markdown("""
                             - 段落寫作的過程，如果全程採用 JUTOR 的建議例句，在這部分的批改可能會發生自我修訂的現象。例如：為了符合級別需求，JUTOR 會將自已建議的例句，以換句話說的方式再次修改，你可以忽略。
@@ -1152,25 +1118,59 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                         gr.Markdown("## 修改結果")
                         refine_output_diff = gr.HTML()
 
-                        generate_refine_paragraph_button.click(
-                            fn=generate_refine_paragraph,
-                            inputs=[
-                                model,
-                                sys_content_input,
-                                eng_level_input,
-                                paragraph_correct_grammatical_spelling_errors_input,
-                                user_refine_paragraph_prompt
-                            ],
-                            outputs=[refine_output_table, refine_output]
-                        ).then(
-                            fn=highlight_diff_texts,
-                            inputs=[refine_output_table, refine_output],
-                            outputs=refine_output_diff
-                        ).then(
-                            fn=update_paragraph_refine_input,
-                            inputs=[paragraph_correct_grammatical_spelling_errors_input],
-                            outputs=paragraph_refine_input
-                        )
+        generate_paragraph_evaluate_button.click(
+            fn=generate_paragraph_evaluate,
+            inputs=[
+                model,
+                sys_content_input,
+                paragraph_output,
+                user_generate_paragraph_evaluate_prompt
+            ],
+            outputs=paragraph_evaluate_output
+        ).then(
+            fn=update_paragraph_correct_grammatical_spelling_errors_input,
+            inputs=[paragraph_output],
+            outputs=paragraph_correct_grammatical_spelling_errors_input
+        )
+
+        generate_correct_grammatical_spelling_errors_button.click(
+            fn=generate_correct_grammatical_spelling_errors,
+            inputs=[
+                model,
+                sys_content_input,
+                eng_level_input,
+                paragraph_output,
+                user_correct_grammatical_spelling_errors_prompt,
+            ],
+            outputs=[
+                correct_grammatical_spelling_errors_output_table, 
+                revised_paragraph_output
+            ]
+        ).then(
+            fn=highlight_diff_texts,
+            inputs=[correct_grammatical_spelling_errors_output_table, revised_paragraph_output],
+            outputs=revised_paragraph_diff
+        ).then(
+            fn=update_paragraph_refine_input,
+            inputs=[paragraph_correct_grammatical_spelling_errors_input],
+            outputs=paragraph_refine_input
+        )
+
+        generate_refine_paragraph_button.click(
+            fn=generate_refine_paragraph,
+            inputs=[
+                model,
+                sys_content_input,
+                eng_level_input,
+                paragraph_correct_grammatical_spelling_errors_input,
+                user_refine_paragraph_prompt
+            ],
+            outputs=[refine_output_table, refine_output]
+        ).then(
+            fn=highlight_diff_texts,
+            inputs=[refine_output_table, refine_output],
+            outputs=refine_output_diff
+        )
                 
         # Final Step. 寫作完成
         with gr.Row():
@@ -1299,7 +1299,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
             full_paragraph_save_output = gr.Textbox(label="最後結果")
             full_audio_output = gr.Audio(label="音檔", type="filepath")
 
-
         full_paragraph_evaluate_button.click(
             fn=generate_paragraph_evaluate,
             inputs=[model, sys_content_input, full_paragraph_input, user_generate_full_paragraph_evaluate_prompt],
@@ -1345,8 +1344,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
             inputs=[full_paragraph_refine_input],
             outputs=[full_paragraph_save_output, full_audio_output]
         )
-
-     # ====="考古題寫作練習"=====
     
     # ====="英文考古題寫作練習====="
     with gr.Tab("英文考古題寫作練習"):
@@ -1467,7 +1464,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
     # =====中文全文批改=====
     with gr.Tab("中文全文批改"):
         with gr.Row(visible=False) as chinese_full_paragraph_params:
-            chinese_full_paragraph_sys_content_input = gr.Textbox(label="System Prompt", value="You are an Chinese teacher who is practicing with me to improve my Chinese writing skill.")
+            chinese_full_paragraph_sys_content_input = gr.Textbox(label="System Prompt", value="You are a Chinese teacher who is practicing with me to improve my Chinese writing skill.")
             default_user_generate_chinese_full_paragraph_evaluate_prompt =  """
                 你是一位國文老師，負責評分學生的作文。請根據以下的評分標準，對這篇作文進行詳細評價：
                 請根據「國文作文評分標準」，對這篇作文進行詳細評價：
@@ -1550,7 +1547,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                 gr.Markdown("## 修訂結果")
                 revised_chinese_full_paragraph_diff = gr.HTML()
 
-                
         # JUTOR 段落批改與整體建議
         with gr.Row():
             gr.Markdown("## 段落改善建議")
@@ -1564,8 +1560,6 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue=gr.themes.colors.blue, secondary
                 gr.Markdown("## 修改結果")
                 chinese_full_paragraph_refine_output_diff = gr.HTML()
 
-                
-        
         # 寫作完成
         with gr.Row():
             gr.Markdown("# 寫作完成")