kash-shell 0.3.21__tar.gz → 0.3.23__tar.gz

{kash_shell-0.3.21 → kash_shell-0.3.23}/PKG-INFO

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

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/actions/core/markdownify_html.py

@@ -1,9 +1,12 @@
+from prettyfmt import abbrev_on_words
+
 from kash.config.logger import get_logger
 from kash.exec import kash_action
 from kash.exec.preconditions import has_html_body, is_url_resource
 from kash.exec.runtime_settings import current_runtime_settings
 from kash.model import Format, Item
 from kash.model.items_model import ItemType
+from kash.utils.text_handling.markdown_utils import first_heading
 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
@@ -25,6 +28,14 @@ def markdownify_html(item: Item) -> Item:
     assert page_data.clean_html
     markdown_content = markdownify_custom(page_data.clean_html)
 
+    # Sometimes readability doesn't include the title, in which case we add it.
+    first_h1 = first_heading(markdown_content, allowed_tags=("h1",))
+    title = page_data.title and abbrev_on_words(page_data.title.strip(), 80)
+    if not first_h1 and title:
+        log.message(f"No h1 found, inserting h1: {title}")
+        # Insert a h1 at the top of the document
+        markdown_content = f"# {title}\n\n{markdown_content}"
+
     output_item = item.derived_copy(
         type=ItemType.doc, format=Format.markdown, body=markdown_content
     )

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/actions/core/tabbed_webpage_generate.py

@@ -1,6 +1,6 @@
 from kash.config.logger import get_logger
 from kash.exec import kash_action
-from kash.exec.preconditions import is_config
+from kash.exec.preconditions import is_data
 from kash.model import ONE_ARG, ActionInput, ActionResult, FileExt, Format, Item, ItemType, Param
 from kash.web_gen import tabbed_webpage
 
@@ -9,7 +9,7 @@ log = get_logger(__name__)
 
 @kash_action(
     expected_args=ONE_ARG,
-    precondition=is_config,
+    precondition=is_data,
     params=(Param("add_title", "Add a title to the page body.", type=bool),),
 )
 def tabbed_webpage_generate(input: ActionInput, add_title: bool = False) -> ActionResult:

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/commands/help/assistant_commands.py

@@ -1,8 +1,6 @@
-from rich import get_console
-
 from kash.commands.base.basic_file_commands import trash
 from kash.commands.workspace.selection_commands import select
-from kash.config.logger import get_logger
+from kash.config.logger import get_console, get_logger
 from kash.config.text_styles import PROMPT_ASSIST, SPINNER
 from kash.docs.all_docs import DocSelection
 from kash.exec import kash_command
@@ -45,7 +43,7 @@ def assist(
             help()
             return
 
-    with get_console().status("Thinking…", spinner=SPINNER):
+    with get_console().status("Thinking…", spinner=SPINNER):  # noqa: F821
         shell_context_assistance(input, model=model, assistance_type=type)
 
 

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/commands/help/logo.py

@@ -2,7 +2,8 @@ import re
 from pathlib import Path
 
 from rich.box import SQUARE
-from rich.console import Group
+from rich.console import Group, RenderableType
+from rich.padding import Padding
 from rich.panel import Panel
 from rich.text import Text
 
@@ -62,7 +63,13 @@ def color_logo() -> Group:
     )
 
 
-def branded_box(content: Group | None, version: str | None = None) -> Panel:
+def simple_box(content: RenderableType) -> Panel:
+    return Panel(
+        content, border_style=COLOR_HINT, padding=(0, 1), width=CONSOLE_WRAP_WIDTH, box=SQUARE
+    )
+
+
+def logo_box(content: Group | None = None) -> Padding:
     panel_width = CONSOLE_WRAP_WIDTH
 
     logo_lines = LOGO_LARGE.split("\n")
@@ -70,29 +77,17 @@ def branded_box(content: Group | None, version: str | None = None) -> Panel:
     tagline_offset = (panel_width - 4 - len(TAGLINE_STYLED)) // 2
 
     colored_lines = [logo_colorize_line(line, " ", rest_offset) for line in logo_lines]
-    header = None
-    if version:
-        footer = Text(version, style=COLOR_HINT, justify="right")
-    else:
-        footer = None
 
     body = ["", content] if content else []
 
-    return Panel(
+    return Padding(
         Group(
             Text.assemble(" " * tagline_offset, LOGO_SPACER),
             *colored_lines,
             Text.assemble(" " * tagline_offset, TAGLINE_STYLED),
             *body,
         ),
-        title=header,
-        title_align="center",
-        subtitle=footer,
-        subtitle_align="right",
-        border_style=COLOR_HINT,
-        padding=(0, 1),
-        width=panel_width,
-        box=SQUARE,
+        pad=(1, 1),
     )
 
 
@@ -101,7 +96,7 @@ def kash_logo(box: bool = False, svg_out: str | None = None, html_out: str | Non
     """
     Show the kash logo.
     """
-    logo = branded_box(None) if box else color_logo()
+    logo = logo_box(None) if box else color_logo()
 
     cprint(logo)
 

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/commands/help/welcome.py

@@ -2,7 +2,7 @@ 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.logo import logo_box, simple_box
 from kash.config.text_styles import (
     COLOR_HINT,
 )
@@ -20,14 +20,15 @@ def welcome() -> None:
     """
 
     help_topics = all_docs.help_topics
-    version = get_full_version_name()
+
     # Create header with logo and right-justified version
 
     PrintHooks.before_welcome()
+    cprint(logo_box())
     cprint(
-        branded_box(
+        simple_box(
             Group(Markdown(help_topics.welcome)),
-            version,
         )
     )
     cprint(Panel(Markdown(help_topics.warning), box=SQUARE, border_style=COLOR_HINT))
+    cprint("%s", get_full_version_name())

kash_shell-0.3.23/src/kash/docs/markdown/warning.md

@@ -0,0 +1,3 @@
+**Important:** This is a shell.
+Commands can be destructive.
+Review commands carefully!

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/docs/markdown/welcome.md

@@ -1,5 +1,6 @@
-**Welcome to kash!** Use `help` for the manual and full list of available commands.
+**Welcome to Kash!**
 
+Use `help` for the manual and full list of available commands.
 Press **tab** for contextual autocomplete of commands, questions, actions, and files.
 You may simply ask a question and the kash assistant will help you.
 Press **space** (or type **?**), then write your question or request.

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/exec/fetch_url_items.py

@@ -12,7 +12,11 @@ log = get_logger(__name__)
 
 
 def fetch_url_item(
-    locator: Url | StorePath, *, save_content: bool = True, refetch: bool = False
+    locator: Url | StorePath,
+    *,
+    save_content: bool = True,
+    refetch: bool = False,
+    cache: bool = True,
 ) -> Item:
     from kash.workspaces import current_ws
 
@@ -28,17 +32,21 @@ def fetch_url_item(
     else:
         raise InvalidInput(f"Not a URL or URL resource: {fmt_loc(locator)}")
 
-    return fetch_url_item_content(item, save_content=save_content, refetch=refetch)
+    return fetch_url_item_content(item, save_content=save_content, refetch=refetch, cache=cache)
 
 
-def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bool = False) -> Item:
+def fetch_url_item_content(
+    item: Item, *, save_content: bool = True, refetch: bool = False, cache: bool = True
+) -> Item:
     """
     Fetch content and metadata for a URL using a media service if we
     recognize the URL as a known media service. Otherwise, fetch and extract the
     metadata and content from the web page and save it to the URL item.
 
-    If `save_content` is true, a copy of the content is also saved as
-    a resource item.
+    If `save_content` is true, a copy of the content is also saved to the workspace
+    as a resource item.
+
+    If `cache` is true, the content is also cached in the local file cache.
 
     The content item is returned if content was saved. Otherwise, the updated
     URL item is returned.
@@ -48,9 +56,10 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
     from kash.workspaces import current_ws
 
     ws = current_ws()
-    if not refetch and item.title and item.description:
-        log.message(
-            "Already have title and description, will not fetch metadata: %s", item.fmt_loc()
+    if not refetch and item.title and item.description and item.body:
+        log.info(
+            "Already have title, description, and body, will not fetch: %s",
+            item.fmt_loc(),
         )
         return item
 
@@ -58,7 +67,7 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
         raise InvalidInput(f"No URL for item: {item.fmt_loc()}")
 
     url = canonicalize_url(item.url)
-    log.message("No metadata for URL, will fetch: %s", url)
+    log.info("No metadata for URL, will fetch: %s", url)
 
     # Prefer fetching metadata from media using the media service if possible.
     # Data is cleaner and YouTube for example often blocks regular scraping.
@@ -72,12 +81,12 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
         if slice:
             new_url = add_slice_to_url(media_metadata.url, slice)
             if new_url != item.url:
-                log.message("Updated URL from metadata and added slice: %s", new_url)
+                log.info("Updated URL from metadata and added slice: %s", new_url)
             url_item.url = new_url
 
         url_item = item.merged_copy(url_item)
     else:
-        page_data = fetch_page_content(url, refetch=refetch, cache=save_content)
+        page_data = fetch_page_content(url, refetch=refetch, cache=cache)
         url_item = item.new_copy_with(
             title=page_data.title or item.title,
             description=page_data.description or item.description,
@@ -100,10 +109,11 @@ def fetch_url_item_content(item: Item, *, save_content: bool = True, refetch: bo
     # Now save the updated URL item and also the content item if we have one.
     ws.save(url_item)
     assert url_item.store_path
-    log.debug("Saved URL item: %s", url_item.fmt_loc())
     if content_item:
         ws.save(content_item)
         assert content_item.store_path
-        log.debug("Saved content item: %s", content_item.fmt_loc())
+        log.info("Saved content item: %s", content_item.fmt_loc())
+    else:
+        log.info("Saved URL item: %s", url_item.fmt_loc())
 
     return content_item or url_item

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/exec/preconditions.py

@@ -48,8 +48,13 @@ def is_concept(item: Item) -> bool:
 
 
 @kash_precondition
-def is_config(item: Item) -> bool:
-    return item.type == ItemType.config
+def is_data(item: Item) -> bool:
+    return item.type == ItemType.data
+
+
+@kash_precondition
+def is_table(item: Item) -> bool:
+    return item.type == ItemType.table
 
 
 @kash_precondition

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/file_storage/file_store.py

@@ -289,7 +289,7 @@ class FileStore(Workspace):
                 if self.exists(default_path):
                     old_item = self.load(default_path)
                     if old_item.item_id() == item_id:
-                        log.message(
+                        log.info(
                             "Item with the same id already saved (disk check):\n%s",
                             fmt_lines([fmt_loc(default_path), item_id]),
                         )
@@ -297,7 +297,7 @@ class FileStore(Workspace):
                         self.id_map[item_id] = default_path
                         return default_path
             if store_path and self.exists(store_path):
-                log.message(
+                log.info(
                     "Item with the same id already saved (disk check):\n%s",
                     fmt_lines([fmt_loc(store_path), item_id]),
                 )
@@ -536,7 +536,7 @@ class FileStore(Workspace):
             item = Item(item_type, url=url, format=Format.url)
             previous_store_path = self.find_by_id(item)
             if previous_store_path and not reimport:
-                log.message(
+                log.info(
                     "Workspace already has this URL:\n%s",
                     fmt_lines([fmt_loc(previous_store_path), url]),
                 )

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/model/items_model.py

@@ -55,7 +55,8 @@ class ItemType(Enum):
     concept = "concept"
     resource = "resource"
     asset = "asset"
-    config = "config"
+    data = "data"
+    table = "table"
     export = "export"
     chat = "chat"
     extension = "extension"
@@ -86,7 +87,9 @@ class ItemType(Enum):
             Format.diff: ItemType.doc,
             Format.python: ItemType.extension,
             Format.json: ItemType.doc,
-            Format.csv: ItemType.doc,
+            Format.csv: ItemType.table,
+            Format.xlsx: ItemType.table,
+            Format.npz: ItemType.table,
             Format.log: ItemType.log,
             Format.pdf: ItemType.resource,
             Format.jpeg: ItemType.asset,
@@ -646,7 +649,7 @@ class Item:
         body_text = abbrev_str(self.body_text(), max_len)
 
         # Just for aesthetics, especially for titles of chat files.
-        if self.type in [ItemType.chat, ItemType.config] or self.format == Format.yaml:
+        if self.type in [ItemType.chat, ItemType.data] or self.format == Format.yaml:
             try:
                 yaml_obj = list(new_yaml().load_all(self.body_text()))
                 if len(yaml_obj) > 0:
@@ -663,16 +666,16 @@ class Item:
         """
         return bool(self.body and self.body.strip())
 
-    def read_as_config(self) -> Any:
+    def read_as_data(self) -> Any:
         """
-        If it is a config Item, return the parsed YAML.
+        If it is a data Item, return the parsed YAML.
         """
-        if not self.type == ItemType.config:
-            raise FileFormatError(f"Item is not a config: {self}")
+        if not self.type == ItemType.data:
+            raise FileFormatError(f"Item is not a data item: {self}")
         if not self.body:
-            raise FileFormatError(f"Config item has no body: {self}")
+            raise FileFormatError(f"Data item has no body: {self}")
         if self.format != Format.yaml:
-            raise FileFormatError(f"Config item is not YAML: {self.format}: {self}")
+            raise FileFormatError(f"Data item is not YAML: {self.format}: {self}")
         return from_yaml_string(self.body)
 
     def get_filename(self) -> str | None:
@@ -709,8 +712,8 @@ class Item:
         elif self.type == ItemType.script:
             # Same for kash/xonsh scripts.
             return f"{self.type.value}.{FileExt.xsh.value}"
-        elif self.type == ItemType.export:
-            # For exports, skip the item type to keep it maximally compatible for external tools.
+        elif self.type in [ItemType.export, ItemType.data, ItemType.table]:
+            # For exports, data, and tables, skip the item type to keep it maximally compatible for external tools.
             return f"{self.get_file_ext().value}"
         else:
             return f"{self.type.value}.{self.get_file_ext().value}"

{kash_shell-0.3.21 → kash_shell-0.3.23}/src/kash/shell/output/shell_output.py

@@ -4,7 +4,7 @@ Output to the shell UI. These are for user interaction, not logging.
 
 import contextvars
 from collections.abc import Callable
-from contextlib import contextmanager
+from contextlib import contextmanager, nullcontext
 from enum import Enum, auto
 
 import rich
@@ -82,12 +82,16 @@ def console_pager(use_pager: bool = True):
 
 
 def multitask_status(
-    settings: StatusSettings | None = None, *, auto_summary: bool = True
-) -> MultiTaskStatus:
+    settings: StatusSettings | None = None, *, auto_summary: bool = True, enabled: bool = True
+) -> MultiTaskStatus | nullcontext:
     """
     Create a `MultiTaskStatus` context manager for displaying multiple task progress
-    using the global shell console.
+    using the global shell console. If disabled, returns a null context, so it's convenient
+    to disable status display.
     """
+    if not enabled:
+        return nullcontext()
+
     return MultiTaskStatus(
         console=get_console(),
         settings=settings,