From 4b82440915392da6c8106c3328b39f78ff6759ca Mon Sep 17 00:00:00 2001 From: Evan Lohn Date: Thu, 30 Jan 2025 15:41:28 -0800 Subject: [PATCH] finished rebase and fixed issues --- .../agents/agent_search/basic/graph_builder.py | 2 +- .../deep_search_a/main/graph_builder.py | 14 ++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/backend/onyx/agents/agent_search/basic/graph_builder.py b/backend/onyx/agents/agent_search/basic/graph_builder.py index 9ea2b904ae84..43e3d0a67762 100644 --- a/backend/onyx/agents/agent_search/basic/graph_builder.py +++ b/backend/onyx/agents/agent_search/basic/graph_builder.py @@ -85,7 +85,7 @@ if __name__ == "__main__": graph = basic_graph_builder() compiled_graph = graph.compile() - input = BasicInput(logs="") + input = BasicInput(_unused=True) primary_llm, fast_llm = get_default_llms() with get_session_context_manager() as db_session: config, _ = get_test_config( diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py index 24d27ef1eb4d..ae47d6cd12bc 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py @@ -156,13 +156,8 @@ def main_graph_builder(test_mode: bool = False) -> StateGraph: ) graph.add_edge( -<<<<<<< HEAD - start_key="agent_search_start", - end_key="generate_initial_answer_subgraph", -======= start_key="start_agent_search", - end_key="initial_search_sq_subgraph", ->>>>>>> ab2510c4d (main nodes renaming) + end_key="generate_initial_answer_subgraph", ) graph.add_edge( @@ -171,13 +166,8 @@ def main_graph_builder(test_mode: bool = False) -> StateGraph: ) graph.add_edge( -<<<<<<< HEAD - start_key=["generate_initial_answer_subgraph", "entity_term_extraction_llm"], - end_key="refined_answer_decision", -======= - start_key=["initial_search_sq_subgraph", "extract_entity_term"], + start_key=["generate_initial_answer_subgraph", "extract_entity_term"], end_key="validate_refined_answer", ->>>>>>> ab2510c4d (main nodes renaming) ) graph.add_conditional_edges(