verify_moderation add client

app.py

@@ -41,7 +41,6 @@ if is_env_local:
         CUTOR_OPEN_AI_ASSISTANT_ID = config["CUTOR_OPEN_AI_ASSISTANT_ID"]
         CUTOR_OPEN_AI_ASSISTANT_SPELLING_ID = config["CUTOR_OPEN_AI_ASSISTANT_SPELLING_ID"]
         CUTOR_OPEN_AI_STRUCTURE_ASSISTANT_ID = config["CUTOR_OPEN_AI_STRUCTURE_ASSISTANT_ID"]
-        OPEN_AI_MODERATION_BOT1 = config["OPEN_AI_MODERATION_BOT1"]
 
 else:
     OPEN_AI_KEY = os.getenv("OPEN_AI_KEY")
@@ -50,11 +49,9 @@ else:
     CUTOR_OPEN_AI_ASSISTANT_ID = os.getenv("CUTOR_OPEN_AI_ASSISTANT_ID")
     CUTOR_OPEN_AI_ASSISTANT_SPELLING_ID = os.getenv("CUTOR_OPEN_AI_ASSISTANT_SPELLING_ID")
     CUTOR_OPEN_AI_STRUCTURE_ASSISTANT_ID = os.getenv("CUTOR_OPEN_AI_STRUCTURE_ASSISTANT_ID")
-    OPEN_AI_MODERATION_BOT1 = os.getenv("OPEN_AI_MODERATION_BOT1", OPEN_AI_KEY)
 
 OPEN_AI_CLIENT = OpenAI(api_key=OPEN_AI_KEY)
 CUTOR_OPEN_AI_CLIENT = OpenAI(api_key=CUTOR_OPEN_AI_KEY)
-OPEN_AI_MODERATION_CLIENT = OpenAI(api_key=OPEN_AI_MODERATION_BOT1)
 
 # 設置 Google Cloud Storage 客户端
 GCS_SERVICE = GoogleCloudStorage(GCS_KEY)
@@ -1594,8 +1591,8 @@ def verify_string_length_short(text):
     if len(text) < 100:
         raise gr.Error("輸入的文字長度過短，少於 100字，請重新輸入！")
 
-def verify_moderation(text):
-    response = OPEN_AI_MODERATION_CLIENT.moderations.create(input=text)
+def verify_moderation(text, client):
+    response = client.moderations.create(input=text)
     response_dict = response.model_dump()
     is_flagged = response_dict['results'][0]['flagged']
     print("========get_chat_moderation==========")
@@ -1784,7 +1781,7 @@ def get_chinese_paragraph_1st_evaluate_content(
         paragraph, 
     ):
     verify_string_length(paragraph)
-    verify_moderation(paragraph)
+    verify_moderation(paragraph, client=CUTOR_OPEN_AI_CLIENT)
     verify_string_length_short(paragraph)
 
     size_count_prompt = generate_size_count_prompt(paragraph)
@@ -1866,7 +1863,7 @@ def get_chinese_paragraph_refine_evaluate_content(
         paragraph_2, 
     ):
     verify_string_length(paragraph_2)
-    verify_moderation(paragraph_2)
+    verify_moderation(paragraph_2, client=CUTOR_OPEN_AI_CLIENT)
     verify_string_length_short(paragraph_2)
 
     size_count_prompt = generate_size_count_prompt(paragraph_2)
@@ -1945,7 +1942,7 @@ def get_chinese_paragraph_refine_evaluate_content(
 
 # 小學作文機器人
 def generate_content_by_open_ai_assistant(user_content, thread_id=None, model_name=None):
-    verify_moderation(user_content)
+    verify_moderation(user_content, client=CUTOR_OPEN_AI_CLIENT)
 
     client = CUTOR_OPEN_AI_CLIENT
     assistant_id = CUTOR_OPEN_AI_ASSISTANT_ID
@@ -1993,7 +1990,7 @@ def generate_content_by_open_ai_assistant(user_content, thread_id=None, model_na
 
 # 錯別字機器人
 def generate_content_by_open_ai_assistant_spelling_robot(paragraph, thread_id=None, model_name=None):   
-    verify_moderation(paragraph)
+    verify_moderation(paragraph, client=CUTOR_OPEN_AI_CLIENT)
 
     client = CUTOR_OPEN_AI_CLIENT
     assistant_id = CUTOR_OPEN_AI_ASSISTANT_SPELLING_ID
@@ -2069,7 +2066,7 @@ def generate_content_by_open_ai_assistant_spelling_robot(paragraph, thread_id=No
 
 # 結構 assistant id
 def generate_content_by_open_ai_assistant_structure_robot(paragraph, thread_id=None, model_name=None):
-    verify_moderation(paragraph)
+    verify_moderation(paragraph, client=CUTOR_OPEN_AI_CLIENT)
 
     client = CUTOR_OPEN_AI_CLIENT
     assistant_id = CUTOR_OPEN_AI_STRUCTURE_ASSISTANT_ID
@@ -2165,7 +2162,7 @@ def duplicate_element(element):
     return element
 
 def generate_chinese_essay_idea(model, user_prompt, chinese_essay_title_input):
-    verify_moderation(chinese_essay_title_input)
+    verify_moderation(chinese_essay_title_input, client=CUTOR_OPEN_AI_CLIENT)
 
     sys_content = "你是一位老師，正在和我一起練習提高我的寫作技能。 給予的回覆不超過 500字。 用 Markdown 語法回答。"
     user_content = f"""
@@ -2194,8 +2191,8 @@ def generate_chinese_essay_idea(model, user_prompt, chinese_essay_title_input):
     return content
 
 def check_chinese_essay_feedback(feedback_check_prompt, chinese_essay_from_student_input, chinese_essay_feedback_check_input):
-    verify_moderation(chinese_essay_from_student_input)
-    verify_moderation(chinese_essay_feedback_check_input)
+    verify_moderation(chinese_essay_from_student_input, client=CUTOR_OPEN_AI_CLIENT)
+    verify_moderation(chinese_essay_feedback_check_input, client=CUTOR_OPEN_AI_CLIENT)
 
     verify_string_length_short(chinese_essay_from_student_input)
     verify_string_length_short(chinese_essay_feedback_check_input)