From ef6e6f95566041d9de2e91ca1a22f9aeff3f50fe Mon Sep 17 00:00:00 2001 From: joachim-danswer Date: Thu, 30 Jan 2025 12:13:33 -0800 Subject: [PATCH] more renaming --- .../graph_builder.py | 30 +++++++++---------- .../{answer_check.py => check_sub_answer.py} | 4 ++- ...{format_answer.py => format_sub_answer.py} | 2 +- ...r_generation.py => generate_sub_answer.py} | 2 +- ...ieval.py => ingest_retrieved_documents.py} | 4 ++- .../generate_initial_answer/graph_builder.py | 18 +++++------ ....py => consolidate_retrieved_documents.py} | 0 ...ieval.py => ingest_retrieved_documents.py} | 0 ...ty_check.py => validate_initial_answer.py} | 2 +- .../consolidate_sub_answers/graph_builder.py | 30 +++++++++---------- 10 files changed, 48 insertions(+), 44 deletions(-) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/{answer_check.py => check_sub_answer.py} (95%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/{format_answer.py => format_sub_answer.py} (92%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/{answer_generation.py => generate_sub_answer.py} (99%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/{ingest_retrieval.py => ingest_retrieved_documents.py} (90%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/{retrieval_consolidation.py => consolidate_retrieved_documents.py} (100%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/{ingest_initial_base_retrieval.py => ingest_retrieved_documents.py} (100%) rename backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/{initial_answer_quality_check.py => validate_initial_answer.py} (92%) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py index b12241f5a00..3f92cad9353 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py @@ -5,17 +5,17 @@ from langgraph.graph import StateGraph from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.edges import ( send_to_expanded_retrieval, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_check import ( - answer_check, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.check_sub_answer import ( + check_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_generation import ( - answer_generation, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_sub_answer import ( + format_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_answer import ( - format_answer, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.generate_sub_answer import ( + generate_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieval import ( - ingest_retrieval, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieved_documents import ( + ingest_retrieved_documents, ) from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, @@ -51,19 +51,19 @@ def answer_query_graph_builder() -> StateGraph: ) graph.add_node( node="answer_check", - action=answer_check, + action=check_sub_answer, ) graph.add_node( - node="answer_generation", - action=answer_generation, + node="generate_sub_answer", + action=generate_sub_answer, ) graph.add_node( node="format_answer", - action=format_answer, + action=format_sub_answer, ) graph.add_node( node="ingest_retrieval", - action=ingest_retrieval, + action=ingest_retrieved_documents, ) ### Add edges ### @@ -79,10 +79,10 @@ def answer_query_graph_builder() -> StateGraph: ) graph.add_edge( start_key="ingest_retrieval", - end_key="answer_generation", + end_key="generate_sub_answer", ) graph.add_edge( - start_key="answer_generation", + start_key="generate_sub_answer", end_key="answer_check", ) graph.add_edge( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_check.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/check_sub_answer.py similarity index 95% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_check.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/check_sub_answer.py index 25ef06cdc80..b1d54626ce0 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_check.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/check_sub_answer.py @@ -17,7 +17,9 @@ from onyx.agents.agent_search.shared_graph_utils.prompts import UNKNOWN_ANSWER from onyx.agents.agent_search.shared_graph_utils.utils import parse_question_id -def answer_check(state: AnswerQuestionState, config: RunnableConfig) -> QACheckUpdate: +def check_sub_answer( + state: AnswerQuestionState, config: RunnableConfig +) -> QACheckUpdate: now_start = datetime.now() level, question_num = parse_question_id(state.question_id) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_sub_answer.py similarity index 92% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_sub_answer.py index 485cd19d11a..9cc8c5b75de 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_sub_answer.py @@ -9,7 +9,7 @@ from onyx.agents.agent_search.shared_graph_utils.models import ( ) -def format_answer(state: AnswerQuestionState) -> AnswerQuestionOutput: +def format_sub_answer(state: AnswerQuestionState) -> AnswerQuestionOutput: return AnswerQuestionOutput( answer_results=[ QuestionAnswerResults( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_generation.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/generate_sub_answer.py similarity index 99% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_generation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/generate_sub_answer.py index be07d467094..64c330f7d5f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_generation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/generate_sub_answer.py @@ -31,7 +31,7 @@ from onyx.utils.logger import setup_logger logger = setup_logger() -def answer_generation( +def generate_sub_answer( state: AnswerQuestionState, config: RunnableConfig ) -> QAGenerationUpdate: now_start = datetime.now() diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieved_documents.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieved_documents.py index 8d848574632..7afc70ab64e 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieved_documents.py @@ -7,7 +7,9 @@ from onyx.agents.agent_search.deep_search_a.shared.expanded_retrieval.states imp from onyx.agents.agent_search.shared_graph_utils.models import AgentChunkStats -def ingest_retrieval(state: ExpandedRetrievalOutput) -> RetrievalIngestionUpdate: +def ingest_retrieved_documents( + state: ExpandedRetrievalOutput, +) -> RetrievalIngestionUpdate: sub_question_retrieval_stats = ( state.expanded_retrieval_result.sub_question_retrieval_stats ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/graph_builder.py index 147133e5325..28b34849aa3 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/graph_builder.py @@ -5,14 +5,14 @@ from langgraph.graph import StateGraph from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.graph_builder import ( initial_sq_subgraph_builder, ) +from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.consolidate_retrieved_documents import ( + retrieval_consolidation, +) from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.generate_initial_answer import ( generate_initial_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.initial_answer_quality_check import ( - initial_answer_quality_check, -) -from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.retrieval_consolidation import ( - retrieval_consolidation, +from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.validate_initial_answer import ( + validate_initial_answer, ) from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.states import ( SearchSQInput, @@ -68,8 +68,8 @@ def initial_search_sq_subgraph_builder(test_mode: bool = False) -> StateGraph: ) graph.add_node( - node="initial_answer_quality_check", - action=initial_answer_quality_check, + node="validate_initial_answer", + action=validate_initial_answer, ) ### Add edges ### @@ -118,11 +118,11 @@ def initial_search_sq_subgraph_builder(test_mode: bool = False) -> StateGraph: graph.add_edge( start_key="generate_initial_answer", - end_key="initial_answer_quality_check", + end_key="validate_initial_answer", ) graph.add_edge( - start_key="initial_answer_quality_check", + start_key="validate_initial_answer", end_key=END, ) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/retrieval_consolidation.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/consolidate_retrieved_documents.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/retrieval_consolidation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/consolidate_retrieved_documents.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/ingest_initial_base_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/ingest_retrieved_documents.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/ingest_initial_base_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/ingest_retrieved_documents.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/initial_answer_quality_check.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/validate_initial_answer.py similarity index 92% rename from backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/initial_answer_quality_check.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/validate_initial_answer.py index 571f1cdd321..40e5be3c75c 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/initial_answer_quality_check.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/validate_initial_answer.py @@ -9,7 +9,7 @@ from onyx.agents.agent_search.deep_search_a.main.states import ( ) -def initial_answer_quality_check(state: SearchSQState) -> InitialAnswerQualityUpdate: +def validate_initial_answer(state: SearchSQState) -> InitialAnswerQualityUpdate: """ Check whether the final output satisfies the original user question diff --git a/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py index 8c300efc228..e5052fe2929 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py @@ -2,17 +2,17 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_check import ( - answer_check, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.check_sub_answer import ( + check_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_generation import ( - answer_generation, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_sub_answer import ( + format_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_answer import ( - format_answer, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.generate_sub_answer import ( + generate_sub_answer, ) -from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieval import ( - ingest_retrieval, +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieved_documents import ( + ingest_retrieved_documents, ) from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, @@ -50,19 +50,19 @@ def answer_refined_query_graph_builder() -> StateGraph: ) graph.add_node( node="refined_sub_answer_check", - action=answer_check, + action=check_sub_answer, ) graph.add_node( - node="refined_sub_answer_generation", - action=answer_generation, + node="generate_refined_sub_answer", + action=generate_sub_answer, ) graph.add_node( node="format_refined_sub_answer", - action=format_answer, + action=format_sub_answer, ) graph.add_node( node="ingest_refined_retrieval", - action=ingest_retrieval, + action=ingest_retrieved_documents, ) ### Add edges ### @@ -78,10 +78,10 @@ def answer_refined_query_graph_builder() -> StateGraph: ) graph.add_edge( start_key="ingest_refined_retrieval", - end_key="refined_sub_answer_generation", + end_key="generate_refined_sub_answer", ) graph.add_edge( - start_key="refined_sub_answer_generation", + start_key="generate_refined_sub_answer", end_key="refined_sub_answer_check", ) graph.add_edge(