diff --git a/backend/alembic/versions/98a5008d8711_agent_tracking.py b/backend/alembic/versions/98a5008d8711_agent_tracking.py index 6daf2466f2b..7f2e00e038b 100644 --- a/backend/alembic/versions/98a5008d8711_agent_tracking.py +++ b/backend/alembic/versions/98a5008d8711_agent_tracking.py @@ -1,7 +1,7 @@ """agent_tracking Revision ID: 98a5008d8711 -Revises: 33ea50e88f24 +Revises: 2f80c6a2550f Create Date: 2025-01-29 17:00:00.000001 """ @@ -12,7 +12,7 @@ from sqlalchemy.dialects.postgresql import UUID # revision identifiers, used by Alembic. revision = "98a5008d8711" -down_revision = "33ea50e88f24" +down_revision = "2f80c6a2550f" branch_labels = None depends_on = None diff --git a/backend/onyx/agents/agent_search/deep_search/initial/generate_individual_sub_answer/graph_builder.py b/backend/onyx/agents/agent_search/deep_search/initial/generate_individual_sub_answer/graph_builder.py index fb2c67547d2..2e9989a69a7 100644 --- a/backend/onyx/agents/agent_search/deep_search/initial/generate_individual_sub_answer/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search/initial/generate_individual_sub_answer/graph_builder.py @@ -133,7 +133,5 @@ if __name__ == "__main__": for thing in compiled_graph.stream( input=inputs, config={"configurable": {"config": graph_config}}, - # debug=True, - # subgraphs=True, ): logger.debug(thing) diff --git a/backend/onyx/agents/agent_search/deep_search/main/graph_builder.py b/backend/onyx/agents/agent_search/deep_search/main/graph_builder.py index afac8cc4b60..edb5d4a0770 100644 --- a/backend/onyx/agents/agent_search/deep_search/main/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search/main/graph_builder.py @@ -204,12 +204,12 @@ def main_graph_builder(test_mode: bool = False) -> StateGraph: ) graph.add_conditional_edges( - source="create_refined_sub_questions", # DONE + source="create_refined_sub_questions", path=parallelize_refined_sub_question_answering, path_map=["answer_refined_question_subgraphs"], ) graph.add_edge( - start_key="answer_refined_question_subgraphs", # HERE + start_key="answer_refined_question_subgraphs", end_key="ingest_refined_sub_answers", ) @@ -259,8 +259,7 @@ if __name__ == "__main__": for thing in compiled_graph.stream( input=inputs, config={"configurable": {"config": graph_config}}, - # stream_mode="debug", - # debug=True, + stream_mode="custom", subgraphs=True, ): logger.debug(thing) diff --git a/backend/onyx/agents/agent_search/deep_search/main/nodes/generate_refined_answer.py b/backend/onyx/agents/agent_search/deep_search/main/nodes/generate_refined_answer.py index e0c0384aaf0..04888c7c595 100644 --- a/backend/onyx/agents/agent_search/deep_search/main/nodes/generate_refined_answer.py +++ b/backend/onyx/agents/agent_search/deep_search/main/nodes/generate_refined_answer.py @@ -261,10 +261,6 @@ def generate_refined_answer( response = merge_content(*streamed_tokens) answer = cast(str, response) - # refined_agent_stats = _calculate_refined_agent_stats( - # state.decomp_answer_results, state.original_question_retrieval_stats - # ) - refined_agent_stats = RefinedAgentStats( revision_doc_efficiency=refined_doc_effectiveness, revision_question_efficiency=revision_question_efficiency, diff --git a/backend/onyx/agents/agent_search/deep_search/main/states.py b/backend/onyx/agents/agent_search/deep_search/main/states.py index 33b36995c0f..3f9a87928a7 100644 --- a/backend/onyx/agents/agent_search/deep_search/main/states.py +++ b/backend/onyx/agents/agent_search/deep_search/main/states.py @@ -70,11 +70,6 @@ class InitialRefinedAnswerComparisonUpdate(LoggerUpdate): refined_answer_improvement_eval: bool = False -# Not used in current graph -class InitialAnswerBASEUpdate(BaseModel): - initial_base_answer: str | None = None - - class InitialAnswerUpdate(LoggerUpdate): """ Initial answer information @@ -157,7 +152,6 @@ class MainState( ToolChoiceUpdate, InitialQuestionDecompositionUpdate, InitialAnswerUpdate, - InitialAnswerBASEUpdate, SubQuestionResultsUpdate, OrigQuestionRetrievalUpdate, EntityTermExtractionUpdate, diff --git a/backend/onyx/agents/agent_search/deep_search/refinement/consolidate_sub_answers/graph_builder.py b/backend/onyx/agents/agent_search/deep_search/refinement/consolidate_sub_answers/graph_builder.py index 24c92affb88..7a1db5e8834 100644 --- a/backend/onyx/agents/agent_search/deep_search/refinement/consolidate_sub_answers/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search/refinement/consolidate_sub_answers/graph_builder.py @@ -127,9 +127,6 @@ if __name__ == "__main__": ) for thing in compiled_graph.stream( input=inputs, - # debug=True, - # subgraphs=True, + stream_mode="custom", ): logger.debug(thing) - # output = compiled_graph.invoke(inputs) - # logger.debug(output) diff --git a/backend/onyx/agents/agent_search/deep_search/shared/expanded_retrieval/graph_builder.py b/backend/onyx/agents/agent_search/deep_search/shared/expanded_retrieval/graph_builder.py index ef9710689b3..57ffd829df6 100644 --- a/backend/onyx/agents/agent_search/deep_search/shared/expanded_retrieval/graph_builder.py +++ b/backend/onyx/agents/agent_search/deep_search/shared/expanded_retrieval/graph_builder.py @@ -155,7 +155,7 @@ if __name__ == "__main__": for thing in compiled_graph.stream( input=inputs, config={"configurable": {"config": graph_config}}, - # debug=True, + stream_mode="custom", subgraphs=True, ): logger.debug(thing) diff --git a/backend/onyx/agents/agent_search/run_graph.py b/backend/onyx/agents/agent_search/run_graph.py index f415a473987..dc859c3dbdb 100644 --- a/backend/onyx/agents/agent_search/run_graph.py +++ b/backend/onyx/agents/agent_search/run_graph.py @@ -162,7 +162,6 @@ if __name__ == "__main__": # query="What is the difference between astronomy and astrology?", query="Do a search to tell me what is the difference between astronomy and astrology?", ) - # Joachim custom persona with get_session_context_manager() as db_session: config = get_test_config(db_session, primary_llm, fast_llm, search_request) @@ -177,11 +176,8 @@ if __name__ == "__main__": base_question=config.inputs.search_request.query, log_messages=[] ) - # with open("output.txt", "w") as f: tool_responses: list = [] for output in run_graph(compiled_graph, config, input): - # pass - if isinstance(output, ToolCallKickoff): pass elif isinstance(output, ExtendedToolResponse): diff --git a/web/src/app/chat/sessionSidebar/HistorySidebar.tsx b/web/src/app/chat/sessionSidebar/HistorySidebar.tsx index 51310f1dedb..5b5aa970a62 100644 --- a/web/src/app/chat/sessionSidebar/HistorySidebar.tsx +++ b/web/src/app/chat/sessionSidebar/HistorySidebar.tsx @@ -129,6 +129,7 @@ const SortableAssistant: React.FC = ({ className="w-3 ml-[2px] mr-[2px] group-hover:visible invisible flex-none cursor-grab" />
{ e.preventDefault(); if (!isDragging) {