sqlsaber 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

sqlsaber/agents/anthropic.py

@@ -1,7 +1,8 @@
 """Anthropic-specific SQL agent implementation."""
 
+import asyncio
 import json
-from typing import Any, AsyncIterator, Dict, List, Optional
+from typing import Any, AsyncIterator, Dict, List
 
 from anthropic import AsyncAnthropic
 
@@ -21,7 +22,7 @@ class AnthropicSQLAgent(BaseSQLAgent):
     """SQL Agent using Anthropic SDK directly."""
 
     def __init__(
-        self, db_connection: BaseDatabaseConnection, database_name: Optional[str] = None
+        self, db_connection: BaseDatabaseConnection, database_name: str | None = None
     ):
         super().__init__(db_connection)
 
@@ -164,7 +165,7 @@ Guidelines:
 
         return base_prompt
 
-    def add_memory(self, content: str) -> Optional[str]:
+    def add_memory(self, content: str) -> str | None:
         """Add a memory for the current database."""
         if not self.database_name:
             return None
@@ -174,7 +175,7 @@ Guidelines:
         self.system_prompt = self._build_system_prompt()
         return memory.id
 
-    async def execute_sql(self, query: str, limit: Optional[int] = 100) -> str:
+    async def execute_sql(self, query: str, limit: int | None = None) -> str:
         """Execute a SQL query against the database with streaming support."""
         # Call parent implementation for core functionality
         result = await super().execute_sql(query, limit)
@@ -203,10 +204,18 @@ Guidelines:
         return await super().process_tool_call(tool_name, tool_input)
 
     async def _process_stream_events(
-        self, stream, content_blocks: List[Dict], tool_use_blocks: List[Dict]
+        self,
+        stream,
+        content_blocks: List[Dict],
+        tool_use_blocks: List[Dict],
+        cancellation_token: asyncio.Event | None = None,
     ) -> AsyncIterator[StreamEvent]:
         """Process stream events and yield appropriate StreamEvents."""
         async for event in stream:
+            # Only check cancellation if token is provided
+            if cancellation_token is not None and cancellation_token.is_set():
+                return
+
             if event.type == "content_block_start":
                 if hasattr(event.content_block, "type"):
                     if event.content_block.type == "tool_use":
@@ -253,11 +262,17 @@ Guidelines:
         return "stop"
 
     async def _process_tool_results(
-        self, response: StreamingResponse
+        self,
+        response: StreamingResponse,
+        cancellation_token: asyncio.Event | None = None,
     ) -> AsyncIterator[StreamEvent]:
         """Process tool results and yield appropriate events."""
         tool_results = []
         for block in response.content:
+            # Only check cancellation if token is provided
+            if cancellation_token is not None and cancellation_token.is_set():
+                return
+
             if block.get("type") == "tool_use":
                 yield StreamEvent(
                     "tool_use",
@@ -304,7 +319,10 @@ Guidelines:
         yield StreamEvent("tool_result_data", tool_results)
 
     async def query_stream(
-        self, user_query: str, use_history: bool = True
+        self,
+        user_query: str,
+        use_history: bool = True,
+        cancellation_token: asyncio.Event | None = None,
     ) -> AsyncIterator[StreamEvent]:
         """Process a user query and stream responses."""
         # Initialize for tracking state
@@ -322,7 +340,11 @@ Guidelines:
         try:
             # Create initial stream and get response
             response = None
-            async for event in self._create_and_process_stream(messages):
+            async for event in self._create_and_process_stream(
+                messages, cancellation_token
+            ):
+                if cancellation_token is not None and cancellation_token.is_set():
+                    return
                 if event.type == "response_ready":
                     response = event.data
                 else:
@@ -332,14 +354,21 @@ Guidelines:
 
             # Process tool calls if needed
             while response is not None and response.stop_reason == "tool_use":
+                # Check for cancellation at the start of tool cycle
+                if cancellation_token is not None and cancellation_token.is_set():
+                    return
+
                 # Add assistant's response to conversation
                 collected_content.append(
                     {"role": "assistant", "content": response.content}
                 )
 
-                # Process tool results
+                # Process tool results - DO NOT check cancellation during tool execution
+                # as this would break the tool_use -> tool_result API contract
                 tool_results = []
-                async for event in self._process_tool_results(response):
+                async for event in self._process_tool_results(
+                    response, None
+                ):  # Pass None to disable cancellation checks
                     if event.type == "tool_result_data":
                         tool_results = event.data
                     else:
@@ -347,6 +376,12 @@ Guidelines:
 
                 # Continue conversation with tool results
                 collected_content.append({"role": "user", "content": tool_results})
+                if use_history:
+                    self.conversation_history.extend(collected_content)
+
+                # Check for cancellation AFTER tool results are complete
+                if cancellation_token is not None and cancellation_token.is_set():
+                    return
 
                 # Signal that we're processing the tool results
                 yield StreamEvent("processing", "Analyzing results...")
@@ -354,8 +389,10 @@ Guidelines:
                 # Get next response
                 response = None
                 async for event in self._create_and_process_stream(
-                    messages + collected_content
+                    messages + collected_content, cancellation_token
                 ):
+                    if cancellation_token is not None and cancellation_token.is_set():
+                        return
                     if event.type == "response_ready":
                         response = event.data
                     else:
@@ -363,21 +400,19 @@ Guidelines:
 
             # Update conversation history if using history
             if use_history:
-                self.conversation_history.append(
-                    {"role": "user", "content": user_query}
-                )
-                self.conversation_history.extend(collected_content)
                 # Add final assistant response
                 if response is not None:
                     self.conversation_history.append(
                         {"role": "assistant", "content": response.content}
                     )
 
+        except asyncio.CancelledError:
+            return
         except Exception as e:
             yield StreamEvent("error", str(e))
 
     async def _create_and_process_stream(
-        self, messages: List[Dict]
+        self, messages: List[Dict], cancellation_token: asyncio.Event | None = None
     ) -> AsyncIterator[StreamEvent]:
         """Create a stream and yield events while building response."""
         stream = await self.client.messages.create(
@@ -393,8 +428,11 @@ Guidelines:
         tool_use_blocks = []
 
         async for event in self._process_stream_events(
-            stream, content_blocks, tool_use_blocks
+            stream, content_blocks, tool_use_blocks, cancellation_token
         ):
+            # Only check cancellation if token is provided
+            if cancellation_token is not None and cancellation_token.is_set():
+                return
             yield event
 
         # Finalize tool blocks and create response

sqlsaber/agents/base.py

@@ -1,5 +1,6 @@
 """Abstract base class for SQL agents."""
 
+import asyncio
 import json
 from abc import ABC, abstractmethod
 from typing import Any, AsyncIterator, Dict, List, Optional
@@ -27,9 +28,18 @@ class BaseSQLAgent(ABC):
 
     @abstractmethod
     async def query_stream(
-        self, user_query: str, use_history: bool = True
+        self,
+        user_query: str,
+        use_history: bool = True,
+        cancellation_token: asyncio.Event | None = None,
     ) -> AsyncIterator[StreamEvent]:
-        """Process a user query and stream responses."""
+        """Process a user query and stream responses.
+
+        Args:
+            user_query: The user's query to process
+            use_history: Whether to include conversation history
+            cancellation_token: Optional event to signal cancellation
+        """
         pass
 
     def clear_history(self):
@@ -86,7 +96,7 @@ class BaseSQLAgent(ABC):
         except Exception as e:
             return json.dumps({"error": f"Error listing tables: {str(e)}"})
 
-    async def execute_sql(self, query: str, limit: Optional[int] = 100) -> str:
+    async def execute_sql(self, query: str, limit: Optional[int] = None) -> str:
         """Execute a SQL query against the database."""
         try:
             # Security check - only allow SELECT queries unless write is enabled

sqlsaber/cli/display.py

@@ -62,12 +62,20 @@ class DisplayManager:
         )
 
         # Create table with columns from first result
-        columns = list(results[0].keys())
-        table = self._create_table(columns)
+        all_columns = list(results[0].keys())
+        display_columns = all_columns[:15]  # Limit to first 15 columns
+
+        # Show warning if columns were truncated
+        if len(all_columns) > 15:
+            self.console.print(
+                f"[yellow]Note: Showing first 15 of {len(all_columns)} columns[/yellow]"
+            )
+
+        table = self._create_table(display_columns)
 
         # Add rows (show first 20 rows)
         for row in results[:20]:
-            table.add_row(*[str(row[key]) for key in columns])
+            table.add_row(*[str(row[key]) for key in display_columns])
 
         self.console.print(table)
 

sqlsaber/cli/interactive.py

@@ -1,6 +1,10 @@
 """Interactive mode handling for the CLI."""
 
+import asyncio
+from typing import Optional
+
 import questionary
+from prompt_toolkit.completion import Completer, Completion
 from rich.console import Console
 from rich.panel import Panel
 
@@ -9,6 +13,34 @@ from sqlsaber.cli.display import DisplayManager
 from sqlsaber.cli.streaming import StreamingQueryHandler
 
 
+class SlashCommandCompleter(Completer):
+    """Custom completer for slash commands."""
+
+    def get_completions(self, document, complete_event):
+        """Get completions for slash commands."""
+        # Only provide completions if the line starts with "/"
+        text = document.text
+        if text.startswith("/"):
+            # Get the partial command after the slash
+            partial_cmd = text[1:]
+
+            # Define available commands with descriptions
+            commands = [
+                ("clear", "Clear conversation history"),
+                ("exit", "Exit the interactive session"),
+                ("quit", "Exit the interactive session"),
+            ]
+
+            # Yield completions that match the partial command
+            for cmd, description in commands:
+                if cmd.startswith(partial_cmd):
+                    yield Completion(
+                        cmd,
+                        start_position=-len(partial_cmd),
+                        display_meta=description,
+                    )
+
+
 class InteractiveSession:
     """Manages interactive CLI sessions."""
 
@@ -17,6 +49,8 @@ class InteractiveSession:
         self.agent = agent
         self.display = DisplayManager(console)
         self.streaming_handler = StreamingQueryHandler(console)
+        self.current_task: Optional[asyncio.Task] = None
+        self.cancellation_token: Optional[asyncio.Event] = None
 
     def show_welcome_message(self):
         """Display welcome message for interactive mode."""
@@ -28,7 +62,7 @@ class InteractiveSession:
             Panel.fit(
                 "[bold green]SQLSaber - Use the agent Luke![/bold green]\n\n"
                 "[bold]Your agentic SQL assistant.[/bold]\n\n\n"
-                "[dim]Use 'clear' to reset conversation, 'exit' or 'quit' to leave.[/dim]\n\n"
+                "[dim]Use '/clear' to reset conversation, '/exit' or '/quit' to leave.[/dim]\n\n"
                 "[dim]Start a message with '#' to add something to agent's memory for this database.[/dim]",
                 border_style="green",
             )
@@ -38,8 +72,31 @@ class InteractiveSession:
         )
         self.console.print(
             "[dim]Press Esc-Enter or Meta-Enter to submit your query.[/dim]\n"
+            "[dim]Press Ctrl+C during query execution to interrupt and return to prompt.[/dim]\n"
         )
 
+    async def _execute_query_with_cancellation(self, user_query: str):
+        """Execute a query with cancellation support."""
+        # Create cancellation token
+        self.cancellation_token = asyncio.Event()
+
+        # Create the query task
+        query_task = asyncio.create_task(
+            self.streaming_handler.execute_streaming_query(
+                user_query, self.agent, self.cancellation_token
+            )
+        )
+        self.current_task = query_task
+
+        try:
+            # Simply await the query task
+            # Ctrl+C will be handled by the KeyboardInterrupt exception in run()
+            await query_task
+
+        finally:
+            self.current_task = None
+            self.cancellation_token = None
+
     async def run(self):
         """Run the interactive session loop."""
         self.show_welcome_message()
@@ -51,12 +108,16 @@ class InteractiveSession:
                     qmark="",
                     multiline=True,
                     instruction="",
+                    completer=SlashCommandCompleter(),
                 ).ask_async()
 
-                if user_query.lower() in ["exit", "quit", "q"]:
+                if not user_query:
+                    continue
+
+                if user_query in ["/exit", "/quit"]:
                     break
 
-                if user_query.lower() == "clear":
+                if user_query == "/clear":
                     self.agent.clear_history()
                     self.console.print("[green]Conversation history cleared.[/green]\n")
                     continue
@@ -85,12 +146,24 @@ class InteractiveSession:
                             )
                         continue
 
-                    await self.streaming_handler.execute_streaming_query(
-                        user_query, self.agent
-                    )
+                    # Execute query with cancellation support
+                    await self._execute_query_with_cancellation(user_query)
                     self.display.show_newline()  # Empty line for readability
 
             except KeyboardInterrupt:
-                self.console.print("\n[yellow]Use 'exit' or 'quit' to leave.[/yellow]")
+                # Handle Ctrl+C - cancel current task if running
+                if self.current_task and not self.current_task.done():
+                    if self.cancellation_token is not None:
+                        self.cancellation_token.set()
+                    self.current_task.cancel()
+                    try:
+                        await self.current_task
+                    except asyncio.CancelledError:
+                        pass
+                    self.console.print("\n[yellow]Query interrupted[/yellow]")
+                else:
+                    self.console.print(
+                        "\n[yellow]Use '/exit' or '/quit' to leave.[/yellow]"
+                    )
             except Exception as e:
                 self.console.print(f"[bold red]Error:[/bold red] {str(e)}")

sqlsaber/cli/streaming.py

@@ -1,5 +1,7 @@
 """Streaming query handling for the CLI."""
 
+import asyncio
+
 from rich.console import Console
 
 from sqlsaber.agents.base import BaseSQLAgent
@@ -13,7 +15,12 @@ class StreamingQueryHandler:
         self.console = console
         self.display = DisplayManager(console)
 
-    async def execute_streaming_query(self, user_query: str, agent: BaseSQLAgent):
+    async def execute_streaming_query(
+        self,
+        user_query: str,
+        agent: BaseSQLAgent,
+        cancellation_token: asyncio.Event | None = None,
+    ):
         """Execute a query with streaming display."""
 
         has_content = False
@@ -24,7 +31,12 @@ class StreamingQueryHandler:
         status.start()
 
         try:
-            async for event in agent.query_stream(user_query):
+            async for event in agent.query_stream(
+                user_query, cancellation_token=cancellation_token
+            ):
+                if cancellation_token is not None and cancellation_token.is_set():
+                    break
+
                 if event.type == "tool_use":
                     # Stop any ongoing status, but don't mark has_content yet
                     self._stop_status(status)
@@ -83,6 +95,13 @@ class StreamingQueryHandler:
                         has_content = True
                     self.display.show_error(event.data)
 
+        except asyncio.CancelledError:
+            # Handle cancellation gracefully
+            self._stop_status(status)
+            if explanation_started:
+                self.display.show_newline()
+            self.console.print("[yellow]Query interrupted[/yellow]")
+            return
         finally:
             # Make sure status is stopped
             self._stop_status(status)

{sqlsaber-0.5.0.dist-info → sqlsaber-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.5.0
+Version: 0.6.0
 Summary: SQLSaber - Agentic SQL assistant like Claude Code
 License-File: LICENSE
 Requires-Python: >=3.12

{sqlsaber-0.5.0.dist-info → sqlsaber-0.6.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
 sqlsaber/__init__.py,sha256=QCFi8xTVMohelfi7zOV1-6oLCcGoiXoOcKQY-HNBCk8,66
 sqlsaber/__main__.py,sha256=RIHxWeWh2QvLfah-2OkhI5IJxojWfy4fXpMnVEJYvxw,78
 sqlsaber/agents/__init__.py,sha256=LWeSeEUE4BhkyAYFF3TE-fx8TtLud3oyEtyB8ojFJgo,167
-sqlsaber/agents/anthropic.py,sha256=HxpMV5uiOmxPAUR-ZZw8ncK7lM0aCUvj8mLiyFaUFwE,16268
-sqlsaber/agents/base.py,sha256=IYVYYdQgSOQV6o1_3bzOizRuVMDw_aXfiPdFMNHwpg0,10269
+sqlsaber/agents/anthropic.py,sha256=FLVET2HvFmsEuFln9Hu4SaBs-Tnk-GestOgnDnUp3ps,17885
+sqlsaber/agents/base.py,sha256=DAnezHl5RLYoef8XQ-n3KA9PowdrMbQrkjdGKPPnFsI,10570
 sqlsaber/agents/mcp.py,sha256=FKtXgDrPZ2-xqUYCw2baI5JzrWekXaC5fjkYW1_Mg50,827
 sqlsaber/agents/streaming.py,sha256=_EO390-FHUrL1fRCNfibtE9QuJz3LGQygbwG3CB2ViY,533
 sqlsaber/cli/__init__.py,sha256=qVSLVJLLJYzoC6aj6y9MFrzZvAwc4_OgxU9DlkQnZ4M,86
 sqlsaber/cli/commands.py,sha256=Dw24W0jij-8t1lpk99C4PBTgzFSag6vU-FZcjAYGG54,5074
 sqlsaber/cli/database.py,sha256=DUfyvNBDp47oFM_VAC_hXHQy_qyE7JbXtowflJpwwH8,12643
-sqlsaber/cli/display.py,sha256=LhsUSAFbiPBQRtW2JFf8PnpDnF2_kYdVTsB9HYgvxT4,8888
-sqlsaber/cli/interactive.py,sha256=Kqe7kN9mhUiY_5z1Ki6apZ9ahs8uzhHp3xMZGiyTXpY,3912
+sqlsaber/cli/display.py,sha256=lZW7BI2LusU5lJhov7u9kKWwfsqcXGSfjrw-kNO3FQA,9200
+sqlsaber/cli/interactive.py,sha256=RNEWyCM1gLLUsXaXaCFzXu0PFDVuAK8NBOOYYFTHTUE,6716
 sqlsaber/cli/memory.py,sha256=LW4ZF2V6Gw6hviUFGZ4ym9ostFCwucgBTIMZ3EANO-I,7671
 sqlsaber/cli/models.py,sha256=3IcXeeU15IQvemSv-V-RQzVytJ3wuQ4YmWk89nTDcSE,7813
-sqlsaber/cli/streaming.py,sha256=EpltnkdokN42bczULbP9u_t8zduwhGyV-TWm1h8H-jc,3975
+sqlsaber/cli/streaming.py,sha256=2vLCYqqziQTO52erfgvnEk_hM3BoDM1TMBAXgT7KKfo,4548
 sqlsaber/config/__init__.py,sha256=olwC45k8Nc61yK0WmPUk7XHdbsZH9HuUAbwnmKe3IgA,100
 sqlsaber/config/api_keys.py,sha256=kLdoExF_My9ojmdhO5Ca7-ZeowsO0v1GVa_QT5jjUPo,3658
 sqlsaber/config/database.py,sha256=vKFOxPjVakjQhj1uoLcfzhS9ZFr6Z2F5b4MmYALQZoA,11421
@@ -28,8 +28,8 @@ sqlsaber/memory/storage.py,sha256=DvZBsSPaAfk_DqrNEn86uMD-TQsWUI6rQLfNw6PSCB8,57
 sqlsaber/models/__init__.py,sha256=RJ7p3WtuSwwpFQ1Iw4_DHV2zzCtHqIzsjJzxv8kUjUE,287
 sqlsaber/models/events.py,sha256=q2FackB60J9-7vegYIjzElLwKebIh7nxnV5AFoZc67c,752
 sqlsaber/models/types.py,sha256=3U_30n91EB3IglBTHipwiW4MqmmaA2qfshfraMZyPps,896
-sqlsaber-0.5.0.dist-info/METADATA,sha256=npxser6DO4GaHpYKsdcHvosseRr7RU0pZ0c81h2t2KA,5969
-sqlsaber-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sqlsaber-0.5.0.dist-info/entry_points.txt,sha256=jmFo96Ylm0zIKXJBwhv_P5wQ7SXP9qdaBcnTp8iCEe8,195
-sqlsaber-0.5.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-sqlsaber-0.5.0.dist-info/RECORD,,
+sqlsaber-0.6.0.dist-info/METADATA,sha256=Mvou6xXxA8T2Cfwq4y1bd0DYW46zBs4Qw7oXWNfihfE,5969
+sqlsaber-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.6.0.dist-info/entry_points.txt,sha256=jmFo96Ylm0zIKXJBwhv_P5wQ7SXP9qdaBcnTp8iCEe8,195
+sqlsaber-0.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.6.0.dist-info/RECORD,,