nvidia-nat 1.2rc9__py3-none-any.whl → 1.2.0rc10__py3-none-any.whl

nat/agent/base.py

@@ -179,6 +179,7 @@ class BaseAgent(ABC):
                 logger.debug("%s Retrying tool call for %s in %d seconds...", AGENT_LOG_PREFIX, tool.name, sleep_time)
                 await asyncio.sleep(sleep_time)
 
+        # pylint: disable=C0209
         # All retries exhausted, return error message
         error_content = "Tool call failed after all retry attempts. Last error: %s" % str(last_exception)
         logger.error("%s %s", AGENT_LOG_PREFIX, error_content)
@@ -234,6 +235,22 @@ class BaseAgent(ABC):
             logger.warning("%s Unexpected error during JSON parsing: %s", AGENT_LOG_PREFIX, str(e))
             return {"error": f"Unexpected parsing error: {str(e)}", "original_string": json_string}
 
+    def _get_chat_history(self, messages: list[BaseMessage]) -> str:
+        """
+        Get the chat history excluding the last message.
+
+        Parameters
+        ----------
+        messages : list[BaseMessage]
+            The messages to get the chat history from
+
+        Returns
+        -------
+        str
+            The chat history excluding the last message
+        """
+        return "\n".join([f"{message.type}: {message.content}" for message in messages[:-1]])
+
     @abstractmethod
     async def _build_graph(self, state_schema: type) -> CompiledGraph:
         pass

nat/agent/react_agent/agent.py

@@ -17,6 +17,7 @@ import json
 # pylint: disable=R0917
 import logging
 from json import JSONDecodeError
+from typing import TYPE_CHECKING
 
 from langchain_core.agents import AgentAction
 from langchain_core.agents import AgentFinish
@@ -44,7 +45,10 @@ from nat.agent.react_agent.output_parser import ReActOutputParser
 from nat.agent.react_agent.output_parser import ReActOutputParserException
 from nat.agent.react_agent.prompt import SYSTEM_PROMPT
 from nat.agent.react_agent.prompt import USER_PROMPT
-from nat.agent.react_agent.register import ReActAgentWorkflowConfig
+
+# To avoid circular imports
+if TYPE_CHECKING:
+    from nat.agent.react_agent.register import ReActAgentWorkflowConfig
 
 logger = logging.getLogger(__name__)
 
@@ -124,17 +128,19 @@ class ReActAgentGraph(DualNodeAgent):
                     if len(state.messages) == 0:
                         raise RuntimeError('No input received in state: "messages"')
                     # to check is any human input passed or not, if no input passed Agent will return the state
-                    content = str(state.messages[0].content)
+                    content = str(state.messages[-1].content)
                     if content.strip() == "":
                         logger.error("%s No human input passed to the agent.", AGENT_LOG_PREFIX)
                         state.messages += [AIMessage(content=NO_INPUT_ERROR_MESSAGE)]
                         return state
                     question = content
                     logger.debug("%s Querying agent, attempt: %s", AGENT_LOG_PREFIX, attempt)
-
+                    chat_history = self._get_chat_history(state.messages)
                     output_message = await self._stream_llm(
                         self.agent,
-                        {"question": question},
+                        {
+                            "question": question, "chat_history": chat_history
+                        },
                         RunnableConfig(callbacks=self.callbacks)  # type: ignore
                     )
 
@@ -152,13 +158,15 @@ class ReActAgentGraph(DualNodeAgent):
                         tool_response = HumanMessage(content=tool_response_content)
                         agent_scratchpad.append(tool_response)
                     agent_scratchpad += working_state
-                    question = str(state.messages[0].content)
+                    chat_history = self._get_chat_history(state.messages)
+                    question = str(state.messages[-1].content)
                     logger.debug("%s Querying agent, attempt: %s", AGENT_LOG_PREFIX, attempt)
 
-                    output_message = await self._stream_llm(self.agent, {
-                        "question": question, "agent_scratchpad": agent_scratchpad
-                    },
-                                                            RunnableConfig(callbacks=self.callbacks))
+                    output_message = await self._stream_llm(
+                        self.agent, {
+                            "question": question, "agent_scratchpad": agent_scratchpad, "chat_history": chat_history
+                        },
+                        RunnableConfig(callbacks=self.callbacks))
 
                     if self.detailed_logs:
                         logger.info(AGENT_CALL_LOG_MESSAGE, question, output_message.content)
@@ -326,7 +334,7 @@ class ReActAgentGraph(DualNodeAgent):
         return True
 
 
-def create_react_agent_prompt(config: ReActAgentWorkflowConfig) -> ChatPromptTemplate:
+def create_react_agent_prompt(config: "ReActAgentWorkflowConfig") -> ChatPromptTemplate:
     """
     Create a ReAct Agent prompt from the config.
 

nat/agent/react_agent/prompt.py

@@ -26,7 +26,7 @@ Use the following format exactly to ask the human to use a tool:
 Question: the input question you must answer
 Thought: you should always think about what to do
 Action: the action to take, should be one of [{tool_names}]
-Action Input: the input to the action (if there is no required input, include "Action Input: None")  
+Action Input: the input to the action (if there is no required input, include "Action Input: None")
 Observation: wait for the human to respond with the result from the tool, do not assume the response
 
 ... (this Thought/Action/Action Input/Observation can repeat N times. If you do not need to use a tool, or after asking the human to use any tools and waiting for the human to respond, you might know the final answer.)
@@ -37,5 +37,8 @@ Final Answer: the final answer to the original input question
 """
 
 USER_PROMPT = """
+Previous conversation history:
+{chat_history}
+
 Question: {question}
 """

nat/agent/rewoo_agent/agent.py

@@ -21,6 +21,7 @@ from json import JSONDecodeError
 from langchain_core.callbacks.base import AsyncCallbackHandler
 from langchain_core.language_models import BaseChatModel
 from langchain_core.messages.ai import AIMessage
+from langchain_core.messages.base import BaseMessage
 from langchain_core.messages.human import HumanMessage
 from langchain_core.messages.tool import ToolMessage
 from langchain_core.prompts.chat import ChatPromptTemplate
@@ -43,6 +44,7 @@ logger = logging.getLogger(__name__)
 
 class ReWOOGraphState(BaseModel):
     """State schema for the ReWOO Agent Graph"""
+    messages: list[BaseMessage] = Field(default_factory=list)  # input and output of the ReWOO Agent
     task: HumanMessage = Field(default_factory=lambda: HumanMessage(content=""))  # the task provided by user
     plan: AIMessage = Field(
         default_factory=lambda: AIMessage(content=""))  # the plan generated by the planner to solve the task
@@ -183,10 +185,12 @@ class ReWOOAgentGraph(BaseAgent):
             if not task:
                 logger.error("%s No task provided to the ReWOO Agent. Please provide a valid task.", AGENT_LOG_PREFIX)
                 return {"result": NO_INPUT_ERROR_MESSAGE}
-
+            chat_history = self._get_chat_history(state.messages)
             plan = await self._stream_llm(
                 planner,
-                {"task": task},
+                {
+                    "task": task, "chat_history": chat_history
+                },
                 RunnableConfig(callbacks=self.callbacks)  # type: ignore
             )
 

nat/agent/rewoo_agent/prompt.py

@@ -87,6 +87,9 @@ Begin!
 """
 
 PLANNER_USER_PROMPT = """
+Previous conversation history:
+{chat_history}
+
 task: {task}
 """
 

nat/agent/rewoo_agent/register.py

@@ -124,8 +124,9 @@ async def rewoo_agent_workflow(config: ReWOOAgentWorkflowConfig, builder: Builde
                                                         token_counter=len,
                                                         start_on="human",
                                                         include_system=True)
-            task = HumanMessage(content=messages[0].content)
-            state = ReWOOGraphState(task=task)
+
+            task = HumanMessage(content=messages[-1].content)
+            state = ReWOOGraphState(messages=messages, task=task)
 
             # run the ReWOO Agent Graph
             state = await graph.ainvoke(state)

{nvidia_nat-1.2rc9.dist-info → nvidia_nat-1.2.0rc10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat
-Version: 1.2rc9
+Version: 1.2.0rc10
 Summary: NVIDIA NeMo Agent toolkit
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation

{nvidia_nat-1.2rc9.dist-info → nvidia_nat-1.2.0rc10.dist-info}/RECORD

@@ -1,19 +1,19 @@
 aiq/__init__.py,sha256=E9vuQX0dCZIALhOg360sRLO53f6NXPgMTv3X1sh8WAM,2376
 nat/agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/agent/base.py,sha256=vKD3q6RiRdXYlmsZOsB9DB0cVfSMNByhjn7uwp8TxGw,9094
+nat/agent/base.py,sha256=DVSUq1VBhrgeTxnDgcESMFcJlEhnBa3PU9I1Rl5t3B8,9602
 nat/agent/dual_node.py,sha256=EOYpYzhaY-m1t2W3eiQrBjSfNjYMDttAwtzEEEcYP4s,2353
 nat/agent/register.py,sha256=EATlFFl7ov5HNGySLcPv1T7jzV-Jy-jPVkUzSXDT-7s,1005
 nat/agent/react_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/agent/react_agent/agent.py,sha256=UJBhVVpPwNB0fcHtHeJk2U0TKQtVnWe9R-_BNXVZlw4,19424
+nat/agent/react_agent/agent.py,sha256=s968IEwb3toBRDfeBFTOQlseC_5zULu_3IQaS5li9xY,19770
 nat/agent/react_agent/output_parser.py,sha256=m7K6wRwtckBBpAHqOf3BZ9mqZLwrP13Kxz5fvNxbyZE,4219
-nat/agent/react_agent/prompt.py,sha256=iGPBU6kh1xbp4QsU1p3o4A0JDov23J1EVM3HSAX6S0A,1713
+nat/agent/react_agent/prompt.py,sha256=N47JJrT6xwYQCv1jedHhlul2AE7EfKsSYfAbgJwWRew,1758
 nat/agent/react_agent/register.py,sha256=g3xkVWqr1p26Gjk4OJF_kolV6WBtS5GJkLvFHG7e7-I,8099
 nat/agent/reasoning_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/agent/reasoning_agent/reasoning_agent.py,sha256=2NDDHeesM2s2PnJfRsv2OTYjeajR1rYUVDvJZLzWGAQ,9434
 nat/agent/rewoo_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/agent/rewoo_agent/agent.py,sha256=BE4w8Tk1XvxN3qH-lbrT03RQlGP7WAEFfqXjAly8JCM,19009
-nat/agent/rewoo_agent/prompt.py,sha256=yRDaH8qMVBVchz--rZIJt8dP3GgFi4akVpclt-q1lHw,3673
-nat/agent/rewoo_agent/register.py,sha256=6lZVKi7dWC9324mqAMvsO4pLAAz1Vv914NlhFWvAYwk,8411
+nat/agent/rewoo_agent/agent.py,sha256=MEyBaFjxWaTwAtaKHNwHR0q4fR_-SpO85U_6d2kGZUg,19296
+nat/agent/rewoo_agent/prompt.py,sha256=nFMav3Zl_vmKPLzAIhbQHlldWnurPJb1GlwnekUuxDs,3720
+nat/agent/rewoo_agent/register.py,sha256=v04nBg6608HoQL1lxuOSZjX1gr2DpscjyQwMCRWF94Y,8432
 nat/agent/tool_calling_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/agent/tool_calling_agent/agent.py,sha256=tKcVIV1EI0D9qlSDUJ7mJOhWCAotFBka2Ii0f4mukoU,5718
 nat/agent/tool_calling_agent/register.py,sha256=iUZ53Ki-KfNwJ-R17r7a3JqmKdKbZCNZReUK0uPJfbU,5413
@@ -426,10 +426,10 @@ nat/utils/reactive/base/observer_base.py,sha256=UAlyAY_ky4q2t0P81RVFo2Bs_R7z5Nde
 nat/utils/reactive/base/subject_base.py,sha256=UQOxlkZTIeeyYmG5qLtDpNf_63Y7p-doEeUA08_R8ME,2521
 nat/utils/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/utils/settings/global_settings.py,sha256=CYHQX7F6MDR18vsVFTrEySpS9cBufuVGTUqZm9lREFs,7446
-nvidia_nat-1.2rc9.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat-1.2rc9.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat-1.2rc9.dist-info/METADATA,sha256=LoxwV8a37Yb459jgDXB4Yg97s2Mh_uw1wTgNNpfeKjk,21776
-nvidia_nat-1.2rc9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat-1.2rc9.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
-nvidia_nat-1.2rc9.dist-info/top_level.txt,sha256=lgJWLkigiVZuZ_O1nxVnD_ziYBwgpE2OStdaCduMEGc,8
-nvidia_nat-1.2rc9.dist-info/RECORD,,
+nvidia_nat-1.2.0rc10.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat-1.2.0rc10.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat-1.2.0rc10.dist-info/METADATA,sha256=JfvYkcvhML1Ku6UjiXJJlagwMu1ZcOJQ7Vjk2jqhNBw,21779
+nvidia_nat-1.2.0rc10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat-1.2.0rc10.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
+nvidia_nat-1.2.0rc10.dist-info/top_level.txt,sha256=lgJWLkigiVZuZ_O1nxVnD_ziYBwgpE2OStdaCduMEGc,8
+nvidia_nat-1.2.0rc10.dist-info/RECORD,,