nvidia-nat 1.3.0.dev2__py3-none-any.whl → 1.3.0rc1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (242) hide show
  1. aiq/__init__.py +2 -2
  2. nat/agent/base.py +24 -15
  3. nat/agent/dual_node.py +9 -4
  4. nat/agent/prompt_optimizer/prompt.py +68 -0
  5. nat/agent/prompt_optimizer/register.py +149 -0
  6. nat/agent/react_agent/agent.py +79 -47
  7. nat/agent/react_agent/register.py +41 -21
  8. nat/agent/reasoning_agent/reasoning_agent.py +11 -9
  9. nat/agent/register.py +1 -1
  10. nat/agent/rewoo_agent/agent.py +326 -148
  11. nat/agent/rewoo_agent/prompt.py +19 -22
  12. nat/agent/rewoo_agent/register.py +46 -26
  13. nat/agent/tool_calling_agent/agent.py +84 -28
  14. nat/agent/tool_calling_agent/register.py +51 -28
  15. nat/authentication/api_key/api_key_auth_provider.py +2 -2
  16. nat/authentication/credential_validator/bearer_token_validator.py +557 -0
  17. nat/authentication/http_basic_auth/http_basic_auth_provider.py +1 -1
  18. nat/authentication/interfaces.py +5 -2
  19. nat/authentication/oauth2/oauth2_auth_code_flow_provider.py +40 -20
  20. nat/authentication/oauth2/oauth2_resource_server_config.py +124 -0
  21. nat/authentication/register.py +0 -1
  22. nat/builder/builder.py +56 -24
  23. nat/builder/component_utils.py +9 -5
  24. nat/builder/context.py +46 -11
  25. nat/builder/eval_builder.py +16 -11
  26. nat/builder/framework_enum.py +1 -0
  27. nat/builder/front_end.py +1 -1
  28. nat/builder/function.py +378 -8
  29. nat/builder/function_base.py +3 -3
  30. nat/builder/function_info.py +6 -8
  31. nat/builder/user_interaction_manager.py +2 -2
  32. nat/builder/workflow.py +13 -1
  33. nat/builder/workflow_builder.py +281 -76
  34. nat/cli/cli_utils/config_override.py +2 -2
  35. nat/cli/commands/evaluate.py +1 -1
  36. nat/cli/commands/info/info.py +16 -6
  37. nat/cli/commands/info/list_channels.py +1 -1
  38. nat/cli/commands/info/list_components.py +7 -8
  39. nat/cli/commands/mcp/__init__.py +14 -0
  40. nat/cli/commands/mcp/mcp.py +986 -0
  41. nat/cli/commands/object_store/__init__.py +14 -0
  42. nat/cli/commands/object_store/object_store.py +227 -0
  43. nat/cli/commands/optimize.py +90 -0
  44. nat/cli/commands/registry/publish.py +2 -2
  45. nat/cli/commands/registry/pull.py +2 -2
  46. nat/cli/commands/registry/remove.py +2 -2
  47. nat/cli/commands/registry/search.py +15 -17
  48. nat/cli/commands/start.py +16 -5
  49. nat/cli/commands/uninstall.py +1 -1
  50. nat/cli/commands/workflow/templates/config.yml.j2 +0 -1
  51. nat/cli/commands/workflow/templates/pyproject.toml.j2 +4 -1
  52. nat/cli/commands/workflow/templates/register.py.j2 +0 -1
  53. nat/cli/commands/workflow/workflow_commands.py +9 -13
  54. nat/cli/entrypoint.py +8 -10
  55. nat/cli/register_workflow.py +38 -4
  56. nat/cli/type_registry.py +75 -6
  57. nat/control_flow/__init__.py +0 -0
  58. nat/control_flow/register.py +20 -0
  59. nat/control_flow/router_agent/__init__.py +0 -0
  60. nat/control_flow/router_agent/agent.py +329 -0
  61. nat/control_flow/router_agent/prompt.py +48 -0
  62. nat/control_flow/router_agent/register.py +91 -0
  63. nat/control_flow/sequential_executor.py +166 -0
  64. nat/data_models/agent.py +34 -0
  65. nat/data_models/api_server.py +10 -10
  66. nat/data_models/authentication.py +23 -9
  67. nat/data_models/common.py +1 -1
  68. nat/data_models/component.py +2 -0
  69. nat/data_models/component_ref.py +11 -0
  70. nat/data_models/config.py +41 -17
  71. nat/data_models/dataset_handler.py +1 -1
  72. nat/data_models/discovery_metadata.py +4 -4
  73. nat/data_models/evaluate.py +4 -1
  74. nat/data_models/function.py +34 -0
  75. nat/data_models/function_dependencies.py +14 -6
  76. nat/data_models/gated_field_mixin.py +242 -0
  77. nat/data_models/intermediate_step.py +3 -3
  78. nat/data_models/optimizable.py +119 -0
  79. nat/data_models/optimizer.py +149 -0
  80. nat/data_models/swe_bench_model.py +1 -1
  81. nat/data_models/temperature_mixin.py +44 -0
  82. nat/data_models/thinking_mixin.py +86 -0
  83. nat/data_models/top_p_mixin.py +44 -0
  84. nat/embedder/nim_embedder.py +1 -1
  85. nat/embedder/openai_embedder.py +1 -1
  86. nat/embedder/register.py +0 -1
  87. nat/eval/config.py +3 -1
  88. nat/eval/dataset_handler/dataset_handler.py +71 -7
  89. nat/eval/evaluate.py +86 -31
  90. nat/eval/evaluator/base_evaluator.py +1 -1
  91. nat/eval/evaluator/evaluator_model.py +13 -0
  92. nat/eval/intermediate_step_adapter.py +1 -1
  93. nat/eval/rag_evaluator/evaluate.py +2 -2
  94. nat/eval/rag_evaluator/register.py +3 -3
  95. nat/eval/register.py +4 -1
  96. nat/eval/remote_workflow.py +3 -3
  97. nat/eval/runtime_evaluator/__init__.py +14 -0
  98. nat/eval/runtime_evaluator/evaluate.py +123 -0
  99. nat/eval/runtime_evaluator/register.py +100 -0
  100. nat/eval/swe_bench_evaluator/evaluate.py +6 -6
  101. nat/eval/trajectory_evaluator/evaluate.py +1 -1
  102. nat/eval/trajectory_evaluator/register.py +1 -1
  103. nat/eval/tunable_rag_evaluator/evaluate.py +4 -7
  104. nat/eval/utils/eval_trace_ctx.py +89 -0
  105. nat/eval/utils/weave_eval.py +18 -9
  106. nat/experimental/decorators/experimental_warning_decorator.py +27 -7
  107. nat/experimental/test_time_compute/functions/plan_select_execute_function.py +7 -3
  108. nat/experimental/test_time_compute/functions/ttc_tool_orchestration_function.py +3 -3
  109. nat/experimental/test_time_compute/functions/ttc_tool_wrapper_function.py +1 -1
  110. nat/experimental/test_time_compute/models/strategy_base.py +5 -4
  111. nat/experimental/test_time_compute/register.py +0 -1
  112. nat/experimental/test_time_compute/selection/llm_based_output_merging_selector.py +1 -3
  113. nat/front_ends/console/authentication_flow_handler.py +82 -30
  114. nat/front_ends/console/console_front_end_plugin.py +8 -5
  115. nat/front_ends/fastapi/auth_flow_handlers/websocket_flow_handler.py +52 -17
  116. nat/front_ends/fastapi/dask_client_mixin.py +65 -0
  117. nat/front_ends/fastapi/fastapi_front_end_config.py +36 -5
  118. nat/front_ends/fastapi/fastapi_front_end_controller.py +4 -4
  119. nat/front_ends/fastapi/fastapi_front_end_plugin.py +135 -4
  120. nat/front_ends/fastapi/fastapi_front_end_plugin_worker.py +481 -281
  121. nat/front_ends/fastapi/job_store.py +518 -99
  122. nat/front_ends/fastapi/main.py +11 -19
  123. nat/front_ends/fastapi/message_handler.py +13 -14
  124. nat/front_ends/fastapi/message_validator.py +17 -19
  125. nat/front_ends/fastapi/response_helpers.py +4 -4
  126. nat/front_ends/fastapi/step_adaptor.py +2 -2
  127. nat/front_ends/fastapi/utils.py +57 -0
  128. nat/front_ends/mcp/introspection_token_verifier.py +73 -0
  129. nat/front_ends/mcp/mcp_front_end_config.py +10 -1
  130. nat/front_ends/mcp/mcp_front_end_plugin.py +45 -13
  131. nat/front_ends/mcp/mcp_front_end_plugin_worker.py +116 -8
  132. nat/front_ends/mcp/tool_converter.py +44 -14
  133. nat/front_ends/register.py +0 -1
  134. nat/front_ends/simple_base/simple_front_end_plugin_base.py +3 -1
  135. nat/llm/aws_bedrock_llm.py +24 -12
  136. nat/llm/azure_openai_llm.py +13 -6
  137. nat/llm/litellm_llm.py +69 -0
  138. nat/llm/nim_llm.py +20 -8
  139. nat/llm/openai_llm.py +14 -6
  140. nat/llm/register.py +4 -1
  141. nat/llm/utils/env_config_value.py +2 -3
  142. nat/llm/utils/thinking.py +215 -0
  143. nat/meta/pypi.md +9 -9
  144. nat/object_store/register.py +0 -1
  145. nat/observability/exporter/base_exporter.py +3 -3
  146. nat/observability/exporter/file_exporter.py +1 -1
  147. nat/observability/exporter/processing_exporter.py +309 -81
  148. nat/observability/exporter/span_exporter.py +1 -1
  149. nat/observability/exporter_manager.py +7 -7
  150. nat/observability/mixin/file_mixin.py +7 -7
  151. nat/observability/mixin/redaction_config_mixin.py +42 -0
  152. nat/observability/mixin/tagging_config_mixin.py +62 -0
  153. nat/observability/mixin/type_introspection_mixin.py +420 -107
  154. nat/observability/processor/batching_processor.py +5 -7
  155. nat/observability/processor/falsy_batch_filter_processor.py +55 -0
  156. nat/observability/processor/processor.py +3 -0
  157. nat/observability/processor/processor_factory.py +70 -0
  158. nat/observability/processor/redaction/__init__.py +24 -0
  159. nat/observability/processor/redaction/contextual_redaction_processor.py +125 -0
  160. nat/observability/processor/redaction/contextual_span_redaction_processor.py +66 -0
  161. nat/observability/processor/redaction/redaction_processor.py +177 -0
  162. nat/observability/processor/redaction/span_header_redaction_processor.py +92 -0
  163. nat/observability/processor/span_tagging_processor.py +68 -0
  164. nat/observability/register.py +6 -4
  165. nat/profiler/calc/calc_runner.py +3 -4
  166. nat/profiler/callbacks/agno_callback_handler.py +1 -1
  167. nat/profiler/callbacks/langchain_callback_handler.py +6 -6
  168. nat/profiler/callbacks/llama_index_callback_handler.py +3 -3
  169. nat/profiler/callbacks/semantic_kernel_callback_handler.py +3 -3
  170. nat/profiler/data_frame_row.py +1 -1
  171. nat/profiler/decorators/framework_wrapper.py +62 -13
  172. nat/profiler/decorators/function_tracking.py +160 -3
  173. nat/profiler/forecasting/models/forecasting_base_model.py +3 -1
  174. nat/profiler/inference_optimization/bottleneck_analysis/simple_stack_analysis.py +1 -1
  175. nat/profiler/inference_optimization/data_models.py +3 -3
  176. nat/profiler/inference_optimization/experimental/prefix_span_analysis.py +7 -8
  177. nat/profiler/inference_optimization/token_uniqueness.py +1 -1
  178. nat/profiler/parameter_optimization/__init__.py +0 -0
  179. nat/profiler/parameter_optimization/optimizable_utils.py +93 -0
  180. nat/profiler/parameter_optimization/optimizer_runtime.py +67 -0
  181. nat/profiler/parameter_optimization/parameter_optimizer.py +153 -0
  182. nat/profiler/parameter_optimization/parameter_selection.py +107 -0
  183. nat/profiler/parameter_optimization/pareto_visualizer.py +380 -0
  184. nat/profiler/parameter_optimization/prompt_optimizer.py +384 -0
  185. nat/profiler/parameter_optimization/update_helpers.py +66 -0
  186. nat/profiler/profile_runner.py +14 -9
  187. nat/profiler/utils.py +4 -2
  188. nat/registry_handlers/local/local_handler.py +2 -2
  189. nat/registry_handlers/package_utils.py +1 -2
  190. nat/registry_handlers/pypi/pypi_handler.py +23 -26
  191. nat/registry_handlers/register.py +3 -4
  192. nat/registry_handlers/rest/rest_handler.py +12 -13
  193. nat/retriever/milvus/retriever.py +2 -2
  194. nat/retriever/nemo_retriever/retriever.py +1 -1
  195. nat/retriever/register.py +0 -1
  196. nat/runtime/loader.py +2 -2
  197. nat/runtime/runner.py +3 -2
  198. nat/runtime/session.py +43 -8
  199. nat/settings/global_settings.py +16 -5
  200. nat/tool/chat_completion.py +5 -2
  201. nat/tool/code_execution/local_sandbox/local_sandbox_server.py +3 -3
  202. nat/tool/datetime_tools.py +49 -9
  203. nat/tool/document_search.py +2 -2
  204. nat/tool/github_tools.py +450 -0
  205. nat/tool/nvidia_rag.py +1 -1
  206. nat/tool/register.py +2 -9
  207. nat/tool/retriever.py +3 -2
  208. nat/utils/callable_utils.py +70 -0
  209. nat/utils/data_models/schema_validator.py +3 -3
  210. nat/utils/exception_handlers/automatic_retries.py +104 -51
  211. nat/utils/exception_handlers/schemas.py +1 -1
  212. nat/utils/io/yaml_tools.py +2 -2
  213. nat/utils/log_levels.py +25 -0
  214. nat/utils/reactive/base/observable_base.py +2 -2
  215. nat/utils/reactive/base/observer_base.py +1 -1
  216. nat/utils/reactive/observable.py +2 -2
  217. nat/utils/reactive/observer.py +4 -4
  218. nat/utils/reactive/subscription.py +1 -1
  219. nat/utils/settings/global_settings.py +6 -8
  220. nat/utils/type_converter.py +4 -3
  221. nat/utils/type_utils.py +9 -5
  222. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/METADATA +42 -16
  223. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/RECORD +230 -189
  224. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/entry_points.txt +1 -0
  225. nat/cli/commands/info/list_mcp.py +0 -304
  226. nat/tool/github_tools/create_github_commit.py +0 -133
  227. nat/tool/github_tools/create_github_issue.py +0 -87
  228. nat/tool/github_tools/create_github_pr.py +0 -106
  229. nat/tool/github_tools/get_github_file.py +0 -106
  230. nat/tool/github_tools/get_github_issue.py +0 -166
  231. nat/tool/github_tools/get_github_pr.py +0 -256
  232. nat/tool/github_tools/update_github_issue.py +0 -100
  233. nat/tool/mcp/exceptions.py +0 -142
  234. nat/tool/mcp/mcp_client.py +0 -255
  235. nat/tool/mcp/mcp_tool.py +0 -96
  236. nat/utils/exception_handlers/mcp.py +0 -211
  237. /nat/{tool/github_tools → agent/prompt_optimizer}/__init__.py +0 -0
  238. /nat/{tool/mcp → authentication/credential_validator}/__init__.py +0 -0
  239. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/WHEEL +0 -0
  240. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/licenses/LICENSE-3rd-party.txt +0 -0
  241. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/licenses/LICENSE.md +0 -0
  242. {nvidia_nat-1.3.0.dev2.dist-info → nvidia_nat-1.3.0rc1.dist-info}/top_level.txt +0 -0
@@ -13,10 +13,12 @@
13
13
  # See the License for the specific language governing permissions and
14
14
  # limitations under the License.
15
15
 
16
+ import asyncio
16
17
  import json
17
- # pylint: disable=R0917
18
18
  import logging
19
+ import re
19
20
  from json import JSONDecodeError
21
+ from typing import Any
20
22
 
21
23
  from langchain_core.callbacks.base import AsyncCallbackHandler
22
24
  from langchain_core.language_models import BaseChatModel
@@ -28,6 +30,7 @@ from langchain_core.prompts.chat import ChatPromptTemplate
28
30
  from langchain_core.runnables.config import RunnableConfig
29
31
  from langchain_core.tools import BaseTool
30
32
  from langgraph.graph import StateGraph
33
+ from langgraph.graph.state import CompiledStateGraph
31
34
  from pydantic import BaseModel
32
35
  from pydantic import Field
33
36
 
@@ -42,6 +45,17 @@ from nat.agent.base import BaseAgent
42
45
  logger = logging.getLogger(__name__)
43
46
 
44
47
 
48
+ class ReWOOEvidence(BaseModel):
49
+ placeholder: str
50
+ tool: str
51
+ tool_input: Any
52
+
53
+
54
+ class ReWOOPlanStep(BaseModel):
55
+ plan: str
56
+ evidence: ReWOOEvidence
57
+
58
+
45
59
  class ReWOOGraphState(BaseModel):
46
60
  """State schema for the ReWOO Agent Graph"""
47
61
  messages: list[BaseMessage] = Field(default_factory=list) # input and output of the ReWOO Agent
@@ -50,15 +64,21 @@ class ReWOOGraphState(BaseModel):
50
64
  default_factory=lambda: AIMessage(content="")) # the plan generated by the planner to solve the task
51
65
  steps: AIMessage = Field(
52
66
  default_factory=lambda: AIMessage(content="")) # the steps to solve the task, parsed from the plan
67
+ # New fields for parallel execution support
68
+ evidence_map: dict[str, ReWOOPlanStep] = Field(default_factory=dict) # mapping from placeholders to step info
69
+ execution_levels: list[list[str]] = Field(default_factory=list) # levels for parallel execution
70
+ current_level: int = Field(default=0) # current execution level
53
71
  intermediate_results: dict[str, ToolMessage] = Field(default_factory=dict) # the intermediate results of each step
54
72
  result: AIMessage = Field(
55
73
  default_factory=lambda: AIMessage(content="")) # the final result of the task, generated by the solver
56
74
 
57
75
 
58
76
  class ReWOOAgentGraph(BaseAgent):
59
- """Configurable LangGraph ReWOO Agent. A ReWOO Agent performs reasoning by interacting with other objects or tools
60
- and utilizes their outputs to make decisions. Supports retrying on output parsing errors. Argument
61
- "detailed_logs" toggles logging of inputs, outputs, and intermediate steps."""
77
+ """Configurable ReWOO Agent.
78
+
79
+ Args:
80
+ detailed_logs: Toggles logging of inputs, outputs, and intermediate steps.
81
+ """
62
82
 
63
83
  def __init__(self,
64
84
  llm: BaseChatModel,
@@ -67,28 +87,34 @@ class ReWOOAgentGraph(BaseAgent):
67
87
  tools: list[BaseTool],
68
88
  use_tool_schema: bool = True,
69
89
  callbacks: list[AsyncCallbackHandler] | None = None,
70
- detailed_logs: bool = False):
71
- super().__init__(llm=llm, tools=tools, callbacks=callbacks, detailed_logs=detailed_logs)
90
+ detailed_logs: bool = False,
91
+ log_response_max_chars: int = 1000,
92
+ tool_call_max_retries: int = 3,
93
+ raise_tool_call_error: bool = True):
94
+ super().__init__(llm=llm,
95
+ tools=tools,
96
+ callbacks=callbacks,
97
+ detailed_logs=detailed_logs,
98
+ log_response_max_chars=log_response_max_chars)
72
99
 
73
100
  logger.debug(
74
101
  "%s Filling the prompt variables 'tools' and 'tool_names', using the tools provided in the config.",
75
102
  AGENT_LOG_PREFIX)
76
- tool_names = ",".join([tool.name for tool in tools[:-1]]) + ',' + tools[-1].name # prevent trailing ","
77
- if not use_tool_schema:
78
- tool_names_and_descriptions = "\n".join(
79
- [f"{tool.name}: {tool.description}"
80
- for tool in tools[:-1]]) + "\n" + f"{tools[-1].name}: {tools[-1].description}" # prevent trailing "\n"
81
- else:
82
- logger.debug("%s Adding the tools' input schema to the tools' description", AGENT_LOG_PREFIX)
83
- tool_names_and_descriptions = "\n".join([
84
- f"{tool.name}: {tool.description}. {INPUT_SCHEMA_MESSAGE.format(schema=tool.input_schema.model_fields)}"
85
- for tool in tools[:-1]
86
- ]) + "\n" + (f"{tools[-1].name}: {tools[-1].description}. "
87
- f"{INPUT_SCHEMA_MESSAGE.format(schema=tools[-1].input_schema.model_fields)}")
103
+
104
+ def describe_tool(tool: BaseTool) -> str:
105
+ description = f"{tool.name}: {tool.description}"
106
+ if use_tool_schema:
107
+ description += f". {INPUT_SCHEMA_MESSAGE.format(schema=tool.input_schema.model_fields)}"
108
+ return description
109
+
110
+ tool_names = ",".join(tool.name for tool in tools)
111
+ tool_names_and_descriptions = "\n".join(describe_tool(tool) for tool in tools)
88
112
 
89
113
  self.planner_prompt = planner_prompt.partial(tools=tool_names_and_descriptions, tool_names=tool_names)
90
114
  self.solver_prompt = solver_prompt
91
115
  self.tools_dict = {tool.name: tool for tool in tools}
116
+ self.tool_call_max_retries = tool_call_max_retries
117
+ self.raise_tool_call_error = raise_tool_call_error
92
118
 
93
119
  logger.debug("%s Initialized ReWOO Agent Graph", AGENT_LOG_PREFIX)
94
120
 
@@ -96,34 +122,91 @@ class ReWOOAgentGraph(BaseAgent):
96
122
  try:
97
123
  return self.tools_dict.get(tool_name)
98
124
  except Exception as ex:
99
- logger.exception("%s Unable to find tool with the name %s\n%s",
100
- AGENT_LOG_PREFIX,
101
- tool_name,
102
- ex,
103
- exc_info=True)
104
- raise ex
125
+ logger.error("%s Unable to find tool with the name %s\n%s", AGENT_LOG_PREFIX, tool_name, ex)
126
+ raise
105
127
 
106
128
  @staticmethod
107
- def _get_current_step(state: ReWOOGraphState) -> int:
108
- steps = state.steps.content
109
- if len(steps) == 0:
110
- raise RuntimeError('No steps received in ReWOOGraphState')
129
+ def _get_current_level_status(state: ReWOOGraphState) -> tuple[int, bool]:
130
+ """
131
+ Get the current execution level and whether it's complete.
132
+
133
+ Args:
134
+ state: The ReWOO graph state.
111
135
 
112
- if len(state.intermediate_results) == len(steps):
113
- # all steps are done
114
- return -1
136
+ Returns:
137
+ tuple of (current_level, is_complete). Level -1 means all execution is complete.
138
+ """
139
+ if not state.execution_levels:
140
+ return -1, True
115
141
 
116
- return len(state.intermediate_results)
142
+ current_level = state.current_level
143
+
144
+ # Check if we've completed all levels
145
+ if current_level >= len(state.execution_levels):
146
+ return -1, True
147
+
148
+ # Check if current level is complete
149
+ current_level_placeholders = state.execution_levels[current_level]
150
+ level_complete = all(placeholder in state.intermediate_results for placeholder in current_level_placeholders)
151
+
152
+ return current_level, level_complete
117
153
 
118
154
  @staticmethod
119
- def _parse_planner_output(planner_output: str) -> AIMessage:
155
+ def _parse_planner_output(planner_output: str) -> list[ReWOOPlanStep]:
120
156
 
121
157
  try:
122
- steps = json.loads(planner_output)
123
- except json.JSONDecodeError as ex:
158
+ return [ReWOOPlanStep(**step) for step in json.loads(planner_output)]
159
+ except Exception as ex:
124
160
  raise ValueError(f"The output of planner is invalid JSON format: {planner_output}") from ex
125
161
 
126
- return AIMessage(content=steps)
162
+ @staticmethod
163
+ def _parse_planner_dependencies(steps: list[ReWOOPlanStep]) -> tuple[dict[str, ReWOOPlanStep], list[list[str]]]:
164
+ """
165
+ Parse planner steps to identify dependencies and create execution levels for parallel processing.
166
+ This creates a dependency map and identifies which evidence placeholders can be executed in parallel.
167
+
168
+ Args:
169
+ steps: list of plan steps from the planner.
170
+
171
+ Returns:
172
+ A mapping from evidence placeholders to step info and execution levels for parallel processing.
173
+ """
174
+ # First pass: collect all evidence placeholders and their info
175
+ evidences: dict[str, ReWOOPlanStep] = {
176
+ step.evidence.placeholder: step
177
+ for step in steps if step.evidence and step.evidence.placeholder
178
+ }
179
+
180
+ # Second pass: find dependencies now that we have all placeholders
181
+ dependencies = {
182
+ step.evidence.placeholder: [
183
+ var for var in re.findall(r"#E\d+", str(step.evidence.tool_input))
184
+ if var in evidences and var != step.evidence.placeholder
185
+ ]
186
+ for step in steps if step.evidence and step.evidence.placeholder
187
+ }
188
+
189
+ # Create execution levels using topological sort
190
+ levels: list[list[str]] = []
191
+ remaining = dict(dependencies)
192
+
193
+ while remaining:
194
+ # Find items with no dependencies (can be executed in parallel)
195
+ ready = [placeholder for placeholder, deps in remaining.items() if not deps]
196
+
197
+ if not ready:
198
+ raise ValueError("Circular dependency detected in planner output")
199
+
200
+ levels.append(ready)
201
+
202
+ # Remove completed items from remaining
203
+ for placeholder in ready:
204
+ remaining.pop(placeholder)
205
+
206
+ # Remove completed items from other dependencies
207
+ for ph, deps in list(remaining.items()):
208
+ remaining[ph] = list(set(deps) - set(ready))
209
+ return evidences, levels
127
210
 
128
211
  @staticmethod
129
212
  def _replace_placeholder(placeholder: str, tool_input: str | dict, tool_output: str | dict) -> str | dict:
@@ -143,6 +226,7 @@ class ReWOOAgentGraph(BaseAgent):
143
226
 
144
227
  else:
145
228
  assert False, f"Unexpected type for tool_input: {type(tool_input)}"
229
+
146
230
  return tool_input
147
231
 
148
232
  @staticmethod
@@ -196,123 +280,206 @@ class ReWOOAgentGraph(BaseAgent):
196
280
 
197
281
  steps = self._parse_planner_output(str(plan.content))
198
282
 
283
+ # Parse dependencies and create execution levels for parallel processing
284
+ evidence_map, execution_levels = self._parse_planner_dependencies(steps)
285
+
199
286
  if self.detailed_logs:
200
287
  agent_response_log_message = AGENT_CALL_LOG_MESSAGE % (task, str(plan.content))
201
288
  logger.info("ReWOO agent planner output: %s", agent_response_log_message)
289
+ logger.info("ReWOO agent execution levels: %s", execution_levels)
202
290
 
203
- return {"plan": plan, "steps": steps}
291
+ return {
292
+ "plan": plan,
293
+ "evidence_map": evidence_map,
294
+ "execution_levels": execution_levels,
295
+ "current_level": 0,
296
+ }
204
297
 
205
298
  except Exception as ex:
206
- logger.exception("%s Failed to call planner_node: %s", AGENT_LOG_PREFIX, ex, exc_info=True)
207
- raise ex
299
+ logger.error("%s Failed to call planner_node: %s", AGENT_LOG_PREFIX, ex)
300
+ raise
208
301
 
209
302
  async def executor_node(self, state: ReWOOGraphState):
303
+ """
304
+ Execute tools in parallel for the current dependency level.
305
+
306
+ This replaces the sequential execution with parallel execution of tools
307
+ that have no dependencies between them.
308
+ """
210
309
  try:
211
310
  logger.debug("%s Starting the ReWOO Executor Node", AGENT_LOG_PREFIX)
212
311
 
213
- current_step = self._get_current_step(state)
214
- # The executor node should not be invoked after all steps are finished
215
- if current_step < 0:
216
- logger.error("%s ReWOO Executor is invoked with an invalid step number: %s",
217
- AGENT_LOG_PREFIX,
218
- current_step)
219
- raise RuntimeError(f"ReWOO Executor is invoked with an invalid step number: {current_step}")
220
-
221
- steps_content = state.steps.content
222
- if isinstance(steps_content, list) and current_step < len(steps_content):
223
- step = steps_content[current_step]
224
- if isinstance(step, dict) and "evidence" in step:
225
- step_info = step["evidence"]
226
- placeholder = step_info.get("placeholder", "")
227
- tool = step_info.get("tool", "")
228
- tool_input = step_info.get("tool_input", "")
312
+ current_level, level_complete = self._get_current_level_status(state)
313
+
314
+ # Should not be invoked if all levels are complete
315
+ if current_level < 0:
316
+ logger.error("%s ReWOO Executor invoked after all levels complete", AGENT_LOG_PREFIX)
317
+ raise RuntimeError("ReWOO Executor invoked after all levels complete")
318
+
319
+ # If current level is already complete, move to next level
320
+ if level_complete:
321
+ new_level = current_level + 1
322
+ logger.debug("%s Level %s complete, moving to level %s", AGENT_LOG_PREFIX, current_level, new_level)
323
+ return {"current_level": new_level}
324
+
325
+ # Get placeholders for current level
326
+ current_level_placeholders = state.execution_levels[current_level]
327
+
328
+ # Filter to only placeholders not yet completed
329
+ pending_placeholders = list(set(current_level_placeholders) - set(state.intermediate_results.keys()))
330
+
331
+ if not pending_placeholders:
332
+ # All placeholders in this level are done, move to next level
333
+ new_level = current_level + 1
334
+ return {"current_level": new_level}
335
+
336
+ logger.debug("%s Executing level %s with %s tools in parallel: %s",
337
+ AGENT_LOG_PREFIX,
338
+ current_level,
339
+ len(pending_placeholders),
340
+ pending_placeholders)
341
+
342
+ # Execute all tools in current level in parallel
343
+ tasks = []
344
+ for placeholder in pending_placeholders:
345
+ step_info = state.evidence_map[placeholder]
346
+ task = self._execute_single_tool(placeholder, step_info, state.intermediate_results)
347
+ tasks.append(task)
348
+
349
+ # Wait for all tasks in current level to complete
350
+ results = await asyncio.gather(*tasks, return_exceptions=True)
351
+
352
+ # Process results and update intermediate_results
353
+ updated_intermediate_results = dict(state.intermediate_results)
354
+
355
+ for placeholder, result in zip(pending_placeholders, results):
356
+ if isinstance(result, BaseException):
357
+ logger.error("%s Tool execution failed for %s: %s", AGENT_LOG_PREFIX, placeholder, result)
358
+ # Create error tool message
359
+ error_message = f"Tool execution failed: {str(result)}"
360
+ updated_intermediate_results[placeholder] = ToolMessage(content=error_message,
361
+ tool_call_id=placeholder)
362
+ if self.raise_tool_call_error:
363
+ raise result
229
364
  else:
230
- logger.error("%s Invalid step format at index %s", AGENT_LOG_PREFIX, current_step)
231
- return {"intermediate_results": state.intermediate_results}
232
- else:
233
- logger.error("%s Invalid steps content or index %s", AGENT_LOG_PREFIX, current_step)
234
- return {"intermediate_results": state.intermediate_results}
235
-
236
- intermediate_results = state.intermediate_results
237
-
238
- # Replace the placeholder in the tool input with the previous tool output
239
- for _placeholder, _tool_output in intermediate_results.items():
240
- _tool_output = _tool_output.content
241
- # If the content is a list, get the first element which should be a dict
242
- if isinstance(_tool_output, list):
243
- _tool_output = _tool_output[0]
244
- assert isinstance(_tool_output, dict)
245
-
246
- tool_input = self._replace_placeholder(_placeholder, tool_input, _tool_output)
247
-
248
- requested_tool = self._get_tool(tool)
249
- if not requested_tool:
250
- configured_tool_names = list(self.tools_dict.keys())
251
- logger.warning(
252
- "%s ReWOO Agent wants to call tool %s. In the ReWOO Agent's configuration within the config file,"
253
- "there is no tool with that name: %s",
254
- AGENT_LOG_PREFIX,
255
- tool,
256
- configured_tool_names)
257
-
258
- intermediate_results[placeholder] = ToolMessage(content=TOOL_NOT_FOUND_ERROR_MESSAGE.format(
259
- tool_name=tool, tools=configured_tool_names),
260
- tool_call_id=tool)
261
- return {"intermediate_results": intermediate_results}
365
+ updated_intermediate_results[placeholder] = result
366
+ # Check if the ToolMessage has error status and raise_tool_call_error is True
367
+ if (isinstance(result, ToolMessage) and hasattr(result, 'status') and result.status == "error"
368
+ and self.raise_tool_call_error):
369
+ logger.error("%s Tool call failed for %s: %s", AGENT_LOG_PREFIX, placeholder, result.content)
370
+ raise RuntimeError(f"Tool call failed: {result.content}")
262
371
 
263
372
  if self.detailed_logs:
264
- logger.debug("%s Calling tool %s with input: %s", AGENT_LOG_PREFIX, requested_tool.name, tool_input)
265
-
266
- # Run the tool. Try to use structured input, if possible
267
- tool_input_parsed = self._parse_tool_input(tool_input)
268
- tool_response = await self._call_tool(requested_tool,
269
- tool_input_parsed,
270
- RunnableConfig(callbacks=self.callbacks),
271
- max_retries=3)
373
+ logger.info("%s Completed level %s with %s tools",
374
+ AGENT_LOG_PREFIX,
375
+ current_level,
376
+ len(pending_placeholders))
272
377
 
273
- # ToolMessage only accepts str or list[str | dict] as content.
274
- # Convert into list if the response is a dict.
275
- if isinstance(tool_response, dict):
276
- tool_response = [tool_response]
277
-
278
- tool_response_message = ToolMessage(name=tool, tool_call_id=tool, content=tool_response)
279
-
280
- if self.detailed_logs:
281
- self._log_tool_response(requested_tool.name, tool_input_parsed, str(tool_response))
282
-
283
- intermediate_results[placeholder] = tool_response_message
284
- return {"intermediate_results": intermediate_results}
378
+ return {"intermediate_results": updated_intermediate_results}
285
379
 
286
380
  except Exception as ex:
287
- logger.exception("%s Failed to call executor_node: %s", AGENT_LOG_PREFIX, ex, exc_info=True)
288
- raise ex
381
+ logger.error("%s Failed to call executor_node: %s", AGENT_LOG_PREFIX, ex)
382
+ raise
383
+
384
+ async def _execute_single_tool(self,
385
+ placeholder: str,
386
+ step_info: ReWOOPlanStep,
387
+ intermediate_results: dict[str, ToolMessage]) -> ToolMessage:
388
+ """
389
+ Execute a single tool with proper placeholder replacement.
390
+
391
+ Args:
392
+ placeholder: The evidence placeholder (e.g., "#E1").
393
+ step_info: Step information containing tool and tool_input.
394
+ intermediate_results: Current intermediate results for placeholder replacement.
395
+
396
+ Returns:
397
+ ToolMessage with the tool execution result.
398
+ """
399
+ evidence_info = step_info.evidence
400
+ tool_name = evidence_info.tool
401
+ tool_input = evidence_info.tool_input
402
+
403
+ # Replace placeholders in tool input with previous results
404
+ for ph_key, tool_output in intermediate_results.items():
405
+ tool_output_content = tool_output.content
406
+ # If the content is a list, get the first element which should be a dict
407
+ if isinstance(tool_output_content, list):
408
+ tool_output_content = tool_output_content[0]
409
+ assert isinstance(tool_output_content, dict)
410
+
411
+ tool_input = self._replace_placeholder(ph_key, tool_input, tool_output_content)
412
+
413
+ # Get the requested tool
414
+ requested_tool = self._get_tool(tool_name)
415
+ if not requested_tool:
416
+ configured_tool_names = list(self.tools_dict.keys())
417
+ logger.warning(
418
+ "%s ReWOO Agent wants to call tool %s. In the ReWOO Agent's configuration within the config file,"
419
+ "there is no tool with that name: %s",
420
+ AGENT_LOG_PREFIX,
421
+ tool_name,
422
+ configured_tool_names)
423
+
424
+ return ToolMessage(content=TOOL_NOT_FOUND_ERROR_MESSAGE.format(tool_name=tool_name,
425
+ tools=configured_tool_names),
426
+ tool_call_id=placeholder)
427
+
428
+ if self.detailed_logs:
429
+ logger.debug("%s Calling tool %s with input: %s", AGENT_LOG_PREFIX, requested_tool.name, tool_input)
430
+
431
+ # Parse and execute the tool
432
+ tool_input_parsed = self._parse_tool_input(tool_input)
433
+ tool_response = await self._call_tool(
434
+ requested_tool,
435
+ tool_input_parsed,
436
+ RunnableConfig(callbacks=self.callbacks), # type: ignore
437
+ max_retries=self.tool_call_max_retries)
438
+
439
+ if self.detailed_logs:
440
+ self._log_tool_response(requested_tool.name, tool_input_parsed, str(tool_response))
441
+
442
+ return tool_response
289
443
 
290
444
  async def solver_node(self, state: ReWOOGraphState):
291
445
  try:
292
446
  logger.debug("%s Starting the ReWOO Solver Node", AGENT_LOG_PREFIX)
293
447
 
294
448
  plan = ""
295
- # Add the tool outputs of each step to the plan
296
- for step in state.steps.content:
297
- step_info = step["evidence"]
298
- placeholder = step_info.get("placeholder", "")
299
- tool_input = step_info.get("tool_input", "")
300
-
301
- intermediate_results = state.intermediate_results
302
- for _placeholder, _tool_output in intermediate_results.items():
303
- _tool_output = _tool_output.content
449
+ # Add the tool outputs of each step to the plan using evidence_map
450
+ for placeholder, step_info in state.evidence_map.items():
451
+ evidence_info = step_info.evidence
452
+ original_tool_input = evidence_info.tool_input
453
+ tool_name = evidence_info.tool
454
+
455
+ # Replace placeholders in tool input with actual results
456
+ final_tool_input = original_tool_input
457
+ for ph_key, tool_output in state.intermediate_results.items():
458
+ tool_output_content = tool_output.content
304
459
  # If the content is a list, get the first element which should be a dict
305
- if isinstance(_tool_output, list):
306
- _tool_output = _tool_output[0]
307
- assert isinstance(_tool_output, dict)
308
-
309
- tool_input = self._replace_placeholder(_placeholder, tool_input, _tool_output)
310
-
311
- placeholder = placeholder.replace(_placeholder, str(_tool_output))
312
-
313
- _plan = step.get("plan")
314
- tool = step_info.get("tool")
315
- plan += f"Plan: {_plan}\n{placeholder} = {tool}[{tool_input}]"
460
+ if isinstance(tool_output_content, list):
461
+ tool_output_content = tool_output_content[0]
462
+ assert isinstance(tool_output_content, dict)
463
+
464
+ final_tool_input = self._replace_placeholder(ph_key, final_tool_input, tool_output_content)
465
+
466
+ # Get the final result for this placeholder
467
+ final_result = ""
468
+ if placeholder in state.intermediate_results:
469
+ result_content = state.intermediate_results[placeholder].content
470
+ if isinstance(result_content, list):
471
+ result_content = result_content[0]
472
+ if isinstance(result_content, dict):
473
+ final_result = str(result_content)
474
+ else:
475
+ final_result = str(result_content)
476
+
477
+ step_plan = step_info.plan
478
+ plan += '\n'.join([
479
+ f"Plan: {step_plan}",
480
+ f"{placeholder} = {tool_name}[{final_tool_input}",
481
+ f"Result: {final_result}\n\n"
482
+ ])
316
483
 
317
484
  task = str(state.task.content)
318
485
  solver_prompt = self.solver_prompt.partial(plan=plan)
@@ -328,30 +495,39 @@ class ReWOOAgentGraph(BaseAgent):
328
495
  return {"result": output_message}
329
496
 
330
497
  except Exception as ex:
331
- logger.exception("%s Failed to call solver_node: %s", AGENT_LOG_PREFIX, ex, exc_info=True)
332
- raise ex
498
+ logger.error("%s Failed to call solver_node: %s", AGENT_LOG_PREFIX, ex)
499
+ raise
333
500
 
334
501
  async def conditional_edge(self, state: ReWOOGraphState):
335
502
  try:
336
503
  logger.debug("%s Starting the ReWOO Conditional Edge", AGENT_LOG_PREFIX)
337
504
 
338
- current_step = self._get_current_step(state)
339
- if current_step == -1:
340
- logger.debug("%s The ReWOO Executor has finished its task", AGENT_LOG_PREFIX)
505
+ current_level, level_complete = self._get_current_level_status(state)
506
+
507
+ # If all levels are complete, move to solver
508
+ if current_level == -1:
509
+ logger.debug("%s All execution levels complete, moving to solver", AGENT_LOG_PREFIX)
341
510
  return AgentDecision.END
342
511
 
343
- logger.debug("%s The ReWOO Executor is still working on the task", AGENT_LOG_PREFIX)
512
+ # If current level is complete, check if there are more levels
513
+ if level_complete:
514
+ next_level = current_level + 1
515
+ if next_level >= len(state.execution_levels):
516
+ logger.debug("%s All execution levels complete, moving to solver", AGENT_LOG_PREFIX)
517
+ return AgentDecision.END
518
+
519
+ logger.debug("%s Continuing with executor (level %s, complete: %s)",
520
+ AGENT_LOG_PREFIX,
521
+ current_level,
522
+ level_complete)
344
523
  return AgentDecision.TOOL
345
524
 
346
525
  except Exception as ex:
347
- logger.exception("%s Failed to determine whether agent is calling a tool: %s",
348
- AGENT_LOG_PREFIX,
349
- ex,
350
- exc_info=True)
526
+ logger.exception("%s Failed to determine whether agent is calling a tool: %s", AGENT_LOG_PREFIX, ex)
351
527
  logger.warning("%s Ending graph traversal", AGENT_LOG_PREFIX)
352
528
  return AgentDecision.END
353
529
 
354
- async def _build_graph(self, state_schema):
530
+ async def _build_graph(self, state_schema: type) -> CompiledStateGraph:
355
531
  try:
356
532
  logger.debug("%s Building and compiling the ReWOO Graph", AGENT_LOG_PREFIX)
357
533
 
@@ -361,8 +537,10 @@ class ReWOOAgentGraph(BaseAgent):
361
537
  graph.add_node("solver", self.solver_node)
362
538
 
363
539
  graph.add_edge("planner", "executor")
364
- conditional_edge_possible_outputs = {AgentDecision.TOOL: "executor", AgentDecision.END: "solver"}
365
- graph.add_conditional_edges("executor", self.conditional_edge, conditional_edge_possible_outputs)
540
+ graph.add_conditional_edges("executor",
541
+ self.conditional_edge, {
542
+ AgentDecision.TOOL: "executor", AgentDecision.END: "solver"
543
+ })
366
544
 
367
545
  graph.set_entry_point("planner")
368
546
  graph.set_finish_point("solver")
@@ -373,8 +551,8 @@ class ReWOOAgentGraph(BaseAgent):
373
551
  return self.graph
374
552
 
375
553
  except Exception as ex:
376
- logger.exception("%s Failed to build ReWOO Graph: %s", AGENT_LOG_PREFIX, ex, exc_info=ex)
377
- raise ex
554
+ logger.error("%s Failed to build ReWOO Graph: %s", AGENT_LOG_PREFIX, ex)
555
+ raise
378
556
 
379
557
  async def build_graph(self):
380
558
  try:
@@ -382,8 +560,8 @@ class ReWOOAgentGraph(BaseAgent):
382
560
  logger.debug("%s ReWOO Graph built and compiled successfully", AGENT_LOG_PREFIX)
383
561
  return self.graph
384
562
  except Exception as ex:
385
- logger.exception("%s Failed to build ReWOO Graph: %s", AGENT_LOG_PREFIX, ex, exc_info=ex)
386
- raise ex
563
+ logger.error("%s Failed to build ReWOO Graph: %s", AGENT_LOG_PREFIX, ex)
564
+ raise
387
565
 
388
566
  @staticmethod
389
567
  def validate_planner_prompt(planner_prompt: str) -> bool:
@@ -399,7 +577,7 @@ class ReWOOAgentGraph(BaseAgent):
399
577
  errors.append(error_message)
400
578
  if errors:
401
579
  error_text = "\n".join(errors)
402
- logger.exception("%s %s", AGENT_LOG_PREFIX, error_text)
580
+ logger.error("%s %s", AGENT_LOG_PREFIX, error_text)
403
581
  raise ValueError(error_text)
404
582
  return True
405
583
 
@@ -410,6 +588,6 @@ class ReWOOAgentGraph(BaseAgent):
410
588
  errors.append("The solver prompt cannot be empty.")
411
589
  if errors:
412
590
  error_text = "\n".join(errors)
413
- logger.exception("%s %s", AGENT_LOG_PREFIX, error_text)
591
+ logger.error("%s %s", AGENT_LOG_PREFIX, error_text)
414
592
  raise ValueError(error_text)
415
593
  return True