autosh 0.0.3__py3-none-any.whl → 0.0.4__py3-none-any.whl

autosh/main.py

@@ -1,9 +1,11 @@
 import os
+
+os.environ["AGENTIA_DISABLE_PLUGINS"] = "1"
+
 from pathlib import Path
 import rich
 import typer
 import asyncio
-import dotenv
 from rich.columns import Columns
 from rich.panel import Panel
 import argparse
@@ -26,6 +28,8 @@ app = typer.Typer(
 async def start_session(prompt: str | None, args: list[str]):
     CLI_OPTIONS.args = args
     session = Session()
+    os.environ["OPENROUTER_HAS_REASONING"] = "false"
+    os.environ["OPENROUTER_INCLUDE_REASONING"] = "false"
     await session.init()
     piped_stdin = not sys.stdin.isatty()
     if piped_stdin and not CLI_OPTIONS.yes:

autosh/plugins/__init__.py

@@ -1,3 +1,4 @@
+from typing import Any, Callable
 import rich
 from rich.prompt import Confirm
 from rich.panel import Panel
@@ -5,40 +6,55 @@ from rich.console import RenderableType
 from autosh.config import CLI_OPTIONS, CONFIG
 
 
-def banner(tag: str, text: str | None = None, dim: str | None = None):
+def __print_simple_banner(tag: str, text: str | None = None, dim: str | None = None):
     if CLI_OPTIONS.quiet:
         return
-    s = f"[bold magenta]{tag}[/bold magenta]"
+    s = f"\n[bold on magenta] {tag} [/bold on magenta]"
     if text:
         s += f" [italic magenta]{text}[/italic magenta]"
     if dim:
         s += f" [italic dim]{dim}[/italic dim]"
-    s += "\n"
     rich.print(s)
 
 
-def confirm(message: str):
-    if CLI_OPTIONS.yes:
-        return True
-    result = Confirm.ask(
-        f"[magenta]{message}[/magenta]", default=True, case_sensitive=False
+def simple_banner(
+    tag: str | Callable[[Any], str],
+    text: Callable[[Any], str] | None = None,
+    dim: Callable[[Any], str] | None = None,
+):
+    return lambda x: __print_simple_banner(
+        tag if isinstance(tag, str) else tag(x),
+        text(x) if text else None,
+        dim(x) if dim else None,
     )
-    if not CLI_OPTIONS.quiet:
-        rich.print()
-    return result
 
 
-def cmd_preview_panel(title: str, content: RenderableType, short: str | None = 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"[magenta]{short}[/magenta]\n")
+            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)
     rich.print()
 
 
-def cmd_result_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,
     err: str | None = None,

autosh/plugins/calc.py

@@ -1,12 +1,16 @@
 from agentia.plugins import tool, Plugin
 from typing import Annotated
-from . import banner
+from . import simple_banner
 
 
 class CalculatorPlugin(Plugin):
     NAME = "calc"
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner("CALC", dim=lambda a: a.get("expression", ""))
+        }
+    )
     def evaluate(
         self,
         expression: Annotated[
@@ -16,7 +20,6 @@ class CalculatorPlugin(Plugin):
         """
         Execute a math expression and return the result. The expression must be an valid python expression that can be execuated by `eval()`.
         """
-        banner("CALC", expression)
 
         result = eval(expression)
         return result

autosh/plugins/cli.py

@@ -1,14 +1,14 @@
 import os
 import sys
 from typing import Annotated
-from agentia.plugins import Plugin, tool
+from agentia import Plugin, tool, UserConsentEvent
 import rich
 import subprocess
 from enum import StrEnum
 
 from autosh.config import CLI_OPTIONS
 
-from . import banner, confirm, cmd_result_panel, cmd_preview_panel
+from . import code_result_panel, code_preview_banner, simple_banner
 
 
 class Color(StrEnum):
@@ -59,22 +59,20 @@ class CLIPlugin(Plugin):
         rich.print(text, file=sys.stderr if stderr else sys.stdout, end=end)
         return "DONE. You can continue and no need to repeat the text"
 
-    @tool
+    @tool(metadata={"banner": simple_banner("CWD", dim=lambda a: a.get("path", ""))})
     def chdir(self, path: Annotated[str, "The path to the new working directory"]):
         """
         Changes the current working directory of the terminal to another directory.
         """
-        banner("CWD", path)
         if not os.path.exists(path):
             raise FileNotFoundError(f"Path `{path}` does not exist.")
         os.chdir(path)
 
-    @tool
+    @tool(metadata={"banner": simple_banner("GET ARGV")})
     def get_argv(self):
         """
         Get the command line arguments.
         """
-        banner("GET ARGV")
         if not CLI_OPTIONS.script:
             return CLI_OPTIONS.args
         return {
@@ -82,28 +80,34 @@ class CLIPlugin(Plugin):
             "args": CLI_OPTIONS.args,
         }
 
-    @tool
+    @tool(metadata={"banner": simple_banner("GET ENV", dim=lambda a: a.get("key", ""))})
     def get_env(self, key: Annotated[str, "The environment variable to get"]):
         """
         Get an environment variable.
         """
-        banner("GET ENV", key)
         if key not in os.environ:
             raise KeyError(f"Environment variable `{key}` does not exist.")
         return os.environ[key]
 
-    @tool
+    @tool(metadata={"banner": simple_banner("GET ALL ENVS")})
     def get_all_envs(self):
         """
         Get all environment variables.
         """
-        banner("GET ALL ENVS")
         envs = {}
         for key, value in os.environ.items():
             envs[key] = value
         return {"envs": envs}
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner(
+                tag=lambda a: "SET ENV" if a.get("value") else "DEL ENV",
+                text=lambda a: a.get("key", ""),
+                dim=lambda a: a.get("value", "") or "",
+            ),
+        }
+    )
     def update_env(
         self,
         key: Annotated[str, "The environment variable to set"],
@@ -116,15 +120,13 @@ class CLIPlugin(Plugin):
         Set or delete an environment variable.
         """
         if value is None:
-            banner("DEL ENV", key)
             if key in os.environ:
                 del os.environ[key]
         else:
-            banner("SET ENV", key, value)
             os.environ[key] = value
         return f"DONE"
 
-    @tool
+    @tool(metadata={"banner": simple_banner("READ", dim=lambda a: a.get("path", ""))})
     def read(
         self,
         path: Annotated[str, "The path to the file to read"],
@@ -132,7 +134,6 @@ class CLIPlugin(Plugin):
         """
         Read a file and print its content.
         """
-        banner("READ", path)
         if not os.path.exists(path):
             raise FileNotFoundError(f"File `{path}` does not exist.")
         if not os.path.isfile(path):
@@ -141,7 +142,15 @@ class CLIPlugin(Plugin):
             content = f.read()
         return content
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner(
+                tag=lambda a: "WRITE" if not a.get("append") else "APPEND",
+                text=lambda a: a.get("path", ""),
+                dim=lambda a: f"({len(a.get('content', ''))} bytes)",
+            ),
+        }
+    )
     def write(
         self,
         path: Annotated[str, "The path to the file to write"],
@@ -154,8 +163,6 @@ class CLIPlugin(Plugin):
         """
         Write or append text content to a file.
         """
-        banner("WRITE" if not append else "APPEND", path, f"({len(content)} bytes)")
-
         if not create and not os.path.exists(path):
             raise FileNotFoundError(f"File `{path}` does not exist.")
         if not create and not os.path.isfile(path):
@@ -164,7 +171,7 @@ class CLIPlugin(Plugin):
             raise FileExistsError(
                 f"No, you cannot overwrite the script file `{path}`. You're likely writing to it by mistake."
             )
-        if not confirm("Write file?"):
+        if not (yield UserConsentEvent("Write file?")):
             return {"error": "The user declined the write operation."}
         flag = "a" if append else "w"
         if create:
@@ -200,7 +207,15 @@ class CLIPlugin(Plugin):
             raise RuntimeError("No piped input from stdin")
         return sys.stdin.read()
 
-    @tool
+    @tool(
+        metadata={
+            "banner": code_preview_banner(
+                title="Run Command",
+                short=lambda a: f"[magenta][bold]➜[/bold] [italic]{a.get("command", "")}[/italic][/magenta]",
+                content=lambda a: f"[magenta][bold]➜[/bold] [italic]{a.get("command", "")}[/italic][/magenta]\n\n[dim]{a.get("explanation", "")}[/dim]",
+            )
+        }
+    )
     def exec(
         self,
         command: Annotated[
@@ -220,15 +235,8 @@ class CLIPlugin(Plugin):
             cmd = ["bash", "-c", command]
             return subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
-        # Print the command and explanation
-        cmd_preview_panel(
-            title="Run Command",
-            content=f"[magenta][bold]➜[/bold] [italic]{command}[/italic][/magenta]\n\n[dim]{explanation}[/dim]",
-            short=f"[magenta][bold]➜[/bold] [italic]{command}[/italic][/magenta]",
-        )
-
         # Ask for confirmation
-        if not confirm("Execute this command?"):
+        if not (yield UserConsentEvent("Execute this command?")):
             return {"error": "The user declined to execute the command."}
 
         # Execute the command
@@ -245,7 +253,7 @@ class CLIPlugin(Plugin):
                     title = f"[red][bold]✘[/bold] Command Failed [{proc_result.returncode}][/red]"
                 else:
                     title = "[green][bold]✔[/bold] Command Finished[/green]"
-            cmd_result_panel(title, out, err)
+            code_result_panel(title, out, err)
 
         result = {
             "stdout": proc_result.stdout.decode("utf-8"),
@@ -255,10 +263,9 @@ class CLIPlugin(Plugin):
         }
         return result
 
-    @tool
+    @tool(metadata={"banner": simple_banner("EXIT")})
     def exit(self, exitcode: Annotated[int, "The exit code of this shell session"] = 0):
         """
         Exit the current shell session with an optional exit code.
         """
-        banner("EXIT", str(exitcode))
         sys.exit(exitcode)

autosh/plugins/clock.py

@@ -2,14 +2,13 @@ import datetime
 from agentia.plugins import tool, Plugin
 import tzlocal
 
-from autosh.plugins import banner
+from autosh.plugins import simple_banner
 
 
 class ClockPlugin(Plugin):
-    @tool
+    @tool(metadata={"banner": simple_banner("GET TIME")})
     def get_current_time(self):
         """Get the current UTC time in ISO format"""
-        banner("GET TIME")
         utc = datetime.datetime.now(datetime.timezone.utc).isoformat()
         local = datetime.datetime.now().isoformat()
         timezone = tzlocal.get_localzone_name()

autosh/plugins/code.py

@@ -1,15 +1,32 @@
-from agentia.plugins import tool, Plugin
+from agentia import tool, Plugin, UserConsentEvent
 from typing import Annotated
 import traceback
 from rich.syntax import Syntax
 from rich.console import group
 from contextlib import redirect_stdout, redirect_stderr
 import io
-from . import confirm, cmd_result_panel, cmd_preview_panel
+from . import code_preview_banner, code_result_panel
+
+
+@group()
+def code_with_explanation(code: str, explanation: str):
+    yield Syntax(code.strip(), "python")
+    yield "\n[dim]───[/dim]\n"
+    yield f"[dim]{explanation}[/dim]"
 
 
 class CodePlugin(Plugin):
-    @tool
+    @tool(
+        metadata={
+            "banner": code_preview_banner(
+                title="Run Python",
+                short="[bold]RUN[/bold] [italic]Python Code[/italic]",
+                content=lambda a: code_with_explanation(
+                    a.get("python_code", ""), a.get("explanation", "")
+                ),
+            )
+        }
+    )
     def execute(
         self,
         python_code: Annotated[str, "The python code to run."],
@@ -22,20 +39,7 @@ class CodePlugin(Plugin):
         The python code must be a valid python source file that accepts no inputs.
         Print results to stdout or stderr.
         """
-
-        @group()
-        def code_with_explanation():
-            yield Syntax(python_code.strip(), "python")
-            yield "\n[dim]───[/dim]\n"
-            yield f"[dim]{explanation}[/dim]"
-
-        cmd_preview_panel(
-            title="Run Python",
-            content=code_with_explanation(),
-            short=f"[bold]RUN[/bold] [italic]Python Code[/italic]",
-        )
-
-        if not confirm("Execute this code?"):
+        if not (yield UserConsentEvent("Execute this code?")):
             return {"error": "The user declined to execute the command."}
 
         out = io.StringIO()
@@ -64,5 +68,5 @@ class CodePlugin(Plugin):
                         "traceback": repr(traceback.format_exc()),
                     }
 
-        cmd_result_panel(title, o, e)
+        code_result_panel(title, o, e)
         return result

autosh/plugins/search.py

@@ -3,7 +3,7 @@ from typing import Annotated, override
 import os
 from tavily import TavilyClient
 
-from autosh.plugins import banner
+from autosh.plugins import simple_banner
 
 
 class SearchPlugin(Plugin):
@@ -17,7 +17,11 @@ class SearchPlugin(Plugin):
             raise ValueError("Please set the TAVILY_API_KEY environment variable.")
         self.__tavily = TavilyClient(api_key=key)
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner("WEB SEARCH", dim=lambda a: a.get("query", "")),
+        }
+    )
     async def web_search(
         self,
         query: Annotated[
@@ -29,8 +33,6 @@ class SearchPlugin(Plugin):
         Returning the top related search results in json format.
         When necessary, you need to combine this tool with the get_webpage_content tools (if available), to browse the web in depth by jumping through links.
         """
-        banner("WEB SEARCH", dim=query)
-
         tavily_results = self.__tavily.search(
             query=query,
             search_depth="advanced",
@@ -41,7 +43,11 @@ class SearchPlugin(Plugin):
         )
         return tavily_results
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner("NEWS SEARCH", dim=lambda a: a.get("query", "")),
+        }
+    )
     async def news_search(
         self,
         query: Annotated[
@@ -52,7 +58,6 @@ class SearchPlugin(Plugin):
         Perform news search on the given query.
         Returning the top related results in json format.
         """
-        banner("NEWS SEARCH", dim=query)
 
         tavily_results = self.__tavily.search(
             query=query,
@@ -65,7 +70,11 @@ class SearchPlugin(Plugin):
         )
         return tavily_results
 
-    @tool
+    @tool(
+        metadata={
+            "banner": simple_banner("FINANCE SEARCH", dim=lambda a: a.get("query", ""))
+        }
+    )
     async def finance_search(
         self,
         query: Annotated[
@@ -76,7 +85,6 @@ class SearchPlugin(Plugin):
         Search for finance-related news and information on the given query.
         Returning the top related results in json format.
         """
-        banner("FINANCE SEARCH", dim=query)
 
         tavily_results = self.__tavily.search(
             query=query,

autosh/plugins/web.py

@@ -7,7 +7,7 @@ from markdownify import markdownify
 import uuid
 from tavily import TavilyClient
 
-from autosh.plugins import banner
+from autosh.plugins import simple_banner
 
 
 class WebPlugin(Plugin):
@@ -47,7 +47,7 @@ class WebPlugin(Plugin):
         md = markdownify(res.text)
         return {"content": md}
 
-    @tool
+    @tool(metadata={"banner": simple_banner("BROWSE", dim=lambda a: a.get("url", ""))})
     def get_webpage_content(
         self,
         url: Annotated[str, "The URL of the web page to get the content of"],
@@ -57,7 +57,6 @@ class WebPlugin(Plugin):
         You can always use this tool to directly access web content or access external sites.
         Use it at any time when you think you may need to access the internet.
         """
-        banner("BROWSE", dim=url)
 
         result = self.__tavily.extract(
             urls=url,