Update app.py

app.py

@@ -33,22 +33,20 @@ def get_random_item(candidates):
 
 def generate_natural_language_description(tags, api_key=None):
     """
-    生成自然语言描述，可以选择使用 GPT 或手写逻辑。
+    使用 OpenAI GPT 生成自然语言描述（适配 GPT-4o）。
     """
     if api_key:
         try:
             openai.api_key = api_key.strip()
             response = openai.ChatCompletion.create(
-                model="gpt-4o",
+                model="gpt-4",
                 messages=[
                     {"role": "system", "content": (
                         "You are a helpful assistant that generates creative painting/prompt descriptions. "
                         "Write at least three sentences in English, separated by periods."
                     )},
                     {"role": "user", "content": f"Here are the tags: {tags}\nPlease generate a vivid, imaginative scene description."}
-                ],
-                max_tokens=300,
-                temperature=0.7,
+                ]
             )
             return response["choices"][0]["message"]["content"].strip()
         except Exception as e:
@@ -97,7 +95,8 @@ def generate_prompt(action_file, style_file, artist_files, character_files, api_
     # 返回结果
     tags_list = [value for value in tags.values() if value]
     final_tags = ", ".join(tags_list)
-    return final_tags, description
+    combined_output = f"Tags: {final_tags}\n\nDescription: {description}"
+    return final_tags, description, combined_output
 
 # ========== Gradio 界面 ==========
 def gradio_interface():
@@ -133,6 +132,7 @@ def gradio_interface():
         with gr.Row():
             tags_output = gr.Textbox(label="Generated Tags")
             description_output = gr.Textbox(label="Generated Description")
+            combined_output = gr.Textbox(label="Combined Output: Tags + Description")
 
         # 按钮
         generate_button = gr.Button("Generate Prompt")
@@ -141,7 +141,7 @@ def gradio_interface():
         generate_button.click(
             generate_prompt,
             inputs=[action_file, style_file, artist_files, character_files, api_key_input, selected_categories],
-            outputs=[tags_output, description_output],
+            outputs=[tags_output, description_output, combined_output],
         )
 
     return demo