From 0c8d59e33ed4e3be7dfb15f72ee2ac5e72536df8 Mon Sep 17 00:00:00 2001 From: Alishahryar1 Date: Thu, 19 Feb 2026 20:38:11 -0800 Subject: [PATCH] Removed deprecated modules and updated imports --- api/app.py | 2 +- messaging/__init__.py | 4 ++-- messaging/tree_data.py | 5 ----- messaging/tree_processor.py | 5 ----- messaging/tree_queue.py | 10 ---------- messaging/tree_repository.py | 5 ----- tests/api/test_app_lifespan_and_errors.py | 2 +- tests/messaging/test_handler.py | 4 ++-- tests/messaging/test_handler_context_isolation.py | 2 +- tests/messaging/test_handler_integration.py | 2 +- .../test_handler_markdown_and_status_edges.py | 2 +- tests/messaging/test_messaging.py | 10 +++++----- tests/messaging/test_restart_reply_restore.py | 2 +- tests/messaging/test_tree_concurrency.py | 4 ++-- tests/messaging/test_tree_processor.py | 4 ++-- tests/messaging/test_tree_queue.py | 2 +- tests/messaging/test_tree_repository.py | 4 ++-- utils/text.py | 8 -------- 18 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 messaging/tree_data.py delete mode 100644 messaging/tree_processor.py delete mode 100644 messaging/tree_queue.py delete mode 100644 messaging/tree_repository.py delete mode 100644 utils/text.py diff --git a/api/app.py b/api/app.py index c2f0320..8436005 100644 --- a/api/app.py +++ b/api/app.py @@ -107,7 +107,7 @@ async def lifespan(app: FastAPI): saved_trees = session_store.get_all_trees() if saved_trees: logger.info(f"Restoring {len(saved_trees)} conversation trees...") - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager message_handler.tree_queue = TreeQueueManager.from_dict( { diff --git a/messaging/__init__.py b/messaging/__init__.py index 514e60e..7439210 100644 --- a/messaging/__init__.py +++ b/messaging/__init__.py @@ -5,8 +5,8 @@ from .event_parser import parse_cli_event from .handler import ClaudeMessageHandler from .models import IncomingMessage from .session import SessionStore -from .tree_data import MessageNode, MessageState, MessageTree -from .tree_queue import TreeQueueManager +from .trees.data import MessageNode, MessageState, MessageTree +from .trees.queue_manager import TreeQueueManager __all__ = [ "CLISession", diff --git a/messaging/tree_data.py b/messaging/tree_data.py deleted file mode 100644 index 396fc80..0000000 --- a/messaging/tree_data.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Backward-compatible re-export. Use messaging.trees.data for new code.""" - -from .trees.data import MessageNode, MessageState, MessageTree - -__all__ = ["MessageNode", "MessageState", "MessageTree"] diff --git a/messaging/tree_processor.py b/messaging/tree_processor.py deleted file mode 100644 index 61419aa..0000000 --- a/messaging/tree_processor.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Backward-compatible re-export. Use messaging.trees.processor for new code.""" - -from .trees.processor import TreeQueueProcessor - -__all__ = ["TreeQueueProcessor"] diff --git a/messaging/tree_queue.py b/messaging/tree_queue.py deleted file mode 100644 index 9bb995d..0000000 --- a/messaging/tree_queue.py +++ /dev/null @@ -1,10 +0,0 @@ -"""Backward-compatible re-export. Use messaging.trees.queue_manager for new code.""" - -from .trees.queue_manager import ( - MessageNode, - MessageState, - MessageTree, - TreeQueueManager, -) - -__all__ = ["MessageNode", "MessageState", "MessageTree", "TreeQueueManager"] diff --git a/messaging/tree_repository.py b/messaging/tree_repository.py deleted file mode 100644 index fc23c28..0000000 --- a/messaging/tree_repository.py +++ /dev/null @@ -1,5 +0,0 @@ -"""Backward-compatible re-export. Use messaging.trees.repository for new code.""" - -from .trees.repository import TreeRepository - -__all__ = ["TreeRepository"] diff --git a/tests/api/test_app_lifespan_and_errors.py b/tests/api/test_app_lifespan_and_errors.py index c8a52de..3374966 100644 --- a/tests/api/test_app_lifespan_and_errors.py +++ b/tests/api/test_app_lifespan_and_errors.py @@ -130,7 +130,7 @@ def test_app_lifespan_sets_state_and_cleans_up(tmp_path, messaging_enabled): patch("messaging.session.SessionStore", return_value=session_store), patch("cli.manager.CLISessionManager", return_value=cli_manager), patch( - "messaging.tree_queue.TreeQueueManager.from_dict", return_value=fake_queue + "messaging.trees.queue_manager.TreeQueueManager.from_dict", return_value=fake_queue ), TestClient(app), ): diff --git a/tests/messaging/test_handler.py b/tests/messaging/test_handler.py index eb09041..92fb1e2 100644 --- a/tests/messaging/test_handler.py +++ b/tests/messaging/test_handler.py @@ -4,8 +4,8 @@ import pytest from messaging.handler import ClaudeMessageHandler from messaging.models import IncomingMessage -from messaging.tree_data import MessageNode, MessageTree -from messaging.tree_queue import MessageState +from messaging.trees.data import MessageNode, MessageTree +from messaging.trees.queue_manager import MessageState @pytest.fixture diff --git a/tests/messaging/test_handler_context_isolation.py b/tests/messaging/test_handler_context_isolation.py index 1732a03..fc18090 100644 --- a/tests/messaging/test_handler_context_isolation.py +++ b/tests/messaging/test_handler_context_isolation.py @@ -3,7 +3,7 @@ from unittest.mock import AsyncMock, MagicMock import pytest from messaging.handler import ClaudeMessageHandler -from messaging.tree_data import MessageState +from messaging.trees.data import MessageState async def _gen_session(events): diff --git a/tests/messaging/test_handler_integration.py b/tests/messaging/test_handler_integration.py index 9603ffe..b98375d 100644 --- a/tests/messaging/test_handler_integration.py +++ b/tests/messaging/test_handler_integration.py @@ -4,7 +4,7 @@ from unittest.mock import MagicMock import pytest from messaging.handler import ClaudeMessageHandler -from messaging.tree_data import MessageState +from messaging.trees.data import MessageState @pytest.fixture diff --git a/tests/messaging/test_handler_markdown_and_status_edges.py b/tests/messaging/test_handler_markdown_and_status_edges.py index ff37765..2ed82ab 100644 --- a/tests/messaging/test_handler_markdown_and_status_edges.py +++ b/tests/messaging/test_handler_markdown_and_status_edges.py @@ -5,7 +5,7 @@ import pytest from messaging.handler import ClaudeMessageHandler from messaging.models import IncomingMessage from messaging.telegram_markdown import render_markdown_to_mdv2 -from messaging.tree_data import MessageNode, MessageState +from messaging.trees.data import MessageNode, MessageState def test_render_markdown_to_mdv2_empty_returns_empty(): diff --git a/tests/messaging/test_messaging.py b/tests/messaging/test_messaging.py index 5ba09fb..eecd79f 100644 --- a/tests/messaging/test_messaging.py +++ b/tests/messaging/test_messaging.py @@ -174,21 +174,21 @@ class TestTreeQueueManager: def test_tree_queue_manager_init(self): """Test TreeQueueManager initialization.""" - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager mgr = TreeQueueManager() assert mgr.get_tree_count() == 0 def test_tree_not_busy_initially(self): """Test tree is not busy when no messages.""" - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager mgr = TreeQueueManager() assert mgr.is_tree_busy("nonexistent") is False def test_get_queue_size_empty(self): """Test queue size is 0 for non-existent node.""" - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager mgr = TreeQueueManager() assert mgr.get_queue_size("nonexistent") == 0 @@ -197,7 +197,7 @@ class TestTreeQueueManager: async def test_create_tree_and_enqueue(self): """Test creating a tree and enqueueing.""" from messaging.models import IncomingMessage - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager mgr = TreeQueueManager() processed = [] @@ -217,7 +217,7 @@ class TestTreeQueueManager: def test_cancel_tree_empty(self): """Test cancelling non-existent tree.""" - from messaging.tree_queue import TreeQueueManager + from messaging.trees.queue_manager import TreeQueueManager mgr = TreeQueueManager() cancelled = mgr.cancel_tree("nonexistent") diff --git a/tests/messaging/test_restart_reply_restore.py b/tests/messaging/test_restart_reply_restore.py index 0203cfb..f52183a 100644 --- a/tests/messaging/test_restart_reply_restore.py +++ b/tests/messaging/test_restart_reply_restore.py @@ -5,7 +5,7 @@ import pytest from messaging.handler import ClaudeMessageHandler from messaging.models import IncomingMessage from messaging.session import SessionStore -from messaging.tree_queue import TreeQueueManager +from messaging.trees.queue_manager import TreeQueueManager @pytest.mark.asyncio diff --git a/tests/messaging/test_tree_concurrency.py b/tests/messaging/test_tree_concurrency.py index e42d41a..f9db786 100644 --- a/tests/messaging/test_tree_concurrency.py +++ b/tests/messaging/test_tree_concurrency.py @@ -5,8 +5,8 @@ import asyncio import pytest from messaging.models import IncomingMessage -from messaging.tree_data import MessageNode, MessageState, MessageTree -from messaging.tree_queue import TreeQueueManager +from messaging.trees.data import MessageNode, MessageState, MessageTree +from messaging.trees.queue_manager import TreeQueueManager def _make_incoming(text: str = "hello", msg_id: str = "m1") -> IncomingMessage: diff --git a/tests/messaging/test_tree_processor.py b/tests/messaging/test_tree_processor.py index ee4df46..0c0ff62 100644 --- a/tests/messaging/test_tree_processor.py +++ b/tests/messaging/test_tree_processor.py @@ -5,8 +5,8 @@ from unittest.mock import AsyncMock, MagicMock import pytest from messaging.models import IncomingMessage -from messaging.tree_data import MessageNode, MessageState, MessageTree -from messaging.tree_processor import TreeQueueProcessor +from messaging.trees.data import MessageNode, MessageState, MessageTree +from messaging.trees.processor import TreeQueueProcessor @pytest.fixture diff --git a/tests/messaging/test_tree_queue.py b/tests/messaging/test_tree_queue.py index 04e2255..6ecaac7 100644 --- a/tests/messaging/test_tree_queue.py +++ b/tests/messaging/test_tree_queue.py @@ -5,7 +5,7 @@ import asyncio import pytest from messaging.models import IncomingMessage -from messaging.tree_queue import ( +from messaging.trees.queue_manager import ( MessageNode, MessageState, MessageTree, diff --git a/tests/messaging/test_tree_repository.py b/tests/messaging/test_tree_repository.py index 0b61a30..2860ae6 100644 --- a/tests/messaging/test_tree_repository.py +++ b/tests/messaging/test_tree_repository.py @@ -3,8 +3,8 @@ from unittest.mock import MagicMock import pytest from messaging.models import IncomingMessage -from messaging.tree_data import MessageNode, MessageState, MessageTree -from messaging.tree_repository import TreeRepository +from messaging.trees.data import MessageNode, MessageState, MessageTree +from messaging.trees.repository import TreeRepository @pytest.fixture diff --git a/utils/text.py b/utils/text.py deleted file mode 100644 index f38d60b..0000000 --- a/utils/text.py +++ /dev/null @@ -1,8 +0,0 @@ -"""Shared text extraction utilities. - -This module is deprecated. Use providers.common.text instead. -""" - -from providers.common.text import extract_text_from_content - -__all__ = ["extract_text_from_content"]