update openai_api

lightllm/server/api_models.py

@@ -1,7 +1,7 @@
 import time
 import uuid
 
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 from typing import Any, Dict, List, Optional, Union, Literal, ClassVar
 from transformers import GenerationConfig
 
@@ -21,6 +21,14 @@ class Message(BaseModel):
     content: Union[str, List[MessageContent]]
 
 
+class CharacterMessage(BaseModel):
+    """Message format for character-based chat, where role is inferred from name."""
+
+    name: str
+    content: Union[str, List[MessageContent]]
+    role: Optional[str] = None  # Optional, can be inferred from role_setting
+
+
 class Function(BaseModel):
     """Function descriptions."""
 
@@ -105,7 +113,7 @@ def _normalize_role(cls, v):
         raise ValueError("'role' must be a string")
 
 
-ChatCompletionMessageParam = Union[ChatCompletionMessageGenericParam, Message]
+ChatCompletionMessageParam = Union[ChatCompletionMessageGenericParam, Message, CharacterMessage]
 
 
 class CompletionRequest(BaseModel):
@@ -176,6 +184,8 @@ def apply_loaded_defaults(cls, data: Any):
 
 
 class ChatCompletionRequest(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     model: str
     messages: List[ChatCompletionMessageParam]
     function_call: Optional[str] = "none"
@@ -216,7 +226,7 @@ class ChatCompletionRequest(BaseModel):
     top_k: Optional[int] = -1
     repetition_penalty: Optional[float] = 1.0
     ignore_eos: Optional[bool] = False
-    role_settings: Optional[Dict[str, str]] = None
+    role_settings: Optional[Dict[str, str]] = Field(default=None, alias="role_setting")
     character_settings: Optional[List[Dict[str, str]]] = None
 
     # Class variables to store loaded default values

lightllm/server/api_openai.py

@@ -105,7 +105,8 @@ def _get_history_tool_calls_cnt(request: ChatCompletionRequest) -> int:
     messages = getattr(request, "messages", [])
     idx = 0
     for msg in messages:
-        if msg.role == "assistant":
+        role = getattr(msg, "role", None)
+        if role == "assistant":
             tool_calls = getattr(msg, "tool_calls", None)
             idx += len(list(tool_calls)) if tool_calls is not None else 0  # noqa
     return idx

lightllm/server/build_prompt.py

@@ -17,7 +17,11 @@ async def build_prompt(request, tools) -> str:
     global tokenizer
     # pydantic格式转成dict， 否则，当根据tokenizer_config.json拼template时，Jinja判断无法识别
     messages = [m.model_dump(by_alias=True, exclude_none=True) for m in request.messages]
-    kwargs = {"conversation": messages}
+    kwargs = {
+        "conversation": messages,
+        # 假设 request 对象里有这个字段，或者你想传空
+        "system_instruction": getattr(request, "system_instruction", ""),
+    }
     if request.character_settings:
         kwargs["character_settings"] = request.character_settings
     if request.role_settings: