yaicli 0.2.0__py3-none-any.whl → 0.3.0__py3-none-any.whl

yaicli/console.py

@@ -0,0 +1,66 @@
+from typing import Any, Optional, Union
+
+from rich.console import Console, JustifyMethod, OverflowMethod
+from rich.style import Style
+
+from yaicli.config import cfg
+from yaicli.const import DEFAULT_JUSTIFY
+
+_console = None
+
+
+class YaiConsole(Console):
+    """Custom Console class that defaults to the configured justify value."""
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._default_justify: JustifyMethod = DEFAULT_JUSTIFY
+        if "JUSTIFY" in cfg:
+            self._default_justify = cfg["JUSTIFY"]
+
+    def print(
+        self,
+        *objects: Any,
+        sep: str = " ",
+        end: str = "\n",
+        style: Optional[Union[str, Style]] = None,
+        justify: Optional[JustifyMethod] = None,
+        overflow: Optional[OverflowMethod] = None,
+        no_wrap: Optional[bool] = None,
+        emoji: Optional[bool] = None,
+        markup: Optional[bool] = None,
+        highlight: Optional[bool] = None,
+        width: Optional[int] = None,
+        height: Optional[int] = None,
+        crop: bool = True,
+        soft_wrap: Optional[bool] = None,
+        new_line_start: bool = False,
+    ):
+        """Override the print method to default to the configured justify value."""
+        if justify is None:
+            justify = self._default_justify
+        return super().print(
+            *objects,
+            sep=sep,
+            end=end,
+            style=style,
+            justify=justify,
+            overflow=overflow,
+            no_wrap=no_wrap,
+            emoji=emoji,
+            markup=markup,
+            highlight=highlight,
+            width=width,
+            height=height,
+            crop=crop,
+            soft_wrap=soft_wrap,
+            new_line_start=new_line_start,
+        )
+
+
+def get_console() -> YaiConsole:
+    """Use a singleton pattern to ensure only one instance of Console is created."""
+    global _console
+    if _console is None:
+        _console = YaiConsole()
+    return _console

yaicli/const.py

@@ -1,6 +1,18 @@
 from enum import StrEnum
 from pathlib import Path
 from tempfile import gettempdir
+from typing import Any
+
+from rich.console import JustifyMethod
+
+
+class JustifyEnum(StrEnum):
+    DEFAULT = "default"
+    LEFT = "left"
+    CENTER = "center"
+    RIGHT = "right"
+    FULL = "full"
+
 
 CMD_CLEAR = "/clear"
 CMD_EXIT = "/exit"
@@ -14,8 +26,12 @@ CMD_DELETE_CHAT = "/del"
 EXEC_MODE = "exec"
 CHAT_MODE = "chat"
 TEMP_MODE = "temp"
+CODE_MODE = "code"
 
 CONFIG_PATH = Path("~/.config/yaicli/config.ini").expanduser()
+ROLES_DIR = CONFIG_PATH.parent / "roles"
+
+# Default configuration values
 DEFAULT_CODE_THEME = "monokai"
 DEFAULT_COMPLETION_PATH = "chat/completions"
 DEFAULT_ANSWER_PATH = "choices[0].message.content"
@@ -30,10 +46,12 @@ DEFAULT_TOP_P: float = 1.0
 DEFAULT_MAX_TOKENS: int = 1024
 DEFAULT_MAX_HISTORY: int = 500
 DEFAULT_AUTO_SUGGEST = "true"
+DEFAULT_SHOW_REASONING = "true"
 DEFAULT_TIMEOUT: int = 60
 DEFAULT_INTERACTIVE_ROUND: int = 25
 DEFAULT_CHAT_HISTORY_DIR = Path(gettempdir()) / "yaicli/chats"
 DEFAULT_MAX_SAVED_CHATS = 20
+DEFAULT_JUSTIFY: JustifyMethod = "default"
 
 
 class EventTypeEnum(StrEnum):
@@ -46,20 +64,41 @@ class EventTypeEnum(StrEnum):
     FINISH = "finish"
 
 
-SHELL_PROMPT = """Your are a Shell Command Generator.
+SHELL_PROMPT = """Your are a Shell Command Generator named YAICLI.
 Generate a command EXCLUSIVELY for {_os} OS with {_shell} shell.
 If details are missing, offer the most logical solution.
 Ensure the output is a valid shell command.
 Combine multiple steps with `&&` when possible.
 Supply plain text only, avoiding Markdown formatting."""
 
-DEFAULT_PROMPT = (
-    "You are YAICLI, a system management and programing assistant, "
-    "You are managing {_os} operating system with {_shell} shell. "
-    "Your responses should be concise and use Markdown format (but dont't use ```markdown), "
-    "unless the user explicitly requests more details."
+DEFAULT_PROMPT = """
+You are YAICLI, a system management and programing assistant, 
+You are managing {_os} operating system with {_shell} shell. 
+Your responses should be concise and use Markdown format (but dont't use ```markdown), 
+unless the user explicitly requests more details.
+"""
+
+CODER_PROMPT = (
+    "You are YAICLI, a code assistant. "
+    "You are helping with programming tasks. "
+    "Your responses must ONLY contain code, with NO explanation, NO markdown formatting, and NO preamble. "
+    "If user does not specify the language, provide Python code. "
+    "Do not wrap code in markdown code blocks (```) or language indicators."
 )
 
+
+class DefaultRoleNames(StrEnum):
+    SHELL = "Shell Command Generator"
+    DEFAULT = "DEFAULT"
+    CODER = "Code Assistant"
+
+
+DEFAULT_ROLES: dict[str, dict[str, Any]] = {
+    DefaultRoleNames.SHELL: {"name": DefaultRoleNames.SHELL, "prompt": SHELL_PROMPT},
+    DefaultRoleNames.DEFAULT: {"name": DefaultRoleNames.DEFAULT, "prompt": DEFAULT_PROMPT},
+    DefaultRoleNames.CODER: {"name": DefaultRoleNames.CODER, "prompt": CODER_PROMPT},
+}
+
 # DEFAULT_CONFIG_MAP is a dictionary of the configuration options.
 # The key is the name of the configuration option.
 # The value is a dictionary with the following keys:
@@ -92,6 +131,8 @@ DEFAULT_CONFIG_MAP = {
     "CODE_THEME": {"value": DEFAULT_CODE_THEME, "env_key": "YAI_CODE_THEME", "type": str},
     "MAX_HISTORY": {"value": DEFAULT_MAX_HISTORY, "env_key": "YAI_MAX_HISTORY", "type": int},
     "AUTO_SUGGEST": {"value": DEFAULT_AUTO_SUGGEST, "env_key": "YAI_AUTO_SUGGEST", "type": bool},
+    "SHOW_REASONING": {"value": DEFAULT_SHOW_REASONING, "env_key": "YAI_SHOW_REASONING", "type": bool},
+    "JUSTIFY": {"value": DEFAULT_JUSTIFY, "env_key": "YAI_JUSTIFY", "type": str},
     # Chat history settings
     "CHAT_HISTORY_DIR": {"value": DEFAULT_CHAT_HISTORY_DIR, "env_key": "YAI_CHAT_HISTORY_DIR", "type": str},
     "MAX_SAVED_CHATS": {"value": DEFAULT_MAX_SAVED_CHATS, "env_key": "YAI_MAX_SAVED_CHATS", "type": int},
@@ -128,6 +169,10 @@ CODE_THEME={DEFAULT_CONFIG_MAP["CODE_THEME"]["value"]}
 # Max entries kept in history file
 MAX_HISTORY={DEFAULT_CONFIG_MAP["MAX_HISTORY"]["value"]}
 AUTO_SUGGEST={DEFAULT_CONFIG_MAP["AUTO_SUGGEST"]["value"]}
+# Print reasoning content or not
+SHOW_REASONING={DEFAULT_CONFIG_MAP["SHOW_REASONING"]["value"]}
+# Text alignment (default, left, center, right, full)
+JUSTIFY={DEFAULT_CONFIG_MAP["JUSTIFY"]["value"]}
 
 # Chat history settings
 CHAT_HISTORY_DIR={DEFAULT_CONFIG_MAP["CHAT_HISTORY_DIR"]["value"]}

yaicli/entry.py

@@ -1,64 +1,179 @@
 import sys
-from typing import Annotated, Optional
+from typing import Annotated, Any, Optional
 
 import typer
 
+from yaicli.chat_manager import FileChatManager
 from yaicli.cli import CLI
-from yaicli.const import DEFAULT_CONFIG_INI
+from yaicli.config import cfg
+from yaicli.const import DEFAULT_CONFIG_INI, DefaultRoleNames, JustifyEnum
+from yaicli.roles import RoleManager
 
 app = typer.Typer(
     name="yaicli",
     help="YAICLI - Yet Another AI CLI Interface.",
     context_settings={"help_option_names": ["-h", "--help"]},
     pretty_exceptions_enable=False,  # Let the CLI handle errors gracefully
-    add_completion=False,  # Disable default shell completion for now
+    rich_markup_mode="rich",  # Render rich text in help messages
 )
 
 
+def override_config(
+    ctx: typer.Context,  # noqa: F841
+    param: typer.CallbackParam,
+    value: Any,
+):
+    """Override config with input value if value not equal to option default."""
+    if value != param.default and isinstance(param.name, str):
+        cfg[param.name.upper()] = value
+    return value
+
+
 @app.command()
 def main(
     ctx: typer.Context,
     prompt: Annotated[
         Optional[str], typer.Argument(help="The prompt to send to the LLM. Reads from stdin if available.")
     ] = None,
-    chat: Annotated[
-        bool, typer.Option("--chat", "-c", help="Start in interactive chat mode.", rich_help_panel="Chat Options")
-    ] = False,
-    shell: Annotated[
-        bool,
-        typer.Option(
-            "--shell",
-            "-s",
-            help="Generate and optionally execute a shell command (non-interactive).",
-            rich_help_panel="Shell Options",
-        ),
-    ] = False,
-    list_chats: Annotated[
-        bool,
-        typer.Option(
-            "--list-chats",
-            "-lc",
-            help="List saved chat sessions.",
-            rich_help_panel="Chat Options",
-        ),
-    ] = False,
-    verbose: Annotated[
-        bool,
-        typer.Option(
-            "--verbose", "-V", help="Show verbose output (e.g., loaded config).", rich_help_panel="Other Options"
-        ),
-    ] = False,
-    template: Annotated[
-        bool,
-        typer.Option(
-            "--template", help="Show the default config file template and exit.", rich_help_panel="Other Options"
-        ),
-    ] = False,
-):  # Removed trailing comma
+    # ------------------- LLM Options -------------------
+    model: str = typer.Option(  # noqa: F841
+        "",
+        "--model",
+        "-M",
+        help="Specify the model to use.",
+        rich_help_panel="LLM Options",
+        callback=override_config,
+    ),
+    temperature: float = typer.Option(  # noqa: F841
+        cfg["TEMPERATURE"],
+        "--temperature",
+        "-T",
+        help="Specify the temperature to use.",
+        rich_help_panel="LLM Options",
+        min=0.0,
+        max=2.0,
+        callback=override_config,
+    ),
+    top_p: float = typer.Option(  # noqa: F841
+        cfg["TOP_P"],
+        "--top-p",
+        "-P",
+        help="Specify the top-p to use.",
+        rich_help_panel="LLM Options",
+        min=0.0,
+        max=1.0,
+        callback=override_config,
+    ),
+    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,
+    ),
+    # ------------------- Role Options -------------------
+    role: str = typer.Option(
+        DefaultRoleNames.DEFAULT,
+        "--role",
+        "-r",
+        help="Specify the assistant role to use.",
+        rich_help_panel="Role Options",
+        callback=RoleManager.check_id_ok,
+    ),
+    create_role: str = typer.Option(
+        "",
+        "--create-role",
+        help="Create a new role with the specified name.",
+        rich_help_panel="Role Options",
+        callback=RoleManager.create_role_option,
+    ),
+    delete_role: str = typer.Option(  # noqa: F841
+        "",
+        "--delete-role",
+        help="Delete a role with the specified name.",
+        rich_help_panel="Role Options",
+        callback=RoleManager.delete_role_option,
+    ),
+    list_roles: bool = typer.Option(
+        False,
+        "--list-roles",
+        help="List all available roles.",
+        rich_help_panel="Role Options",
+        callback=RoleManager.print_list_option,
+    ),
+    show_role: str = typer.Option(  # noqa: F841
+        "",
+        "--show-role",
+        help="Show the role with the specified name.",
+        rich_help_panel="Role Options",
+        callback=RoleManager.show_role_option,
+    ),
+    # ------------------- Chat Options -------------------
+    chat: bool = typer.Option(
+        False,
+        "--chat",
+        "-c",
+        help="Start in interactive chat mode.",
+        rich_help_panel="Chat Options",
+    ),
+    # ------------------- Shell Options -------------------
+    shell: bool = typer.Option(
+        False,
+        "--shell",
+        "-s",
+        help="Generate and optionally execute a shell command (non-interactive).",
+        rich_help_panel="Shell Options",
+    ),
+    # ------------------- Code Options -------------------
+    code: bool = typer.Option(
+        False,
+        "--code",
+        help="Generate and optionally execute a code block (non-interactive).",
+        rich_help_panel="Code Options",
+    ),
+    # ------------------- Chat Options -------------------
+    list_chats: bool = typer.Option(
+        False,
+        "--list-chats",
+        help="List saved chat sessions.",
+        rich_help_panel="Chat Options",
+        callback=FileChatManager.print_list_option,
+    ),
+    # ------------------- Other Options -------------------
+    verbose: bool = typer.Option(
+        False,
+        "--verbose",
+        "-V",
+        help="Show verbose output (e.g., loaded config).",
+        rich_help_panel="Other Options",
+    ),
+    template: bool = typer.Option(
+        False,
+        "--template",
+        help="Show the default config file template and exit.",
+        rich_help_panel="Other Options",
+    ),
+    show_reasoning: bool = typer.Option(  # noqa: F841
+        cfg["SHOW_REASONING"],
+        help=f"Show reasoning content from the LLM. [dim](default: {cfg['SHOW_REASONING']})[/dim]",
+        rich_help_panel="Other Options",
+        show_default=False,
+        callback=override_config,
+    ),
+    justify: JustifyEnum = typer.Option(  # noqa: F841
+        cfg["JUSTIFY"],
+        "--justify",
+        "-j",
+        help="Specify the justify to use.",
+        rich_help_panel="Other Options",
+        callback=override_config,
+    ),
+):
     """YAICLI: Your AI assistant in the command line.
 
-    Call with a PROMPT to get a direct answer, use --shell to execute as command,
-    or use --chat for an interactive session.
+    Call with a PROMPT to get a direct answer, use --shell to execute as command, or use --chat for an interactive session.
     """
     if template:
         print(DEFAULT_CONFIG_INI)
@@ -75,28 +190,36 @@ def main(
             else:
                 final_prompt = stdin_content
         # prompt_toolkit will raise EOFError if stdin is redirected
-        # Set chat to False to avoid starting interactive mode
+        # Set chat to False to prevent starting interactive mode.
         if chat:
             print("Warning: --chat is ignored when stdin was redirected.")
             chat = False
 
     # Basic validation for conflicting options or missing prompt
-    if not final_prompt and not chat and not list_chats:
-        # If no prompt, not starting chat, and not listing chats, show help
+    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()
 
-    try:
-        # Instantiate the main CLI class
-        cli_instance = CLI(verbose=verbose)
+    # 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
 
-        # Handle list_chats option
-        if list_chats:
-            cli_instance._list_chats()
-            return
+    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, prompt=final_prompt)
+        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}")

yaicli/exceptions.py

@@ -0,0 +1,46 @@
+class YAICLIException(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"""
+
+    pass
+
+
+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