autosh 0.0.1__tar.gz → 0.0.2__tar.gz

{autosh-0.0.1 → autosh-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autosh
-Version: 0.0.1
+Version: 0.0.2
 Summary: Add your description here
 License-File: LICENSE
 Requires-Python: >=3.13

{autosh-0.0.1 → autosh-0.0.2}/autosh/config.py

@@ -3,6 +3,8 @@ from pydantic import BaseModel, Field
 from pathlib import Path
 import tomllib
 
+import rich
+
 USER_CONFIG_PATH = Path.home() / ".config" / "autosh" / "config.toml"
 
 
@@ -42,10 +44,14 @@ class Config(BaseModel):
     @staticmethod
     def load() -> "Config":
         if USER_CONFIG_PATH.is_file():
-            doc = tomllib.loads(USER_CONFIG_PATH.read_text())
-            main = doc.get("autosh", {})
-            plugins = Plugins(**doc.get("plugins", {}))
-            config = Config.model_validate({**main, "plugins": plugins})
+            try:
+                doc = tomllib.loads(USER_CONFIG_PATH.read_text())
+                main = doc.get("autosh", {})
+                plugins = Plugins(**doc.get("plugins", {}))
+                config = Config.model_validate({**main, "plugins": plugins})
+            except tomllib.TOMLDecodeError as e:
+                rich.print(f"[bold red]Error:[/bold red] invalid config file: {e}")
+                sys.exit(1)
         else:
             config = Config()
         return config

{autosh-0.0.1 → autosh-0.0.2}/autosh/md.py

@@ -142,6 +142,7 @@ class MarkdowmPrinter:
                 case "`":
                     await self.next()
                     if (i := find("code")) is not None:
+                        self.print(c)
                         if not outer_is_dim:
                             self.print("\x1b[22m")
                             if find("bold") is not None or outer_is_bold:
@@ -150,6 +151,7 @@ class MarkdowmPrinter:
                     else:
                         self.print("\x1b[2m")
                         styles.append("code")
+                        self.print(c)
                 # Bold
                 case "*" if (
                     not_code and await self.check("**") and not find_italic_first()
@@ -158,24 +160,32 @@ class MarkdowmPrinter:
                     await self.next()
                     # print(">", styles, find("bold"))
                     if (i := find("bold")) is not None:
+                        self.print(c)
+                        self.print(c)
                         if not outer_is_bold:
                             self.print("\x1b[22m")
                         styles = styles[:i]
                     else:
                         self.print("\x1b[1m")
                         styles.append("bold")
+                        self.print(c)
+                        self.print(c)
                 case "_" if (
                     not_code and await self.check("__") and not find_italic_first()
                 ):
                     await self.next()
                     await self.next()
                     if (i := find("bold")) is not None:
+                        self.print(c)
+                        self.print(c)
                         if not outer_is_bold:
                             self.print("\x1b[22m")
                         styles = styles[:i]
                     else:
                         self.print("\x1b[1m")
                         styles.append("bold")
+                        self.print(c)
+                        self.print(c)
                 # Italic
                 case "*" | "_" if (
                     not_code
@@ -184,6 +194,7 @@ class MarkdowmPrinter:
                 ):
                     await self.next()
                     if (i := find("italic")) is not None:
+                        self.print(c)
                         if not outer_is_italic:
                             self.print("\x1b[23m")
                         styles = styles[:i]
@@ -191,16 +202,19 @@ class MarkdowmPrinter:
                     else:
                         self.print("\x1b[3m")
                         styles.append("italic")
+                        self.print(c)
                 # Strike through
                 case "~" if not_code and await self.check("~~"):
                     await self.next()
                     await self.next()
                     if (i := find("strike")) is not None:
+                        self.print("~~")
                         self.print("\x1b[29m")
                         styles = styles[:i]
                     else:
                         self.print("\x1b[9m")
                         styles.append("strike")
+                        self.print("~~")
                 case _:
                     self.print(c)
                     await self.next()

{autosh-0.0.1 → autosh-0.0.2}/autosh/plugins/cli.py

@@ -82,6 +82,48 @@ class CLIPlugin(Plugin):
             "args": CLI_OPTIONS.args,
         }
 
+    @tool
+    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
+    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
+    def update_env(
+        self,
+        key: Annotated[str, "The environment variable to set"],
+        value: Annotated[
+            str | None,
+            "The value to set the environment variable to, or None to delete it",
+        ],
+    ):
+        """
+        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
     def read(
         self,

{autosh-0.0.1 → autosh-0.0.2}/autosh/session.py

@@ -1,3 +1,4 @@
+import asyncio
 from pathlib import Path
 import sys
 from agentia import Agent
@@ -10,6 +11,7 @@ from autosh.md import stream_md
 from .plugins import create_plugins
 import rich
 import platform
+from rich.prompt import Prompt
 
 
 INSTRUCTIONS = f"""
@@ -90,7 +92,7 @@ class Session:
         else:
             cmd = CLI_OPTIONS.script.name
         return UserMessage(
-            content=f"PROGRAM NAME: {cmd}\n\nCOMMAND LINE ARGS: {args}",
+            content=f"PROGRAM NAME: {cmd}\n\nCOMMAND LINE ARGS: {args}\n\nCWD: {str(Path.cwd())}",
             role="user",
         )
 
@@ -108,6 +110,7 @@ class Session:
         ):
             await self._print_help_and_exit(prompt)
         # Execute the prompt
+        loading = self.__create_loading_indicator()
         CLI_OPTIONS.prompt = prompt
         self.agent.history.add(self._get_argv_message())
         if CLI_OPTIONS.stdin_has_data():
@@ -119,8 +122,11 @@ class Session:
             )
         completion = self.agent.chat_completion(prompt, stream=True)
         async for stream in completion:
-            if await self.__render_streamed_markdown(stream):
+            if not loading:
+                loading = self.__create_loading_indicator()
+            if await self.__render_streamed_markdown(stream, loading=loading):
                 print()
+            loading = None
 
     async def exec_from_stdin(self):
         if sys.stdin.isatty():
@@ -141,19 +147,60 @@ class Session:
         console = rich.console.Console()
         while True:
             try:
-                prompt = console.input("[bold]>[/bold] ").strip()
+                prompt = console.input("[bold blue]>[/bold blue] ").strip()
                 if prompt in ["exit", "quit"]:
                     break
                 if len(prompt) == 0:
                     continue
+                loading = self.__create_loading_indicator(newline=True)
                 completion = self.agent.chat_completion(prompt, stream=True)
                 async for stream in completion:
-                    if await self.__render_streamed_markdown(stream):
+                    if not loading:
+                        loading = self.__create_loading_indicator()
+                    if await self.__render_streamed_markdown(stream, loading=loading):
                         print()
+                    loading = None
             except KeyboardInterrupt:
                 break
 
-    async def __render_streamed_markdown(self, stream: MessageStream):
+    def __create_loading_indicator(self, newline: bool = False):
+        return (
+            asyncio.create_task(self.__loading(newline))
+            if sys.stdout.isatty()
+            else None
+        )
+
+    async def __loading(self, newline: bool = False):
+        chars = "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
+        char_width = 1
+        msg = "Loading..."
+        count = 0
+        print("\x1b[2m", end="", flush=True)
+        while True:
+            try:
+                print(chars[count], end="", flush=True)
+                print(" " + msg, end="", flush=True)
+                count += 1
+                await asyncio.sleep(0.1)
+                length = char_width + len(msg) + 1
+                print("\b" * length, end="", flush=True)
+                print(" " * length, end="", flush=True)
+                print("\b" * length, end="", flush=True)
+                if count == len(chars):
+                    count = 0
+            except asyncio.CancelledError:
+                length = char_width + len(msg) + 1
+                print("\b" * length, end="", flush=True)
+                print(" " * length, end="", flush=True)
+                print("\b" * length, end="", flush=True)
+                print("\x1b[0m", end="", flush=True)
+                if newline:
+                    print()
+                break
+
+    async def __render_streamed_markdown(
+        self, stream: MessageStream, loading: asyncio.Task[None] | None = None
+    ):
         if sys.stdout.isatty():
             # buffer first few chars so we don't need to launch glow if there is no output
             chunks = aiter(stream)
@@ -163,8 +210,14 @@ class Session:
                     buf += await anext(chunks)
                 except StopAsyncIteration:
                     if len(buf) == 0:
+                        if loading:
+                            loading.cancel()
+                            await loading
                         return False
                     break
+            if loading:
+                loading.cancel()
+                await loading
 
             content = {"v": ""}
 

{autosh-0.0.1 → autosh-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "autosh"
-version = "0.0.1"
+version = "0.0.2"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.13"