rename retrieval & consolidate_sub_answers (initial and refinement)

backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/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.initial.generate_individual_sub_answer.graph_builder import (
-    answer_query_graph_builder,
-)
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.edges import (
+from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.edges import (
     parallelize_initial_sub_question_answering,
 )
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.nodes.ingest_initial_sub_answers import (
+from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.nodes.ingest_initial_sub_answers import (
     ingest_initial_sub_answers,
 )
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.nodes.initial_decomposition import (
+from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.nodes.initial_decomposition import (
     initial_sub_question_creation,
 )
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.states import (
+from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.states import (
     SQInput,
 )
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.states import (
+from onyx.agents.agent_search.deep_search_a.initial.consolidate_sub_answers.states import (
     SQState,
 )
+from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.graph_builder import (
+    answer_query_graph_builder,
+)
 from onyx.utils.logger import setup_logger
 
 logger = setup_logger()

backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/graph_builder.py

@@ -2,6 +2,9 @@ from langgraph.graph import END
 from langgraph.graph import START
 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.generate_initial_answer import (
     generate_initial_answer,
 )
@@ -17,12 +20,9 @@ from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.stat
 from onyx.agents.agent_search.deep_search_a.initial.generate_initial_answer.states import (
     SearchSQState,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.graph_builder import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.graph_builder import (
     base_raw_search_graph_builder,
 )
-from onyx.agents.agent_search.deep_search_a.initial.sub_answer_consolidation.graph_builder import (
-    initial_sq_subgraph_builder,
-)
 from onyx.utils.logger import setup_logger
 
 logger = setup_logger()

backend/onyx/agents/agent_search/deep_search_a/initial/generate_initial_answer/nodes/ingest_initial_base_retrieval.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchOutput,
 )
 from onyx.agents.agent_search.deep_search_a.main.operations import logger

backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/graph_builder.py

@@ -2,22 +2,22 @@ from langgraph.graph import END
 from langgraph.graph import START
 from langgraph.graph import StateGraph
 
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.nodes.format_raw_search_results import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.nodes.format_raw_search_results import (
     format_raw_search_results,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.nodes.generate_raw_search_data import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.nodes.generate_raw_search_data import (
     generate_raw_search_data,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.nodes.ingest_initial_base_retrieval import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.nodes.ingest_initial_base_retrieval import (
     ingest_initial_base_retrieval,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchInput,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchOutput,
 )
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchState,
 )
 from onyx.agents.agent_search.deep_search_a.shared.expanded_retrieval.graph_builder import (

backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/format_raw_search_results.py

@@ -1,4 +1,4 @@
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchOutput,
 )
 from onyx.agents.agent_search.deep_search_a.shared.expanded_retrieval.states import (

backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/ingest_initial_base_retrieval.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from onyx.agents.agent_search.deep_search_a.initial.retrieval.states import (
+from onyx.agents.agent_search.deep_search_a.initial.retrieve_orig_question_documents.states import (
     BaseRawSearchOutput,
 )
 from onyx.agents.agent_search.deep_search_a.main.operations import logger

backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py

@@ -40,7 +40,7 @@ from onyx.agents.agent_search.deep_search_a.main.nodes.refined_sub_question_crea
 )
 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.refinement.sub_answer_consolidation.graph_builder import (
+from onyx.agents.agent_search.deep_search_a.refinement.consolidate_sub_answers.graph_builder import (
     answer_refined_query_graph_builder,
 )
 from onyx.agents.agent_search.orchestration.nodes.basic_use_tool_response import (

backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py

@@ -23,7 +23,7 @@ from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answ
 from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import (
     AnswerQuestionState,
 )
-from onyx.agents.agent_search.deep_search_a.refinement.sub_answer_consolidation.edges import (
+from onyx.agents.agent_search.deep_search_a.refinement.consolidate_sub_answers.edges import (
     send_to_expanded_refined_retrieval,
 )
 from onyx.agents.agent_search.deep_search_a.shared.expanded_retrieval.graph_builder import (

backend/onyx/chat/process_message.py

@@ -51,7 +51,9 @@ from onyx.context.search.enums import SearchType
 from onyx.context.search.models import InferenceSection
 from onyx.context.search.models import RetrievalDetails
 from onyx.context.search.models import SearchRequest
-from onyx.context.search.retrieval.search_runner import inference_sections_from_ids
+from onyx.context.search.retrieve_orig_question_documents.search_runner import (
+    inference_sections_from_ids,
+)
 from onyx.context.search.utils import chunks_or_sections_to_search_docs
 from onyx.context.search.utils import dedupe_documents
 from onyx.context.search.utils import drop_llm_indices

backend/onyx/context/search/pipeline.py

@@ -24,7 +24,9 @@ from onyx.context.search.models import SearchRequest
 from onyx.context.search.postprocessing.postprocessing import cleanup_chunks
 from onyx.context.search.postprocessing.postprocessing import search_postprocessing
 from onyx.context.search.preprocessing.preprocessing import retrieval_preprocessing
-from onyx.context.search.retrieval.search_runner import retrieve_chunks
+from onyx.context.search.retrieve_orig_question_documents.search_runner import (
+    retrieve_chunks,
+)
 from onyx.context.search.utils import inference_section_from_chunks
 from onyx.context.search.utils import relevant_sections_to_indices
 from onyx.db.models import User

backend/onyx/context/search/preprocessing/preprocessing.py

@@ -20,7 +20,7 @@ from onyx.context.search.models import SearchRequest
 from onyx.context.search.preprocessing.access_filters import (
     build_access_filters_for_user,
 )
-from onyx.context.search.retrieval.search_runner import (
+from onyx.context.search.retrieve_orig_question_documents.search_runner import (
     remove_stop_words_and_punctuation,
 )
 from onyx.db.engine import CURRENT_TENANT_ID_CONTEXTVAR

backend/onyx/onyxbot/slack/listener.py

@@ -30,7 +30,9 @@ from onyx.configs.onyxbot_configs import DANSWER_BOT_REPHRASE_MESSAGE
 from onyx.configs.onyxbot_configs import DANSWER_BOT_RESPOND_EVERY_CHANNEL
 from onyx.configs.onyxbot_configs import NOTIFY_SLACKBOT_NO_ANSWER
 from onyx.connectors.slack.utils import expert_info_from_slack_id
-from onyx.context.search.retrieval.search_runner import download_nltk_data
+from onyx.context.search.retrieve_orig_question_documents.search_runner import (
+    download_nltk_data,
+)
 from onyx.db.engine import get_all_tenant_ids
 from onyx.db.engine import get_session_with_tenant
 from onyx.db.models import SlackBot

backend/onyx/setup.py

@@ -11,7 +11,9 @@ from onyx.configs.model_configs import FAST_GEN_AI_MODEL_VERSION
 from onyx.configs.model_configs import GEN_AI_API_KEY
 from onyx.configs.model_configs import GEN_AI_MODEL_VERSION
 from onyx.context.search.models import SavedSearchSettings
-from onyx.context.search.retrieval.search_runner import download_nltk_data
+from onyx.context.search.retrieve_orig_question_documents.search_runner import (
+    download_nltk_data,
+)
 from onyx.db.connector import check_connectors_exist
 from onyx.db.connector import create_initial_default_connector
 from onyx.db.connector_credential_pair import associate_default_cc_pair