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

autosh/plugins/__init__.py

@@ -39,7 +39,6 @@ def __print_code_preview_banner(
     panel = Panel.fit(content, title=f"[magenta]{title}[/magenta]", title_align="left")
     rich.print()
     rich.print(panel)
-    rich.print()
 
 
 def code_preview_banner(
@@ -61,6 +60,7 @@ def code_result_panel(
 ):
     if CLI_OPTIONS.quiet:
         return
+    print()
     if isinstance(out, str):
         out = out.strip()
     if isinstance(err, str):
@@ -72,8 +72,6 @@ def code_result_panel(
         text += (("\n---\n" if out else "") + err) if err else ""
         panel = Panel.fit(text, title=title, title_align="left", style="dim")
         rich.print(panel)
-    if not CLI_OPTIONS.quiet:
-        rich.print()
 
 
 from . import calc

autosh/plugins/cli.py

@@ -67,6 +67,7 @@ class CLIPlugin(Plugin):
         if not os.path.exists(path):
             raise FileNotFoundError(f"Path `{path}` does not exist.")
         os.chdir(path)
+        return f"DONE"
 
     @tool(metadata={"banner": simple_banner("GET ARGV")})
     def get_argv(self):
@@ -269,3 +270,4 @@ class CLIPlugin(Plugin):
         Exit the current shell session with an optional exit code.
         """
         sys.exit(exitcode)
+        return f"EXITED with code {exitcode}"

autosh/session.py

@@ -1,4 +1,3 @@
-import asyncio
 from pathlib import Path
 import sys
 from agentia import (
@@ -7,7 +6,7 @@ from agentia import (
     Event,
     ToolCallEvent,
     MessageStream,
-    ChatCompletion,
+    Run,
     UserConsentEvent,
 )
 from agentia.plugins import PluginInitError
@@ -87,8 +86,8 @@ class Session:
             """,
         )
         agent.history.add(self.__get_argv_message())
-        completion = agent.chat_completion(prompt, stream=True)
-        async for stream in completion:
+        run = agent.run(prompt, stream=True)
+        async for stream in run:
             await self.__render_streamed_markdown(stream)
         sys.exit(0)
 
@@ -117,7 +116,7 @@ class Session:
         ):
             await self._print_help_and_exit(prompt)
         # Execute the prompt
-        loading = self.__create_loading_indicator()
+        loading = self.__create_loading_indicator() if sys.stdout.isatty() else None
         CLI_OPTIONS.prompt = prompt
         self.agent.history.add(self.__get_argv_message())
         if CLI_OPTIONS.stdin_has_data():
@@ -141,8 +140,8 @@ class Session:
                     role="user",
                 )
             )
-        completion = self.agent.chat_completion(prompt, stream=True, events=True)
-        await self.__process_completion(completion, loading)
+        run = self.agent.run(prompt, stream=True, events=True)
+        await self.__process_run(run, loading, False)
 
     async def exec_from_stdin(self):
         if sys.stdin.isatty():
@@ -170,32 +169,37 @@ class Session:
         if CLI_OPTIONS.yes:
             return True
         result = Confirm.ask(
-            f"[magenta]{message}[/magenta]", default=True, case_sensitive=False
+            f"\n[magenta]{message}[/magenta]", default=True, case_sensitive=False
         )
-        if not CLI_OPTIONS.quiet:
-            rich.print()
         return result
 
-    async def __process_completion(
-        self, completion: ChatCompletion[Event | MessageStream], loading: Loading
+    async def __process_run(
+        self, run: Run[Event | MessageStream], loading: Loading | None, repl: bool
     ):
-        async for stream in completion:
-            await loading.finish()
+        async for e in run:
+            if loading:
+                await loading.finish()
 
-            if isinstance(stream, Event):
-                await self.__process_event(stream)
+            if isinstance(e, Event):
+                await self.__process_event(e)
             else:
-                print()
-                await self.__render_streamed_markdown(stream)
-                print()
+                if repl or not CLI_OPTIONS.quiet:
+                    print()
+                await self.__render_streamed_markdown(e)
 
-            loading = self.__create_loading_indicator()
+            if loading:
+                loading = self.__create_loading_indicator()
 
-        await loading.finish()
+        if loading:
+            await loading.finish()
 
     async def run_repl(self):
+        first = True
         while True:
             try:
+                if not first:
+                    print()
+                first = False
                 prompt = (
                     await ng.input("> ", sync=False, persist="/tmp/autosh-history")
                 ).strip()
@@ -204,10 +208,8 @@ class Session:
                 if len(prompt) == 0:
                     continue
                 loading = self.__create_loading_indicator()
-                completion = self.agent.chat_completion(
-                    prompt, stream=True, events=True
-                )
-                await self.__process_completion(completion, loading)
+                run = self.agent.run(prompt, stream=True, events=True)
+                await self.__process_run(run, loading, True)
             except KeyboardInterrupt:
                 break
 

{autosh-0.0.4.dist-info → autosh-0.0.6.dist-info}/METADATA

@@ -1,13 +1,16 @@
 Metadata-Version: 2.4
 Name: autosh
-Version: 0.0.4
-Summary: Add your description here
+Version: 0.0.6
+Summary: The AI-powered, noob-friendly interactive shell
+Author-email: Wenyu Zhao <wenyuzhaox@gmail.com>
+License-Expression: MIT
 License-File: LICENSE
-Requires-Python: >=3.13
-Requires-Dist: agentia>=0.0.7
+Keywords: agent,chatgpt,cli,command line,gpt,interactive,llm,openai,openrouter,shell,terminal
+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
+Requires-Dist: neongrid>=0.0.1
 Requires-Dist: prompt-toolkit>=3.0.51
 Requires-Dist: pydantic>=2.11.3
 Requires-Dist: python-dotenv>=1.1.0

{autosh-0.0.4.dist-info → autosh-0.0.6.dist-info}/RECORD

@@ -2,16 +2,16 @@ autosh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 autosh/config-template.toml,sha256=iLdCBHIK0czWgNHtwAgvuhV670aiNc-IOmaPHP12i0Y,269
 autosh/config.py,sha256=7DXUSsqHm8dPsXln-NTu8D0_Uwcs2h4sT8pFtQM8tso,2654
 autosh/main.py,sha256=bgWkYpU9cmyU2AyWt4o8Mcj6LH_UGYSYrFx4Qkl8vqk,5117
-autosh/session.py,sha256=fOJySGU9abjFReNOyvQf-s9rFQdGy8Pv01GgplqrRuw,7943
-autosh/plugins/__init__.py,sha256=oUtO7M1AuZKshbaS-kO0fbV4CYal0uOvg-GpYVFE16I,2996
+autosh/session.py,sha256=AOhDTuTg9MlqW-VDKmHsiqqEg7PkDMUj0mknubE97cQ,7962
+autosh/plugins/__init__.py,sha256=LzaRWYpXv-e2YPr3VP1Ggd1rjNlQDjGRMPVTK7Hdfnk,2940
 autosh/plugins/calc.py,sha256=x_fZW3kkStlAAQEhejcD2_MQnpqCd5ghU72CNSjqIsg,672
-autosh/plugins/cli.py,sha256=G4WqTWeCi7OxdB36lAUiR1OBdtSvxmKRcQGGLdMcxms,9230
+autosh/plugins/cli.py,sha256=P8orcjsTfD_k7oEmaoW4xrrIpzg_XXKvV8ok3br6B44,9299
 autosh/plugins/clock.py,sha256=gIrYBz3GmnAJTujzd3B8ewuThXpF-OvWYBugcZMYGTQ,570
 autosh/plugins/code.py,sha256=HK7cd7gNit2yZAukaCnTGXb6BAh31cPh0EHCx6msOWc,2457
 autosh/plugins/search.py,sha256=aWbIDJ7E5m-Xrw2A1DB6w53oGiFe1Uc3EuZikIH5eTs,2984
 autosh/plugins/web.py,sha256=LxE7ed7IS9B4spWCm-3aBMLfC9ghcNnmJzMiD6ayLdc,2648
-autosh-0.0.4.dist-info/METADATA,sha256=cv69lLqKHEFwz5AZWEmmL0scvhzYv8-ECPdEiRzOaus,1959
-autosh-0.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-autosh-0.0.4.dist-info/entry_points.txt,sha256=BV7bzUnxG6Z5InEkrfajGCxjooYORC5tZDDZctOPenQ,67
-autosh-0.0.4.dist-info/licenses/LICENSE,sha256=BnLDJsIJe-Dm18unR9DOoSv7QOfAz6LeIQc1yHAjxp0,1066
-autosh-0.0.4.dist-info/RECORD,,
+autosh-0.0.6.dist-info/METADATA,sha256=3Bkxyj284hbhWISqxLtQQ3jbjSxX6S6cGYhmlvGuboA,2154
+autosh-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+autosh-0.0.6.dist-info/entry_points.txt,sha256=BV7bzUnxG6Z5InEkrfajGCxjooYORC5tZDDZctOPenQ,67
+autosh-0.0.6.dist-info/licenses/LICENSE,sha256=BnLDJsIJe-Dm18unR9DOoSv7QOfAz6LeIQc1yHAjxp0,1066
+autosh-0.0.6.dist-info/RECORD,,