mirror of https://github.com/Mai-with-u/MaiBot.git
Update tool_processor.py
parent
afe088b62b
commit
9c28afb05f
|
|
@ -1,4 +1,5 @@
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
from src.chat.heart_flow.observation.chatting_observation import ChattingObservation
|
from src.chat.heart_flow.observation.chatting_observation import ChattingObservation
|
||||||
from src.llm_models.utils_model import LLMRequest
|
from src.llm_models.utils_model import LLMRequest
|
||||||
from src.config.config import global_config
|
from src.config.config import global_config
|
||||||
|
|
@ -185,6 +186,8 @@ class ToolProcessor(BaseProcessor):
|
||||||
|
|
||||||
init_prompt()
|
init_prompt()
|
||||||
=======
|
=======
|
||||||
|
=======
|
||||||
|
>>>>>>> parent of f3142432 (修复参数错误)
|
||||||
from src.chat.heart_flow.observation.chatting_observation import ChattingObservation
|
from src.chat.heart_flow.observation.chatting_observation import ChattingObservation
|
||||||
from src.llm_models.utils_model import LLMRequest
|
from src.llm_models.utils_model import LLMRequest
|
||||||
from src.config.config import global_config
|
from src.config.config import global_config
|
||||||
|
|
@ -370,4 +373,7 @@ class ToolProcessor(BaseProcessor):
|
||||||
|
|
||||||
|
|
||||||
init_prompt()
|
init_prompt()
|
||||||
|
<<<<<<< HEAD
|
||||||
|
>>>>>>> parent of f3142432 (修复参数错误)
|
||||||
|
=======
|
||||||
>>>>>>> parent of f3142432 (修复参数错误)
|
>>>>>>> parent of f3142432 (修复参数错误)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue