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

sqlsaber/cli/interactive.py

@@ -1,8 +1,12 @@
 """Interactive mode handling for the CLI."""
 
 import asyncio
+from pathlib import Path
 
-import questionary
+import platformdirs
+from prompt_toolkit import PromptSession
+from prompt_toolkit.history import FileHistory
+from prompt_toolkit.styles import Style
 from pydantic_ai import Agent
 from rich.console import Console
 from rich.panel import Panel
@@ -24,6 +28,23 @@ from sqlsaber.database.schema import SchemaManager
 from sqlsaber.threads import ThreadStorage
 
 
+def bottom_toolbar():
+    return [
+        (
+            "class:bottom-toolbar",
+            " Use 'Esc-Enter' or 'Meta-Enter' to submit.",
+        )
+    ]
+
+
+style = Style.from_dict(
+    {
+        "frame.border": "#ebbcba",
+        "bottom-toolbar": "#ebbcba bg:#21202e",
+    }
+)
+
+
 class InteractiveSession:
     """Manages interactive CLI sessions."""
 
@@ -82,7 +103,7 @@ class InteractiveSession:
             self.console.print(
                 "\n",
                 "[dim] > Use '/clear' to reset conversation",
-                "[dim] > Use '/exit' or '/quit' to leave[/dim]",
+                "[dim] > Use 'Ctrl+D', '/exit' or '/quit' to leave[/dim]",
                 "[dim] > Use 'Ctrl+C' to interrupt and return to prompt\n\n",
                 "[dim] > Start message with '#' to add something to agent's memory for this database",
                 "[dim] > Type '@' to get table name completions",
@@ -137,7 +158,10 @@ class InteractiveSession:
         # Create the query task
         query_task = asyncio.create_task(
             self.streaming_handler.execute_streaming_query(
-                user_query, self.agent, self.cancellation_token, self.message_history
+                user_query,
+                self.agent,
+                self.cancellation_token,
+                self.message_history,
             )
         )
         self.current_task = query_task
@@ -183,17 +207,26 @@ class InteractiveSession:
         # Initialize table cache
         await self._update_table_cache()
 
+        session = PromptSession(
+            history=FileHistory(
+                Path(platformdirs.user_config_dir("sqlsaber")) / "history"
+            )
+        )
+
         while True:
             try:
-                user_query = await questionary.text(
-                    ">",
-                    qmark="",
+                # with patch_stdout():
+                user_query = await session.prompt_async(
+                    "",
                     multiline=True,
-                    instruction="",
+                    mouse_support=True,
                     completer=CompositeCompleter(
                         SlashCommandCompleter(), self.table_completer
                     ),
-                ).ask_async()
+                    show_frame=True,
+                    bottom_toolbar=bottom_toolbar,
+                    style=style,
+                )
 
                 if not user_query:
                     continue
@@ -276,7 +309,10 @@ class InteractiveSession:
                     self.console.print("\n[yellow]Query interrupted[/yellow]")
                 else:
                     self.console.print(
-                        "\n[yellow]Use '/exit' or '/quit' to leave.[/yellow]"
+                        "\n[yellow]Press Ctrl+D to exit. Or use '/exit' or '/quit' slash command.[/yellow]"
                     )
+            except EOFError:
+                # Exit when Ctrl+D is pressed
+                break
             except Exception as e:
                 self.console.print(f"[bold red]Error:[/bold red] {str(e)}")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlsaber
-Version: 0.18.0
+Version: 0.19.0
 Summary: SQLsaber - Open-source agentic SQL assistant
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -13,6 +13,7 @@ Requires-Dist: httpx>=0.28.1
 Requires-Dist: keyring>=25.6.0
 Requires-Dist: pandas>=2.0.0
 Requires-Dist: platformdirs>=4.0.0
+Requires-Dist: prompt-toolkit>3.0.51
 Requires-Dist: pydantic-ai
 Requires-Dist: questionary>=2.1.0
 Requires-Dist: rich>=13.7.0

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

@@ -10,7 +10,7 @@ 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=wa7BjTBwXwqLT145Q1AEL0C28pQJTrvDN10mnFMjqsg,8554
-sqlsaber/cli/interactive.py,sha256=QqBjSsjtb6XoBVRyGS520cQrm7DvWC-obQ_EflcygbU,12051
+sqlsaber/cli/interactive.py,sha256=uoJdLWPoaDBkfdFN-59u6zduU8XGY98L16zpNsGu7nE,12964
 sqlsaber/cli/memory.py,sha256=OufHFJFwV0_GGn7LvKRTJikkWhV1IwNIUDOxFPHXOaQ,7794
 sqlsaber/cli/models.py,sha256=ZewtwGQwhd9b-yxBAPKePolvI1qQG-EkmeWAGMqtWNQ,8986
 sqlsaber/cli/streaming.py,sha256=WNqBYYbWtL5CNQkRg5YWhYpWKI8qz7JmqneB2DXTOHY,5259
@@ -40,8 +40,8 @@ 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-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-0.19.0.dist-info/METADATA,sha256=oH4qQnKuu5n7ucEEtSccDyvI1obYPPeZV3xNAn-8Mzc,6178
+sqlsaber-0.19.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sqlsaber-0.19.0.dist-info/entry_points.txt,sha256=qEbOB7OffXPFgyJc7qEIJlMEX5RN9xdzLmWZa91zCQQ,162
+sqlsaber-0.19.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+sqlsaber-0.19.0.dist-info/RECORD,,