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

yaicli/config.py

@@ -1,65 +1,19 @@
 import configparser
 from os import getenv
-from pathlib import Path
 from typing import Optional
 
 from rich import get_console
 from rich.console import Console
 
+from yaicli.const import (
+    CONFIG_PATH,
+    DEFAULT_CHAT_HISTORY_DIR,
+    DEFAULT_CONFIG_INI,
+    DEFAULT_CONFIG_MAP,
+    DEFAULT_MAX_SAVED_CHATS,
+)
 from yaicli.utils import str2bool
 
-DEFAULT_CONFIG_MAP = {
-    # Core API settings
-    "BASE_URL": {"value": "https://api.openai.com/v1", "env_key": "YAI_BASE_URL", "type": str},
-    "API_KEY": {"value": "", "env_key": "YAI_API_KEY", "type": str},
-    "MODEL": {"value": "gpt-4o", "env_key": "YAI_MODEL", "type": str},
-    # System detection hints
-    "SHELL_NAME": {"value": "auto", "env_key": "YAI_SHELL_NAME", "type": str},
-    "OS_NAME": {"value": "auto", "env_key": "YAI_OS_NAME", "type": str},
-    # API response parsing
-    "COMPLETION_PATH": {"value": "chat/completions", "env_key": "YAI_COMPLETION_PATH", "type": str},
-    "ANSWER_PATH": {"value": "choices[0].message.content", "env_key": "YAI_ANSWER_PATH", "type": str},
-    # API call parameters
-    "STREAM": {"value": "true", "env_key": "YAI_STREAM", "type": bool},
-    "TEMPERATURE": {"value": "0.7", "env_key": "YAI_TEMPERATURE", "type": float},
-    "TOP_P": {"value": "1.0", "env_key": "YAI_TOP_P", "type": float},
-    "MAX_TOKENS": {"value": "1024", "env_key": "YAI_MAX_TOKENS", "type": int},
-    # UI/UX settings
-    "CODE_THEME": {"value": "monokai", "env_key": "YAI_CODE_THEME", "type": str},
-    "MAX_HISTORY": {"value": "500", "env_key": "YAI_MAX_HISTORY", "type": int},
-    "AUTO_SUGGEST": {"value": "true", "env_key": "YAI_AUTO_SUGGEST", "type": bool},
-}
-
-DEFAULT_CONFIG_INI = f"""[core]
-PROVIDER=openai
-BASE_URL={DEFAULT_CONFIG_MAP["BASE_URL"]["value"]}
-API_KEY={DEFAULT_CONFIG_MAP["API_KEY"]["value"]}
-MODEL={DEFAULT_CONFIG_MAP["MODEL"]["value"]}
-
-# auto detect shell and os (or specify manually, e.g., bash, zsh, powershell.exe)
-SHELL_NAME={DEFAULT_CONFIG_MAP["SHELL_NAME"]["value"]}
-OS_NAME={DEFAULT_CONFIG_MAP["OS_NAME"]["value"]}
-
-# API paths (usually no need to change for OpenAI compatible APIs)
-COMPLETION_PATH={DEFAULT_CONFIG_MAP["COMPLETION_PATH"]["value"]}
-ANSWER_PATH={DEFAULT_CONFIG_MAP["ANSWER_PATH"]["value"]}
-
-# true: streaming response, false: non-streaming
-STREAM={DEFAULT_CONFIG_MAP["STREAM"]["value"]}
-
-# LLM parameters
-TEMPERATURE={DEFAULT_CONFIG_MAP["TEMPERATURE"]["value"]}
-TOP_P={DEFAULT_CONFIG_MAP["TOP_P"]["value"]}
-MAX_TOKENS={DEFAULT_CONFIG_MAP["MAX_TOKENS"]["value"]}
-
-# UI/UX
-CODE_THEME={DEFAULT_CONFIG_MAP["CODE_THEME"]["value"]}
-MAX_HISTORY={DEFAULT_CONFIG_MAP["MAX_HISTORY"]["value"]}
-AUTO_SUGGEST={DEFAULT_CONFIG_MAP["AUTO_SUGGEST"]["value"]}
-"""
-
-CONFIG_PATH = Path("~/.config/yaicli/config.ini").expanduser()
-
 
 class CasePreservingConfigParser(configparser.RawConfigParser):
     """Case preserving config parser"""
@@ -95,9 +49,7 @@ class Config(dict):
         self.update(self._load_defaults())
 
         # Load from config file
-        file_config = self._load_from_file()
-        if file_config:
-            self.update(file_config)
+        self._load_from_file()
 
         # Load from environment variables and apply type conversion
         self._load_from_env()
@@ -111,26 +63,44 @@ class Config(dict):
         """
         return {k: v["value"] for k, v in DEFAULT_CONFIG_MAP.items()}
 
-    def _load_from_file(self) -> dict[str, str]:
+    def _ensure_version_updated_config_keys(self):
+        """Ensure configuration keys added in version updates exist in the config file.
+        Appends missing keys to the config file if they don't exist.
+        """
+        with open(CONFIG_PATH, "r+", encoding="utf-8") as f:
+            config_content = f.read()
+            if "CHAT_HISTORY_DIR" not in config_content.strip():  # Check for empty lines
+                f.write(f"\nCHAT_HISTORY_DIR={DEFAULT_CHAT_HISTORY_DIR}\n")
+            if "MAX_SAVED_CHATS" not in config_content.strip():  # Check for empty lines
+                f.write(f"\nMAX_SAVED_CHATS={DEFAULT_MAX_SAVED_CHATS}\n")
+
+    def _load_from_file(self) -> None:
         """Load configuration from the config file.
 
         Creates default config file if it doesn't exist.
-
-        Returns:
-            Dictionary with configuration values from file, or empty dict if no valid values
         """
         if not CONFIG_PATH.exists():
             self.console.print("Creating default configuration file.", style="bold yellow")
             CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
             with open(CONFIG_PATH, "w", encoding="utf-8") as f:
                 f.write(DEFAULT_CONFIG_INI)
-            return {}
+            return
 
         config_parser = CasePreservingConfigParser()
         config_parser.read(CONFIG_PATH, encoding="utf-8")
-        if "core" in config_parser:
-            return {k: v for k, v in config_parser["core"].items() if k in DEFAULT_CONFIG_MAP and v.strip()}
-        return {}
+
+        # Check if "core" section exists in the config file
+        if "core" not in config_parser or not config_parser["core"]:
+            return
+
+        for k, v in {"SHELL_NAME": "Unknown Shell", "OS_NAME": "Unknown OS"}.items():
+            if not config_parser["core"].get(k, "").strip():
+                config_parser["core"][k] = v
+
+        self.update(config_parser["core"])
+
+        # Check if keys added in version updates are missing and add them
+        self._ensure_version_updated_config_keys()
 
     def _load_from_env(self) -> None:
         """Load configuration from environment variables.

yaicli/const.py

@@ -1,15 +1,21 @@
 from enum import StrEnum
+from pathlib import Path
+from tempfile import gettempdir
 
 CMD_CLEAR = "/clear"
 CMD_EXIT = "/exit"
 CMD_HISTORY = "/his"
 CMD_MODE = "/mode"
+CMD_SAVE_CHAT = "/save"
+CMD_LOAD_CHAT = "/load"
+CMD_LIST_CHATS = "/list"
+CMD_DELETE_CHAT = "/del"
 
 EXEC_MODE = "exec"
 CHAT_MODE = "chat"
 TEMP_MODE = "temp"
 
-DEFAULT_CONFIG_PATH = "~/.config/yaicli/config.ini"
+CONFIG_PATH = Path("~/.config/yaicli/config.ini").expanduser()
 DEFAULT_CODE_THEME = "monokai"
 DEFAULT_COMPLETION_PATH = "chat/completions"
 DEFAULT_ANSWER_PATH = "choices[0].message.content"
@@ -26,6 +32,8 @@ DEFAULT_MAX_HISTORY: int = 500
 DEFAULT_AUTO_SUGGEST = "true"
 DEFAULT_TIMEOUT: int = 60
 DEFAULT_INTERACTIVE_ROUND: int = 25
+DEFAULT_CHAT_HISTORY_DIR = Path(gettempdir()) / "yaicli/chats"
+DEFAULT_MAX_SAVED_CHATS = 20
 
 
 class EventTypeEnum(StrEnum):
@@ -66,7 +74,7 @@ DEFAULT_CONFIG_MAP = {
     # System detection hints
     "SHELL_NAME": {"value": DEFAULT_SHELL_NAME, "env_key": "YAI_SHELL_NAME", "type": str},
     "OS_NAME": {"value": DEFAULT_OS_NAME, "env_key": "YAI_OS_NAME", "type": str},
-    # API response parsing
+    # API paths (usually no need to change for OpenAI compatible APIs)
     "COMPLETION_PATH": {"value": DEFAULT_COMPLETION_PATH, "env_key": "YAI_COMPLETION_PATH", "type": str},
     "ANSWER_PATH": {"value": DEFAULT_ANSWER_PATH, "env_key": "YAI_ANSWER_PATH", "type": str},
     # API call parameters
@@ -84,6 +92,9 @@ 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},
+    # 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},
 }
 
 DEFAULT_CONFIG_INI = f"""[core]
@@ -114,6 +125,11 @@ INTERACTIVE_ROUND={DEFAULT_CONFIG_MAP["INTERACTIVE_ROUND"]["value"]}
 
 # UI/UX
 CODE_THEME={DEFAULT_CONFIG_MAP["CODE_THEME"]["value"]}
-MAX_HISTORY={DEFAULT_CONFIG_MAP["MAX_HISTORY"]["value"]} # Max entries kept in history file
+# Max entries kept in history file
+MAX_HISTORY={DEFAULT_CONFIG_MAP["MAX_HISTORY"]["value"]}
 AUTO_SUGGEST={DEFAULT_CONFIG_MAP["AUTO_SUGGEST"]["value"]}
+
+# Chat history settings
+CHAT_HISTORY_DIR={DEFAULT_CONFIG_MAP["CHAT_HISTORY_DIR"]["value"]}
+MAX_SAVED_CHATS={DEFAULT_CONFIG_MAP["MAX_SAVED_CHATS"]["value"]}
 """

yaicli/entry.py

@@ -22,7 +22,7 @@ def main(
         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="Mode Options")
+        bool, typer.Option("--chat", "-c", help="Start in interactive chat mode.", rich_help_panel="Chat Options")
     ] = False,
     shell: Annotated[
         bool,
@@ -30,7 +30,16 @@ def main(
             "--shell",
             "-s",
             help="Generate and optionally execute a shell command (non-interactive).",
-            rich_help_panel="Mode Options",
+            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[
@@ -65,20 +74,27 @@ def main(
                 final_prompt = f"{stdin_content}\n\n{final_prompt}"
             else:
                 final_prompt = stdin_content
+        # prompt_toolkit will raise EOFError if stdin is redirected
+        # Set chat to False to avoid 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:
-        # If no prompt and not starting chat, show help
+    if not final_prompt and not chat and not list_chats:
+        # If no prompt, not starting chat, and not listing chats, show help
         typer.echo(ctx.get_help())
         raise typer.Exit()
-    if chat and final_prompt:
-        # Warn if both chat mode and a prompt are given (prompt will be ignored)
-        # Or, could use the prompt as the first message in chat mode
-        print("Warning: Starting in chat mode. Initial prompt argument will be ignored.")
 
     try:
         # Instantiate the main CLI class
         cli_instance = CLI(verbose=verbose)
+
+        # Handle list_chats option
+        if list_chats:
+            cli_instance._list_chats()
+            return
+
         # Run the appropriate mode
         cli_instance.run(chat=chat, shell=shell, prompt=final_prompt)
     except Exception as e: