优化react结构

Author: shell-nlp

gpt_server/model_handler/utils.py

@@ -1,6 +1,15 @@
-from gpt_server.model_handler.react.v0.qwen_react import qwen_tool_formatter
-from gpt_server.model_handler.react.v0.chatglm_react import glm4_tool_formatter
-from gpt_server.model_handler.react.v0.system_react import system_tool_formatter
+from gpt_server.model_handler.react.v0.qwen_react import (
+    qwen_tool_formatter,
+    qwen_tool_extractor,
+)
+from gpt_server.model_handler.react.v0.chatglm_react import (
+    glm4_tool_formatter,
+    glm4_tool_extractor,
+)
+from gpt_server.model_handler.react.v0.system_react import (
+    system_tool_formatter,
+    system_tool_extractor,
+)
 from loguru import logger
 from typing import Literal, Optional, Union
 

gpt_server/model_worker/chatglm.py

@@ -4,8 +4,7 @@
 import torch
 from loguru import logger
 from gpt_server.model_worker.base.model_worker_base import ModelWorkerBase
-from gpt_server.model_handler.react.v0.chatglm_react import glm4_tool_extractor
-from gpt_server.model_handler.utils import add_tools2messages
+from gpt_server.model_handler.utils import add_tools2messages, glm4_tool_extractor
 
 
 class ChatGLMWorker(ModelWorkerBase):

gpt_server/model_worker/qwen.py

@@ -5,8 +5,7 @@
 import torch
 
 from gpt_server.model_worker.base.model_worker_base import ModelWorkerBase
-from gpt_server.model_handler.react.v0.qwen_react import qwen_tool_extractor
-from gpt_server.model_handler.utils import add_tools2messages
+from gpt_server.model_handler.utils import add_tools2messages, qwen_tool_extractor
 
 
 class QwenWorker(ModelWorkerBase):