From 42780d5f971e2070324bdbefed53904d1c18639d Mon Sep 17 00:00:00 2001 From: joachim-danswer Date: Thu, 30 Jan 2025 10:38:33 -0800 Subject: [PATCH] rename of individual_sub_answer_generation --- .../edges.py | 2 +- .../graph_builder.py | 16 ++++++++-------- .../models.py | 0 .../nodes/answer_check.py | 4 ++-- .../nodes/answer_generation.py | 4 ++-- .../nodes/format_answer.py | 4 ++-- .../nodes/ingest_retrieval.py | 2 +- .../states.py | 0 .../initial/initial_answer_generation/edges.py | 4 ++-- .../initial/sub_answer_consolidation/edges.py | 4 ++-- .../sub_answer_consolidation/graph_builder.py | 2 +- .../nodes/ingest_initial_sub_answers.py | 2 +- .../agent_search/deep_search_a/main/edges.py | 4 ++-- .../main/nodes/ingest_refined_answers.py | 2 +- .../refinement/sub_answer_consolidation/edges.py | 2 +- .../sub_answer_consolidation/graph_builder.py | 14 +++++++------- 16 files changed, 33 insertions(+), 33 deletions(-) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/edges.py (88%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/graph_builder.py (77%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/models.py (100%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/nodes/answer_check.py (90%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/nodes/answer_generation.py (95%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/nodes/format_answer.py (80%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/nodes/ingest_retrieval.py (89%) rename backend/onyx/agents/agent_search/deep_search_a/initial/{individual_sub_answer_generation => generate_individual_sub_answer}/states.py (100%) diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/edges.py similarity index 88% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/edges.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/edges.py index da3f58a38..837a3f652 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/edges.py @@ -3,7 +3,7 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) 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/individual_sub_answer_generation/graph_builder.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py similarity index 77% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/graph_builder.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py index cc06e6d16..b12241f5a 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/graph_builder.py @@ -2,28 +2,28 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.edges import ( +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.individual_sub_answer_generation.nodes.answer_check import ( +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.individual_sub_answer_generation.nodes.answer_generation import ( +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.individual_sub_answer_generation.nodes.format_answer import ( +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.individual_sub_answer_generation.nodes.ingest_retrieval import ( +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.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionState, ) 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/individual_sub_answer_generation/models.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/models.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/models.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/models.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_check.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_check.py similarity index 90% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_check.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_check.py index da679581e..25ef06cdc 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_check.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/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.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( QACheckUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_generation.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_generation.py similarity index 95% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_generation.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/answer_generation.py index 150cdced5..be07d4670 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/answer_generation.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/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.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionState, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( QAGenerationUpdate, ) from onyx.agents.agent_search.models import AgentSearchConfig diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/format_answer.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py similarity index 80% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/format_answer.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py index f4d870dce..485cd19d1 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/format_answer.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/format_answer.py @@ -1,7 +1,7 @@ -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionState, ) from onyx.agents.agent_search.shared_graph_utils.models import ( diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/ingest_retrieval.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py similarity index 89% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/ingest_retrieval.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py index cc11d4997..8d8485746 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/nodes/ingest_retrieval.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/nodes/ingest_retrieval.py @@ -1,4 +1,4 @@ -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( RetrievalIngestionUpdate, ) 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/individual_sub_answer_generation/states.py b/backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/states.py similarity index 100% rename from backend/onyx/agents/agent_search/deep_search_a/initial/individual_sub_answer_generation/states.py rename to backend/onyx/agents/agent_search/deep_search_a/initial/generate_individual_sub_answer/states.py diff --git a/backend/onyx/agents/agent_search/deep_search_a/initial/initial_answer_generation/edges.py b/backend/onyx/agents/agent_search/deep_search_a/initial/initial_answer_generation/edges.py index 788c24ce3..044ab5aa7 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/initial/initial_answer_generation/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/initial/initial_answer_generation/edges.py @@ -3,10 +3,10 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) from onyx.agents.agent_search.deep_search_a.initial.initial_answer_generation.states import ( 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/sub_answer_consolidation/edges.py index 788c24ce3..044ab5aa7 100644 --- 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/sub_answer_consolidation/edges.py @@ -3,10 +3,10 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) from onyx.agents.agent_search.deep_search_a.initial.initial_answer_generation.states import ( 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/sub_answer_consolidation/graph_builder.py index a594aaf65..0b1a20079 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/sub_answer_consolidation/graph_builder.py @@ -2,7 +2,7 @@ from langgraph.graph import END from langgraph.graph import START from langgraph.graph import StateGraph -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.graph_builder import ( +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 ( 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/sub_answer_consolidation/nodes/ingest_initial_sub_answers.py index 92860ca18..c5bd50a6f 100644 --- 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/sub_answer_consolidation/nodes/ingest_initial_sub_answers.py @@ -1,6 +1,6 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) from onyx.agents.agent_search.deep_search_a.main.operations import logger diff --git a/backend/onyx/agents/agent_search/deep_search_a/main/edges.py b/backend/onyx/agents/agent_search/deep_search_a/main/edges.py index 5ed7254a9..b4be29be7 100644 --- a/backend/onyx/agents/agent_search/deep_search_a/main/edges.py +++ b/backend/onyx/agents/agent_search/deep_search_a/main/edges.py @@ -6,10 +6,10 @@ from typing import Literal from langchain_core.runnables import RunnableConfig from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) from onyx.agents.agent_search.deep_search_a.main.states import MainState 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/nodes/ingest_refined_answers.py index b30671221..e69bb04a7 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/nodes/ingest_refined_answers.py @@ -1,6 +1,6 @@ from datetime import datetime -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) from onyx.agents.agent_search.deep_search_a.main.operations import logger 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/sub_answer_consolidation/edges.py index da6bf42d3..a72c8953c 100644 --- 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/sub_answer_consolidation/edges.py @@ -3,7 +3,7 @@ from datetime import datetime from langgraph.types import Send -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) from onyx.agents.agent_search.deep_search_a.shared.expanded_retrieval.states import ( 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/sub_answer_consolidation/graph_builder.py index cbabe34d3..3e96a7583 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/sub_answer_consolidation/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.initial.individual_sub_answer_generation.nodes.answer_check import ( +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.individual_sub_answer_generation.nodes.answer_generation import ( +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.individual_sub_answer_generation.nodes.format_answer import ( +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.individual_sub_answer_generation.nodes.ingest_retrieval import ( +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.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionInput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionOutput, ) -from onyx.agents.agent_search.deep_search_a.initial.individual_sub_answer_generation.states import ( +from onyx.agents.agent_search.deep_search_a.initial.generate_individual_sub_answer.states import ( AnswerQuestionState, ) from onyx.agents.agent_search.deep_search_a.refininement.sub_answer_consolidation.edges import (