Update openai_ondemand_adapter.py

openai_ondemand_adapter.py

@@ -51,16 +51,18 @@ BAD_KEY_RETRY_INTERVAL = 600  # 标记为坏的KEY的重试间隔（秒），例
 MODEL_MAP = {
     "o3-mini": "predefined-openai-gpto3-mini",
     "gpt-4o": "predefined-openai-gpt4o",
-    "gpt-4.1": "predefined-openai-gpt4.1",
-    "gpt-4.1-mini": "predefined-openai-gpt4.1-mini",
-    "gpt-4.1-nano": "predefined-openai-gpt4.1-nano",
-    "gpt-4o-mini": "predefined-openai-gpt4o-mini",
-    "deepseek-v3": "predefined-deepseek-v3",
-    "deepseek-r1": "predefined-deepseek-r1",
-    "claude-3-7-sonnet": "predefined-claude-3.7-sonnet",
-    "gemini-2.0-flash": "predefined-gemini-2.0-flash",
+    "gpt-4o-mini": "predefined-openai-gpt4o-mini", # 修正：之前可能是gpt-4.1-mini，根据实际情况调整
+    "gpt-4-turbo": "predefined-openai-gpt4-turbo", # 示例新增
+    "claude-3-opus": "predefined-anthropic-claude-3-opus", # 示例新增
+    "claude-3-sonnet": "predefined-anthropic-claude-3-sonnet", # 修正：之前可能是claude-3-7-sonnet
+    "claude-3-haiku": "predefined-anthropic-claude-3-haiku", # 示例新增
+    "gemini-1.5-pro": "predefined-google-gemini-1.5-pro", # 示例新增
+    "gemini-1.5-flash": "predefined-google-gemini-1.5-flash", # 修正：之前可能是gemini-2.0-flash
+    # 根据 OnDemand 支持的模型列表进行补充和调整
+    "deepseek-v3": "predefined-deepseek-v3", # 假设存在
+    "deepseek-r1": "predefined-deepseek-r1", # 假设存在
 }
-DEFAULT_ONDEMAND_MODEL = "predefined-openai-gpt4o"
+DEFAULT_ONDEMAND_MODEL = "predefined-openai-gpt4o" # 如果用户未指定模型或模型未在MAP中，则使用此默认值
 # ==========================================
 
 class KeyManager:
@@ -205,12 +207,14 @@ def chat_completions():
         content = msg.get("content", "").strip()
         if not content: # 跳过空内容的消息
             continue
-        formatted_query_parts.append(f"{role}: {content}")
+        formatted_query_parts.append(f"<|{role}|>: {content}")
     
     if not formatted_query_parts:
         return jsonify({"error": "No valid content found in 'messages'."}), 400
-        
-    final_query_to_ondemand = "\n".join(formatted_query_parts)
+
+    start_prompt = "Below is the chat history. You should follow instructions and respond.\n"
+    final_query_to_ondemand = start_prompt + "\n".join(formatted_query_parts)
+    
     # --- 结束构造 query ---
 
     # 内部函数，用于封装实际的API调用逻辑，方便重试和密钥管理