autosh 0.0.7__tar.gz → 0.0.9__tar.gz

{autosh-0.0.7 → autosh-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autosh
-Version: 0.0.7
+Version: 0.0.9
 Summary: The AI-powered, noob-friendly interactive shell
 Author-email: Wenyu Zhao <wenyuzhaox@gmail.com>
 License-Expression: MIT
@@ -10,7 +10,7 @@ Requires-Python: >=3.12
 Requires-Dist: agentia>=0.0.8
 Requires-Dist: asyncio>=3.4.3
 Requires-Dist: markdownify>=1.1.0
-Requires-Dist: neongrid>=0.0.1
+Requires-Dist: neongrid>=0.0.3
 Requires-Dist: prompt-toolkit>=3.0.51
 Requires-Dist: pydantic>=2.11.3
 Requires-Dist: python-dotenv>=1.1.0
@@ -22,6 +22,8 @@ Description-Content-Type: text/markdown
 
 # `autosh` - The AI-powered, noob-friendly interactive shell
 
+![recording](recording.gif) <!-- https://ezgif.com/video-to-gif -->
+
 # Getting Started
 
 ## Install

{autosh-0.0.7 → autosh-0.0.9}/README.md

@@ -1,5 +1,7 @@
 # `autosh` - The AI-powered, noob-friendly interactive shell
 
+![recording](recording.gif) <!-- https://ezgif.com/video-to-gif -->
+
 # Getting Started
 
 ## Install

{autosh-0.0.7 → autosh-0.0.9}/autosh/config.py

@@ -40,7 +40,7 @@ class Config(BaseModel):
         description="The banner for the REPL.",
     )
     repl_prompt: str = Field(
-        default="[bold on cyan]{short_cwd}[/bold on cyan][cyan]\ue0b0[/cyan] ",
+        default="{short_cwd}> ",
         description="The prompt for the REPL user input.",
     )
 
@@ -77,6 +77,7 @@ class CLIOptions(BaseModel):
     yes: bool = False
     quiet: bool = False
     think: bool = False
+    start_repl_after_prompt: bool = False
 
     prompt: str | None = None
     """The prompt to execute"""

{autosh-0.0.7 → autosh-0.0.9}/autosh/main.py

@@ -39,6 +39,14 @@ async def start_session(prompt: str | None, args: list[str]):
             file=sys.stderr,
         )
         sys.exit(1)
+    if CLI_OPTIONS.start_repl_after_prompt:
+        if piped_stdin or piped_stdout:
+            rich.print(
+                "[bold red]Error:[/bold red] [red]--repl is only available when not using piped stdin or stdout.[/red]",
+                file=sys.stderr,
+            )
+            sys.exit(1)
+
     if prompt:
         # No piped stdin, just run the prompt
         if Path(prompt).is_file():
@@ -73,6 +81,11 @@ def print_help():
             f"The LLM model to use. [dim]Default: {CONFIG.model} ({CONFIG.think_model} for reasoning).[/dim]",
         ],
         ["--think", "", "Use the reasoning models to think more before operating."],
+        [
+            "--repl",
+            "",
+            "Start a REPL session after executing the prompt or the script.",
+        ],
         ["--help", "-h", "Show this message and exit."],
     ]
 
@@ -117,6 +130,7 @@ def parse_args() -> tuple[str | None, list[str]]:
     p.add_argument("--quiet", "-q", action="store_true")
     p.add_argument("--think", action="store_true")
     p.add_argument("--model", "-m", type=str, default=None)
+    p.add_argument("--repl", action="store_true")
     p.add_argument("PROMPT_OR_FILE", nargs="?", default=None)
     p.add_argument("ARGS", nargs=argparse.REMAINDER)
 
@@ -133,6 +147,7 @@ def parse_args() -> tuple[str | None, list[str]]:
 
     CLI_OPTIONS.yes = args.yes
     CLI_OPTIONS.quiet = args.quiet
+    CLI_OPTIONS.start_repl_after_prompt = args.repl
 
     if args.model:
         if args.think:

{autosh-0.0.7 → autosh-0.0.9}/autosh/plugins/__init__.py

@@ -2,7 +2,6 @@ from dataclasses import dataclass
 import sys
 from typing import Any, Callable
 import rich
-from rich.prompt import Confirm
 from rich.panel import Panel
 from rich.console import RenderableType
 from autosh.config import CLI_OPTIONS, CONFIG
@@ -62,56 +61,6 @@ class Banner:
         return True
 
 
-# def __print_simple_banner(tag: str, text: str | None = None):
-#     if CLI_OPTIONS.quiet:
-#         return
-#     if not sys.stdout.isatty():
-#         s = f"\n[TOOL] {tag}"
-#         if text:
-#             s += f" {text}"
-#         print(s)
-#         return
-#     s = f"\n[bold on magenta] {tag} [/bold on magenta]"
-#     if text:
-#         s += f" [italic dim]{text}[/italic dim]"
-#     rich.print(s)
-
-
-# def simple_banner(
-#     tag: str | Callable[[Any], str],
-#     text: Callable[[Any], str] | None = None,
-#     text_key: str | None = None,
-# ):
-#     return lambda x: __print_simple_banner(
-#         tag if isinstance(tag, str) else tag(x),
-#         text(x) if text else (x.get(text_key) if text_key else None),
-#     )
-
-
-# def __print_code_preview_banner(
-#     title: str, content: RenderableType, short: str | None = None
-# ):
-#     if CLI_OPTIONS.quiet:
-#         if short and not CLI_OPTIONS.yes:
-#             rich.print(f"\n[magenta]{short}[/magenta]\n")
-#         return
-#     panel = Panel.fit(content, title=f"[magenta]{title}[/magenta]", title_align="left")
-#     rich.print()
-#     rich.print(panel)
-
-
-# def code_preview_banner(
-#     title: str | Callable[[Any], str],
-#     short: str | Callable[[Any], str],
-#     content: Callable[[Any], RenderableType],
-# ):
-#     return lambda x: __print_code_preview_banner(
-#         title=title if isinstance(title, str) else title(x),
-#         content=content(x),
-#         short=short if isinstance(short, str) else short(x),
-#     )
-
-
 def code_result_panel(
     title: str,
     out: str | None = None,

{autosh-0.0.7 → autosh-0.0.9}/autosh/session.py

@@ -1,4 +1,3 @@
-from io import StringIO
 from pathlib import Path
 import socket
 import sys
@@ -19,7 +18,6 @@ import neongrid as ng
 from .plugins import Banner, create_plugins
 import rich
 import platform
-from rich.prompt import Confirm
 import os
 
 
@@ -105,6 +103,46 @@ class Session:
             role="user",
         )
 
+    async def __process_event(self, e: Event, first: bool, repl: bool):
+        prefix_newline = repl or not first
+        if isinstance(e, UserConsentEvent):
+            if CLI_OPTIONS.yes:
+                e.response = True
+                return False
+            if prefix_newline:
+                print()
+            e.response = ng.confirm(e.message)
+            return True
+        if isinstance(e, ToolCallEvent) and e.result is None:
+            if (banner := (e.metadata or {}).get("banner")) and isinstance(
+                banner, Banner
+            ):
+                return banner.render(e.arguments, prefix_newline=prefix_newline)
+        return False
+
+    async def __process_run(
+        self, run: Run[Event | MessageStream], loading: Loading | None, repl: bool
+    ):
+        first = True
+        async for e in run:
+            if loading:
+                await loading.finish()
+
+            if isinstance(e, Event):
+                if await self.__process_event(e, first=first, repl=repl):
+                    first = False
+            else:
+                if repl or not first:
+                    print()
+                await self.__render_streamed_markdown(e)
+                first = False
+
+            if loading:
+                loading = self.__create_loading_indicator()
+
+        if loading:
+            await loading.finish()
+
     async def exec_prompt(self, prompt: str):
         # Clean up the prompt
         if prompt is not None:
@@ -145,6 +183,8 @@ class Session:
             )
         run = self.agent.run(prompt, stream=True, events=True)
         await self.__process_run(run, loading, False)
+        if CLI_OPTIONS.start_repl_after_prompt:
+            await self.run_repl(handover=True)
 
     async def exec_from_stdin(self):
         if sys.stdin.isatty():
@@ -161,45 +201,29 @@ class Session:
             prompt = f.read()
         await self.exec_prompt(prompt)
 
-    async def __process_event(self, e: Event, first: bool, repl: bool):
-        prefix_newline = repl or not first
-        if isinstance(e, UserConsentEvent):
-            if CLI_OPTIONS.yes:
-                e.response = True
-                return False
-            if prefix_newline:
-                print()
-            e.response = ng.confirm(e.message)
-            return True
-        if isinstance(e, ToolCallEvent) and e.result is None:
-            if (banner := (e.metadata or {}).get("banner")) and isinstance(
-                banner, Banner
-            ):
-                return banner.render(e.arguments, prefix_newline=prefix_newline)
-        return False
-
-    async def __process_run(
-        self, run: Run[Event | MessageStream], loading: Loading | None, repl: bool
-    ):
-        first = True
-        async for e in run:
-            if loading:
-                await loading.finish()
-
-            if isinstance(e, Event):
-                if await self.__process_event(e, first=first, repl=repl):
-                    first = False
-            else:
-                if repl or not first:
+    async def run_repl(self, handover: bool = False):
+        if not handover and CONFIG.repl_banner:
+            rich.print(CONFIG.repl_banner)
+        first = not handover
+        while True:
+            try:
+                if not first:
                     print()
-                await self.__render_streamed_markdown(e)
                 first = False
-
-            if loading:
+                input_prompt = self.__get_input_prompt()
+                prompt = await ng.input(
+                    input_prompt, sync=False, persist="/tmp/autosh-history"
+                )
+                prompt = prompt.strip()
+                if prompt in ["exit", "quit"]:
+                    break
+                if len(prompt) == 0:
+                    continue
                 loading = self.__create_loading_indicator()
-
-        if loading:
-            await loading.finish()
+                run = self.agent.run(prompt, stream=True, events=True)
+                await self.__process_run(run, loading, True)
+            except KeyboardInterrupt:
+                break
 
     def __get_input_prompt(self):
         cwd = Path.cwd()
@@ -229,29 +253,6 @@ class Session:
         )
         return prompt
 
-    async def run_repl(self):
-        if CONFIG.repl_banner:
-            rich.print(CONFIG.repl_banner)
-        first = True
-        while True:
-            try:
-                if not first:
-                    print()
-                first = False
-                input_prompt = self.__get_input_prompt()
-                rich.print(input_prompt, end="", flush=True)
-                prompt = await ng.input("", sync=False, persist="/tmp/autosh-history")
-                prompt = prompt.strip()
-                if prompt in ["exit", "quit"]:
-                    break
-                if len(prompt) == 0:
-                    continue
-                loading = self.__create_loading_indicator()
-                run = self.agent.run(prompt, stream=True, events=True)
-                await self.__process_run(run, loading, True)
-            except KeyboardInterrupt:
-                break
-
     def __create_loading_indicator(self):
         return ng.loading.kana()
 

{autosh-0.0.7 → autosh-0.0.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autosh"
-version = "0.0.7"
+version = "0.0.9"
 description = "The AI-powered, noob-friendly interactive shell"
 authors = [{ name = "Wenyu Zhao", email = "wenyuzhaox@gmail.com" }]
 requires-python = ">=3.12"
@@ -29,7 +29,7 @@ dependencies = [
     "tavily-python>=0.5.4",
     "typer>=0.12.5",
     "tzlocal>=5.3.1",
-    "neongrid>=0.0.1",
+    "neongrid>=0.0.3",
     "agentia>=0.0.8",
 ]