yujunjun/haystack
1
0
Fork 0
mirror of https://github.com/deepset-ai/haystack.git synced 2025-12-02 09:56:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Remove streaming LLM tracking; they are all streaming now (#4944)

Browse Source 
* Remove streaming LLM tracking; they are all streaming now

* PR feedback
This commit is contained in:
Vladimir Blagojevic 2023-05-22 12:33:47 +02:00 committed by GitHub
parent cd2ea4bc91
commit 361cb1d240
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
haystack/agents/base.py
View File

@ -13,7 +13,7 @@ from haystack.agents.memory import Memory, NoMemory
from haystack.telemetry import send_event
from haystack.agents.agent_step import AgentStep
from haystack.agents.types import Color, AgentTokenStreamingHandler
from haystack.agents.utils import print_text, STREAMING_CAPABLE_MODELS
from haystack.agents.utils import print_text
from haystack.nodes import PromptNode, BaseRetriever, PromptTemplate
from haystack.pipelines import (
BaseStandardPipeline,
@ -228,6 +228,7 @@ class Agent:
prompt_parameters_resolver: Optional[Callable] = None,
max_steps: int = 8,
final_answer_pattern: str = r"Final Answer\s*:\s*(.*)",
streaming: bool = True,
):
"""
Creates an Agent instance.
@ -248,6 +249,9 @@ class Agent:
Set it to at least 2, so that the Agent can run one a tool once and then infer it knows the final answer.
The default is 8.
:param final_answer_pattern: A regular expression to extract the final answer from the text the Agent generated.
:param streaming: Whether to use streaming or not. If True, the Agent will stream response tokens from the LLM.
If False, the Agent will wait for the LLM to finish generating the response and then process it. The default is
True.
"""
self.max_steps = max_steps
self.tm = tools_manager or ToolsManager()
@ -273,12 +277,7 @@ class Agent:
prompt_parameters_resolver if prompt_parameters_resolver else react_parameter_resolver
)
self.final_answer_pattern = final_answer_pattern
# Resolve model name to check if it's a streaming model
if isinstance(self.prompt_node.model_name_or_path, str):
model_name = self.prompt_node.model_name_or_path
else:
model_name = self.prompt_node.model_name_or_path.model_name_or_path
self.add_default_logging_callbacks(streaming=any(m for m in STREAMING_CAPABLE_MODELS if m in model_name))
self.add_default_logging_callbacks(streaming=streaming)
self.hash = None
self.last_hash = None
self.update_hash()
@ -318,7 +317,7 @@ class Agent:
self.callback_manager.on_new_token += lambda token, **kwargs: print_text(token, color=agent_color)
else:
self.callback_manager.on_agent_step += lambda agent_step: print_text(
agent_step.prompt_node_response, color=agent_color
agent_step.prompt_node_response, end="\n", color=agent_color
)
def add_tool(self, tool: Tool):

2
haystack/agents/utils.py
View File

@ -2,8 +2,6 @@ from typing import Optional
from haystack.agents.types import Color
STREAMING_CAPABLE_MODELS = ["text-davinci-003", "gpt-3.5-turbo", "gpt-35-turbo", "gpt-4"]
def print_text(text: str, end="", color: Optional[Color] = None) -> None:
"""