From 91b929d46643e8b143f963249e9cc67b4332209c Mon Sep 17 00:00:00 2001 From: joachim-danswer Date: Wed, 29 Jan 2025 08:31:00 -0800 Subject: [PATCH] graph directory renamings --- .../edges.py | 6 ++-- .../graph_builder.py | 20 +++++------ .../nodes/ingest_initial_sub_answers.py} | 10 +++--- .../nodes/initial_decomposition.py} | 14 +++++--- .../states.py | 10 ++++-- .../edges.py | 4 +-- .../graph_builder.py | 18 +++++----- .../models.py | 0 .../nodes/answer_check.py | 4 +-- .../nodes/answer_generation.py | 4 +-- .../nodes/format_answer.py | 4 +-- .../nodes/ingest_retrieval.py | 4 +-- .../states.py | 0 .../graph_builder.py | 14 ++++---- .../models.py | 0 .../nodes/format_raw_search_results.py | 4 +-- .../nodes/generate_raw_search_data.py | 2 +- .../nodes/ingest_initial_base_retrieval.py | 8 +++-- .../states.py | 8 +++-- .../edges.py | 6 ++-- .../graph_builder.py | 18 +++++----- .../nodes/generate_initial_answer.py | 16 +++++---- .../nodes/ingest_initial_base_retrieval.py | 8 +++-- .../nodes/initial_answer_quality_check.py | 6 ++-- .../nodes/retrieval_consolidation.py | 4 +-- .../states.py | 24 ++++++++----- .../{main => main__graph}/edges.py | 8 ++--- .../{main => main__graph}/graph_builder.py | 34 +++++++++---------- .../{main => main__graph}/models.py | 0 .../nodes/agent_logging.py | 12 ++++--- .../nodes/agent_path_decision.py | 6 ++-- .../nodes/agent_path_routing.py | 2 +- .../nodes/agent_search_start.py | 8 +++-- .../nodes/answer_comparison.py | 6 ++-- .../nodes/direct_llm_handling.py | 8 +++-- .../nodes/entity_term_extraction_llm.py | 6 ++-- ...enerate_initial_base_search_only_answer.py | 8 +++-- .../nodes/generate_refined_answer.py | 16 +++++---- .../nodes/ingest_refined_answers.py | 8 +++-- .../nodes/refined_answer_decision.py | 6 ++-- .../nodes/refined_sub_question_creation.py | 14 +++++--- .../{main => main__graph}/operations.py | 0 .../{main => main__graph}/states.py | 12 ++++--- .../edges.py | 4 +-- .../graph_builder.py | 18 +++++----- .../models.py | 0 .../edges.py | 4 +-- .../graph_builder.py | 22 ++++++------ .../models.py | 0 .../nodes/doc_reranking.py | 8 +++-- .../nodes/doc_retrieval.py | 8 +++-- .../nodes/doc_verification.py | 4 +-- .../nodes/dummy.py | 4 +-- .../nodes/expand_queries.py | 10 +++--- .../nodes/format_results.py | 8 ++--- .../nodes/verification_kickoff.py | 4 +-- .../operations.py | 0 .../states.py | 2 +- backend/onyx/agents/agent_search/run_graph.py | 6 ++-- .../agent_search/shared_graph_utils/models.py | 12 ++++--- 60 files changed, 272 insertions(+), 212 deletions(-) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__consolidate_sub_answers__subgraph}/edges.py (85%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_sub_question_answering => initial__consolidate_sub_answers__subgraph}/graph_builder.py (73%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_sub_question_answering/nodes/ingest_initial_sub_question_answers.py => initial__consolidate_sub_answers__subgraph/nodes/ingest_initial_sub_answers.py} (81%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_sub_question_answering/nodes/initial_sub_question_creation.py => initial__consolidate_sub_answers__subgraph/nodes/initial_decomposition.py} (90%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_sub_question_answering => initial__consolidate_sub_answers__subgraph}/states.py (63%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/edges.py (78%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/graph_builder.py (75%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/nodes/answer_check.py (90%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/nodes/answer_generation.py (95%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/nodes/format_answer.py (81%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/nodes/ingest_retrieval.py (80%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_initial_sub_question => initial__individual_sub_answer__subgraph}/states.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/graph_builder.py (71%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/nodes/format_raw_search_results.py (72%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/nodes/generate_raw_search_data.py (89%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/nodes/ingest_initial_base_retrieval.py (81%) rename backend/onyx/agents/agent_search/deep_search_a/{base_raw_search => initial__retrieval__subgraph}/states.py (75%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_sub_question_answering => initial__retrieval_sub_answers__subgraph}/edges.py (85%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/graph_builder.py (79%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/nodes/generate_initial_answer.py (94%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/nodes/ingest_initial_base_retrieval.py (82%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/nodes/initial_answer_quality_check.py (78%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/nodes/retrieval_consolidation.py (56%) rename backend/onyx/agents/agent_search/deep_search_a/{initial_search_sq_subgraph => initial__retrieval_sub_answers__subgraph}/states.py (54%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/edges.py (91%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/graph_builder.py (88%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/agent_logging.py (91%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/agent_path_decision.py (80%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/agent_path_routing.py (90%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/agent_search_start.py (88%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/answer_comparison.py (88%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/direct_llm_handling.py (90%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/entity_term_extraction_llm.py (94%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/generate_initial_base_search_only_answer.py (85%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/generate_refined_answer.py (95%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/ingest_refined_answers.py (79%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/refined_answer_decision.py (84%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/nodes/refined_sub_question_creation.py (89%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/operations.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{main => main__graph}/states.py (92%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_refinement_sub_question => refinement__consolidate_sub_answers__subgraph}/edges.py (78%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_refinement_sub_question => refinement__consolidate_sub_answers__subgraph}/graph_builder.py (75%) rename backend/onyx/agents/agent_search/deep_search_a/{answer_refinement_sub_question => refinement__consolidate_sub_answers__subgraph}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/edges.py (84%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/graph_builder.py (73%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/doc_reranking.py (92%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/doc_retrieval.py (92%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/doc_verification.py (89%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/dummy.py (61%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/expand_queries.py (85%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/format_results.py (89%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/nodes/verification_kickoff.py (86%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/operations.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/{expanded_retrieval => util__expanded_retrieval__subgraph}/states.py (95%) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/edges.py similarity index 85% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/edges.py index 2c3f9ebf8..f92727b4f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/edges.py @@ -3,13 +3,13 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) from onyx.agents.agent_search.shared_graph_utils.utils import make_question_id diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/graph_builder.py similarity index 73% rename from backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/graph_builder.py index 8bb9ce604..41f9de1d5 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/graph_builder.py @@ -2,24 +2,24 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.graph_builder import ( - answer_query_graph_builder, -) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.edges import ( +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.edges import ( parallelize_initial_sub_question_answering, ) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.nodes.ingest_initial_sub_question_answers import ( - ingest_initial_sub_question_answers, +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.nodes.ingest_initial_sub_answers import ( + ingest_initial_sub_answers, ) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.nodes.initial_sub_question_creation import ( +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.nodes.initial_decomposition import ( initial_sub_question_creation, ) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.states import ( +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.states import ( SQInput, ) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.states import ( +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.states import ( SQState, ) +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.graph_builder import ( + answer_query_graph_builder, +) from onyx.utils.logger import setup_logger logger = setup_logger() @@ -45,7 +45,7 @@ def initial_sq_subgraph_builder(test_mode: bool = False) -> StateGraph: graph.add_node( node="ingest_initial_sub_question_answers", - action=ingest_initial_sub_question_answers, + action=ingest_initial_sub_answers, ) ### Add edges ### diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/ingest_initial_sub_question_answers.py b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/ingest_initial_sub_answers.py similarity index 81% rename from backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/ingest_initial_sub_question_answers.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/ingest_initial_sub_answers.py index 143898270..f4c606bba 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/ingest_initial_sub_question_answers.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/ingest_initial_sub_answers.py @@ -1,16 +1,18 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import DecompAnswersUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + DecompAnswersUpdate, +) from onyx.agents.agent_search.shared_graph_utils.operators import ( dedup_inference_sections, ) -def ingest_initial_sub_question_answers( +def ingest_initial_sub_answers( state: AnswerQuestionOutput, ) -> DecompAnswersUpdate: now_start = datetime.now() diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/initial_sub_question_creation.py b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/initial_decomposition.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/initial_sub_question_creation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/initial_decomposition.py index 9afe10fe3..2466185fb 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/nodes/initial_sub_question_creation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/nodes/initial_decomposition.py @@ -6,13 +6,17 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_content from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) -from onyx.agents.agent_search.deep_search_a.main.models import AgentRefinedMetrics -from onyx.agents.agent_search.deep_search_a.main.operations import dispatch_subquestion -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import BaseDecompUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentRefinedMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.operations import ( + dispatch_subquestion, +) +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import BaseDecompUpdate from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( build_history_prompt, diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/states.py similarity index 63% rename from backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/states.py index b05ad4241..a563defd0 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/states.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__consolidate_sub_answers__subgraph/states.py @@ -1,9 +1,13 @@ from typing import TypedDict from onyx.agents.agent_search.core_state import CoreState -from onyx.agents.agent_search.deep_search_a.main.states import BaseDecompUpdate -from onyx.agents.agent_search.deep_search_a.main.states import DecompAnswersUpdate -from onyx.agents.agent_search.deep_search_a.main.states import InitialAnswerUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import BaseDecompUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + DecompAnswersUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + InitialAnswerUpdate, +) ### States ### diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/edges.py similarity index 78% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/edges.py index aa9ffafde..d152c7a17 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/edges.py @@ -3,10 +3,10 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) from onyx.utils.logger import setup_logger diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/graph_builder.py similarity index 75% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/graph_builder.py index a6d9c6ecb..e08aa2a4e 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/graph_builder.py @@ -2,31 +2,31 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.edges import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.edges import ( send_to_expanded_retrieval, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.answer_check import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.answer_check import ( answer_check, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.answer_generation import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.answer_generation import ( answer_generation, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.format_answer import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.format_answer import ( format_answer, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.ingest_retrieval import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.ingest_retrieval import ( ingest_retrieval, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.graph_builder import ( expanded_retrieval_graph_builder, ) from onyx.agents.agent_search.shared_graph_utils.utils import get_test_config diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/models.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/models.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_check.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_check.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_check.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_check.py index 031806711..39b053c67 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_check.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_check.py @@ -5,10 +5,10 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_message_runs from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( QACheckUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_generation.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_generation.py similarity index 95% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_generation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_generation.py index 0bf87b094..121f32628 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/answer_generation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/answer_generation.py @@ -6,10 +6,10 @@ from langchain_core.callbacks.manager import dispatch_custom_event from langchain_core.messages import merge_message_runs from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( QAGenerationUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/format_answer.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/format_answer.py similarity index 81% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/format_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/format_answer.py index aa97b4d2b..92f1d5b8c 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/format_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/format_answer.py @@ -1,7 +1,7 @@ -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionState, ) from onyx.agents.agent_search.shared_graph_utils.models import ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/ingest_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/ingest_retrieval.py similarity index 80% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/ingest_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/ingest_retrieval.py index 1449a07d0..3df554abd 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/nodes/ingest_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/nodes/ingest_retrieval.py @@ -1,7 +1,7 @@ -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( RetrievalIngestionUpdate, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalOutput, ) from onyx.agents.agent_search.shared_graph_utils.models import AgentChunkStats diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/states.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/answer_initial_sub_question/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__individual_sub_answer__subgraph/states.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/graph_builder.py similarity index 71% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/graph_builder.py index bbcb33651..a91a9dacc 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/graph_builder.py @@ -2,25 +2,25 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.base_raw_search.nodes.format_raw_search_results import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.nodes.format_raw_search_results import ( format_raw_search_results, ) -from onyx.agents.agent_search.deep_search_a.base_raw_search.nodes.generate_raw_search_data import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.nodes.generate_raw_search_data import ( generate_raw_search_data, ) -from onyx.agents.agent_search.deep_search_a.base_raw_search.nodes.ingest_initial_base_retrieval import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.nodes.ingest_initial_base_retrieval import ( ingest_initial_base_retrieval, ) -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchInput, ) -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchOutput, ) -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchState, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.graph_builder import ( expanded_retrieval_graph_builder, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/models.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/models.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/format_raw_search_results.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/format_raw_search_results.py similarity index 72% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/format_raw_search_results.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/format_raw_search_results.py index 92816a93c..7ab7c5107 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/format_raw_search_results.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/format_raw_search_results.py @@ -1,7 +1,7 @@ -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchOutput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalOutput, ) from onyx.utils.logger import setup_logger diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/generate_raw_search_data.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/generate_raw_search_data.py similarity index 89% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/generate_raw_search_data.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/generate_raw_search_data.py index 5526745b6..34eddfb18 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/generate_raw_search_data.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/generate_raw_search_data.py @@ -3,7 +3,7 @@ from typing import cast from langchain_core.runnables.config import RunnableConfig from onyx.agents.agent_search.core_state import CoreState -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/ingest_initial_base_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/ingest_initial_base_retrieval.py similarity index 81% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/ingest_initial_base_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/ingest_initial_base_retrieval.py index 986d68023..3f600c837 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/nodes/ingest_initial_base_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/nodes/ingest_initial_base_retrieval.py @@ -1,10 +1,12 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchOutput, ) -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ExpandedRetrievalUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExpandedRetrievalUpdate, +) from onyx.agents.agent_search.shared_graph_utils.models import AgentChunkStats diff --git a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/states.py similarity index 75% rename from backend/onyx/agents/agent_search/deep_search_a/base_raw_search/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/states.py index d967959bb..132f7fe5a 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/base_raw_search/states.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval__subgraph/states.py @@ -1,12 +1,14 @@ from pydantic import BaseModel -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.models import ( +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExpandedRetrievalUpdate, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.models import ( ExpandedRetrievalResult, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) -from onyx.agents.agent_search.deep_search_a.main.states import ExpandedRetrievalUpdate ## Update States diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/edges.py similarity index 85% rename from backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/edges.py index 2c3f9ebf8..f92727b4f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_sub_question_answering/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/edges.py @@ -3,13 +3,13 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) from onyx.agents.agent_search.shared_graph_utils.utils import make_question_id diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/graph_builder.py similarity index 79% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/graph_builder.py index 3ffff1d7a..67cc07451 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/graph_builder.py @@ -2,27 +2,27 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.base_raw_search.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.initial__consolidate_sub_answers__subgraph.graph_builder import ( + initial_sq_subgraph_builder, +) +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.graph_builder import ( base_raw_search_graph_builder, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.nodes.generate_initial_answer import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.nodes.generate_initial_answer import ( generate_initial_answer, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.nodes.initial_answer_quality_check import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.nodes.initial_answer_quality_check import ( initial_answer_quality_check, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.nodes.retrieval_consolidation import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.nodes.retrieval_consolidation import ( retrieval_consolidation, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQInput, ) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) -from onyx.agents.agent_search.deep_search_a.initial_sub_question_answering.graph_builder import ( - initial_sq_subgraph_builder, -) from onyx.utils.logger import setup_logger logger = setup_logger() diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/generate_initial_answer.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/generate_initial_answer.py similarity index 94% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/generate_initial_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/generate_initial_answer.py index 260eb7b3b..392448a7d 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/generate_initial_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/generate_initial_answer.py @@ -7,19 +7,21 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_content from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) -from onyx.agents.agent_search.deep_search_a.main.models import AgentBaseMetrics -from onyx.agents.agent_search.deep_search_a.main.operations import ( +from onyx.agents.agent_search.deep_search_a.main__graph.models import AgentBaseMetrics +from onyx.agents.agent_search.deep_search_a.main__graph.operations import ( calculate_initial_agent_stats, ) -from onyx.agents.agent_search.deep_search_a.main.operations import get_query_info -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.operations import ( +from onyx.agents.agent_search.deep_search_a.main__graph.operations import get_query_info +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.operations import ( remove_document_citations, ) -from onyx.agents.agent_search.deep_search_a.main.states import InitialAnswerUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + InitialAnswerUpdate, +) from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( build_history_prompt, diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/ingest_initial_base_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/ingest_initial_base_retrieval.py similarity index 82% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/ingest_initial_base_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/ingest_initial_base_retrieval.py index 5edc8ce7a..88357a3c9 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/ingest_initial_base_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/ingest_initial_base_retrieval.py @@ -1,10 +1,12 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.base_raw_search.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval__subgraph.states import ( BaseRawSearchOutput, ) -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ExpandedRetrievalUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExpandedRetrievalUpdate, +) from onyx.agents.agent_search.shared_graph_utils.models import AgentChunkStats diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/initial_answer_quality_check.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/initial_answer_quality_check.py similarity index 78% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/initial_answer_quality_check.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/initial_answer_quality_check.py index 64845a9a4..fab5ea77a 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/initial_answer_quality_check.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/initial_answer_quality_check.py @@ -1,10 +1,10 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( InitialAnswerQualityUpdate, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/retrieval_consolidation.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/retrieval_consolidation.py similarity index 56% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/retrieval_consolidation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/retrieval_consolidation.py index 880d6d73b..acc27c0e3 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/nodes/retrieval_consolidation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/nodes/retrieval_consolidation.py @@ -1,9 +1,9 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.states import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.states import ( SearchSQState, ) -from onyx.agents.agent_search.deep_search_a.main.states import LoggerUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import LoggerUpdate def retrieval_consolidation( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/states.py similarity index 54% rename from backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/states.py index 757fa26e5..982d39d6f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial_search_sq_subgraph/states.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial__retrieval_sub_answers__subgraph/states.py @@ -3,17 +3,25 @@ from typing import Annotated from typing import TypedDict from onyx.agents.agent_search.core_state import CoreState -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.models import ( - ExpandedRetrievalResult, +from onyx.agents.agent_search.deep_search_a.main__graph.states import BaseDecompUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + DecompAnswersUpdate, ) -from onyx.agents.agent_search.deep_search_a.main.states import BaseDecompUpdate -from onyx.agents.agent_search.deep_search_a.main.states import DecompAnswersUpdate -from onyx.agents.agent_search.deep_search_a.main.states import ExpandedRetrievalUpdate -from onyx.agents.agent_search.deep_search_a.main.states import ExploratorySearchUpdate -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExpandedRetrievalUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExploratorySearchUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( InitialAnswerQualityUpdate, ) -from onyx.agents.agent_search.deep_search_a.main.states import InitialAnswerUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + InitialAnswerUpdate, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.models import ( + ExpandedRetrievalResult, +) ### States ### diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/edges.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/edges.py similarity index 91% rename from backend/onyx/agents/agent_search/deep_search_a/main/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/edges.py index a2dc41b93..40cdfca86 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/edges.py @@ -6,14 +6,14 @@ from typing import Literal from langchain_core.runnables import RunnableConfig from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainState -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( RequireRefinedAnswerUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig 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/graph_builder.py similarity index 88% rename from backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/graph_builder.py index 1e29453c2..609914e3a 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/graph_builder.py @@ -2,47 +2,47 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.answer_refinement_sub_question.graph_builder import ( - answer_refined_query_graph_builder, -) -from onyx.agents.agent_search.deep_search_a.initial_search_sq_subgraph.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.initial__retrieval_sub_answers__subgraph.graph_builder import ( initial_search_sq_subgraph_builder, ) -from onyx.agents.agent_search.deep_search_a.main.edges import ( +from onyx.agents.agent_search.deep_search_a.main__graph.edges import ( continue_to_refined_answer_or_end, ) -from onyx.agents.agent_search.deep_search_a.main.edges import ( +from onyx.agents.agent_search.deep_search_a.main__graph.edges import ( parallelize_refined_sub_question_answering, ) -from onyx.agents.agent_search.deep_search_a.main.edges import ( +from onyx.agents.agent_search.deep_search_a.main__graph.edges import ( route_initial_tool_choice, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.agent_logging import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.agent_logging import ( agent_logging, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.agent_search_start import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.agent_search_start import ( agent_search_start, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.answer_comparison import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.answer_comparison import ( answer_comparison, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.entity_term_extraction_llm import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.entity_term_extraction_llm import ( entity_term_extraction_llm, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.generate_refined_answer import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.generate_refined_answer import ( generate_refined_answer, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.ingest_refined_answers import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.ingest_refined_answers import ( ingest_refined_answers, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.refined_answer_decision import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.refined_answer_decision import ( refined_answer_decision, ) -from onyx.agents.agent_search.deep_search_a.main.nodes.refined_sub_question_creation import ( +from onyx.agents.agent_search.deep_search_a.main__graph.nodes.refined_sub_question_creation import ( refined_sub_question_creation, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainInput -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainInput +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState +from onyx.agents.agent_search.deep_search_a.refinement__consolidate_sub_answers__subgraph.graph_builder import ( + answer_refined_query_graph_builder, +) from onyx.agents.agent_search.orchestration.nodes.basic_use_tool_response import ( basic_use_tool_response, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/models.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/main/models.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_logging.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_logging.py similarity index 91% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_logging.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_logging.py index 3890769e1..a76a84e95 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_logging.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_logging.py @@ -3,11 +3,13 @@ from typing import cast from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.models import AgentAdditionalMetrics -from onyx.agents.agent_search.deep_search_a.main.models import AgentTimings -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import MainOutput -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentAdditionalMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.models import AgentTimings +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainOutput +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.models import CombinedAgentMetrics from onyx.db.chat import log_agent_metrics diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_decision.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_decision.py similarity index 80% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_decision.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_decision.py index 40d38408a..529f4910a 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_decision.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_decision.py @@ -3,9 +3,9 @@ from typing import cast from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import MainState -from onyx.agents.agent_search.deep_search_a.main.states import RoutingDecision +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import RoutingDecision from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_routing.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_routing.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_routing.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_routing.py index f539c1695..4da2f46b8 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_path_routing.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_path_routing.py @@ -3,7 +3,7 @@ from typing import Literal from langgraph.types import Command -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState def agent_path_routing( diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_search_start.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_search_start.py similarity index 88% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_search_start.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_search_start.py index e7ee37930..76ccfc62b 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/agent_search_start.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/agent_search_start.py @@ -3,9 +3,11 @@ from typing import cast from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ExploratorySearchUpdate -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + ExploratorySearchUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( build_history_prompt, diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/answer_comparison.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/answer_comparison.py similarity index 88% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/answer_comparison.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/answer_comparison.py index 75635933f..01c5de85b 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/answer_comparison.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/answer_comparison.py @@ -5,9 +5,9 @@ from langchain_core.callbacks.manager import dispatch_custom_event from langchain_core.messages import HumanMessage from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import AnswerComparison -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import AnswerComparison +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.prompts import ANSWER_COMPARISON_PROMPT from onyx.chat.models import RefinedAnswerImprovement diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/direct_llm_handling.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/direct_llm_handling.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/direct_llm_handling.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/direct_llm_handling.py index 1e244c8d8..8f275f297 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/direct_llm_handling.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/direct_llm_handling.py @@ -7,9 +7,11 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_content from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import InitialAnswerUpdate -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + InitialAnswerUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.prompts import DIRECT_LLM_PROMPT from onyx.agents.agent_search.shared_graph_utils.utils import ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/entity_term_extraction_llm.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/entity_term_extraction_llm.py similarity index 94% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/entity_term_extraction_llm.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/entity_term_extraction_llm.py index dbef33257..7df9d11a0 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/entity_term_extraction_llm.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/entity_term_extraction_llm.py @@ -6,11 +6,11 @@ from typing import cast from langchain_core.messages import HumanMessage from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( EntityTermExtractionUpdate, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( trim_prompt_piece, diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_initial_base_search_only_answer.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_initial_base_search_only_answer.py similarity index 85% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_initial_base_search_only_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_initial_base_search_only_answer.py index ecdadfff1..4bba848c8 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_initial_base_search_only_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_initial_base_search_only_answer.py @@ -4,9 +4,11 @@ from typing import cast from langchain_core.messages import HumanMessage from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import InitialAnswerBASEUpdate -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + InitialAnswerBASEUpdate, +) +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( trim_prompt_piece, diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_refined_answer.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_refined_answer.py similarity index 95% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_refined_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_refined_answer.py index ed10af303..6b71ff283 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/generate_refined_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/generate_refined_answer.py @@ -7,14 +7,18 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_content from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.models import AgentRefinedMetrics -from onyx.agents.agent_search.deep_search_a.main.operations import get_query_info -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.operations import ( +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentRefinedMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.operations import get_query_info +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.operations import ( remove_document_citations, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainState -from onyx.agents.agent_search.deep_search_a.main.states import RefinedAnswerUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + RefinedAnswerUpdate, +) from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( build_history_prompt, diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/ingest_refined_answers.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/ingest_refined_answers.py similarity index 79% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/ingest_refined_answers.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/ingest_refined_answers.py index bbc51a074..de15e664d 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/ingest_refined_answers.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/ingest_refined_answers.py @@ -1,10 +1,12 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import DecompAnswersUpdate +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + DecompAnswersUpdate, +) from onyx.agents.agent_search.shared_graph_utils.operators import ( dedup_inference_sections, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_answer_decision.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_answer_decision.py similarity index 84% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_answer_decision.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_answer_decision.py index d5dece553..a8a629226 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_answer_decision.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_answer_decision.py @@ -3,9 +3,9 @@ from typing import cast from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import MainState -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( RequireRefinedAnswerUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_sub_question_creation.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_sub_question_creation.py similarity index 89% rename from backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_sub_question_creation.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_sub_question_creation.py index 614a0ed2d..c4e0c6b43 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/nodes/refined_sub_question_creation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/nodes/refined_sub_question_creation.py @@ -6,13 +6,17 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_content from langchain_core.runnables import RunnableConfig -from onyx.agents.agent_search.deep_search_a.main.models import FollowUpSubQuestion -from onyx.agents.agent_search.deep_search_a.main.operations import dispatch_subquestion -from onyx.agents.agent_search.deep_search_a.main.operations import logger -from onyx.agents.agent_search.deep_search_a.main.states import ( +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + FollowUpSubQuestion, +) +from onyx.agents.agent_search.deep_search_a.main__graph.operations import ( + dispatch_subquestion, +) +from onyx.agents.agent_search.deep_search_a.main__graph.operations import logger +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( FollowUpSubQuestionsUpdate, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainState +from onyx.agents.agent_search.deep_search_a.main__graph.states import MainState from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.agent_prompt_ops import ( build_history_prompt, diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/operations.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/operations.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/main/operations.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/operations.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/states.py b/backend/onyx/agents/agent_search/deep_search_a/main__graph/states.py similarity index 92% rename from backend/onyx/agents/agent_search/deep_search_a/main/states.py rename to backend/onyx/agents/agent_search/deep_search_a/main__graph/states.py index 598da5bb7..17a2c2349 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/states.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main__graph/states.py @@ -6,12 +6,16 @@ from typing import TypedDict from pydantic import BaseModel from onyx.agents.agent_search.core_state import CoreState -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.models import ( +from onyx.agents.agent_search.deep_search_a.main__graph.models import AgentBaseMetrics +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentRefinedMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + FollowUpSubQuestion, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.models import ( ExpandedRetrievalResult, ) -from onyx.agents.agent_search.deep_search_a.main.models import AgentBaseMetrics -from onyx.agents.agent_search.deep_search_a.main.models import AgentRefinedMetrics -from onyx.agents.agent_search.deep_search_a.main.models import FollowUpSubQuestion from onyx.agents.agent_search.orchestration.states import ToolCallUpdate from onyx.agents.agent_search.orchestration.states import ToolChoiceInput from onyx.agents.agent_search.orchestration.states import ToolChoiceUpdate diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/edges.py b/backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/edges.py similarity index 78% rename from backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/edges.py index 201ac6a4a..370da0708 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/edges.py @@ -3,10 +3,10 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) from onyx.utils.logger import setup_logger diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/graph_builder.py similarity index 75% rename from backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/graph_builder.py index fd991aef2..9bb4f3293 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/graph_builder.py @@ -2,31 +2,31 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.answer_check import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.answer_check import ( answer_check, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.answer_generation import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.answer_generation import ( answer_generation, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.format_answer import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.format_answer import ( format_answer, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.nodes.ingest_retrieval import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.nodes.ingest_retrieval import ( ingest_retrieval, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.answer_initial_sub_question.states import ( +from onyx.agents.agent_search.deep_search_a.initial__individual_sub_answer__subgraph.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.answer_refinement_sub_question.edges import ( +from onyx.agents.agent_search.deep_search_a.refinement__consolidate_sub_answers__subgraph.edges import ( send_to_expanded_refined_retrieval, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.graph_builder import ( expanded_retrieval_graph_builder, ) from onyx.utils.logger import setup_logger diff --git a/backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/models.py b/backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/answer_refinement_sub_question/models.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement__consolidate_sub_answers__subgraph/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/edges.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/edges.py similarity index 84% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/edges.py index b76d12755..dc9771e09 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/edges.py @@ -4,10 +4,10 @@ from typing import cast from langchain_core.runnables.config import RunnableConfig from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( RetrievalInput, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/graph_builder.py similarity index 73% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/graph_builder.py index 2251bb6bd..141c3d418 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/graph_builder.py @@ -2,37 +2,37 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.edges import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.edges import ( parallel_retrieval_edge, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.doc_reranking import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.doc_reranking import ( doc_reranking, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.doc_retrieval import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.doc_retrieval import ( doc_retrieval, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.doc_verification import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.doc_verification import ( doc_verification, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.dummy import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.dummy import ( dummy, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.expand_queries import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.expand_queries import ( expand_queries, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.format_results import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.format_results import ( format_results, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.nodes.verification_kickoff import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.nodes.verification_kickoff import ( verification_kickoff, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalOutput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) from onyx.agents.agent_search.shared_graph_utils.utils import get_test_config diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/models.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/models.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_reranking.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_reranking.py similarity index 92% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_reranking.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_reranking.py index fc9735f9e..56fce68b6 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_reranking.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_reranking.py @@ -3,11 +3,13 @@ from typing import cast from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.operations import logger -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.operations import ( + logger, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( DocRerankingUpdate, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_retrieval.py similarity index 92% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_retrieval.py index d4bc9d274..651311fc5 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_retrieval.py @@ -3,11 +3,13 @@ from typing import cast from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.operations import logger -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.operations import ( + logger, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( DocRetrievalUpdate, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( RetrievalInput, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_verification.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_verification.py similarity index 89% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_verification.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_verification.py index e96f809da..36a61e363 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/doc_verification.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/doc_verification.py @@ -3,10 +3,10 @@ from typing import cast from langchain_core.messages import HumanMessage from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( DocVerificationInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( DocVerificationUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/dummy.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/dummy.py similarity index 61% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/dummy.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/dummy.py index 93ff3dd23..62941f35f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/dummy.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/dummy.py @@ -1,9 +1,9 @@ from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( QueryExpansionUpdate, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/expand_queries.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/expand_queries.py similarity index 85% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/expand_queries.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/expand_queries.py index 8c4f8da1f..3e9dc0d2e 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/expand_queries.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/expand_queries.py @@ -5,14 +5,16 @@ from langchain_core.messages import HumanMessage from langchain_core.messages import merge_message_runs from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.operations import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.operations import ( dispatch_subquery, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.operations import logger -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.operations import ( + logger, +) +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( QueryExpansionUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/format_results.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/format_results.py similarity index 89% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/format_results.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/format_results.py index a7bd5769f..3437efd2e 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/format_results.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/format_results.py @@ -3,16 +3,16 @@ from typing import cast from langchain_core.callbacks.manager import dispatch_custom_event from langchain_core.runnables.config import RunnableConfig -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.models import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.models import ( ExpandedRetrievalResult, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.operations import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.operations import ( calculate_sub_question_retrieval_stats, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/verification_kickoff.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/verification_kickoff.py similarity index 86% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/verification_kickoff.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/verification_kickoff.py index 55e813d12..10a3cb333 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/nodes/verification_kickoff.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/nodes/verification_kickoff.py @@ -5,10 +5,10 @@ from langchain_core.runnables.config import RunnableConfig from langgraph.types import Command from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( DocVerificationInput, ) -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.states import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.states import ( ExpandedRetrievalState, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/operations.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/operations.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/operations.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/operations.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/states.py b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/states.py similarity index 95% rename from backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/states.py rename to backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/states.py index f01cc2d71..2b90618b4 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/expanded_retrieval/states.py +++ b/backend/onyx/agents/agent_search/deep_search_a/util__expanded_retrieval__subgraph/states.py @@ -4,7 +4,7 @@ from typing import Annotated from pydantic import BaseModel from onyx.agents.agent_search.core_state import SubgraphCoreState -from onyx.agents.agent_search.deep_search_a.expanded_retrieval.models import ( +from onyx.agents.agent_search.deep_search_a.util__expanded_retrieval__subgraph.models import ( ExpandedRetrievalResult, ) from onyx.agents.agent_search.shared_graph_utils.models import QueryResult diff --git a/backend/onyx/agents/agent_search/run_graph.py b/backend/onyx/agents/agent_search/run_graph.py index c4a849e3f..4f6cc92af 100644 --- a/backend/onyx/agents/agent_search/run_graph.py +++ b/backend/onyx/agents/agent_search/run_graph.py @@ -9,10 +9,12 @@ from langgraph.graph.state import CompiledStateGraph from onyx.agents.agent_search.basic.graph_builder import basic_graph_builder from onyx.agents.agent_search.basic.states import BasicInput -from onyx.agents.agent_search.deep_search_a.main.graph_builder import ( +from onyx.agents.agent_search.deep_search_a.main__graph.graph_builder import ( main_graph_builder as main_graph_builder_a, ) -from onyx.agents.agent_search.deep_search_a.main.states import MainInput as MainInput_a +from onyx.agents.agent_search.deep_search_a.main__graph.states import ( + MainInput as MainInput_a, +) from onyx.agents.agent_search.models import AgentSearchConfig from onyx.agents.agent_search.shared_graph_utils.utils import get_test_config from onyx.chat.models import AgentAnswerPiece diff --git a/backend/onyx/agents/agent_search/shared_graph_utils/models.py b/backend/onyx/agents/agent_search/shared_graph_utils/models.py index ccf2ce6dd..c79577cbf 100644 --- a/backend/onyx/agents/agent_search/shared_graph_utils/models.py +++ b/backend/onyx/agents/agent_search/shared_graph_utils/models.py @@ -2,10 +2,14 @@ from typing import Literal from pydantic import BaseModel -from onyx.agents.agent_search.deep_search_a.main.models import AgentAdditionalMetrics -from onyx.agents.agent_search.deep_search_a.main.models import AgentBaseMetrics -from onyx.agents.agent_search.deep_search_a.main.models import AgentRefinedMetrics -from onyx.agents.agent_search.deep_search_a.main.models import AgentTimings +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentAdditionalMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.models import AgentBaseMetrics +from onyx.agents.agent_search.deep_search_a.main__graph.models import ( + AgentRefinedMetrics, +) +from onyx.agents.agent_search.deep_search_a.main__graph.models import AgentTimings from onyx.context.search.models import InferenceSection from onyx.tools.models import SearchQueryInfo