diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/edges.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/edges.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/graph_builder.py similarity index 81% rename from backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/graph_builder.py index 0b1a2007980..45e8c48276b 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/graph_builder.py +++ b/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() diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/nodes/ingest_initial_sub_answers.py b/backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/nodes/ingest_initial_sub_answers.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/nodes/ingest_initial_sub_answers.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/nodes/ingest_initial_sub_answers.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/nodes/initial_decomposition.py b/backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/nodes/initial_decomposition.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/nodes/initial_decomposition.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/nodes/initial_decomposition.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/states.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/sub_answer_consolidation/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/consolidate_sub_answers/states.py 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 0b336f127e1..147133e5325 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 @@ -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() 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_initial_base_retrieval.py index 0fb8e5d6214..02d569c0780 100644 --- 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_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 diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/graph_builder.py similarity index 73% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/graph_builder.py index a8d4fbe09b2..d81a88fc22d 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/graph_builder.py +++ b/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 ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/models.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/models.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/format_raw_search_results.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/format_raw_search_results.py similarity index 84% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/format_raw_search_results.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/format_raw_search_results.py index 2f25b2be8c3..4d2d66159bc 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/format_raw_search_results.py +++ b/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 ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/generate_raw_search_data.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/generate_raw_search_data.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/generate_raw_search_data.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/generate_raw_search_data.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/ingest_initial_base_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/ingest_initial_base_retrieval.py similarity index 93% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/ingest_initial_base_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/nodes/ingest_initial_base_retrieval.py index fe9811db300..f95b56b2d2f 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/nodes/ingest_initial_base_retrieval.py +++ b/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 diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/states.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/retrieval/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/retrieve_orig_question_documents/states.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py index 3439443e70a..b30a48cbdb3 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main/graph_builder.py @@ -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 ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/edges.py b/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/edges.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/edges.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py similarity index 97% rename from backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/graph_builder.py index b951175fa20..8c300efc228 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/graph_builder.py +++ b/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 ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/models.py b/backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/refinement/sub_answer_consolidation/models.py rename to backend/onyx/agents/agent_search/deep_search_a/refinement/consolidate_sub_answers/models.py diff --git a/backend/onyx/chat/process_message.py b/backend/onyx/chat/process_message.py index bf7f988365b..fec9c123f8d 100644 --- a/backend/onyx/chat/process_message.py +++ b/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 diff --git a/backend/onyx/context/search/pipeline.py b/backend/onyx/context/search/pipeline.py index 2388ea53bf4..ea6c458c70e 100644 --- a/backend/onyx/context/search/pipeline.py +++ b/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 diff --git a/backend/onyx/context/search/preprocessing/preprocessing.py b/backend/onyx/context/search/preprocessing/preprocessing.py index da228f5f1fb..91b2843fc02 100644 --- a/backend/onyx/context/search/preprocessing/preprocessing.py +++ b/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 diff --git a/backend/onyx/onyxbot/slack/listener.py b/backend/onyx/onyxbot/slack/listener.py index 721140fa11e..d3bda0103fc 100644 --- a/backend/onyx/onyxbot/slack/listener.py +++ b/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 diff --git a/backend/onyx/setup.py b/backend/onyx/setup.py index 07c37666413..c37e47b3f73 100644 --- a/backend/onyx/setup.py +++ b/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