yaicli 0.4.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

yaicli/entry.py

@@ -3,15 +3,15 @@ from typing import Annotated, Any, Optional
 
 import typer
 
-from yaicli.chat_manager import FileChatManager
-from yaicli.cli import CLI
-from yaicli.config import cfg
-from yaicli.const import DEFAULT_CONFIG_INI, DefaultRoleNames, JustifyEnum
-from yaicli.roles import RoleManager
+from .chat import FileChatManager
+from .config import cfg
+from .const import DEFAULT_CONFIG_INI, DefaultRoleNames, JustifyEnum
+from .functions import install_functions, print_functions
+from .role import RoleManager
 
 app = typer.Typer(
     name="yaicli",
-    help="YAICLI - Yet Another AI CLI Interface.",
+    help="YAICLI - Your AI assistant in the command line.",
     context_settings={"help_option_names": ["-h", "--help"]},
     pretty_exceptions_enable=False,  # Let the CLI handle errors gracefully
     rich_markup_mode="rich",  # Render rich text in help messages
@@ -67,12 +67,19 @@ def main(
     max_tokens: int = typer.Option(  # noqa: F841
         cfg["MAX_TOKENS"],
         "--max-tokens",
-        "-M",
         help="Specify the max tokens to use.",
         rich_help_panel="LLM Options",
         min=1,
         callback=override_config,
     ),
+    stream: bool = typer.Option(  # noqa: F841
+        cfg["STREAM"],
+        "--stream/--no-stream",
+        help=f"Specify whether to stream the response. [dim](default: {'stream' if cfg['STREAM'] else 'no-stream'})[/dim]",
+        rich_help_panel="LLM Options",
+        show_default=False,
+        callback=override_config,
+    ),
     # ------------------- Role Options -------------------
     role: str = typer.Option(
         DefaultRoleNames.DEFAULT,
@@ -118,7 +125,7 @@ def main(
         help="Start in interactive chat mode.",
         rich_help_panel="Chat Options",
     ),
-    # ------------------- Shell Options -------------------
+    # # ------------------- Shell Options -------------------
     shell: bool = typer.Option(
         False,
         "--shell",
@@ -126,7 +133,7 @@ def main(
         help="Generate and optionally execute a shell command (non-interactive).",
         rich_help_panel="Shell Options",
     ),
-    # ------------------- Code Options -------------------
+    # # ------------------- Code Options -------------------
     code: bool = typer.Option(
         False,
         "--code",
@@ -157,7 +164,8 @@ def main(
     ),
     show_reasoning: bool = typer.Option(  # noqa: F841
         cfg["SHOW_REASONING"],
-        help=f"Show reasoning content from the LLM. [dim](default: {cfg['SHOW_REASONING']})[/dim]",
+        "--show-reasoning/--hide-reasoning",
+        help=f"Show reasoning content from the LLM. [dim](default: {'show' if cfg['SHOW_REASONING'] else 'hide'})[/dim]",
         rich_help_panel="Other Options",
         show_default=False,
         callback=override_config,
@@ -170,6 +178,37 @@ def main(
         rich_help_panel="Other Options",
         callback=override_config,
     ),
+    # ------------------- Function Options -------------------
+    install_functions: bool = typer.Option(  # noqa: F841
+        False,
+        "--install-functions",
+        help="Install default functions.",
+        rich_help_panel="Function Options",
+        callback=install_functions,
+    ),
+    list_functions: bool = typer.Option(  # noqa: F841
+        False,
+        "--list-functions",
+        help="List all available functions.",
+        rich_help_panel="Function Options",
+        callback=print_functions,
+    ),
+    enable_functions: bool = typer.Option(  # noqa: F841
+        cfg["ENABLE_FUNCTIONS"],
+        "--enable-functions/--disable-functions",
+        help=f"Enable/disable function calling in API requests [dim](default: {'enabled' if cfg['ENABLE_FUNCTIONS'] else 'disabled'})[/dim]",
+        rich_help_panel="Function Options",
+        show_default=False,
+        callback=override_config,
+    ),
+    show_function_output: bool = typer.Option(  # noqa: F841
+        cfg["SHOW_FUNCTION_OUTPUT"],
+        "--show-function-output/--hide-function-output",
+        help=f"Show the output of functions [dim](default: {'show' if cfg['SHOW_FUNCTION_OUTPUT'] else 'hide'})[/dim]",
+        rich_help_panel="Function Options",
+        show_default=False,
+        callback=override_config,
+    ),
 ):
     """YAICLI: Your AI assistant in the command line.
 
@@ -179,7 +218,7 @@ def main(
         print(DEFAULT_CONFIG_INI)
         raise typer.Exit()
 
-    # Combine prompt argument with stdin content if available
+    # # Combine prompt argument with stdin content if available
     final_prompt = prompt
     if not sys.stdin.isatty():
         stdin_content = sys.stdin.read().strip()
@@ -194,40 +233,29 @@ def main(
         if chat:
             print("Warning: --chat is ignored when stdin was redirected.")
             chat = False
+    if not any([final_prompt, chat]):
+        print(ctx.get_help())
+        return
 
-    # Basic validation for conflicting options or missing prompt
-    if not any([final_prompt, chat, list_chats, list_roles, create_role]):
-        # If no prompt, not starting chat, and not listing chats or roles, show help
-        typer.echo(ctx.get_help())
-        raise typer.Exit()
-
-    # Use build-in role for --shell or --code mode
+    # # Use build-in role for --shell or --code mode
     if role and role != DefaultRoleNames.DEFAULT and (shell or code):
         print("Warning: --role is ignored when --shell or --code is used.")
         role = DefaultRoleNames.DEFAULT
 
-    if code:
-        role = DefaultRoleNames.CODER
-
-    try:
-        # Instantiate the main CLI class with the specified role
-        cli_instance = CLI(verbose=verbose, role=role)
-
-        # Run the appropriate mode
-        cli_instance.run(
-            chat=chat,
-            shell=shell,
-            input=final_prompt,
-            role=role,
-        )
-    except Exception as e:
-        # Catch potential errors during CLI initialization or run
-        print(f"An error occurred: {e}")
-        if verbose:
-            import traceback
-
-            traceback.print_exc()
-        raise typer.Exit(code=1)
+    from yaicli.cli import CLI
+
+    role = CLI.evaluate_role_name(code, shell, role)
+
+    # Instantiate the main CLI class with the specified role
+    cli = CLI(verbose=verbose, role=role)
+
+    # Run the appropriate mode
+    cli.run(
+        chat=chat,
+        shell=shell,
+        code=code,
+        user_input=final_prompt,
+    )
 
 
 if __name__ == "__main__":

yaicli/exceptions.py

@@ -1,46 +1,18 @@
-class YAICLIException(Exception):
-    """Base exception for YAICLI"""
+class YaicliError(Exception):
+    """Base exception for yaicli"""
 
     def __init__(self, message: str):
         self.message = message
         super().__init__(self.message)
 
 
-###################################
-# Role exceptions
-class RoleNotFoundError(YAICLIException):
-    """Exception raised when a role is not found"""
+class ChatSaveError(YaicliError):
+    """Error saving chat"""
 
-    pass
 
+class ChatLoadError(YaicliError):
+    """Error loading chat"""
 
-class RoleAlreadyExistsError(YAICLIException):
-    """Exception raised when a role already exists"""
 
-    pass
-
-
-class RoleCreationError(YAICLIException):
-    """Exception raised when a role creation fails"""
-
-    pass
-
-
-###################################
-# Chat exceptions
-class ChatNotFoundError(YAICLIException):
-    """Exception raised when a chat is not found"""
-
-    pass
-
-
-class ChatSaveError(YAICLIException):
-    """Exception raised when a chat save fails"""
-
-    pass
-
-
-class ChatDeleteError(YAICLIException):
-    """Exception raised when a chat delete fails"""
-
-    pass
+class ChatDeleteError(YaicliError):
+    """Error deleting chat"""

yaicli/functions/__init__.py

@@ -0,0 +1,39 @@
+import shutil
+from pathlib import Path
+from typing import Any
+
+from ..console import get_console
+from ..const import FUNCTIONS_DIR
+from ..utils import option_callback
+
+console = get_console()
+
+
+@option_callback
+def install_functions(cls, _: Any) -> None:
+    """Install buildin functions"""
+    cur_dir = Path(__file__).absolute().parent
+    buildin_dir = cur_dir / "buildin"
+    buildin_funcs = [Path(path) for path in buildin_dir.glob("*.py")]
+    console.print("Installing buildin functions...")
+    if not FUNCTIONS_DIR.exists():
+        FUNCTIONS_DIR.mkdir(parents=True)
+    for file in buildin_funcs:
+        if (FUNCTIONS_DIR / file.name).exists():
+            # Skip if function already exists
+            console.print(f"Function {file.name} already exists, skipping.")
+            continue
+        shutil.copy(file, FUNCTIONS_DIR, follow_symlinks=True)
+        console.print(f"Installed {FUNCTIONS_DIR}/{file.name}")
+
+
+@option_callback
+def print_functions(cls, _: Any) -> None:
+    """List all available buildin functions"""
+    if not FUNCTIONS_DIR.exists():
+        console.print("No installed functions found.")
+        return
+    for file in FUNCTIONS_DIR.glob("*.py"):
+        if file.name.startswith("_"):
+            continue
+        console.print(file)

yaicli/functions/buildin/execute_shell_command.py

@@ -0,0 +1,47 @@
+import subprocess
+
+from instructor import OpenAISchema
+from pydantic import Field
+
+
+class Function(OpenAISchema):
+    """
+    Execute a shell command and return the output (result).
+    """
+
+    shell_command: str = Field(
+        ...,
+        json_schema_extra={
+            "example": "ls -la",
+        },
+        description="Shell command to execute.",
+    )
+
+    class Config:
+        title = "execute_shell_command"
+
+    @classmethod
+    def execute(cls, shell_command: str) -> str:
+        """
+        Execute a shell command and return the output (result).
+
+        Args:
+            shell_command (str): shell command to execute.
+
+        Returns:
+            str: exit code and output string.
+        """
+        # Optional security check
+        dangerous_commands = ["rm -rf", "mkfs", "dd"]
+        if any(cmd in shell_command for cmd in dangerous_commands):
+            return "Error: Dangerous command detected."
+
+        try:
+            process = subprocess.Popen(
+                shell_command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True
+            )
+            output, _ = process.communicate()
+            exit_code = process.returncode
+            return f"Exit code: {exit_code}, Output:\n{output}"
+        except Exception as e:
+            return f"Error: {str(e)}"