more renaming

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 (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.check_sub_answer import (
-    answer_check,
+    check_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_generation import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_sub_answer import (
-    answer_generation,
+    format_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_answer import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.generate_sub_answer import (
-    format_answer,
+    generate_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieval import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieved_documents import (
-    ingest_retrieval,
+    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",
+        node="generate_sub_answer",
-        action=answer_generation,
+        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(

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)

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(

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()

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
     )

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 (
+from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.nodes.validate_initial_answer import (
-    initial_answer_quality_check,
+    validate_initial_answer,
-)
-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.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",
+        node="validate_initial_answer",
-        action=initial_answer_quality_check,
+        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,
     )
 

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
 

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 (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.check_sub_answer import (
-    answer_check,
+    check_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.answer_generation import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_sub_answer import (
-    answer_generation,
+    format_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.format_answer import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.generate_sub_answer import (
-    format_answer,
+    generate_sub_answer,
 )
-from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieval import (
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.nodes.ingest_retrieved_documents import (
-    ingest_retrieval,
+    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",
+        node="generate_refined_sub_answer",
-        action=answer_generation,
+        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(