kash-shell 0.3.11__tar.gz → 0.3.13__tar.gz

{kash_shell-0.3.11 → kash_shell-0.3.13}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier. Do not edit manually.
-_commit: v0.2.5
+_commit: v0.2.8
 _src_path: gh:jlevy/simple-modern-uv
 package_author_email: joshua@cal.berkeley.edu
 package_author_name: Joshua Levy

{kash_shell-0.3.11 → kash_shell-0.3.13}/.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
         uses: astral-sh/setup-uv@v5
         with:
           # Update this as needed:
-          version: "0.6.14"
+          version: "0.7.3"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 

{kash_shell-0.3.11 → kash_shell-0.3.13}/.github/workflows/publish.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install uv (official Astral action)
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.6.14"
+          version: "0.7.3"
           enable-cache: true
           python-version: "3.12"
 

{kash_shell-0.3.11 → kash_shell-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.11
+Version: 0.3.13
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -20,17 +20,16 @@ Requires-Dist: anyio>=4.8.0
 Requires-Dist: audioop-lts>=0.2.1; python_version >= '3.13'
 Requires-Dist: cachetools>=5.5.2
 Requires-Dist: chopdiff>=0.2.1
-Requires-Dist: clideps>=0.1.1
+Requires-Dist: clideps>=0.1.4
 Requires-Dist: colour>=0.1.5
 Requires-Dist: cssselect>=1.2.0
 Requires-Dist: deepgram-sdk>=3.10.1
 Requires-Dist: dunamai>=1.23.0
 Requires-Dist: fastapi>=0.115.11
-Requires-Dist: flowmark>=0.4.5
+Requires-Dist: flowmark>=0.4.6
 Requires-Dist: frontmatter-format>=0.2.1
 Requires-Dist: funlog>=0.2.0
 Requires-Dist: humanfriendly>=10.0
-Requires-Dist: inflect>=7.5.0
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: justext>=3.0.2
@@ -43,6 +42,7 @@ Requires-Dist: openai>=1.66.3
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
 Requires-Dist: pathspec>=0.12.1
+Requires-Dist: pluralizer>=1.2.0
 Requires-Dist: prettyfmt>=0.3.1
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic>=2.10.6

{kash_shell-0.3.11 → kash_shell-0.3.13}/devtools/lint.py

@@ -1,6 +1,7 @@
 import subprocess
 
 from funlog import log_calls
+from rich import get_console, reconfigure
 from rich import print as rprint
 
 # Update as needed.
@@ -8,6 +9,9 @@ SRC_PATHS = ["src", "tests", "devtools"]
 DOC_PATHS = ["README.md"]
 
 
+reconfigure(emoji=not get_console().options.legacy_windows)  # No emojis on legacy windows.
+
+
 def main():
     rprint()
 
@@ -21,9 +25,9 @@ def main():
     rprint()
 
     if errcount != 0:
-        rprint(f"[bold red]✗ Lint failed with {errcount} errors.[/bold red]")
+        rprint(f"[bold red]:x: Lint failed with {errcount} errors.[/bold red]")
     else:
-        rprint("[bold green]✔️ Lint passed![/bold green]")
+        rprint("[bold green]:white_check_mark: Lint passed![/bold green]")
     rprint()
 
     return errcount
@@ -32,7 +36,7 @@ def main():
 @log_calls(level="warning", show_timing_only=True)
 def run(cmd: list[str]) -> int:
     rprint()
-    rprint(f"[bold green]❯ {' '.join(cmd)}[/bold green]")
+    rprint(f"[bold green]:arrow_forward: {' '.join(cmd)}[/bold green]")
     errcount = 0
     try:
         subprocess.run(cmd, text=True, check=True)

{kash_shell-0.3.11 → kash_shell-0.3.13}/pyproject.toml

@@ -38,17 +38,17 @@ classifiers = [
 # ---- Main dependencies ----
 
 dependencies = [
-    "dunamai>=1.23.0",
+"dunamai>=1.23.0",
     "pydantic>=2.10.6",
     "typing-extensions>=4.12.2",
     # My tools:
     "strif>=3.0.1",
     "funlog>=0.2.0",
     "prettyfmt>=0.3.1",
-    "flowmark>=0.4.5",
+    "flowmark>=0.4.6",
     "frontmatter-format>=0.2.1",
     "chopdiff>=0.2.1",
-    "clideps>=0.1.1",
+    "clideps>=0.1.4",
     # Shell and file essentials:
     # python-magic is most current and works with libmagic on macOS and Linux.
     # on Windows, python-magic-bin seems like the best option.
@@ -71,7 +71,6 @@ dependencies = [
     "tldr>=3.3.0",
     "jinja2>=3.1.6",
     "pygments>=2.19.1",
-    "inflect>=7.5.0",
     "tenacity>=9.0.0",
     "lazyasd>=0.1.4",
     "pathspec>=0.12.1",
@@ -86,6 +85,7 @@ dependencies = [
     "markdownify>=0.13.1",
     "justext>=3.0.2",
     "cssselect>=1.2.0",
+    "pluralizer>=1.2.0",
     # Minimal media handling:
     "pydub>=0.25.1",
     # audioop-lts is a backport of audioop for Python 3.13 and later needed for pydub.
@@ -102,9 +102,12 @@ dependencies = [
     "mcp-proxy>=0.5.0",
 ]
 
+# ---- Dev dependencies ----
+
 [dependency-groups]
 dev = [
     "pytest>=8.3.5",
+    "pytest-sugar>=1.0.0",
     "ruff>=0.11.0",
     "codespell>=2.4.1",
     "rich>=14.0.0",
@@ -154,8 +157,8 @@ packages = ["src/kash"]
 line-length = 100
 
 [tool.ruff.lint]
-# See: https://docs.astral.sh/ruff/rules/
 select = [
+    # See: https://docs.astral.sh/ruff/rules/
     # Basic list from: https://docs.astral.sh/ruff/linter/#rule-selection
     "E", # https://docs.astral.sh/ruff/rules/#error-e
     "F", # https://docs.astral.sh/ruff/rules/#pyflakes-f
@@ -170,6 +173,7 @@ select = [
 
 ]
 ignore = [
+    # Disable some rules that are overly pedantic. Add/remove as desired:
     "E501", # https://docs.astral.sh/ruff/rules/line-too-long/
     "E402", # https://docs.astral.sh/ruff/rules/module-import-not-at-top-of-file/
     "E731", # https://docs.astral.sh/ruff/rules/lambda-assignment/

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/actions/core/markdownify.py

@@ -1,8 +1,9 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import has_html_body, is_url_item
+from kash.exec.preconditions import has_html_body, is_url_resource
 from kash.model import Format, Item
 from kash.model.params_model import common_params
+from kash.utils.text_handling.markdownify_utils import markdownify_custom
 from kash.web_content.file_cache_utils import get_url_html
 from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 
@@ -10,7 +11,7 @@ log = get_logger(__name__)
 
 
 @kash_action(
-    precondition=is_url_item | has_html_body,
+    precondition=is_url_resource | has_html_body,
     params=common_params("refetch"),
     mcp_tool=True,
 )
@@ -19,12 +20,12 @@ def markdownify(item: Item, refetch: bool = False) -> Item:
     Converts a URL or raw HTML item to Markdown, fetching with the content
     cache if needed. Also uses readability to clean up the HTML.
     """
-    from markdownify import markdownify as markdownify_convert
 
     expiration_sec = 0 if refetch else None
     url, html_content = get_url_html(item, expiration_sec=expiration_sec)
     page_data = extract_text_readabilipy(url, html_content)
-    markdown_content = markdownify_convert(page_data.clean_html)
+    assert page_data.clean_html
+    markdown_content = markdownify_custom(page_data.clean_html)
 
     output_item = item.derived_copy(format=Format.markdown, body=markdown_content)
     return output_item

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/actions/core/readability.py

@@ -1,6 +1,6 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import has_html_body, is_url_item
+from kash.exec.preconditions import has_html_body, is_url_resource
 from kash.model import Format, Item
 from kash.model.params_model import common_params
 from kash.web_content.file_cache_utils import get_url_html
@@ -10,7 +10,7 @@ log = get_logger(__name__)
 
 
 @kash_action(
-    precondition=is_url_item | has_html_body,
+    precondition=is_url_resource | has_html_body,
     params=common_params("refetch"),
     mcp_tool=True,
 )
@@ -20,8 +20,8 @@ def readability(item: Item, refetch: bool = False) -> Item:
     See `markdownify` to also convert to Markdown.
     """
     expiration_sec = 0 if refetch else None
-    url, html_content = get_url_html(item, expiration_sec=expiration_sec)
-    page_data = extract_text_readabilipy(url, html_content)
+    locator, html_content = get_url_html(item, expiration_sec=expiration_sec)
+    page_data = extract_text_readabilipy(locator, html_content)
 
     output_item = item.derived_copy(format=Format.html, body=page_data.clean_html)
 

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/actions/core/render_as_html.py

@@ -1,7 +1,7 @@
 from kash.actions.core.tabbed_webpage_config import tabbed_webpage_config
 from kash.actions.core.tabbed_webpage_generate import tabbed_webpage_generate
 from kash.exec import kash_action
-from kash.exec.preconditions import has_full_html_page_body, has_text_body, is_html
+from kash.exec.preconditions import has_full_html_page_body, has_html_body, has_simple_text_body
 from kash.exec_model.args_model import ONE_OR_MORE_ARGS
 from kash.model import ActionInput, ActionResult, Param
 from kash.model.items_model import ItemType
@@ -11,10 +11,10 @@ from kash.web_gen.simple_webpage import simple_webpage_render
 
 @kash_action(
     expected_args=ONE_OR_MORE_ARGS,
-    precondition=(is_html | has_text_body) & ~has_full_html_page_body,
-    params=(Param("add_title", "Add a title to the page body.", type=bool),),
+    precondition=(has_html_body | has_simple_text_body) & ~has_full_html_page_body,
+    params=(Param("no_title", "Don't add a title to the page body.", type=bool),),
 )
-def render_as_html(input: ActionInput, add_title: bool = False) -> ActionResult:
+def render_as_html(input: ActionInput, no_title: bool = False) -> ActionResult:
     """
     Convert text, Markdown, or HTML to pretty, formatted HTML using a clean
     and simple page template. Supports GFM-flavored Markdown tables and footnotes.
@@ -27,11 +27,13 @@ def render_as_html(input: ActionInput, add_title: bool = False) -> ActionResult:
     """
     if len(input.items) == 1:
         input_item = input.items[0]
-        html_body = simple_webpage_render(input_item, add_title_h1=add_title)
+        html_body = simple_webpage_render(input_item, add_title_h1=not no_title)
         result_item = input_item.derived_copy(
             type=ItemType.export, format=Format.html, body=html_body
         )
         return ActionResult([result_item])
     else:
         config_result = tabbed_webpage_config(input)
-        return tabbed_webpage_generate(ActionInput(items=config_result.items), add_title=add_title)
+        return tabbed_webpage_generate(
+            ActionInput(items=config_result.items), add_title=not no_title
+        )

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/actions/core/show_webpage.py

@@ -1,7 +1,7 @@
 from kash.actions.core.render_as_html import render_as_html
 from kash.commands.base.show_command import show
 from kash.exec import kash_action
-from kash.exec.preconditions import has_full_html_page_body, has_text_body, is_html
+from kash.exec.preconditions import has_full_html_page_body, has_html_body, has_simple_text_body
 from kash.exec_model.args_model import ONE_OR_MORE_ARGS
 from kash.exec_model.commands_model import Command
 from kash.exec_model.shell_model import ShellResult
@@ -10,7 +10,7 @@ from kash.model import ActionInput, ActionResult
 
 @kash_action(
     expected_args=ONE_OR_MORE_ARGS,
-    precondition=(is_html | has_text_body) & ~has_full_html_page_body,
+    precondition=(has_html_body | has_simple_text_body) & ~has_full_html_page_body,
 )
 def show_webpage(input: ActionInput) -> ActionResult:
     """

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/actions/core/strip_html.py

@@ -1,6 +1,6 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import has_html_body, has_text_body
+from kash.exec.preconditions import has_html_body, has_simple_text_body
 from kash.model import Format, Item
 from kash.utils.common.format_utils import html_to_plaintext
 from kash.utils.errors import InvalidInput
@@ -8,7 +8,7 @@ from kash.utils.errors import InvalidInput
 log = get_logger(__name__)
 
 
-@kash_action(precondition=has_html_body | has_text_body)
+@kash_action(precondition=has_html_body | has_simple_text_body)
 def strip_html(item: Item) -> Item:
     """
     Strip HTML tags from HTML or Markdown. This is a simple filter, simply searching

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/base/basic_file_commands.py

@@ -2,7 +2,7 @@ import os
 
 from frontmatter_format import fmf_read_raw, fmf_strip_frontmatter
 from prettyfmt import fmt_lines
-from strif import copyfile_atomic
+from strif import atomic_output_file, copyfile_atomic
 
 from kash.config.logger import get_logger
 from kash.config.text_styles import STYLE_EMPH
@@ -28,10 +28,10 @@ log = get_logger(__name__)
 
 
 @kash_command
-def cbcopy(path: str | None = None, raw: bool = False) -> None:
+def clipboard_copy(path: str | None = None, raw: bool = False) -> None:
     """
     Copy the contents of a file (or the first file in the selection) to the OS-native
-    clipboard.
+    clipboard. Similar to `pbcopy` on macOS.
 
     :param raw: Copy the full exact contents of the file. Otherwise frontmatter is omitted.
     """
@@ -39,6 +39,8 @@ def cbcopy(path: str | None = None, raw: bool = False) -> None:
     import pyperclip
 
     input_paths = assemble_path_args(path)
+    if not input_paths:
+        raise InvalidInput("No path provided")
     input_path = input_paths[0]
 
     format = detect_file_format(input_path)
@@ -69,6 +71,25 @@ def cbcopy(path: str | None = None, raw: bool = False) -> None:
         )
 
 
+@kash_command
+def clipboard_paste(path: str = "untitled_paste.txt") -> None:
+    """
+    Paste the contents of the OS-native clipboard into a new file.
+    """
+    # TODO: Get this to work for images!
+    # And can we convert rich text to Markdown?
+    import pyperclip
+
+    contents = pyperclip.paste()
+    if not contents.strip():
+        raise InvalidInput("Clipboard is empty")
+
+    with atomic_output_file(path, backup_suffix=".{timestamp}.bak") as f:
+        f.write_text(contents)
+
+    print_status("Pasted clipboard contents to:\n%s", fmt_lines([fmt_loc(path)]))
+
+
 @kash_command
 def edit(path: str | None = None, all: bool = False) -> None:
     """

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/base/diff_commands.py

@@ -5,16 +5,51 @@ from kash.commands.workspace.selection_commands import select
 from kash.config.logger import get_logger
 from kash.exec import import_locator_args, kash_command
 from kash.exec_model.shell_model import ShellResult
-from kash.model.items_model import Item, ItemType
+from kash.model.items_model import Item, ItemRelations, ItemType
+from kash.model.paths_model import StorePath
 from kash.shell.output.shell_output import Wrap, cprint
-from kash.text_handling.unified_diffs import unified_diff_files, unified_diff_items
-from kash.utils.errors import InvalidInput, InvalidOperation
+from kash.utils.errors import ContentError, InvalidInput, InvalidOperation
 from kash.utils.file_utils.file_formats_model import Format
+from kash.utils.text_handling.unified_diffs import unified_diff, unified_diff_files
 from kash.workspaces import current_ws
 
 log = get_logger(__name__)
 
 
+def unified_diff_items(from_item: Item, to_item: Item, strict: bool = True) -> Item:
+    """
+    Generate a unified diff between two items. If `strict` is true, will raise
+    an error if the items are of different formats.
+    """
+    if not from_item.body and not to_item.body:
+        raise ContentError(f"No body to diff for {from_item} and {to_item}")
+    if not from_item.store_path or not to_item.store_path:
+        raise ContentError("No store path on items; save before diffing")
+    diff_items = [item for item in [from_item, to_item] if item.format == Format.diff]
+    if len(diff_items) == 1:
+        raise ContentError(
+            f"Cannot compare diffs to non-diffs: {from_item.format}, {to_item.format}"
+        )
+    if len(diff_items) > 0 or from_item.format != to_item.format:
+        msg = f"Diffing items of incompatible format: {from_item.format}, {to_item.format}"
+        if strict:
+            raise ContentError(msg)
+        else:
+            log.warning("%s", msg)
+
+    from_path, to_path = StorePath(from_item.store_path), StorePath(to_item.store_path)
+
+    diff = unified_diff(from_item.body, to_item.body, str(from_path), str(to_path))
+
+    return Item(
+        type=ItemType.doc,
+        title=f"Diff of {from_path} and {to_path}",
+        format=Format.diff,
+        relations=ItemRelations(diff_of=[from_path, to_path]),
+        body=diff.patch_text,
+    )
+
+
 @kash_command
 def diff_items(*paths: str, force: bool = False) -> ShellResult:
     """

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/base/files_command.py

@@ -75,7 +75,8 @@ def _print_listing_tallies(
         cprint("(use --no_max to remove cutoff)", style=STYLE_HINT)
 
 
-DEFAULT_MAX_PG = 100
+DEFAULT_MAX_PER_GROUP = 50
+"""Default maximum number of files to display per group."""
 
 
 @kash_command
@@ -301,13 +302,13 @@ def files(
     # there are lots of groups and lots of files per group.
     # Default is max 100 per group but if we have 4 * 100 items, cut to 25.
     # If we have 2 * 100 items, cut to 50.
-    final_max_pg = DEFAULT_MAX_PG if cap_per_group else max_per_group
+    final_max_pg = DEFAULT_MAX_PER_GROUP if cap_per_group else max_per_group
     max_pg_explicit = max_per_group > 0
     if not max_pg_explicit:
         group_lens = [len(group_df) for group_df in grouped]
         for ratio in [2, 4]:
-            if sum(group_lens) > ratio * DEFAULT_MAX_PG:
-                final_max_pg = int(DEFAULT_MAX_PG / ratio)
+            if sum(group_lens) > ratio * DEFAULT_MAX_PER_GROUP:
+                final_max_pg = int(DEFAULT_MAX_PER_GROUP / ratio)
 
     total_displayed = 0
     total_displayed_size = 0

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/base/reformat_command.py

@@ -8,9 +8,9 @@ from kash.config.logger import get_logger
 from kash.exec import assemble_path_args, kash_command, resolvable_paths
 from kash.exec_model.shell_model import ShellResult
 from kash.shell.output.shell_output import print_status
-from kash.text_handling.doc_normalization import normalize_text_file
 from kash.utils.common.format_utils import fmt_loc
 from kash.utils.file_utils.filename_parsing import join_filename, split_filename
+from kash.utils.text_handling.doc_normalization import normalize_text_file
 
 log = get_logger(__name__)
 

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/base/show_command.py

@@ -54,7 +54,7 @@ def show(
                 item = ws.load(input_path)
                 if thumbnail and item.thumbnail_url:
                     try:
-                        local_path, _was_cached = cache_file(item.thumbnail_url)
+                        local_path = cache_file(item.thumbnail_url).content.path
                         terminal_show_image(local_path)
                     except Exception as e:
                         log.info("Had trouble showing thumbnail image (will skip): %s", e)

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/extras/parse_uv_lock.py

@@ -1,8 +1,10 @@
+from __future__ import annotations
+
 import subprocess
 import tomllib
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-import pandas as pd
 from packaging.tags import Tag, sys_tags
 from packaging.utils import parse_wheel_filename
 from prettyfmt import fmt_size_dual
@@ -13,6 +15,9 @@ from kash.config.text_styles import COLOR_STATUS
 from kash.exec import kash_command
 from kash.shell.output.shell_output import cprint
 
+if TYPE_CHECKING:
+    from pandas import DataFrame
+
 log = get_logger(__name__)
 
 
@@ -49,13 +54,15 @@ def get_platform() -> str:
     return next(sys_tags()).platform
 
 
-def parse_uv_lock(lock_path: Path) -> pd.DataFrame:
+def parse_uv_lock(lock_path: Path) -> 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.
     """
+    from pandas import DataFrame
+
     with open(lock_path, "rb") as f:
         data = tomllib.load(f)
 
@@ -88,7 +95,7 @@ def parse_uv_lock(lock_path: Path) -> pd.DataFrame:
             }
         )
 
-    return pd.DataFrame(rows)
+    return DataFrame(rows)
 
 
 def uv_runtime_packages(
@@ -141,6 +148,8 @@ def uv_dep_info(
     By default, filters to show only 'main' dependencies from pyproject.toml.
     Helpful for looking at sizes of dependencies.
     """
+    import pandas as pd
+
     uv_lock_path = Path(uv_lock)
     pyproject_path = Path(pyproject)
 

{kash_shell-0.3.11 → kash_shell-0.3.13}/src/kash/commands/workspace/selection_commands.py

@@ -2,6 +2,7 @@ from os.path import basename
 from pathlib import Path
 
 from frontmatter_format import fmf_strip_frontmatter
+from prettyfmt import plural
 from strif import copyfile_atomic
 
 from kash.config.logger import get_logger
@@ -11,7 +12,6 @@ from kash.model.paths_model import StorePath
 from kash.shell.ui.shell_results import shell_print_selection_history
 from kash.utils.common.format_utils import fmt_loc
 from kash.utils.errors import InvalidInput
-from kash.utils.lang_utils.inflection import plural
 from kash.workspaces import Selection, current_ws
 
 log = get_logger(__name__)