sqlsaber 0.16.1__py3-none-any.whl → 0.18.0__py3-none-any.whl

sqlsaber/tools/base.py

@@ -1,7 +1,6 @@
 """Base class for SQLSaber tools."""
 
 from abc import ABC, abstractmethod
-from types import SimpleNamespace
 from typing import Any
 
 from .enums import ToolCategory, WorkflowPosition
@@ -44,17 +43,6 @@ class Tool(ABC):
         """
         pass
 
-    def to_definition(self):
-        """Convert this tool to a ToolDefinition-like object with attributes.
-
-        Tests expect attribute access (definition.name), so return a SimpleNamespace.
-        """
-        return SimpleNamespace(
-            name=self.name,
-            description=self.description,
-            input_schema=self.input_schema,
-        )
-
     @property
     def category(self) -> ToolCategory:
         """Return the tool category. Override to customize."""

sqlsaber/tools/enums.py

@@ -8,7 +8,6 @@ class ToolCategory(Enum):
 
     GENERAL = "general"
     SQL = "sql"
-    VISUALIZATION = "visualization"
 
 
 class WorkflowPosition(Enum):
@@ -17,5 +16,4 @@ class WorkflowPosition(Enum):
     DISCOVERY = "discovery"
     ANALYSIS = "analysis"
     EXECUTION = "execution"
-    VISUALIZATION = "visualization"
     OTHER = "other"

sqlsaber/tools/instructions.py

@@ -69,8 +69,7 @@ Your responsibilities:
 2. Use the provided tools efficiently to explore database schema
 3. Generate appropriate SQL queries
 4. Execute queries safely - queries that modify the database are not allowed
-5. Format and explain results clearly
-6. Create visualizations when requested or when they would be helpful"""
+5. Format and explain results clearly"""
 
     def _sort_tools_by_workflow(self, tools: list[Tool]) -> list[Tool]:
         """Sort tools by priority and workflow position."""
@@ -79,14 +78,13 @@ Your responsibilities:
             WorkflowPosition.DISCOVERY: 1,
             WorkflowPosition.ANALYSIS: 2,
             WorkflowPosition.EXECUTION: 3,
-            WorkflowPosition.VISUALIZATION: 4,
-            WorkflowPosition.OTHER: 5,
+            WorkflowPosition.OTHER: 4,
         }
 
         return sorted(
             tools,
             key=lambda tool: (
-                position_order.get(tool.get_workflow_position(), 5),
+                position_order.get(tool.get_workflow_position(), 4),
                 tool.get_priority(),
                 tool.name,
             ),
@@ -145,19 +143,6 @@ Your responsibilities:
                     )
                 step += 1
 
-        # Add visualization tools
-        if WorkflowPosition.VISUALIZATION in workflow_groups:
-            viz_tools = workflow_groups[WorkflowPosition.VISUALIZATION]
-            for tool in viz_tools:
-                usage = tool.get_usage_instructions()
-                if usage:
-                    instructions.append(f"{step}. {usage}")
-                else:
-                    instructions.append(
-                        f"{step}. Use '{tool.name}' when creating visualizations"
-                    )
-                step += 1
-
         return "\n".join(instructions) if len(instructions) > 1 else ""
 
     def _build_tool_guidelines(self, sorted_tools: list[Tool]) -> str:
@@ -195,11 +180,6 @@ Your responsibilities:
                 ]
             )
 
-        if ToolCategory.VISUALIZATION in categories:
-            guidelines.append(
-                "- Create visualizations when they would enhance understanding of the data"
-            )
-
         return "\n".join(guidelines)
 
     def _is_usage_in_workflow(self, usage: str) -> bool:

sqlsaber/tools/registry.py

@@ -101,18 +101,6 @@ class ToolRegistry:
         names = self.list_tools(category)
         return [self.get_tool(name) for name in names]
 
-    def get_tool_definitions(self, category: str | ToolCategory | None = None) -> list:
-        """Get tool definitions for all tools.
-
-        Args:
-            category: Optional category to filter by (string or ToolCategory enum)
-
-        Returns:
-            List of ToolDefinition objects
-        """
-        tools = self.get_all_tools(category)
-        return [tool.to_definition() for tool in tools]
-
 
 # Global registry instance
 tool_registry = ToolRegistry()

{sqlsaber-0.16.1.dist-info → sqlsaber-0.18.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.16.1
+Version: 0.18.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -16,7 +16,6 @@ Requires-Dist: platformdirs>=4.0.0
 Requires-Dist: pydantic-ai
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.7.0
-Requires-Dist: uniplot>=0.21.2
 Description-Content-Type: text/markdown
 
 # SQLsaber
@@ -40,6 +39,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
 - [Usage](#usage)
   - [Interactive Mode](#interactive-mode)
   - [Single Query](#single-query)
+  - [Resume Past Conversation](#resume-past-conversation)
   - [Database Selection](#database-selection)
 - [Examples](#examples)
 - [MCP Server Integration](#mcp-server-integration)
@@ -56,6 +56,7 @@ Ask your questions in natural language and `sqlsaber` will gather the right cont
 - 🛡️ Safe query execution (read-only by default)
 - 🧠 Memory management
 - 💬 Interactive REPL mode
+- 🧵 Conversation threads (store, display, and resume conversations)
 - 🗄️ Support for PostgreSQL, SQLite, and MySQL
 - 🔌 MCP (Model Context Protocol) server support
 - 🎨 Beautiful formatted output
@@ -147,6 +148,14 @@ echo "show me all users created this month" | saber
 cat query.txt | saber
 ```
 
+### Resume Past Conversation
+
+Continue a previous conversation thread:
+
+```bash
+saber threads resume THREAD_ID
+```
+
 ### Database Selection
 
 Use a specific database connection:
@@ -230,7 +239,7 @@ SQLsaber uses a multi-step agentic process to gather the right context and execu
 
 4. **SQL Generation**: Creates optimized SQL queries based on natural language input
 5. **Safe Execution**: Runs read-only queries with built-in protections against destructive operations
-6. **Result Formatting**: Presents results with explanations in tables and optionally, visualizes using plots
+6. **Result Formatting**: Presents results with explanations in tables
 
 ## Contributing
 

{sqlsaber-0.16.1.dist-info → sqlsaber-0.18.0.dist-info}/RECORD

@@ -1,19 +1,20 @@
 sqlsaber/__init__.py,sha256=HjS8ULtP4MGpnTL7njVY45NKV9Fi4e_yeYuY-hyXWQc,73
 sqlsaber/__main__.py,sha256=RIHxWeWh2QvLfah-2OkhI5IJxojWfy4fXpMnVEJYvxw,78
 sqlsaber/agents/__init__.py,sha256=i_MI2eWMQaVzGikKU71FPCmSQxNDKq36Imq1PrYoIPU,130
-sqlsaber/agents/base.py,sha256=2JX7UKW7tbqxPaK4aQLpXIwT3uszdBQHdSsOyML2U7I,6353
+sqlsaber/agents/base.py,sha256=7zOZTHKxUuU0uMc-NTaCkkBfDnU3jtwbT8_eP1ZtJ2k,2615
 sqlsaber/agents/mcp.py,sha256=GcJTx7YDYH6aaxIADEIxSgcWAdWakUx395JIzVnf17U,768
 sqlsaber/agents/pydantic_ai_agent.py,sha256=dGdsgyxCZvfK-v-MH8KimKOr-xb2aSfSWY8CMcOUCT8,6795
 sqlsaber/cli/__init__.py,sha256=qVSLVJLLJYzoC6aj6y9MFrzZvAwc4_OgxU9DlkQnZ4M,86
 sqlsaber/cli/auth.py,sha256=jTsRgbmlGPlASSuIKmdjjwfqtKvjfKd_cTYxX0-QqaQ,7400
-sqlsaber/cli/commands.py,sha256=EhQ5KziG2-nh7rNJ7xko8Ks-FfXZ7V21rILKNGjPe08,6715
+sqlsaber/cli/commands.py,sha256=CmCqDC6KiE8JD6Vkpsry4lBQInCiS8TBeKKx3gdxZcM,8689
 sqlsaber/cli/completers.py,sha256=HsUPjaZweLSeYCWkAcgMl8FylQ1xjWBWYTEL_9F6xfU,6430
 sqlsaber/cli/database.py,sha256=atwg3l8acQ3YTDuhq7vNrBN6tpOv0syz6V62KTF-Bh8,12910
-sqlsaber/cli/display.py,sha256=HtXwPe3VPUh2EJpyvpJVWyisCanu9O7w-rkqq7Y4UaY,9791
-sqlsaber/cli/interactive.py,sha256=SNOV_MaqJt2NQr6H8GbbWzMyuGx2NLFEXetjKtFAefw,9635
+sqlsaber/cli/display.py,sha256=wa7BjTBwXwqLT145Q1AEL0C28pQJTrvDN10mnFMjqsg,8554
+sqlsaber/cli/interactive.py,sha256=QqBjSsjtb6XoBVRyGS520cQrm7DvWC-obQ_EflcygbU,12051
 sqlsaber/cli/memory.py,sha256=OufHFJFwV0_GGn7LvKRTJikkWhV1IwNIUDOxFPHXOaQ,7794
 sqlsaber/cli/models.py,sha256=ZewtwGQwhd9b-yxBAPKePolvI1qQG-EkmeWAGMqtWNQ,8986
-sqlsaber/cli/streaming.py,sha256=3KXDu8_IJDkt-q6HoO7LYtLXjliNwWy_pOrgV8BQ6Bg,5453
+sqlsaber/cli/streaming.py,sha256=WNqBYYbWtL5CNQkRg5YWhYpWKI8qz7JmqneB2DXTOHY,5259
+sqlsaber/cli/threads.py,sha256=xti7_kvh3loQfLb7_GC8wSULJ4Oj56jXY8GQp69CQCI,11111
 sqlsaber/config/__init__.py,sha256=olwC45k8Nc61yK0WmPUk7XHdbsZH9HuUAbwnmKe3IgA,100
 sqlsaber/config/api_keys.py,sha256=RqWQCko1tY7sES7YOlexgBH5Hd5ne_kGXHdBDNqcV2U,3649
 sqlsaber/config/auth.py,sha256=b5qB2h1doXyO9Bn8z0CcL8LAR2jF431gGXBGKLgTmtQ,2756
@@ -22,30 +23,25 @@ sqlsaber/config/oauth_flow.py,sha256=A3bSXaBLzuAfXV2ZPA94m9NV33c2MyL6M4ii9oEkswQ
 sqlsaber/config/oauth_tokens.py,sha256=C9z35hyx-PvSAYdC1LNf3rg9_wsEIY56hkEczelbad0,6015
 sqlsaber/config/providers.py,sha256=JFjeJv1K5Q93zWSlWq3hAvgch1TlgoF0qFa0KJROkKY,2957
 sqlsaber/config/settings.py,sha256=vgb_RXaM-7DgbxYDmWNw1cSyMqwys4j3qNCvM4bljwI,5586
-sqlsaber/conversation/__init__.py,sha256=xa-1gX6NsZpVGg_LDrsZAtDtsDo5FZc1SO8gwtm_IPk,302
-sqlsaber/conversation/manager.py,sha256=LDfmKGIMvTzsL7S0aXGWw6Ve54CHIeTGLU4qwes2NgU,7046
-sqlsaber/conversation/models.py,sha256=fq4wpIB2yxLCQtsXhdpDji4FpscG2ayrOBACrNvgF14,3510
-sqlsaber/conversation/storage.py,sha256=phpGEnZjXVFTmV5PalCKZpiO9VFHubMMfWA9OJCDbwc,11626
 sqlsaber/database/__init__.py,sha256=a_gtKRJnZVO8-fEZI7g3Z8YnGa6Nio-5Y50PgVp07ss,176
-sqlsaber/database/connection.py,sha256=sJtIIe0GVbo-1Py9-j66UxJoY1aKL9gqk68jkDL-Kvk,15123
+sqlsaber/database/connection.py,sha256=kwx18bnwr4kyTUfQT0OW-DXzJUNWIQJP54spJBqU_48,15243
 sqlsaber/database/resolver.py,sha256=RPXF5EoKzvQDDLmPGNHYd2uG_oNICH8qvUjBp6iXmNY,3348
-sqlsaber/database/schema.py,sha256=OC93dnZkijCoVNqb6itSpQ2XsiZ85PjVUW-VZDwrPrk,25989
+sqlsaber/database/schema.py,sha256=r12qoN3tdtAXdO22EKlauAe7QwOm8lL2vTMM59XEMMY,26594
 sqlsaber/mcp/__init__.py,sha256=COdWq7wauPBp5Ew8tfZItFzbcLDSEkHBJSMhxzy8C9c,112
 sqlsaber/mcp/mcp.py,sha256=X12oCMZYAtgJ7MNuh5cqz8y3lALrOzkXWcfpuY0Ijxk,3950
 sqlsaber/memory/__init__.py,sha256=GiWkU6f6YYVV0EvvXDmFWe_CxarmDCql05t70MkTEWs,63
 sqlsaber/memory/manager.py,sha256=p3fybMVfH-E4ApT1ZRZUnQIWSk9dkfUPCyfkmA0HALs,2739
 sqlsaber/memory/storage.py,sha256=ne8szLlGj5NELheqLnI7zu21V8YS4rtpYGGC7tOmi-s,5745
-sqlsaber/models/__init__.py,sha256=b3KVyLN7Y7p2rT1-TlIExpkO26bTG04-VCFwDmBO6i0,204
-sqlsaber/models/types.py,sha256=w-zk81V2dtveuteej36_o1fDK3So428j3P2rAejU62U,862
-sqlsaber/tools/__init__.py,sha256=a-JNOhHsC7WEVhTsQY_IHckaPOmswoM3Q85YOd2iC_E,652
-sqlsaber/tools/base.py,sha256=XLaHrAzZc4OUiOsKBvEfZCtWKDBd5WqgNAnmRufnOp4,2174
-sqlsaber/tools/enums.py,sha256=TnlvEOpkGtuzEzg_JBdSb_S38jg4INhtxw4qZ20kU_E,483
-sqlsaber/tools/instructions.py,sha256=nnItVvJBtN-FLB3-PSR6Y23ix6AiOB5hNX3r4TtYFKw,9869
-sqlsaber/tools/registry.py,sha256=decVRNf50JPNT4i-OHZIL2B8cmoOMDaE4y0Av6q6v0I,3619
+sqlsaber/threads/__init__.py,sha256=Hh3dIG1tuC8fXprREUpslCIgPYz8_6o7aRLx4yNeO48,139
+sqlsaber/threads/storage.py,sha256=rsUdxT4CR52D7xtGir9UlsFnBMk11jZeflzDrk2q4ME,11183
+sqlsaber/tools/__init__.py,sha256=x3YdmX_7P0Qq_HtZHAgfIVKTLxYqKk6oc4tGsujQWsc,586
+sqlsaber/tools/base.py,sha256=mHhvAj27BHmckyvuDLCPlAQdzABJyYxd9SJnaYAwwuA,1777
+sqlsaber/tools/enums.py,sha256=CH32mL-0k9ZA18911xLpNtsgpV6tB85TktMj6uqGz54,411
+sqlsaber/tools/instructions.py,sha256=X-x8maVkkyi16b6Tl0hcAFgjiYceZaSwyWTfmrvx8U8,9024
+sqlsaber/tools/registry.py,sha256=HWOQMsNIdL4XZS6TeNUyrL-5KoSDH6PHsWd3X66o-18,3211
 sqlsaber/tools/sql_tools.py,sha256=hM6tKqW5MDhFUt6MesoqhTUqIpq_5baIIDoN1MjDCXY,9647
-sqlsaber/tools/visualization_tools.py,sha256=059Pe3aOZvgpqT9487Ydv2PhY7T1pVmfALPTvfqPisI,4973
-sqlsaber-0.16.1.dist-info/METADATA,sha256=bVuWNDra_PQgj-6WgntIIee-l0RaPNPzOo4-1z7e_k8,5966
-sqlsaber-0.16.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.16.1.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
-sqlsaber-0.16.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.16.1.dist-info/RECORD,,
+sqlsaber-0.18.0.dist-info/METADATA,sha256=HAXen2RBeZ4wIdxoLIMPKiNgOXJolWFqqXl5_cCOsJA,6141
+sqlsaber-0.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.18.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
+sqlsaber-0.18.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.18.0.dist-info/RECORD,,

sqlsaber/conversation/__init__.py

@@ -1,12 +0,0 @@
-"""Conversation history storage for SQLSaber."""
-
-from .manager import ConversationManager
-from .models import Conversation, ConversationMessage
-from .storage import ConversationStorage
-
-__all__ = [
-    "Conversation",
-    "ConversationMessage",
-    "ConversationStorage",
-    "ConversationManager",
-]

sqlsaber/conversation/manager.py

@@ -1,224 +0,0 @@
-"""Manager for conversation storage operations."""
-
-import logging
-import uuid
-from typing import Any
-
-from .models import Conversation, ConversationMessage
-from .storage import ConversationStorage
-
-logger = logging.getLogger(__name__)
-
-
-class ConversationManager:
-    """High-level manager for conversation storage operations."""
-
-    def __init__(self):
-        """Initialize conversation manager."""
-        self._storage = ConversationStorage()
-
-    async def start_conversation(self, database_name: str) -> str:
-        """Start a new conversation.
-
-        Args:
-            database_name: Name of the database for this conversation
-
-        Returns:
-            Conversation ID
-        """
-        try:
-            return await self._storage.create_conversation(database_name)
-        except Exception as e:
-            logger.warning(f"Failed to start conversation: {e}")
-            return str(uuid.uuid4())
-
-    async def add_user_message(
-        self, conversation_id: str, content: str | dict[str, Any], index: int
-    ) -> str:
-        """Add a user message to the conversation.
-
-        Args:
-            conversation_id: ID of the conversation
-            content: Message content
-            index: Sequential index in conversation
-
-        Returns:
-            Message ID
-        """
-        try:
-            return await self._storage.add_message(
-                conversation_id, "user", content, index
-            )
-        except Exception as e:
-            logger.warning(f"Failed to add user message: {e}")
-            return str(uuid.uuid4())
-
-    async def add_assistant_message(
-        self,
-        conversation_id: str,
-        content: list[dict[str, Any]] | dict[str, Any],
-        index: int,
-    ) -> str:
-        """Add an assistant message to the conversation.
-
-        Args:
-            conversation_id: ID of the conversation
-            content: Message content (typically ContentBlock list)
-            index: Sequential index in conversation
-
-        Returns:
-            Message ID
-        """
-        try:
-            return await self._storage.add_message(
-                conversation_id, "assistant", content, index
-            )
-        except Exception as e:
-            logger.warning(f"Failed to add assistant message: {e}")
-            return str(uuid.uuid4())
-
-    async def add_tool_message(
-        self,
-        conversation_id: str,
-        content: list[dict[str, Any]] | dict[str, Any],
-        index: int,
-    ) -> str:
-        """Add a tool/system message to the conversation.
-
-        Args:
-            conversation_id: ID of the conversation
-            content: Message content (typically tool results)
-            index: Sequential index in conversation
-
-        Returns:
-            Message ID
-        """
-        try:
-            return await self._storage.add_message(
-                conversation_id, "tool", content, index
-            )
-        except Exception as e:
-            logger.warning(f"Failed to add tool message: {e}")
-            return str(uuid.uuid4())
-
-    async def end_conversation(self, conversation_id: str) -> bool:
-        """End a conversation.
-
-        Args:
-            conversation_id: ID of the conversation to end
-
-        Returns:
-            True if successfully ended, False otherwise
-        """
-        try:
-            return await self._storage.end_conversation(conversation_id)
-        except Exception as e:
-            logger.warning(f"Failed to end conversation: {e}")
-            return False
-
-    async def get_conversation(self, conversation_id: str) -> Conversation | None:
-        """Get a conversation by ID.
-
-        Args:
-            conversation_id: ID of the conversation
-
-        Returns:
-            Conversation object or None if not found
-        """
-        try:
-            return await self._storage.get_conversation(conversation_id)
-        except Exception as e:
-            logger.warning(f"Failed to get conversation: {e}")
-            return None
-
-    async def get_conversation_messages(
-        self, conversation_id: str
-    ) -> list[ConversationMessage]:
-        """Get all messages for a conversation.
-
-        Args:
-            conversation_id: ID of the conversation
-
-        Returns:
-            List of messages ordered by index
-        """
-        try:
-            return await self._storage.get_conversation_messages(conversation_id)
-        except Exception as e:
-            logger.warning(f"Failed to get conversation messages: {e}")
-            return []
-
-    async def list_conversations(
-        self, database_name: str | None = None, limit: int = 50
-    ) -> list[Conversation]:
-        """List conversations.
-
-        Args:
-            database_name: Optional database name filter
-            limit: Maximum number of conversations to return
-
-        Returns:
-            List of conversations ordered by start time (newest first)
-        """
-        try:
-            return await self._storage.list_conversations(database_name, limit)
-        except Exception as e:
-            logger.warning(f"Failed to list conversations: {e}")
-            return []
-
-    async def delete_conversation(self, conversation_id: str) -> bool:
-        """Delete a conversation.
-
-        Args:
-            conversation_id: ID of the conversation to delete
-
-        Returns:
-            True if successfully deleted, False otherwise
-        """
-        try:
-            return await self._storage.delete_conversation(conversation_id)
-        except Exception as e:
-            logger.warning(f"Failed to delete conversation: {e}")
-            return False
-
-    async def get_database_names(self) -> list[str]:
-        """Get list of database names with conversations.
-
-        Returns:
-            List of unique database names
-        """
-        try:
-            return await self._storage.get_database_names()
-        except Exception as e:
-            logger.warning(f"Failed to get database names: {e}")
-            return []
-
-    async def restore_conversation_to_agent(
-        self, conversation_id: str, agent_history: list[dict[str, Any]]
-    ) -> bool:
-        """Restore a conversation's messages to an agent's in-memory history.
-
-        Args:
-            conversation_id: ID of the conversation to restore
-            agent_history: Agent's conversation_history list to populate
-
-        Returns:
-            True if successfully restored, False otherwise
-        """
-        try:
-            messages = await self.get_conversation_messages(conversation_id)
-
-            # Clear existing history
-            agent_history.clear()
-
-            # Convert messages back to agent format
-            for msg in messages:
-                if msg.role in ("user", "assistant", "tool"):
-                    agent_history.append({"role": msg.role, "content": msg.content})
-
-            logger.debug(f"Restored {len(messages)} messages to agent history")
-            return True
-
-        except Exception as e:
-            logger.warning(f"Failed to restore conversation to agent: {e}")
-            return False

sqlsaber/conversation/models.py

@@ -1,120 +0,0 @@
-"""Data models for conversation storage."""
-
-import json
-import time
-from dataclasses import dataclass
-from typing import Any
-
-
-@dataclass
-class Conversation:
-    """Represents a conversation session."""
-
-    id: str
-    database_name: str
-    started_at: float
-    ended_at: float | None = None
-
-    def to_dict(self) -> dict[str, Any]:
-        """Convert to dictionary for JSON serialization."""
-        return {
-            "id": self.id,
-            "database_name": self.database_name,
-            "started_at": self.started_at,
-            "ended_at": self.ended_at,
-        }
-
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> "Conversation":
-        """Create from dictionary."""
-        return cls(
-            id=data["id"],
-            database_name=data["database_name"],
-            started_at=data["started_at"],
-            ended_at=data.get("ended_at"),
-        )
-
-    def formatted_start_time(self) -> str:
-        """Get human-readable start timestamp."""
-        return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self.started_at))
-
-    def formatted_end_time(self) -> str | None:
-        """Get human-readable end timestamp."""
-        if self.ended_at is None:
-            return None
-        return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self.ended_at))
-
-    def duration_seconds(self) -> float | None:
-        """Get conversation duration in seconds."""
-        if self.ended_at is None:
-            return None
-        return self.ended_at - self.started_at
-
-
-@dataclass
-class ConversationMessage:
-    """Represents a single message in a conversation."""
-
-    id: str
-    conversation_id: str
-    role: str
-    content: dict[str, Any] | str
-    index_in_conv: int
-    created_at: float
-
-    def to_dict(self) -> dict[str, Any]:
-        """Convert to dictionary for JSON serialization."""
-        return {
-            "id": self.id,
-            "conversation_id": self.conversation_id,
-            "role": self.role,
-            "content": self.content,
-            "index_in_conv": self.index_in_conv,
-            "created_at": self.created_at,
-        }
-
-    @classmethod
-    def from_dict(cls, data: dict[str, Any]) -> "ConversationMessage":
-        """Create from dictionary."""
-        return cls(
-            id=data["id"],
-            conversation_id=data["conversation_id"],
-            role=data["role"],
-            content=data["content"],
-            index_in_conv=data["index_in_conv"],
-            created_at=data["created_at"],
-        )
-
-    def formatted_timestamp(self) -> str:
-        """Get human-readable timestamp."""
-        return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(self.created_at))
-
-    def content_json(self) -> str:
-        """Get content as JSON string for storage."""
-        return json.dumps(self.content)
-
-    @classmethod
-    def from_storage_data(
-        cls,
-        id_: str,
-        conversation_id: str,
-        role: str,
-        content_json: str,
-        index_in_conv: int,
-        created_at: float,
-    ) -> "ConversationMessage":
-        """Create from SQLite storage data."""
-        try:
-            content = json.loads(content_json)
-        except json.JSONDecodeError:
-            # Fallback to string content for malformed JSON
-            content = content_json
-
-        return cls(
-            id=id_,
-            conversation_id=conversation_id,
-            role=role,
-            content=content,
-            index_in_conv=index_in_conv,
-            created_at=created_at,
-        )