def generate_paragraph_evaluate(model, max_tokens, sys_content, paragraph):

app.py

@@ -579,7 +579,7 @@ def generate_paragraph(topic_sentence, supporting_sentences, conclusion_sentence
     paragraph = f"{topic_sentence} {supporting_sentences} {conclusion_sentence}"
     return paragraph
 
-def generate_paragraph_evaluate(model, sys_content, paragraph, user_generate_paragraph_evaluate_prompt):
+def generate_paragraph_evaluate(model, max_tokens, sys_content, paragraph):
     """
     根據用戶輸入的段落，調用 LLM API 生成相關的段落分析。
     
@@ -592,6 +592,92 @@ def generate_paragraph_evaluate(model, sys_content, paragraph, user_generate_par
     Returns:
         gr.update: 包含評估結果的表格更新
     """
+
+    user_generate_paragraph_evaluate_prompt = """
+        Based on the final paragraph provided, evaluate the writing in terms of content, organization, grammar, and vocabulary. Provide feedback in simple and supportive language.
+
+        -- 根據上述的文章，以「內容（content）」層面評分。
+        Assess the student's writing by focusing on the 'Content' category according to the established rubric. Determine the clarity of the theme or thesis statement and whether it is supported by specific and complete details relevant to the topic. Use the following levels to guide your evaluation:
+
+        - Excellent (5-4 points): Look for a clear and pertinent theme or thesis, directly related to the topic, with detailed support.
+        - Good (3 points): The theme should be present but may lack clarity or emphasis; some narrative development related to the theme should be evident.
+        - Fair (2-1 points): Identify if the theme is unclear or if the majority of the narrative is undeveloped or irrelevant to the theme.
+        - Poor (0 points): Determine if the response is off-topic or not written at all. Remember that any response that is off-topic or unwritten should receive zero points in all aspects.
+
+        Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's content meets the criteria. 
+        Translate your feedback into Traditional Chinese (zh-tw) as the final result (#中文解釋 zh-TW).
+
+        評分結果以 JSON 格式輸出: content: { 
+        "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
+        "explanation": "#中文解釋 zh-TW"
+        }
+
+        -- 根據上述的文章，以「組織（organization）」層面評分。
+        Evaluate the student's writing with a focus on 'Organization' according to the grading rubric. Consider the structure of the text, including the presence of a clear introduction, development, and conclusion, as well as the coherence throughout the piece and the use of transitional phrases. Use the following levels to structure your feedback:
+
+        - Excellent (5-4 points): Look for clear key points with a logical introduction, development, and conclusion, and note whether transitions are coherent and effectively used.
+        - Good (3 points): The key points should be identifiable but may not be well-arranged; observe any imbalance in development and transitional phrase usage.
+        - Fair (2-1 points): Identify if the key points are unclear and if the text lacks coherence.
+        - Poor (0 points): Check if the writing is completely unorganized or not written according to the prompts. Texts that are entirely unorganized should receive zero points.
+        
+        Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Organization meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#中文解釋).
+
+        評分結果以 JSON 格式輸出: organization: { 
+        "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
+        "explanation": "#中文解釋 zh-TW" 
+        }
+
+        -- 根據上述的文章，以「文法和用法（Grammar and usage）」層面評分。
+        Review the student's writing, paying special attention to 'Grammar/Sentence Structure'. Assess the accuracy of grammar and the variety of sentence structures throughout the essay. Use the rubric levels to judge the work as follows:
+
+        - Excellent (5-4 points): Search for text with minimal grammatical errors and a diverse range of sentence structures.
+        - Good (3 points): There may be some grammatical errors, but they should not affect the overall meaning or flow of the text.
+        - Fair (2-1 points): Determine if grammatical errors are frequent and if they significantly affect the meaning of the text.
+        - Poor (0 points): If the essay contains severe grammatical errors throughout, leading to an unclear meaning, it should be marked accordingly.
+
+        Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Grammar/Sentence Structure meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#���文解釋).
+
+        評分結果以 JSON 格式輸出: grammar_and_usage: { 
+        "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
+        "explanation": "#中文解釋 zh-TW" 
+        }
+
+        -- 根據上述的文章，以「詞彙（Vocabulary ）」層面評分。
+        Assess the use of 'Vocabulary/Spelling' in the student's writing based on the criteria provided. Evaluate the precision and appropriateness of the vocabulary and the presence of spelling errors. Reference the following scoring levels in your analysis:
+
+        - Excellent (5-4 points): The writing should contain accurate and appropriate vocabulary with almost no spelling mistakes.
+        - Good (3 points): Vocabulary might be somewhat repetitive or mundane; there may be occasional misused words and minor spelling mistakes, but they should not impede understanding.
+        - Fair (2-1 points): Notice if there are many vocabulary errors and spelling mistakes that clearly affect the clarity of the text's meaning.
+        - Poor (0 points): Writing that only contains scattered words related to the topic or is copied should be scored as such.
+
+        Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Vocabulary/Spelling meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#中文解釋).
+
+        評分結果以 JSON 格式輸出: vocabulary: { 
+        "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
+        "explanation": "#中文解釋 zh-TW" 
+        }
+
+        -- 根據上述的文章，以「連貫性和連接詞（Coherence and Cohesion）」層面評分。
+        - 評分等級有三級：beginner, intermediate, advanced.
+        - 以繁體中文 zh-TW 解釋
+        評分結果以 JSON 格式輸出: coherence_and_cohesion: { 
+        "level": "#beginner/intermediate/advanced", 
+        "explanation": "#中文解釋 zh-TW"
+        }
+
+        Restrictions:
+        - the _explanation should be in Traditional Chinese (zh-TW), it's very important.
+
+        Final Output JSON Format:
+        {{
+        "content": {{content's dict}},
+        "organization": {{organization'dict}},
+        "grammar_and_usage": {{grammar_and_usage'dict}},
+        "vocabulary": {{vocabulary'dict}},
+        "coherence_and_cohesion": {{coherence_and_cohesion'dict}}
+        }}            
+    """
+
     def parse_evaluation_response(content):
         """解析 LLM 回應內容"""
         try:
@@ -654,7 +740,7 @@ def generate_paragraph_evaluate(model, sys_content, paragraph, user_generate_par
             prompt=f"{sys_content}\n{user_content}" if "gemini" in model.lower() else None,
             messages=messages,
             model=model,
-            max_tokens=4000,
+            max_tokens=max_tokens,
             response_format={"type": "json_object"}
         )
 
@@ -2854,92 +2940,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                     inputs=[paragraph_output],
                                     outputs=[paragraph_output_download]
                                 )
-                            with gr.Row(visible=False) as paragraph_evaluate_params:
-                                default_user_generate_paragraph_evaluate_prompt = """
-                                    Based on the final paragraph provided, evaluate the writing in terms of content, organization, grammar, and vocabulary. Provide feedback in simple and supportive language.
-
-                                    -- 根據上述的文章，以「內容（content）」層面評分。
-                                    Assess the student's writing by focusing on the 'Content' category according to the established rubric. Determine the clarity of the theme or thesis statement and whether it is supported by specific and complete details relevant to the topic. Use the following levels to guide your evaluation:
-
-                                    - Excellent (5-4 points): Look for a clear and pertinent theme or thesis, directly related to the topic, with detailed support.
-                                    - Good (3 points): The theme should be present but may lack clarity or emphasis; some narrative development related to the theme should be evident.
-                                    - Fair (2-1 points): Identify if the theme is unclear or if the majority of the narrative is undeveloped or irrelevant to the theme.
-                                    - Poor (0 points): Determine if the response is off-topic or not written at all. Remember that any response that is off-topic or unwritten should receive zero points in all aspects.
-
-                                    Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's content meets the criteria. 
-                                    Translate your feedback into Traditional Chinese (zh-tw) as the final result (#中文解釋 zh-TW).
-
-                                    評分結果以 JSON 格式輸出: content: { 
-                                    "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
-                                    "explanation": "#中文解釋 zh-TW"
-                                    }
-
-                                    -- 根據上述的文章，以「組織（organization）」層面評分。
-                                    Evaluate the student's writing with a focus on 'Organization' according to the grading rubric. Consider the structure of the text, including the presence of a clear introduction, development, and conclusion, as well as the coherence throughout the piece and the use of transitional phrases. Use the following levels to structure your feedback:
-
-                                    - Excellent (5-4 points): Look for clear key points with a logical introduction, development, and conclusion, and note whether transitions are coherent and effectively used.
-                                    - Good (3 points): The key points should be identifiable but may not be well-arranged; observe any imbalance in development and transitional phrase usage.
-                                    - Fair (2-1 points): Identify if the key points are unclear and if the text lacks coherence.
-                                    - Poor (0 points): Check if the writing is completely unorganized or not written according to the prompts. Texts that are entirely unorganized should receive zero points.
-                                    
-                                    Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Organization meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#中文解釋).
-
-                                    評分結果以 JSON 格式輸出: organization: { 
-                                    "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
-                                    "explanation": "#中文解釋 zh-TW" 
-                                    }
-
-                                    -- 根據上述的文章，以「文法和用法（Grammar and usage）」層面評分。
-                                    Review the student's writing, paying special attention to 'Grammar/Sentence Structure'. Assess the accuracy of grammar and the variety of sentence structures throughout the essay. Use the rubric levels to judge the work as follows:
-
-                                    - Excellent (5-4 points): Search for text with minimal grammatical errors and a diverse range of sentence structures.
-                                    - Good (3 points): There may be some grammatical errors, but they should not affect the overall meaning or flow of the text.
-                                    - Fair (2-1 points): Determine if grammatical errors are frequent and if they significantly affect the meaning of the text.
-                                    - Poor (0 points): If the essay contains severe grammatical errors throughout, leading to an unclear meaning, it should be marked accordingly.
-
-                                    Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Grammar/Sentence Structure meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#中文解釋).
-
-                                    評分結果以 JSON 格式輸出: grammar_and_usage: { 
-                                    "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
-                                    "explanation": "#中文解釋 zh-TW" 
-                                    }
-
-                                    -- 根據上述的文章，以「詞彙（Vocabulary ）」層面評分。
-                                    Assess the use of 'Vocabulary/Spelling' in the student's writing based on the criteria provided. Evaluate the precision and appropriateness of the vocabulary and the presence of spelling errors. Reference the following scoring levels in your analysis:
-
-                                    - Excellent (5-4 points): The writing should contain accurate and appropriate vocabulary with almost no spelling mistakes.
-                                    - Good (3 points): Vocabulary might be somewhat repetitive or mundane; there may be occasional misused words and minor spelling mistakes, but they should not impede understanding.
-                                    - Fair (2-1 points): Notice if there are many vocabulary errors and spelling mistakes that clearly affect the clarity of the text's meaning.
-                                    - Poor (0 points): Writing that only contains scattered words related to the topic or is copied should be scored as such.
-
-                                    Your detailed feedback should explain the score you assign, including specific examples from the text to illustrate how well the student's Vocabulary/Spelling meets the criteria. Translate your feedback into Traditional Chinese (zh_tw) as the final result (#中文解釋).
-
-                                    評分結果以 JSON 格式輸出: vocabulary: { 
-                                    "level": "#Excellent(5-4 pts)/Good(3 pts)/Fair(2-1 pts)/Poor(0 pts)", 
-                                    "explanation": "#中文解釋 zh-TW" 
-                                    }
-
-                                    -- 根據上述的文章，以「連貫性和連接詞（Coherence and Cohesion）」層面評分。
-                                    - 評分等級有三級：beginner, intermediate, advanced.
-                                    - 以繁體中文 zh-TW 解釋
-                                    評分結果以 JSON 格式輸出: coherence_and_cohesion: { 
-                                    "level": "#beginner/intermediate/advanced", 
-                                    "explanation": "#中文解釋 zh-TW"
-                                    }
-
-                                    Restrictions:
-                                    - the _explanation should be in Traditional Chinese (zh-TW), it's very important.
-
-                                    Final Output JSON Format:
-                                    {{
-                                    "content": {{content's dict}},
-                                    "organization": {{organization'dict}},
-                                    "grammar_and_usage": {{grammar_and_usage'dict}},
-                                    "vocabulary": {{vocabulary'dict}},
-                                    "coherence_and_cohesion": {{coherence_and_cohesion'dict}}
-                                    }}            
-                                """
-                                user_generate_paragraph_evaluate_prompt = gr.Textbox(label="Paragraph evaluate Prompt", value=default_user_generate_paragraph_evaluate_prompt, visible=False)
                             with gr.Row():
                                 generate_paragraph_evaluate_button = gr.Button("✨ 段落分析", variant="primary")
                             with gr.Row():
@@ -3065,9 +3065,9 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_paragraph_evaluate,
                         inputs=[
                             model,
+                            max_tokens,
                             sys_content_input,
-                            paragraph_output,
-                            user_generate_paragraph_evaluate_prompt
+                            paragraph_output
                         ],
                         outputs=paragraph_evaluate_output
                     ).then(
@@ -3233,8 +3233,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                 with gr.Column():
                     with gr.Row(visible=False) as full_paragraph_params:
                         full_paragraph_sys_content_input = gr.Textbox(label="System Prompt", value="You are an English teacher who is practicing with me to improve my English writing skill.")
-                        default_user_generate_full_paragraph_evaluate_prompt = default_user_generate_paragraph_evaluate_prompt
-                        user_generate_full_paragraph_evaluate_prompt = gr.Textbox(label="Paragraph evaluate Prompt", value=default_user_generate_full_paragraph_evaluate_prompt, visible=False)
                     with gr.Row():
                         gr.Markdown("# 📊 英文段落寫作評分")
                     # 輸入段落全文
@@ -3313,7 +3311,12 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                            
                     full_paragraph_evaluate_button.click(
                         fn=generate_paragraph_evaluate,
-                        inputs=[model, sys_content_input, full_paragraph_input, user_generate_full_paragraph_evaluate_prompt],
+                        inputs=[
+                            model,
+                            max_tokens,
+                            sys_content_input, 
+                            full_paragraph_input
+                        ],
                         outputs=full_paragraph_evaluate_output
                     ).then(
                         fn=update_paragraph_correct_grammatical_spelling_errors_input,
@@ -3430,7 +3433,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                 with gr.Column():
                                     with gr.Row():
                                         past_exam_evaluation_sys_content_prompt = gr.Textbox(label="System Prompt", value="You are an English teacher who is practicing with me to improve my English writing skill.", visible=False)
-                                        past_exam_evaluation_user_prompt = gr.Textbox(label="Paragraph evaluate Prompt", value=default_user_generate_paragraph_evaluate_prompt, visible=False)
                                         past_exam_evaluation_input = gr.TextArea("",label="這是你的原始寫作內容，參考 JUTOR 的建議，你可以選擇是否修改：")
                                 with gr.Column():
                                     with gr.Row():
@@ -3559,7 +3561,12 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
 
                                 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],
+                                    inputs=[
+                                        model,
+                                        max_tokens,
+                                        past_exam_evaluation_sys_content_prompt, 
+                                        past_exam_evaluation_input
+                                    ],
                                     outputs=past_exam_evaluation_output
                                 ).then(
                                     fn=update_paragraph_correct_grammatical_spelling_errors_input,