kash-shell 0.3.9__py3-none-any.whl → 0.3.11__py3-none-any.whl

kash/commands/extras/parse_uv_lock.py

@@ -0,0 +1,186 @@
+import subprocess
+import tomllib
+from pathlib import Path
+
+import pandas as pd
+from packaging.tags import Tag, sys_tags
+from packaging.utils import parse_wheel_filename
+from prettyfmt import fmt_size_dual
+from strif import atomic_output_file
+
+from kash.config.logger import get_logger
+from kash.config.text_styles import COLOR_STATUS
+from kash.exec import kash_command
+from kash.shell.output.shell_output import cprint
+
+log = get_logger(__name__)
+
+
+def choose_wheel(wheels: list[dict], allowed: list[Tag]) -> dict | None:
+    """
+    Pick the first wheel whose tag set intersects `allowed`
+    (highest priority wins).
+    """
+    priority = {tag: idx for idx, tag in enumerate(allowed)}
+    best: dict | None = None
+    best_rank = float("inf")
+
+    for meta in wheels:
+        url = meta.get("url", "")
+        filename = Path(url).name if url else ""
+        if not filename:
+            raise ValueError(f"No filename found for {url}")
+        tags = parse_wheel_filename(filename)[-1]
+
+        for tag in tags:
+            rank = priority.get(tag)
+            if rank is not None and rank < best_rank:
+                best = meta
+                best_rank = rank
+                break
+
+    return best
+
+
+def get_platform() -> str:
+    """
+    Get the most-specific platform tag your interpreter supports.
+    """
+    return next(sys_tags()).platform
+
+
+def parse_uv_lock(lock_path: Path) -> pd.DataFrame:
+    """
+    Return one row per package from a uv.lock file, selecting the best
+    matching wheel for the current interpreter or falling back to the sdist.
+
+    Columns: name, version, registry, file_type, url, hash, size, filename.
+    """
+    with open(lock_path, "rb") as f:
+        data = tomllib.load(f)
+
+    rows: list[dict] = []
+    for pkg in data.get("package", []):
+        name = pkg.get("name")
+        version = pkg.get("version")
+        registry = pkg.get("source", {}).get("registry")
+
+        wheels = pkg.get("wheels", [])
+        selected = choose_wheel(wheels, list(sys_tags()))
+        if selected:
+            meta = selected
+            file_type = "wheel"
+        else:
+            meta = pkg.get("sdist", {})
+            file_type = "sdist"
+
+        url = meta.get("url")
+        rows.append(
+            {
+                "name": name,
+                "version": version,
+                "registry": registry,
+                "file_type": file_type,
+                "url": url,
+                "hash": meta.get("hash"),
+                "size": meta.get("size"),
+                "filename": Path(url).name if url else None,
+            }
+        )
+
+    return pd.DataFrame(rows)
+
+
+def uv_runtime_packages(
+    project_dir: str | Path = ".", no_dev: bool = False, uv_executable: str = "uv"
+) -> list[str]:
+    """
+    Return the *runtime* (non-dev) package names that would be installed for the
+    given project, as resolved by uv.
+    """
+    cmd = [
+        uv_executable,
+        "export",
+        "--format",
+        "requirements-txt",
+        "--no-header",
+        "--no-annotate",
+        "--no-hashes",
+    ]
+    if no_dev:
+        cmd.append("--no-dev")
+
+    result = subprocess.run(
+        cmd,
+        cwd=Path(project_dir),
+        check=True,
+        text=True,
+        capture_output=True,
+    )
+
+    packages: list[str] = []
+    for line in result.stdout.splitlines():
+        line = line.strip()
+        if "==" not in line:  # skip “-e .” and blank lines
+            continue
+        pkg_name, _ = line.split("==", maxsplit=1)
+        packages.append(pkg_name.strip())
+
+    return packages
+
+
+@kash_command
+def uv_dep_info(
+    uv_lock: str = "uv.lock",
+    pyproject: str = "pyproject.toml",
+    save: str | None = None,
+    sort_by: str = "size",
+) -> None:
+    """
+    Parse a uv.lock file and print information about the packages.
+    By default, filters to show only 'main' dependencies from pyproject.toml.
+    Helpful for looking at sizes of dependencies.
+    """
+    uv_lock_path = Path(uv_lock)
+    pyproject_path = Path(pyproject)
+
+    main_deps: list[str] | None = None
+    all_deps: list[str] = []
+    if pyproject_path.exists():
+        cprint("Reading main dependencies from with uv", style=COLOR_STATUS)
+        main_deps = uv_runtime_packages(no_dev=True)
+        all_deps = uv_runtime_packages(no_dev=False)
+    else:
+        log.warning("pyproject.toml not found: %s", pyproject_path)
+
+    cprint(f"Parsing lock file: {uv_lock_path}", style=COLOR_STATUS)
+
+    df = parse_uv_lock(uv_lock_path)
+    df = df.sort_values(by=sort_by)
+
+    if main_deps:
+        cprint(
+            f"Filtering lock file entries to include only {len(main_deps)} of {len(all_deps)} dependencies.",
+            style=COLOR_STATUS,
+        )
+        df = df[df["name"].isin(main_deps)]
+    else:
+        cprint("Showing all packages from lock file.", style=COLOR_STATUS)
+    cprint()
+
+    # Show only selected columns and full output
+    cols = ["name", "version", "file_type", "size", "filename"]
+    print(df.loc[:, cols].to_string(max_rows=None))
+    cprint()  # Add a newline for separation
+
+    # Calculate and print summary stats
+    num_deps = len(df)
+    total_size = pd.Series(pd.to_numeric(df["size"], errors="coerce")).fillna(0).sum()
+
+    cprint(f"Packages listed: {num_deps}", style=COLOR_STATUS)
+    cprint(f"Total size: {fmt_size_dual(int(total_size))}", style=COLOR_STATUS)
+
+    if save:
+        with atomic_output_file(save) as temp_name:
+            df.to_csv(temp_name, index=False)  # Added index=False for cleaner CSV
+        cprint(f"Saved to {save}", style=COLOR_STATUS)

kash/commands/help/doc_commands.py

@@ -1,42 +1,13 @@
-from rich.box import SQUARE
-from rich.console import Group
-from rich.panel import Panel
-
-from kash.commands.help.logo import branded_box
+from kash.commands.help.welcome import welcome
 from kash.config.logger import get_logger
-from kash.config.text_styles import (
-    COLOR_HINT,
-)
 from kash.docs.all_docs import DocSelection, all_docs
 from kash.exec import kash_command
 from kash.help.help_pages import print_see_also
-from kash.shell.output.shell_output import PrintHooks, console_pager, cprint, print_markdown
-from kash.shell.version import get_full_version_name
-from kash.utils.rich_custom.rich_markdown_fork import Markdown
+from kash.shell.output.shell_output import console_pager, print_markdown
 
 log = get_logger(__name__)
 
 
-@kash_command
-def welcome() -> None:
-    """
-    Print a welcome message.
-    """
-
-    help_topics = all_docs.help_topics
-    version = get_full_version_name()
-    # Create header with logo and right-justified version
-
-    PrintHooks.before_welcome()
-    cprint(
-        branded_box(
-            Group(Markdown(help_topics.welcome)),
-            version,
-        )
-    )
-    cprint(Panel(Markdown(help_topics.warning), box=SQUARE, border_style=COLOR_HINT))
-
-
 @kash_command
 def manual(no_pager: bool = False, doc_selection: DocSelection = DocSelection.full) -> None:
     """

kash/commands/help/welcome.py

@@ -0,0 +1,33 @@
+from rich.box import SQUARE
+from rich.console import Group
+from rich.panel import Panel
+
+from kash.commands.help.logo import branded_box
+from kash.config.text_styles import (
+    COLOR_HINT,
+)
+from kash.docs.all_docs import all_docs
+from kash.exec import kash_command
+from kash.shell.output.shell_output import PrintHooks, cprint
+from kash.shell.version import get_full_version_name
+from kash.utils.rich_custom.rich_markdown_fork import Markdown
+
+
+@kash_command
+def welcome() -> None:
+    """
+    Print a welcome message.
+    """
+
+    help_topics = all_docs.help_topics
+    version = get_full_version_name()
+    # Create header with logo and right-justified version
+
+    PrintHooks.before_welcome()
+    cprint(
+        branded_box(
+            Group(Markdown(help_topics.welcome)),
+            version,
+        )
+    )
+    cprint(Panel(Markdown(help_topics.warning), box=SQUARE, border_style=COLOR_HINT))

kash/commands/workspace/selection_commands.py

@@ -27,8 +27,9 @@ def select(
     previous: bool = False,
     next: bool = False,
     pop: bool = False,
-    clear: bool = False,
+    clear_all: bool = False,
     clear_future: bool = False,
+    refresh: bool = False,
 ) -> ShellResult:
     """
     Set or show the current selection.
@@ -47,12 +48,13 @@ def select(
     :param previous: Move back in the selection history to the previous selection.
     :param next: Move forward in the selection history to the next selection.
     :param pop: Pop the current selection from the history.
-    :param clear: Clear the full selection history.
+    :param clear_all: Clear the full selection history.
     :param clear_future: Clear all selections from history after the current one.
+    :param refresh: Refresh the current selection to drop any paths that no longer exist.
     """
     ws = current_ws()
 
-    # TODO: It would be nice to be able to read stdin from a pipe but this isn't working rn.
+    # FIXME: It would be nice to be able to read stdin from a pipe but this isn't working rn.
     # You could then run `... | select --stdin` to select the piped input.
     # Globally we have THREAD_SUBPROCS=False to avoid hard-to-interrupt subprocesses.
     # But xonsh seems to hang with stdin unless we modify the spec to be threadable?
@@ -61,7 +63,7 @@ def select(
     # if stdin:
     #     paths = tuple(sys.stdin.read().splitlines())
 
-    exclusive_flags = [history, last, back, forward, previous, next, pop, clear, clear_future]
+    exclusive_flags = [history, last, back, forward, previous, next, pop, clear_all, clear_future]
     if sum(bool(f) for f in exclusive_flags) > 1:
         raise InvalidInput("Cannot combine multiple flags")
     if paths and any(exclusive_flags):
@@ -96,12 +98,15 @@ def select(
     elif pop:
         ws.selections.pop()
         return ShellResult(show_selection=True)
-    elif clear:
-        ws.selections.clear()
+    elif clear_all:
+        ws.selections.clear_all()
         return ShellResult(show_selection=True)
     elif clear_future:
         ws.selections.clear_future()
         return ShellResult(show_selection=True)
+    elif refresh:
+        ws.selections.refresh_current(ws.base_dir)
+        return ShellResult(show_selection=True)
     else:
         return ShellResult(show_selection=True)
 

kash/commands/workspace/workspace_commands.py

@@ -15,7 +15,6 @@ from kash.config.text_styles import (
     EMOJI_WARN,
     STYLE_EMPH,
     STYLE_HINT,
-    format_success_emoji,
 )
 from kash.exec import (
     assemble_path_args,
@@ -36,7 +35,11 @@ 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_formatting import (
+    format_name_and_description,
+    format_name_and_value,
+    format_success_emoji,
+)
 from kash.shell.output.shell_output import (
     PrintHooks,
     Wrap,
@@ -170,14 +173,15 @@ def cache_media(*urls: str) -> None:
 
 
 @kash_command
-def cache_content(*urls_or_paths: str) -> None:
+def cache_content(*urls_or_paths: str, refetch: bool = False) -> None:
     """
     Cache the given file in the content cache. Downloads any URL or copies a local file.
     """
+    expiration_sec = 0 if refetch else None
     PrintHooks.spacer()
     for url_or_path in urls_or_paths:
         locator = resolve_locator_arg(url_or_path)
-        cache_path, was_cached = cache_file(locator)
+        cache_path, was_cached = cache_file(locator, expiration_sec=expiration_sec)
         cache_str = " (already cached)" if was_cached else ""
         cprint(f"{fmt_loc(url_or_path)}{cache_str}:", style=STYLE_EMPH, text_wrap=Wrap.NONE)
         cprint(f"{cache_path}", text_wrap=Wrap.INDENT_ONLY)
@@ -185,10 +189,13 @@ def cache_content(*urls_or_paths: str) -> None:
 
 
 @kash_command
-def download(*urls_or_paths: str) -> None:
+def download(*urls_or_paths: str, refetch: bool = False) -> None:
     """
-    Download a URL or resource. Inputs can be URLs or paths to URL resources.
+    Download a URL or resource. Uses cached content if available, unless `refetch` is true.
+    Inputs can be URLs or paths to URL resources.
     """
+    expiration_sec = 0 if refetch else None
+
     # TODO: Add option to include frontmatter metadata for text files.
     ws = current_ws()
     for url_or_path in urls_or_paths:
@@ -211,7 +218,7 @@ def download(*urls_or_paths: str) -> None:
             media_tools.cache_media(url)
         else:
             log.message("Will cache file and save to workspace: %s", fmt_loc(url))
-            cache_path, _was_cached = cache_file(url)
+            cache_path, _was_cached = cache_file(url, expiration_sec=expiration_sec)
             item = Item.from_external_path(cache_path, item_type=ItemType.resource)
             store_path = ws.save(item)
 
@@ -278,7 +285,7 @@ def init_workspace(path: str | None = None) -> None:
 @kash_command
 def workspace(workspace_name: str | None = None) -> None:
     """
-    If no args are given, change directory to the current workspace.
+    If no args are given, show current workspace info.
     If a workspace name is given, change to that workspace, creating it if it doesn't exist.
     """
     if workspace_name:
@@ -295,7 +302,6 @@ def workspace(workspace_name: str | None = None) -> None:
         ws.log_workspace_info()
     else:
         ws = current_ws(silent=True)
-        os.chdir(ws.base_dir)
         ws.log_workspace_info()
 
 
@@ -402,12 +408,10 @@ def set_params(*key_vals: str) -> None:
 
 
 @kash_command
-def list_params(full: bool = False) -> None:
+def params(full: bool = False) -> None:
     """
-    Show or set currently set of workspace parameters, which are settings that may be used
+    List currently set workspace parameters, which are settings that may be used
     by commands and actions or to override default parameters.
-
-    Run with no args to interactively set parameters.
     """
     ws: Workspace = current_ws()
     settable_params = GLOBAL_PARAMS
@@ -461,9 +465,7 @@ def import_item(
 
 
 @kash_command
-def fetch_metadata(
-    *files_or_urls: str, no_cache: bool = False, refetch: bool = False
-) -> ShellResult:
+def fetch_metadata(*files_or_urls: str, refetch: bool = False) -> ShellResult:
     """
     Fetch metadata for the given URLs or resources. Imports new URLs and saves back
     the fetched metadata for existing resources.
@@ -483,7 +485,7 @@ def fetch_metadata(
         try:
             if isinstance(locator, Path):
                 raise InvalidInput()
-            fetched_item = fetch_url_metadata(locator, use_cache=not no_cache, refetch=refetch)
+            fetched_item = fetch_url_metadata(locator, refetch=refetch)
             store_paths.append(fetched_item.store_path)
         except InvalidInput:
             log.warning("Not a URL or URL resource, will not fetch metadata: %s", fmt_loc(locator))

kash/config/colors.py

@@ -134,8 +134,10 @@ web_light_translucent = SimpleNamespace(
     primary_light=hsl_to_hex("hsl(188, 40%, 62%)"),
     secondary=hsl_to_hex("hsl(188, 12%, 28%)"),
     bg=hsl_to_hex("hsla(44, 6%, 100%, 0.75)"),
+    bg_solid=hsl_to_hex("hsla(44, 6%, 100%, 1)"),
     bg_header=hsl_to_hex("hsla(188, 42%, 70%, 0.2)"),
-    bg_alt=hsl_to_hex("hsla(44, 28%, 90%, 0.3)"),
+    bg_alt=hsl_to_hex("hsla(39, 24%, 90%, 0.3)"),
+    bg_alt_solid=hsl_to_hex("hsla(39, 24%, 97%, 1)"),
     text=hsl_to_hex("hsl(188, 39%, 11%)"),
     border=hsl_to_hex("hsl(188, 8%, 50%)"),
     border_hint=hsl_to_hex("hsla(188, 8%, 72%, 0.7)"),

kash/config/env_settings.py

@@ -28,6 +28,12 @@ class KashEnv(str, Enum):
     KASH_MCP_WS = "KASH_MCP_WS"
     """The directory for the workspace for MCP servers."""
 
+    KASH_SHOW_TRACEBACK = "KASH_SHOW_TRACEBACK"
+    """Whether to show tracebacks on actions and commands in the shell."""
+
+    KASH_USER_AGENT = "KASH_USER_AGENT"
+    """The user agent to use for HTTP requests."""
+
     @overload
     def read_str(self) -> str | None: ...
 
@@ -42,7 +48,7 @@ class KashEnv(str, Enum):
         return os.environ.get(self.value, default)
 
     @overload
-    def read_path(self, default: None) -> None: ...
+    def read_path(self) -> Path | None: ...
 
     @overload
     def read_path(self, default: Path) -> Path: ...
@@ -57,3 +63,10 @@ class KashEnv(str, Enum):
             return Path(value).expanduser().resolve()
         else:
             return default.expanduser().resolve() if default else None
+
+    def read_bool(self, default: bool = False) -> bool:
+        """
+        Get the value of the environment variable as a boolean.
+        """
+        value = str(os.environ.get(self.value, default) or "").lower()
+        return bool(value and value != "0" and value != "false" and value != "no")

kash/config/init.py

@@ -9,10 +9,10 @@ def kash_reload_all() -> tuple[dict[str, Callable], dict[str, type["Action"]]]:
     """
     Import all kash modules that define actions and commands.
     """
-    from kash.exec.action_registry import reload_all_action_classes
+    from kash.exec.action_registry import refresh_action_classes
     from kash.exec.command_registry import get_all_commands
 
     commands = get_all_commands()
-    actions = reload_all_action_classes()
+    actions = refresh_action_classes()
 
     return commands, actions