Update app.py

app.py

@@ -15,7 +15,7 @@ from apscheduler.schedulers.background import BackgroundScheduler
 from flask import Flask, request, jsonify, Response, stream_with_context
 
 os.environ['TZ'] = 'Asia/Shanghai'
-time.tzset()
+# time.tzset()
 
 logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s - %(levelname)s - %(message)s')
@@ -858,6 +858,9 @@ def handsome_images_generations():
             siliconflow_data["safety_tolerance"] = data.get("safety_tolerance", 2)
             siliconflow_data["interval"] = data.get("interval", 2)
             siliconflow_data["output_format"] = data.get("output_format", "png")
+            seed = data.get("seed")
+            if isinstance(seed, int) and 0 < seed < 9999999999:
+                siliconflow_data["seed"] = seed
 
             if siliconflow_data["width"] < 256 or siliconflow_data["width"] > 1440 or siliconflow_data["width"] % 32 != 0:
                 siliconflow_data["width"] = 1024
@@ -898,7 +901,7 @@ def handsome_images_generations():
                     siliconflow_data["guidance_scale"] = 0
                 if siliconflow_data["guidance_scale"] > 100:
                     siliconflow_data["guidance_scale"] = 100
-        # Validate image_size
+
         if "image_size" in siliconflow_data and siliconflow_data["image_size"] not in ["1024x1024", "512x1024", "768x512", "768x1024", "1024x576", "576x1024","960x1280", "720x1440", "720x1280"]:
             siliconflow_data["image_size"] = "1024x1024"
 
@@ -1047,7 +1050,9 @@ def handsome_chat_completions():
             siliconflow_data["safety_tolerance"] = data.get("safety_tolerance", 2)
             siliconflow_data["interval"] = data.get("interval", 2)
             siliconflow_data["output_format"] = data.get("output_format", "png")
-
+            seed = data.get("seed")
+            if isinstance(seed, int) and 0 < seed < 9999999999:
+                siliconflow_data["seed"] = seed
             if siliconflow_data["width"] < 256 or siliconflow_data["width"] > 1440 or siliconflow_data["width"] % 32 != 0:
                 siliconflow_data["width"] = 1024
             if siliconflow_data["height"] < 256 or siliconflow_data["height"] > 1440 or siliconflow_data["height"] % 32 != 0:
@@ -1067,7 +1072,7 @@ def handsome_chat_completions():
             siliconflow_data["num_inference_steps"] = 20
             siliconflow_data["guidance_scale"] = 7.5
             siliconflow_data["prompt_enhancement"] = False
-            
+        
             if data.get("size"):
                 siliconflow_data["image_size"] = data.get("size")
             if data.get("n"):
@@ -1097,7 +1102,7 @@ def handsome_chat_completions():
                 siliconflow_data["guidance_scale"] = 0
             if siliconflow_data["guidance_scale"] > 100:
                 siliconflow_data["guidance_scale"] = 100
-                
+            
             if siliconflow_data["image_size"] not in ["1024x1024", "512x1024", "768x512", "768x1024", "1024x576", "576x1024", "960x1280", "720x1440", "720x1280"]:
                 siliconflow_data["image_size"] = "1024x1024"
 
@@ -1188,7 +1193,6 @@ def handsome_chat_completions():
                             ]
                         }
                         yield f"data: {json.dumps(end_chunk_data)}\n\n".encode('utf-8')
-
                         with data_lock:
                             request_timestamps.append(time.time())
                             token_counts.append(0)
@@ -1204,15 +1208,34 @@ def handsome_chat_completions():
                                     "index": 0,
                                     "delta": {
                                         "role": "assistant",
-                                        "content": "Failed to process image data"
+                                        "content": f"Error: {str(e)}"
                                     },
-                                    "finish_reason": "stop"
+                                    "finish_reason": None
                                 }
                             ]
                         }
                         yield f"data: {json.dumps(error_chunk_data)}\n\n".encode('utf-8')
-                        yield "data: [DONE]\n\n".encode('utf-8')
+                        end_chunk_data = {
+                                "id": f"chatcmpl-{uuid.uuid4()}",
+                                "object": "chat.completion.chunk",
+                                "created": int(time.time()),
+                                "model": model_name,
+                                "choices": [
+                                    {
+                                        "index": 0,
+                                        "delta": {},
+                                        "finish_reason": "stop"
+                                    }
+                                ]
+                            }
+                        yield f"data: {json.dumps(end_chunk_data)}\n\n".encode('utf-8')
+                    logging.info(
+                        f"使用的key: {api_key}, "
+                        f"使用的模��: {model_name}"
+                    )
+                    yield "data: [DONE]\n\n".encode('utf-8')
                 return Response(stream_with_context(generate()), content_type='text/event-stream')
+
             else:
                 response.raise_for_status()
                 end_time = time.time()
@@ -1274,12 +1297,14 @@ def handsome_chat_completions():
                     f"总共用时: {total_time:.4f}秒, "
                     f"使用的模型: {model_name}"
                 )
-
                 with data_lock:
                     request_timestamps.append(time.time())
                     token_counts.append(0)
-
                 return jsonify(response_data)
+
+        except requests.exceptions.RequestException as e:
+            logging.error(f"请求转发异常: {e}")
+            return jsonify({"error": str(e)}), 500
     else:
         try:
             start_time = time.time()
@@ -1394,11 +1419,9 @@ def handsome_chat_completions():
                    f"总共用时: {total_time:.4f}秒, "
                    f"使用的模型: {model_name}"
                 )
-
                 with data_lock:
                     request_timestamps.append(time.time())
                     token_counts.append(0)
-
                 return jsonify(response_data)
         except requests.exceptions.RequestException as e:
             logging.error(f"请求转发异常: {e}")