rollback

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, max_tokens, sys_content, paragraph, user_generate_paragraph_evaluate_prompt):
+def generate_paragraph_evaluate(model, sys_content, paragraph, user_generate_paragraph_evaluate_prompt):
     """
     根據用戶輸入的段落，調用 LLM API 生成相關的段落分析。
     
@@ -654,7 +654,7 @@ def generate_paragraph_evaluate(model, max_tokens, sys_content, paragraph, user_
             prompt=f"{sys_content}\n{user_content}" if "gemini" in model.lower() else None,
             messages=messages,
             model=model,
-            max_tokens=max_tokens,
+            max_tokens=4000,
             response_format={"type": "json_object"}
         )
 
@@ -681,7 +681,7 @@ def generate_paragraph_evaluate(model, max_tokens, sys_content, paragraph, user_
         error_msg = handle_evaluation_error(e)
         raise gr.Error(error_msg)
 
-def generate_correct_grammatical_spelling_errors(model, max_tokens, sys_content, eng_level, paragraph, user_correct_grammatical_spelling_errors_prompt):
+def generate_correct_grammatical_spelling_errors(model, sys_content, eng_level, paragraph, user_correct_grammatical_spelling_errors_prompt):
     """
     根據用戶輸入的段落，生成文法和拼字錯誤修正建議。
     """
@@ -712,7 +712,7 @@ def generate_correct_grammatical_spelling_errors(model, max_tokens, sys_content,
             prompt=f"{sys_content}\n{user_content}" if "gemini" in model.lower() else None,
             messages=messages,
             model=model,
-            max_tokens=max_tokens,
+            max_tokens=4000,
             response_format={"type": "json_object"}
         )
 
@@ -796,7 +796,7 @@ def highlight_diff_texts(highlight_list, text):
 def update_paragraph_correct_grammatical_spelling_errors_input(paragraph):
     return paragraph
 
-def generate_refine_paragraph(model, max_tokens, sys_content, eng_level, paragraph, user_refine_paragraph_prompt):
+def generate_refine_paragraph(model, sys_content, eng_level, paragraph, user_refine_paragraph_prompt):
     """
     根据用户输入的段落，调用 LLM API 生成相关的段落改善建議。
     """
@@ -3065,7 +3065,6 @@ 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
@@ -3086,7 +3085,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_correct_grammatical_spelling_errors,
                         inputs=[
                             model,
-                            max_tokens,
                             sys_content_input,
                             eng_level_input,
                             paragraph_output,
@@ -3115,7 +3113,6 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                         fn=generate_refine_paragraph,
                         inputs=[
                             model,
-                            max_tokens,
                             sys_content_input,
                             eng_level_input,
                             paragraph_correct_grammatical_spelling_errors_input,
@@ -3275,7 +3272,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                             generate_full_paragraph_refine_button = gr.Button("✨ JUTOR 段落改善建議", variant="primary")
                             full_paragraph_refine_output_table = gr.DataFrame(label="段落改善建議", wrap=True, interactive=False)
                             full_paragraph_refine_output = gr.HTML(label="改建議", visible=False)
-                            gr.Markdown("## 修訂建議")
+                            gr.Markdown("## 修改建議")
                             full_paragraph_refine_output_diff = gr.HTML()
 
                     # 寫作完成
@@ -3316,13 +3313,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                            
                     full_paragraph_evaluate_button.click(
                         fn=generate_paragraph_evaluate,
-                        inputs=[
-                            model, 
-                            max_tokens, 
-                            sys_content_input, 
-                            full_paragraph_input, 
-                            user_generate_full_paragraph_evaluate_prompt
-                        ],
+                        inputs=[model, sys_content_input, full_paragraph_input, user_generate_full_paragraph_evaluate_prompt],
                         outputs=full_paragraph_evaluate_output
                     ).then(
                         fn=update_paragraph_correct_grammatical_spelling_errors_input,
@@ -3332,24 +3323,11 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                     
                     generate_full_paragraph_correct_grammatical_spelling_errors_button.click(
                         fn=generate_correct_grammatical_spelling_errors,
-                        inputs=[
-                            model, 
-                            max_tokens, 
-                            sys_content_input, 
-                            eng_level_input, 
-                            full_paragraph_correct_grammatical_spelling_errors_input, 
-                            user_correct_grammatical_spelling_errors_prompt
-                        ],
-                        outputs=[
-                            full_paragraph_correct_grammatical_spelling_errors_output_table, 
-                            revised_full_paragraph_output
-                        ]
+                        inputs=[model, sys_content_input, eng_level_input, full_paragraph_correct_grammatical_spelling_errors_input, user_correct_grammatical_spelling_errors_prompt],
+                        outputs=[full_paragraph_correct_grammatical_spelling_errors_output_table, revised_full_paragraph_output]
                     ).then(
                         fn=highlight_diff_texts,
-                        inputs=[
-                            full_paragraph_correct_grammatical_spelling_errors_output_table, 
-                            revised_full_paragraph_output
-                        ],
+                        inputs=[full_paragraph_correct_grammatical_spelling_errors_output_table, revised_full_paragraph_output],
                         outputs=revised_full_paragraph_diff
                     ).then(
                         fn=update_paragraph_refine_input,
@@ -3360,8 +3338,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                     generate_full_paragraph_refine_button.click(
                         fn=generate_refine_paragraph,
                         inputs=[
-                            model,
-                            max_tokens,
+                            model, 
                             sys_content_input, 
                             eng_level_input, 
                             full_paragraph_refine_input, 
@@ -3582,13 +3559,7 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
 
                                 past_exam_evaluation_button.click(
                                     fn=generate_paragraph_evaluate,
-                                    inputs=[
-                                        model, 
-                                        max_tokens,
-                                        past_exam_evaluation_sys_content_prompt, 
-                                        past_exam_evaluation_input, 
-                                        past_exam_evaluation_user_prompt
-                                    ],
+                                    inputs=[model, past_exam_evaluation_sys_content_prompt, past_exam_evaluation_input, past_exam_evaluation_user_prompt],
                                     outputs=past_exam_evaluation_output
                                 ).then(
                                     fn=update_paragraph_correct_grammatical_spelling_errors_input,
@@ -3598,21 +3569,11 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
 
                                 past_exam_generate_correct_grammatical_spelling_errors_button.click(
                                     fn=generate_correct_grammatical_spelling_errors,
-                                    inputs=[
-                                        model, 
-                                        max_tokens, 
-                                        past_exam_evaluation_sys_content_prompt, 
-                                        eng_level_input, 
-                                        past_exam_correct_grammatical_spelling_errors_input, 
-                                        past_exam_correct_grammatical_spelling_errors_prompt
-                                    ],
+                                    inputs=[model, past_exam_evaluation_sys_content_prompt, eng_level_input, past_exam_correct_grammatical_spelling_errors_input, past_exam_correct_grammatical_spelling_errors_prompt],
                                     outputs=[past_exam_correct_grammatical_spelling_errors_output_table, past_exam_revised_output]
                                 ).then(
                                     fn=highlight_diff_texts,
-                                    inputs=[
-                                        past_exam_correct_grammatical_spelling_errors_output_table, 
-                                        past_exam_revised_output
-                                    ],
+                                    inputs=[past_exam_correct_grammatical_spelling_errors_output_table, past_exam_revised_output],
                                     outputs=past_exam_revised_diff
                                 ).then(
                                     fn=update_paragraph_refine_input,
@@ -3622,24 +3583,11 @@ with gr.Blocks(theme=THEME, css=CSS) as demo:
                                 
                                 past_exam_generate_refine_button.click(
                                     fn=generate_refine_paragraph,
-                                    inputs=[
-                                        model, 
-                                        max_tokens, 
-                                        past_exam_evaluation_sys_content_prompt, 
-                                        eng_level_input, 
-                                        past_exam_refine_input, 
-                                        past_exam_refine_paragraph_prompt
-                                    ],
-                                    outputs=[
-                                        past_exam_refine_output_table, 
-                                        past_exam_refine_output
-                                    ]
+                                    inputs=[model, past_exam_evaluation_sys_content_prompt, eng_level_input, past_exam_refine_input, past_exam_refine_paragraph_prompt],
+                                    outputs=[past_exam_refine_output_table, past_exam_refine_output]
                                 ).then(
                                     fn=highlight_diff_texts,
-                                    inputs=[
-                                        past_exam_refine_output_table, 
-                                        past_exam_refine_output
-                                    ],
+                                    inputs=[past_exam_refine_output_table, past_exam_refine_output],
                                     outputs=past_exam_refine_output_diff
                                 )