kash-shell 0.3.7__tar.gz → 0.3.8__tar.gz

{kash_shell-0.3.7 → kash_shell-0.3.8}/.env.template

@@ -1,14 +1,7 @@
 # Copy this template file to ~/.env or another parent directory and set these
 # values and any other environment variables you need.
 
-# Location of new workspaces. This can be "." to to default to wherever
-# you are working, or an absolute path to ensure the default location
-# for a new workspace is the same place.
-# KASH_WS_ROOT="."
-KASH_WS_ROOT="~/Documents/kash"
-
-# Location of the kash default "global" workspace.
-KASH_GLOBAL_WS="~/Documents/kash/global"
+# See settings.py for optional KASH_* environment variables.
 
 # API Keys:
 

{kash_shell-0.3.7 → kash_shell-0.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.7
+Version: 0.3.8
 Summary: The knowledge agent shell
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/base/debug_commands.py

@@ -12,7 +12,8 @@ from kash.help.function_param_info import annotate_param_info
 from kash.help.recommended_commands import RECOMMENDED_TLDR_COMMANDS
 from kash.model.params_model import Param
 from kash.shell.output.kerm_codes import IframePopover, TextTooltip
-from kash.shell.output.shell_output import PrintHooks, console_pager, cprint, format_name_and_value
+from kash.shell.output.shell_formatting import format_name_and_value
+from kash.shell.output.shell_output import PrintHooks, console_pager, cprint
 from kash.utils.errors import InvalidInput
 
 log = get_logger(__name__)

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/base/general_commands.py

@@ -1,34 +1,32 @@
 from kash.commands.base.model_commands import list_apis, list_models
 from kash.commands.workspace.workspace_commands import list_params
-from kash.config.api_keys import (
-    RECOMMENDED_APIS,
-    Api,
-    get_all_configured_models,
-    load_dotenv_paths,
-    print_api_key_setup,
-)
-from kash.config.dotenv_utils import env_var_is_set
 from kash.config.logger import get_logger
+from kash.config.settings import RECOMMENDED_API_KEYS
 from kash.docs.all_docs import all_docs
 from kash.exec import kash_command
 from kash.help.tldr_help import tldr_refresh_cache
+from kash.llm_utils.llm_api_keys import get_all_configured_models
 from kash.model.params_model import (
     DEFAULT_CAREFUL_LLM,
     DEFAULT_FAST_LLM,
     DEFAULT_STANDARD_LLM,
     DEFAULT_STRUCTURED_LLM,
 )
-from kash.shell.input.collect_dotenv import fill_missing_dotenv
+from kash.shell.clideps.api_keys import (
+    ApiEnvKey,
+    load_dotenv_paths,
+    print_api_key_setup,
+)
+from kash.shell.clideps.dotenv_setup import interactive_dotenv_setup
+from kash.shell.clideps.pkg_deps import pkg_check
+from kash.shell.clideps.terminal_features import terminal_check
 from kash.shell.input.input_prompts import input_choice
+from kash.shell.output.shell_formatting import format_name_and_value
 from kash.shell.output.shell_output import (
     PrintHooks,
     cprint,
-    format_failure,
-    format_name_and_value,
-    format_success,
     print_h2,
 )
-from kash.shell.utils.sys_tool_deps import sys_tool_check, terminal_feature_check
 from kash.shell.version import get_full_version_name
 from kash.utils.errors import InvalidState
 from kash.workspaces.workspaces import current_ws
@@ -50,8 +48,8 @@ def self_check(brief: bool = False) -> None:
     Self-check kash setup, including termal settings, tools, and API keys.
     """
     if brief:
-        terminal_feature_check().print_term_info()
-        print_api_key_setup(once=False)
+        terminal_check().print_term_info()
+        print_api_key_setup(recommended_keys=RECOMMENDED_API_KEYS, once=False)
         check_system_tools(brief=brief)
         tldr_refresh_cache()
         try:
@@ -63,7 +61,7 @@ def self_check(brief: bool = False) -> None:
     else:
         version()
         cprint()
-        terminal_feature_check().print_term_info()
+        terminal_check().print_term_info()
         cprint()
         list_apis()
         cprint()
@@ -86,28 +84,18 @@ def self_check(brief: bool = False) -> None:
 @kash_command
 def self_configure(all: bool = False, update: bool = False) -> None:
     """
-    Interactively configure your .env file with recommended API keys.
-
-    :param all: Configure all known API keys (instead of just recommended ones).
-    :param update: Update values even if they are already set.
+    Interactively configure API keys and preferred models.
     """
 
+    if all:
+        api_keys = [key.value for key in ApiEnvKey]
+    else:
+        api_keys = RECOMMENDED_API_KEYS
     # Show APIs before starting.
     list_apis()
 
-    apis = Api if all else RECOMMENDED_APIS
-    keys = [api.value for api in apis]
-    if not update:
-        keys = [key for key in keys if not env_var_is_set(key)]
-
-    cprint()
-    print_h2("Configuring .env file")
-    if keys:
-        cprint(format_failure(f"API keys needed: {', '.join(keys)}"))
-        fill_missing_dotenv(keys)
-        reload_env()
-    else:
-        cprint(format_success("All requested API keys are set!"))
+    interactive_dotenv_setup(api_keys, update=update)
+    reload_env()
 
     cprint()
     ws = current_ws()
@@ -170,15 +158,15 @@ def check_system_tools(warn_only: bool = False, brief: bool = False) -> None:
     :param brief: Print summary as a single line.
     """
     if warn_only:
-        sys_tool_check().warn_if_missing()
+        pkg_check().warn_if_missing()
     else:
         if brief:
-            cprint(sys_tool_check().status())
+            cprint(pkg_check().status())
         else:
             print_h2("Installed System Tools")
-            cprint(sys_tool_check().formatted())
+            cprint(pkg_check().formatted())
             cprint()
-            sys_tool_check().warn_if_missing()
+            pkg_check().warn_if_missing()
 
 
 @kash_command
@@ -190,7 +178,7 @@ def reload_env() -> None:
     env_paths = load_dotenv_paths()
     if env_paths:
         cprint("Reloaded environment variables")
-        print_api_key_setup()
+        print_api_key_setup(RECOMMENDED_API_KEYS)
     else:
         raise InvalidState("No .env file found")
 

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/base/logs_commands.py

@@ -11,7 +11,8 @@ from kash.config.settings import (
     server_log_file_path,
 )
 from kash.exec import kash_command
-from kash.shell.output.shell_output import cprint, format_name_and_value, print_status
+from kash.shell.output.shell_formatting import format_name_and_value
+from kash.shell.output.shell_output import cprint, print_status
 from kash.shell.utils.native_utils import tail_file
 from kash.utils.common.format_utils import fmt_loc
 

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/base/model_commands.py

@@ -1,17 +1,19 @@
 from flowmark import Wrap
 from rich.text import Text
 
-from kash.config.api_keys import Api
-from kash.config.dotenv_utils import env_var_is_set
-from kash.config.text_styles import format_success_emoji
 from kash.exec.command_registry import kash_command
-from kash.llm_utils import LLM
-from kash.shell.output.shell_output import (
-    cprint,
+from kash.llm_utils import LLM, api_for_model
+from kash.shell.clideps.api_keys import ApiEnvKey
+from kash.shell.clideps.dotenv_utils import env_var_is_set
+from kash.shell.output.shell_formatting import (
     format_failure,
     format_name_and_value,
     format_success,
+    format_success_emoji,
     format_success_or_failure,
+)
+from kash.shell.output.shell_output import (
+    cprint,
     print_h2,
 )
 
@@ -23,11 +25,11 @@ def list_models() -> None:
     """
     print_h2("Models")
     for model in LLM.all_names():
-        api = Api.for_model(model)
-        have_key = bool(api and env_var_is_set(api.env_var))
+        api = api_for_model(model)
+        have_key = bool(api and env_var_is_set(api.value))
         if api:
             provider_msg = format_success(f"provider {api.name}")
-            key_message = format_success_or_failure(have_key, f"{api.env_var}")
+            key_message = format_success_or_failure(have_key, f"{api.value}")
         else:
             provider_msg = format_failure("provider not recognized")
             key_message = format_failure("unknown API key")
@@ -46,11 +48,11 @@ def list_apis() -> None:
     List and check configuration for all APIs.
     """
     print_h2("API keys")
-    for api in Api:
-        emoji = format_success_emoji(env_var_is_set(api.env_var))
+    for api in ApiEnvKey:
+        emoji = format_success_emoji(env_var_is_set(api.value))
         message = (
-            f"API key {api.env_var} found"
-            if env_var_is_set(api.env_var)
-            else f"API key {api.env_var} not found"
+            f"API key {api.value} found"
+            if env_var_is_set(api.value)
+            else f"API key {api.value} not found"
         )
         cprint(Text.assemble(emoji, format_name_and_value(api.name, message)))

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/base/search_command.py

@@ -3,8 +3,8 @@ from pathlib import Path
 from kash.config.logger import get_logger
 from kash.exec import assemble_path_args, kash_command
 from kash.exec_model.shell_model import ShellResult
+from kash.shell.clideps.pkg_deps import Pkg, pkg_check
 from kash.shell.output.shell_output import cprint
-from kash.shell.utils.sys_tool_deps import SysTool, sys_tool_check
 from kash.utils.common.parse_shell_args import shell_quote
 from kash.utils.errors import InvalidState
 
@@ -33,7 +33,7 @@ def search(
     :param ignore_case: Ignore case when searching.
     :param verbose: Also print the ripgrep command line.
     """
-    sys_tool_check().require(SysTool.ripgrep)
+    pkg_check().require(Pkg.ripgrep)
     from ripgrepy import RipGrepNotFound, Ripgrepy
 
     resolved_paths = assemble_path_args(*paths)

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/commands/workspace/workspace_commands.py

@@ -36,13 +36,12 @@ from kash.model.items_model import Item, ItemType
 from kash.model.params_model import GLOBAL_PARAMS
 from kash.model.paths_model import StorePath, fmt_store_path
 from kash.shell.input.param_inputs import input_param_name, input_param_value
+from kash.shell.output.shell_formatting import format_name_and_description, format_name_and_value
 from kash.shell.output.shell_output import (
     PrintHooks,
     Wrap,
     console_pager,
     cprint,
-    format_name_and_description,
-    format_name_and_value,
     print_h2,
     print_h3,
     print_status,

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/config/logger.py

@@ -12,7 +12,6 @@ from pathlib import Path
 from typing import IO, Any, cast
 
 import rich
-from rich import reconfigure
 from rich._null_file import NULL_FILE
 from rich.console import Console
 from rich.logging import RichHandler
@@ -22,8 +21,12 @@ from strif import atomic_output_file, new_timestamped_uid
 from typing_extensions import override
 
 import kash.config.suppress_warnings  # noqa: F401
-from kash.config.logger_basic import basic_file_handler
-from kash.config.settings import GLOBAL_LOGS_DIR, LogLevel, get_global_kash_dir, global_settings
+from kash.config.logger_basic import basic_file_handler, basic_stderr_handler
+from kash.config.settings import (
+    LogLevel,
+    get_system_logs_dir,
+    global_settings,
+)
 from kash.config.text_styles import (
     EMOJI_ERROR,
     EMOJI_SAVED,
@@ -48,9 +51,9 @@ class LogSettings:
     log_file_path: Path
 
 
-_log_base = get_global_kash_dir()
+_log_dir = get_system_logs_dir()
 """
-Parent of the "logs" directory. Initially the global kash data root.
+Parent of the "logs" directory. Initially the global kash workspace.
 """
 
 
@@ -72,14 +75,14 @@ def make_valid_log_name(name: str) -> str:
 
 
 def _read_log_settings() -> LogSettings:
-    global _log_base, _log_name
+    global _log_dir, _log_name
     return LogSettings(
         log_console_level=global_settings().console_log_level,
         log_file_level=global_settings().file_log_level,
-        global_log_dir=GLOBAL_LOGS_DIR,
-        log_dir=_log_base / "logs",
-        log_objects_dir=_log_base / "logs" / "objects" / _log_name,
-        log_file_path=_log_base / "logs" / f"{_log_name}.log",
+        global_log_dir=get_system_logs_dir(),
+        log_dir=_log_dir,
+        log_objects_dir=_log_dir / "objects" / _log_name,
+        log_file_path=_log_dir / f"{_log_name}.log",
     )
 
 
@@ -102,7 +105,7 @@ def reset_log_root(log_root: Path | None = None, log_name: str | None = None):
     """
     global _log_lock, _log_base, _log_name
     with _log_lock:
-        _log_base = log_root or get_global_kash_dir()
+        _log_base = log_root or get_system_logs_dir()
         _log_name = make_valid_log_name(log_name or LOG_NAME_GLOBAL)
         reload_rich_logging_setup()
 
@@ -125,9 +128,6 @@ def get_theme():
     return Theme(RICH_STYLES)
 
 
-reconfigure(theme=get_theme(), highlighter=get_highlighter())
-
-
 def get_console() -> Console:
     """
     Return the Rich global console, unless it is overridden by a
@@ -166,7 +166,7 @@ def record_console() -> Generator[Console, None, None]:
 
 
 _file_handler: logging.FileHandler
-_console_handler: RichHandler
+_console_handler: logging.Handler
 
 
 def reload_rich_logging_setup():
@@ -210,20 +210,25 @@ def _do_logging_setup(log_settings: LogSettings):
             super().emit(record)
 
     global _console_handler
-    _console_handler = PrefixedRichHandler(
-        # For now we use the fixed global console for logging.
-        # In the future we may want to add a way to have thread-local capture
-        # of all system logs.
-        console=rich.get_console(),
-        level=log_settings.log_console_level.value,
-        show_time=False,
-        show_path=False,
-        show_level=False,
-        highlighter=get_highlighter(),
-        markup=True,
-    )
-    _console_handler.setLevel(log_settings.log_console_level.value)
-    _console_handler.setFormatter(Formatter("%(message)s"))
+
+    # Use the Rich stdout handler only on terminals, stderr for servers or non-interactive use.
+    if get_console().is_terminal:
+        _console_handler = PrefixedRichHandler(
+            # For now we use the fixed global console for logging.
+            # In the future we may want to add a way to have thread-local capture
+            # of all system logs.
+            console=rich.get_console(),
+            level=log_settings.log_console_level.value,
+            show_time=False,
+            show_path=False,
+            show_level=False,
+            highlighter=get_highlighter(),
+            markup=True,
+        )
+        _console_handler.setLevel(log_settings.log_console_level.value)
+        _console_handler.setFormatter(Formatter("%(message)s"))
+    else:
+        _console_handler = basic_stderr_handler(log_settings.log_console_level)
 
     # Manually adjust logging for a few packages, removing previous verbose default handlers.
 
@@ -337,17 +342,12 @@ class CustomLogger(logging.Logger):
         )
 
 
-logging.setLoggerClass(CustomLogger)
-
-
-reload_rich_logging_setup()
-
-
 def get_logger(name: str) -> CustomLogger:
     """
     Get a logger that's compatible with system logging but has our additional custom
     methods.
     """
+    init_rich_logging()
     logger = logging.getLogger(name)
     # print("Logger is", logger)
     return cast(CustomLogger, logger)
@@ -355,3 +355,12 @@ def get_logger(name: str) -> CustomLogger:
 
 def get_log_file_stream():
     return _file_handler.stream
+
+
+@cache
+def init_rich_logging():
+    rich.reconfigure(theme=get_theme(), highlighter=get_highlighter())
+
+    logging.setLoggerClass(CustomLogger)
+
+    reload_rich_logging_setup()

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/config/logger_basic.py

@@ -1,4 +1,5 @@
 import logging
+import sys
 from logging import FileHandler, Formatter
 from pathlib import Path
 
@@ -16,7 +17,7 @@ def basic_file_handler(path: Path, level: LogLevel) -> logging.FileHandler:
 
 
 def basic_stderr_handler(level: LogLevel) -> logging.StreamHandler:
-    handler = logging.StreamHandler()
+    handler = logging.StreamHandler(stream=sys.stderr)
     handler.setLevel(level.value)
     handler.setFormatter(Formatter("%(asctime)s %(levelname).1s %(name)s - %(message)s"))
     return handler

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/config/settings.py

@@ -15,9 +15,12 @@ DOT_DIR = ".kash"
 
 GLOBAL_WS_NAME = "global"
 
-
-def get_global_kash_dir() -> Path:
-    return Path(os.environ.get("KASH_DIR", "~/.local/kash")).expanduser().resolve()
+RECOMMENDED_API_KEYS = [
+    "OPENAI_API_KEY",
+    "ANTHROPIC_API_KEY",
+    "DEEPGRAM_API_KEY",
+    "GROQ_API_KEY",
+]
 
 
 @overload
@@ -37,22 +40,27 @@ def path_from_env(env_name: str, default: Path | None) -> Path | None:
 
 
 def get_ws_root_dir() -> Path:
-    return path_from_env("KASH_WS_ROOT", Path("."))
+    """Default root directory for kash workspaces."""
+    return path_from_env("KASH_WS_ROOT", Path("~/Kash").expanduser().resolve())
 
 
 def get_global_ws_dir() -> Path:
+    """Default global workspace directory."""
     kash_ws_dir = path_from_env("KASH_GLOBAL_WS", None)
     if kash_ws_dir:
         return kash_ws_dir
     else:
-        docs_dir = Path("~/Documents").expanduser().resolve()
-        if not docs_dir.exists():
-            raise ValueError(
-                f"Documents directory ({docs_dir}) does not exist; "
-                "set KASH_GLOBAL_WS to specify a global workspace directory"
-            )
-        else:
-            return docs_dir / APP_NAME / GLOBAL_WS_NAME
+        return get_ws_root_dir() / GLOBAL_WS_NAME
+
+
+def get_system_logs_dir() -> Path:
+    """Default global and system logs directory (for server logs, etc)."""
+    return path_from_env("KASH_SYSTEM_LOGS_DIR", get_ws_root_dir() / "logs")
+
+
+def get_system_cache_dir() -> Path:
+    """Default global and system cache directory (for global media, content, etc)."""
+    return path_from_env("KASH_SYSTEM_CACHE_DIR", get_ws_root_dir() / "cache")
 
 
 def get_mcp_ws_dir() -> Path | None:
@@ -70,10 +78,6 @@ def get_rcfile_path() -> Path:
     return Path("~/.kashrc").expanduser().resolve()
 
 
-GLOBAL_LOGS_DIR = get_global_kash_dir() / "logs"
-
-
-GLOBAL_CACHE_PATH = get_global_kash_dir() / "cache"
 MEDIA_CACHE_NAME = "media"
 CONTENT_CACHE_NAME = "content"
 
@@ -87,7 +91,7 @@ LOCAL_SERVER_PORT_START = 4470
 LOCAL_SERVER_PORTS_MAX = 30
 
 
-SERVER_LOG_FILE = str(GLOBAL_LOGS_DIR / "{name}_{port}.log")
+SERVER_LOG_FILE = str(get_system_logs_dir() / "{name}_{port}.log")
 
 
 class LogLevel(Enum):
@@ -207,8 +211,8 @@ def server_log_file_path(name: str, port: int | str) -> Path:
 _settings = AtomicVar(
     Settings(
         # These default to the global but can be overridden by workspace settings.
-        media_cache_dir=GLOBAL_CACHE_PATH / MEDIA_CACHE_NAME,
-        content_cache_dir=GLOBAL_CACHE_PATH / CONTENT_CACHE_NAME,
+        media_cache_dir=get_system_cache_dir() / MEDIA_CACHE_NAME,
+        content_cache_dir=get_system_cache_dir() / CONTENT_CACHE_NAME,
         debug_assistant=True,
         default_editor="nano",
         file_log_level=LogLevel.info,

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/config/setup.py

@@ -8,8 +8,8 @@ def setup(rich_logging: bool):
     """
     One-time setup of essential keys, directories, and configs. Idempotent.
     """
-    from kash.config.api_keys import load_dotenv_paths
     from kash.config.logger import reload_rich_logging_setup
+    from kash.shell.clideps.dotenv_utils import load_dotenv_paths
     from kash.utils.common.stack_traces import add_stacktrace_handler
 
     if rich_logging:

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/exec/llm_transforms.py

@@ -4,7 +4,6 @@ from chopdiff.docs import DiffFilter, TextDoc
 from chopdiff.transforms import WindowSettings, accept_all, filtered_transform
 from flowmark import fill_markdown
 
-from kash.config.api_keys import load_dotenv_paths
 from kash.config.logger import get_logger
 from kash.llm_utils import LLMName
 from kash.llm_utils.fuzzy_parsing import strip_markdown_fence
@@ -12,6 +11,7 @@ from kash.llm_utils.llm_completion import llm_template_completion
 from kash.llm_utils.llm_messages import Message, MessageTemplate
 from kash.model.actions_model import LLMOptions
 from kash.model.items_model import Item, ItemType
+from kash.shell.clideps.dotenv_utils import load_dotenv_paths
 from kash.utils.errors import InvalidInput
 from kash.utils.file_utils.file_formats_model import Format
 

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/file_storage/metadata_dirs.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from pydantic.dataclasses import dataclass
 
 from kash.config.logger import get_logger
-from kash.config.settings import CONTENT_CACHE_NAME, DOT_DIR, GLOBAL_CACHE_PATH, MEDIA_CACHE_NAME
+from kash.config.settings import CONTENT_CACHE_NAME, DOT_DIR, MEDIA_CACHE_NAME, get_system_cache_dir
 from kash.file_storage.persisted_yaml import PersistedYaml
 from kash.model.paths_model import StorePath
 from kash.utils.common.format_utils import fmt_loc
@@ -62,7 +62,7 @@ class MetadataDirs:
     # in which case it is in the global cache path.
     @property
     def cache_dir(self) -> Path:
-        return GLOBAL_CACHE_PATH if self.is_global_ws else StorePath(f"{DOT_DIR}/cache")
+        return get_system_cache_dir() if self.is_global_ws else StorePath(f"{DOT_DIR}/cache")
 
     @property
     def media_cache_dir(self) -> Path:

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/help/help_pages.py

@@ -4,10 +4,10 @@ from kash.config.logger import get_logger
 from kash.config.text_styles import STYLE_HINT
 from kash.docs.all_docs import DocSelection, all_docs
 from kash.help.docstring_utils import parse_docstring
+from kash.shell.output.shell_formatting import format_name_and_value
 from kash.shell.output.shell_output import (
     PrintHooks,
     cprint,
-    format_name_and_value,
     print_h2,
     print_hrule,
     print_markdown,

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/help/help_printing.py

@@ -12,11 +12,10 @@ from kash.llm_utils.llm_messages import Message
 from kash.model.actions_model import Action
 from kash.model.params_model import COMMON_SHELL_PARAMS, RUNTIME_ACTION_PARAMS, Param
 from kash.model.preconditions_model import Precondition
+from kash.shell.output.shell_formatting import format_name_and_description, format_name_and_value
 from kash.shell.output.shell_output import (
     PrintHooks,
     cprint,
-    format_name_and_description,
-    format_name_and_value,
     print_help,
     print_markdown,
 )

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/llm_utils/__init__.py

@@ -1,5 +1,6 @@
 # flake8: noqa: F401
 
+from kash.llm_utils.llm_api_keys import api_for_model, get_all_configured_models, have_key_for_model
 from kash.llm_utils.llm_completion import (
     LLMCompletionResult,
     llm_completion,

kash_shell-0.3.8/src/kash/llm_utils/llm_api_keys.py

@@ -0,0 +1,39 @@
+from __future__ import annotations
+
+import litellm
+from litellm.litellm_core_utils.get_llm_provider_logic import get_llm_provider
+
+from kash.llm_utils.llm_names import LLMName
+from kash.llm_utils.llms import LLM
+from kash.shell.clideps.api_keys import ApiEnvKey
+from kash.shell.clideps.dotenv_utils import env_var_is_set
+
+
+def api_for_model(model: LLMName) -> ApiEnvKey | None:
+    """
+    Get the API key name for a model or None if not found.
+    """
+    try:
+        _model, custom_llm_provider, _dynamic_api_key, _api_base = get_llm_provider(model)
+    except litellm.exceptions.BadRequestError:
+        return None
+
+    return ApiEnvKey.for_provider(custom_llm_provider)
+
+
+def have_key_for_model(model: LLMName) -> bool:
+    """
+    Do we have an API key for this model?
+    """
+    try:
+        api = api_for_model(model)
+        return bool(api and env_var_is_set(api))
+    except ValueError:
+        return False
+
+
+def get_all_configured_models() -> list[LLMName]:
+    """
+    Get all models that have an API key.
+    """
+    return [model for model in LLM if have_key_for_model(model)]

{kash_shell-0.3.7 → kash_shell-0.3.8}/src/kash/mcp/mcp_cli.py

@@ -10,7 +10,7 @@ import os
 from pathlib import Path
 
 from kash.config.logger_basic import basic_logging_setup
-from kash.config.settings import DEFAULT_MCP_SERVER_PORT, GLOBAL_LOGS_DIR, LogLevel
+from kash.config.settings import DEFAULT_MCP_SERVER_PORT, LogLevel, get_system_logs_dir
 from kash.config.setup import setup
 from kash.mcp.mcp_main import McpMode, run_mcp_server
 from kash.mcp.mcp_server_sse import MCP_LOG_PREFIX
@@ -22,7 +22,7 @@ __version__ = get_version()
 
 DEFAULT_PROXY_URL = f"http://localhost:{DEFAULT_MCP_SERVER_PORT}/sse"
 
-LOG_PATH = GLOBAL_LOGS_DIR / f"{MCP_LOG_PREFIX}_cli.log"
+LOG_PATH = get_system_logs_dir() / f"{MCP_LOG_PREFIX}_cli.log"
 
 basic_logging_setup(LOG_PATH, LogLevel.info)