efort
/
glm4
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正非流式输出和process_response tools参数的bug

This commit is contained in:
L 2024-06-18 21:02:29 +08:00
parent ef015f88f9
commit eb8aeb37c1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basic_demo/openai_api_server.py
View File

@ -146,11 +146,11 @@ class InvalidScoreLogitsProcessor(LogitsProcessor):
return scores return scores
def process_response(output: str, tools, use_tool: bool = False) -> Union[str, dict]: def process_response(output: str, tools: dict | List[dict] = None, use_tool: bool = False) -> Union[str, dict]:
lines = output.strip().split("\n") lines = output.strip().split("\n")
arguments_json = None arguments_json = None
special_tools = ["cogview", "simple_browser"] special_tools = ["cogview", "simple_browser"]
tools = {tool['function']['name'] for tool in tools['tools']} tools = {tool['function']['name'] for tool in tools}
# 这是一个简单的工具比较函数，不能保证拦截所有非工具输出的结果，比如参数未对齐等特殊情况。 # 这是一个简单的工具比较函数，不能保证拦截所有非工具输出的结果，比如参数未对齐等特殊情况。
##TODO 如果你希望做更多判断，可以在这里进行逻辑完善。 ##TODO 如果你希望做更多判断，可以在这里进行逻辑完善。
@ -394,7 +394,7 @@ async def create_chat_completion(request: ChatCompletionRequest):
tool_calls = None tool_calls = None
if request.tools: if request.tools:
try: try:
function_call = process_response(response["text"], use_tool=True) function_call = process_response(response["text"], request.tools, use_tool=True)
except Exception as e: except Exception as e:
logger.warning(f"Failed to parse tool call: {e}") logger.warning(f"Failed to parse tool call: {e}")
if isinstance(function_call, dict): if isinstance(function_call, dict):