From 7e36f28e78575ab7e1aa54f0eb51ae77b48a09c1 Mon Sep 17 00:00:00 2001 From: Harrison Chase Date: Thu, 29 Dec 2022 22:23:02 -0500 Subject: [PATCH] Harrison/not verbose (#487) --- docs/getting_started/agents.ipynb | 34 +++++++++++++-------------- langchain/agents/loading.py | 5 +--- tests/unit_tests/agents/test_agent.py | 1 + 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/docs/getting_started/agents.ipynb b/docs/getting_started/agents.ipynb index 19b4056e9ed..009ad935b2b 100644 --- a/docs/getting_started/agents.ipynb +++ b/docs/getting_started/agents.ipynb @@ -31,7 +31,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 1, "id": "d01216c0", "metadata": {}, "outputs": [], @@ -51,7 +51,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "id": "0728f0d9", "metadata": {}, "outputs": [], @@ -69,7 +69,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 3, "id": "ba4e7618", "metadata": {}, "outputs": [], @@ -87,7 +87,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 4, "id": "03208e2b", "metadata": {}, "outputs": [], @@ -105,7 +105,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 5, "id": "244ee75c", "metadata": {}, "outputs": [ @@ -119,28 +119,28 @@ "\u001b[32;1m\u001b[1;3m I need to find out who Olivia Wilde's boyfriend is and then calculate his age raised to the 0.23 power.\n", "Action: Search\n", "Action Input: \"Olivia Wilde boyfriend\"\u001b[0m\n", - "Observation: \u001b[36;1m\u001b[1;3mJason Sudeikis\u001b[0m\n", - "Thought:\u001b[32;1m\u001b[1;3m I need to find out Jason Sudeikis' age\n", + "Observation: \u001b[36;1m\u001b[1;3mHarry Styles\u001b[0m\n", + "Thought:\u001b[32;1m\u001b[1;3m I need to find out Harry Styles' age\n", "Action: Search\n", - "Action Input: \"Jason Sudeikis age\"\u001b[0m\n", - "Observation: \u001b[36;1m\u001b[1;3m47 years\u001b[0m\n", - "Thought:\u001b[32;1m\u001b[1;3m I need to calculate 47 raised to the 0.23 power\n", + "Action Input: \"Harry Styles age\"\u001b[0m\n", + "Observation: \u001b[36;1m\u001b[1;3m28 years\u001b[0m\n", + "Thought:\u001b[32;1m\u001b[1;3m I need to calculate 28 raised to the 0.23 power\n", "Action: Calculator\n", - "Action Input: 47^0.23\u001b[0m\n", - "Observation: \u001b[33;1m\u001b[1;3mAnswer: 2.4242784855673896\n", + "Action Input: 28^0.23\u001b[0m\n", + "Observation: \u001b[33;1m\u001b[1;3mAnswer: 2.1520202182226886\n", "\u001b[0m\n", "Thought:\u001b[32;1m\u001b[1;3m I now know the final answer\n", - "Final Answer: Jason Sudeikis, Olivia Wilde's boyfriend, is 47 years old and his age raised to the 0.23 power is 2.4242784855673896.\u001b[0m\n", - "\u001b[1m> Finished AgentExecutor chain.\u001b[0m\n" + "Final Answer: Harry Styles is Olivia Wilde's boyfriend and his current age raised to the 0.23 power is 2.1520202182226886.\u001b[0m\n", + "\u001b[1m> Finished chain.\u001b[0m\n" ] }, { "data": { "text/plain": [ - "\"Jason Sudeikis, Olivia Wilde's boyfriend, is 47 years old and his age raised to the 0.23 power is 2.4242784855673896.\"" + "\"Harry Styles is Olivia Wilde's boyfriend and his current age raised to the 0.23 power is 2.1520202182226886.\"" ] }, - "execution_count": 3, + "execution_count": 5, "metadata": {}, "output_type": "execute_result" } @@ -174,7 +174,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.10.8" + "version": "3.10.9" } }, "nbformat": 4, diff --git a/langchain/agents/loading.py b/langchain/agents/loading.py index 8a49ccb0a63..cb33d6607a4 100644 --- a/langchain/agents/loading.py +++ b/langchain/agents/loading.py @@ -21,7 +21,6 @@ def initialize_agent( llm: BaseLLM, agent: str = "zero-shot-react-description", callback_manager: Optional[BaseCallbackManager] = None, - verbose: bool = False, **kwargs: Any, ) -> AgentExecutor: """Load agent given tools and LLM. @@ -31,7 +30,6 @@ def initialize_agent( llm: Language model to use as the agent. agent: The agent to use. Valid options are: `zero-shot-react-description`, `react-docstore`, `self-ask-with-search`. - verbose: Whether to use the callback manager for this particular agent. callback_manager: CallbackManager to use. Global callback manager is used if not provided. Defaults to None. **kwargs: Additional key word arguments to pass to the agent. @@ -46,12 +44,11 @@ def initialize_agent( ) agent_cls = AGENT_TO_CLASS[agent] agent_obj = agent_cls.from_llm_and_tools( - llm, tools, callback_manager=callback_manager, verbose=verbose + llm, tools, callback_manager=callback_manager ) return AgentExecutor.from_agent_and_tools( agent=agent_obj, tools=tools, callback_manager=callback_manager, - verbose=verbose, **kwargs, ) diff --git a/tests/unit_tests/agents/test_agent.py b/tests/unit_tests/agents/test_agent.py index 038fd154835..0bbae093b63 100644 --- a/tests/unit_tests/agents/test_agent.py +++ b/tests/unit_tests/agents/test_agent.py @@ -85,6 +85,7 @@ def test_agent_with_callbacks() -> None: verbose=True, callback_manager=manager, ) + agent.agent.llm_chain.verbose = True output = agent.run("when was langchain made") assert output == "curses foiled again"