kash-shell 0.3.30__tar.gz → 0.3.34__tar.gz

{kash_shell-0.3.30 → kash_shell-0.3.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kash-shell
-Version: 0.3.30
+Version: 0.3.34
 Summary: The knowledge agent shell (core)
 Project-URL: Repository, https://github.com/jlevy/kash-shell
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>
@@ -20,7 +20,7 @@ Requires-Dist: aiolimiter>=1.2.1
 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.5
+Requires-Dist: chopdiff>=0.2.6
 Requires-Dist: clideps>=0.1.4
 Requires-Dist: colour>=0.1.5
 Requires-Dist: cssselect>=1.2.0
@@ -41,7 +41,7 @@ Requires-Dist: litellm>=1.74.15.post1
 Requires-Dist: markdownify>=0.13.1
 Requires-Dist: mcp-proxy>=0.5.0
 Requires-Dist: mcp>=1.6.0
-Requires-Dist: openai>=1.66.3
+Requires-Dist: openai==1.99.9
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: patch-ng>=1.18.1
 Requires-Dist: pathspec>=0.12.1
@@ -280,8 +280,8 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
    ```shell
    sudo apt-get update
-   sudo apt-get install -y libgl1 ffmpeg libmagic-dev 
-   # For the additional command-line tools, pixi is better on Ubuntu:
+   sudo apt-get install -y libgl1 ffmpeg libmagic-dev imagemagick bat ripgrep hexyl
+   # Or for more additional command-line tools, pixi is better on Ubuntu:
    curl -fsSL https://pixi.sh/install.sh | sh
    . ~/.bashrc
    pixi global install ripgrep bat eza hexyl imagemagick zoxide

{kash_shell-0.3.30 → kash_shell-0.3.34}/README.md

@@ -201,8 +201,8 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
    ```shell
    sudo apt-get update
-   sudo apt-get install -y libgl1 ffmpeg libmagic-dev 
-   # For the additional command-line tools, pixi is better on Ubuntu:
+   sudo apt-get install -y libgl1 ffmpeg libmagic-dev imagemagick bat ripgrep hexyl
+   # Or for more additional command-line tools, pixi is better on Ubuntu:
    curl -fsSL https://pixi.sh/install.sh | sh
    . ~/.bashrc
    pixi global install ripgrep bat eza hexyl imagemagick zoxide

{kash_shell-0.3.30 → kash_shell-0.3.34}/pyproject.toml

@@ -48,7 +48,7 @@ dependencies = [
     "flowmark>=0.5.3",
     "frontmatter-format>=0.2.3",
     "sidematter-format>=0.0.5",
-    "chopdiff>=0.2.5",
+    "chopdiff>=0.2.6",
     "clideps>=0.1.4",
     "tminify>=0.1.6",
     # Shell and file essentials:
@@ -84,7 +84,7 @@ dependencies = [
     "curl-cffi>=0.11.4",
     # LLM and API essentials:
     "tiktoken>=0.9.0",
-    "openai>=1.66.3",
+    "openai==1.99.9",  # FIXME: Pinning for now due to import errors (ImportError: cannot import name 'ResponseTextConfig' from 'openai.types.responses.response')   
     "litellm>=1.74.15.post1",
     "pyrate-limiter>=3.7.0",
     "aiolimiter>=1.2.1",
@@ -130,6 +130,7 @@ kash-mcp = "kash.mcp.mcp_cli:main"
 
 [tool.uv.sources]
 # For local development:
+# flowmark = { path = "../flowmark", editable = true }
 # clideps = { path = "../clideps", editable = true }
 # tminify = { path = "../tminify", editable = true }
 # chopdiff = { path = "../chopdiff", editable = true }

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/chat.py

@@ -28,6 +28,7 @@ log = get_logger(__name__)
 @kash_action(
     expected_args=ONE_OR_NO_ARGS,
     precondition=is_chat,
+    output_format=Format.yaml,
     uses_selection=False,
     interactive_input=True,
     cacheable=False,

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/markdownify_html.py

@@ -13,7 +13,7 @@ from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 log = get_logger(__name__)
 
 
-@kash_action(precondition=is_url_resource | has_html_body, mcp_tool=True)
+@kash_action(precondition=is_url_resource | has_html_body, output_format=Format.markdown)
 def markdownify_html(item: Item) -> Item:
     """
     Converts raw HTML or the URL of an HTML page to Markdown, fetching with the content

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/readability.py

@@ -9,10 +9,7 @@ from kash.web_content.web_extract_readabilipy import extract_text_readabilipy
 log = get_logger(__name__)
 
 
-@kash_action(
-    precondition=is_url_resource | has_html_body,
-    mcp_tool=True,
-)
+@kash_action(precondition=is_url_resource | has_html_body, output_format=Format.html)
 def readability(item: Item) -> Item:
     """
     Extracts clean HTML from a raw HTML item.

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/render_as_html.py

@@ -15,6 +15,7 @@ log = get_logger(__name__)
 @kash_action(
     expected_args=ONE_OR_MORE_ARGS,
     precondition=(has_html_body | has_simple_text_body) & ~has_fullpage_html_body,
+    output_format=Format.html,
     params=(Param("no_title", "Don't add a title to the page body.", type=bool),),
 )
 def render_as_html(input: ActionInput, no_title: bool = False) -> ActionResult:

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/show_webpage.py

@@ -6,11 +6,13 @@ 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
 from kash.model import ActionInput, ActionResult
+from kash.utils.file_utils.file_formats_model import Format
 
 
 @kash_action(
     expected_args=ONE_OR_MORE_ARGS,
     precondition=(has_html_body | has_simple_text_body) & ~has_fullpage_html_body,
+    output_format=Format.html,
 )
 def show_webpage(input: ActionInput) -> ActionResult:
     """

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/actions/core/summarize_as_bullets.py

@@ -47,7 +47,7 @@ llm_options = LLMOptions(
 )
 
 
-@kash_action(llm_options=llm_options, params=common_params("model"), mcp_tool=True)
+@kash_action(llm_options=llm_options, params=common_params("model"))
 def summarize_as_bullets(item: Item, model: LLMName = LLM.default_standard) -> Item:
     """
     Summarize text as bullet points.

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/config/logger.py

@@ -281,7 +281,7 @@ def _do_logging_setup(log_settings: LogSettings):
 def prefix(line: str, emoji: str = "", warn_emoji: str = "") -> str:
     prefix = task_stack_prefix_str()
     emojis = f"{warn_emoji}{emoji}".strip()
-    return " ".join(filter(None, [prefix, emojis, line]))
+    return "".join(filter(None, [prefix, emojis, line]))
 
 
 def prefix_args(

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/config/text_styles.py

@@ -262,7 +262,7 @@ PROMPT_ASSIST = "(assistant) ❯"
 
 EMOJI_HINT = "👉"
 
-EMOJI_MSG_INDENT = "⋮"
+EMOJI_MSG_INDENT = "⋮   "
 
 EMOJI_START = "[➤]"
 

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/docs/markdown/topics/a2_installation.md

@@ -60,8 +60,9 @@ These are for `kash-media` but you can use a `kash-shell` for a more basic setup
 
    ```shell
    sudo apt-get update
-   sudo apt-get install -y libgl1 ffmpeg libmagic-dev 
-   # For the additional command-line tools, pixi is better on Ubuntu:
+   sudo apt-get install -y libgl1 ffmpeg libmagic-dev imagemagick bat ripgrep hexyl
+
+   # Or for additional command-line tools, pixi is better on Ubuntu:
    curl -fsSL https://pixi.sh/install.sh | sh
    . ~/.bashrc
    pixi global install ripgrep bat eza hexyl imagemagick zoxide

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/exec/action_decorators.py

@@ -37,6 +37,7 @@ from kash.model.params_model import Param, ParamDeclarations, TypedParamValues
 from kash.model.preconditions_model import Precondition
 from kash.utils.common.function_inspect import FuncParam, inspect_function_params
 from kash.utils.errors import InvalidDefinition
+from kash.utils.file_utils.file_formats_model import Format
 
 log = get_logger(__name__)
 
@@ -204,6 +205,7 @@ def kash_action(
     arg_type: ArgType = ArgType.Locator,
     expected_args: ArgCount = ONE_ARG,
     output_type: ItemType = ItemType.doc,
+    output_format: Format | None = None,
     expected_outputs: ArgCount = ONE_ARG,
     params: ParamDeclarations = (),
     run_per_item: bool | None = None,
@@ -318,6 +320,7 @@ def kash_action(
                 self.arg_type = arg_type
                 self.uses_selection = uses_selection
                 self.output_type = output_type
+                self.output_format = output_format
                 self.interactive_input = interactive_input
                 self.live_output = live_output
                 self.mcp_tool = mcp_tool
@@ -397,9 +400,8 @@ def kash_action(
                 context = ExecContext(action, current_runtime_settings())
 
             # Run the action.
-            result, _, _ = run_action_with_caching(context, action_input)
-
-            return result
+            result_with_paths = run_action_with_caching(context, action_input)
+            return result_with_paths.result
 
         if is_simple_func:
             # Need to convert back to a SimpleActionFunction.

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/exec/action_exec.py

@@ -1,5 +1,5 @@
 import time
-from dataclasses import replace
+from dataclasses import dataclass, replace
 from pathlib import Path
 
 from prettyfmt import fmt_lines, fmt_path, plural
@@ -29,8 +29,10 @@ from kash.model.operations_model import Input, Operation, Source
 from kash.model.params_model import ALL_COMMON_PARAMS, GLOBAL_PARAMS, RawParamValues
 from kash.model.paths_model import StorePath
 from kash.shell.output.shell_output import PrintHooks
+from kash.utils.common.s3_utils import get_s3_parent_folder, s3_sync_to_folder
 from kash.utils.common.task_stack import task_stack
 from kash.utils.common.type_utils import not_none
+from kash.utils.common.url import Url, is_s3_url
 from kash.utils.errors import ContentError, InvalidOutput, get_nonfatal_exceptions
 from kash.workspaces import Selection, current_ws
 
@@ -182,7 +184,7 @@ def run_action_operation(
             this_op = replace(operation, arguments=[operation.arguments[i]])
         else:
             this_op = operation
-        item.update_history(Source(operation=this_op, output_num=i, cacheable=action.cacheable))
+        item.update_source(Source(operation=this_op, output_num=i, cacheable=action.cacheable))
 
     # Override the state if appropriate (this handles marking items as transient).
     if settings.override_state:
@@ -339,20 +341,41 @@ def save_action_result(
     return result_store_paths, archived_store_paths
 
 
+@dataclass(frozen=True)
+class ResultWithPaths:
+    """
+    Result of an action, including the store paths of any S3 items created.
+    """
+
+    result: ActionResult
+    result_paths: list[StorePath]
+    archived_paths: list[StorePath]
+    s3_paths: list[Url]
+
+
 def run_action_with_caching(
     exec_context: ExecContext, action_input: ActionInput
-) -> tuple[ActionResult, list[StorePath], list[StorePath]]:
+) -> ResultWithPaths:
     """
     Run an action, including validation, only rerunning if `rerun` requested or
     result is not already present. Returns the result, the store paths of the
     result items, and the store paths of any archived items.
 
+    Also handles optional S3 syncing if the input was from S3.
+
     Note: Mutates the input but only to add `context` to each item.
     """
     action = exec_context.action
     settings = exec_context.settings
     ws = settings.workspace
 
+    # If the input is from S3, we note the parent folder to copy the output back to.
+    s3_parent_folder = None
+    if exec_context.settings.sync_to_s3 and action_input.items and action_input.items[0].url:
+        url = action_input.items[0].url
+        if url and is_s3_url(url):
+            s3_parent_folder = get_s3_parent_folder(url)
+
     # Assemble the operation and validate the action input.
     operation = validate_action_input(exec_context, ws, action, action_input)
 
@@ -408,7 +431,26 @@ def run_action_with_caching(
     finally:
         action_input.clear_context()
 
-    return result, result_store_paths, archived_store_paths
+    # If the action created an S3 item, we copy it back to the same S3 parent folder.
+    # Only do this for the first result, for simplicity.
+    s3_urls: list[Url] = []
+    if s3_parent_folder and len(result_store_paths) > 0:
+        log.warning(
+            "Source was an S3 path so syncing result S3: %s -> %s",
+            result_store_paths[0],
+            s3_parent_folder,
+        )
+        s3_urls = s3_sync_to_folder(
+            result_store_paths[0], s3_parent_folder, include_sidematter=True
+        )
+        log.message("Synced result to S3:\n%s", fmt_lines(s3_urls))
+
+    return ResultWithPaths(
+        result=result,
+        result_paths=result_store_paths,
+        archived_paths=archived_store_paths,
+        s3_paths=s3_urls,
+    )
 
 
 def run_action_with_shell_context(
@@ -486,7 +528,10 @@ def run_action_with_shell_context(
     input = prepare_action_input(*args, refetch=refetch)
 
     # Finally, run the action.
-    result, result_store_paths, archived_store_paths = run_action_with_caching(context, input)
+    result_with_paths = run_action_with_caching(context, input)
+    result = result_with_paths.result
+    result_store_paths = result_with_paths.result_paths
+    archived_store_paths = result_with_paths.archived_paths
 
     # Implement any path operations from the output and/or select the final output
     if not internal_call:

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/exec/fetch_url_items.py

@@ -98,9 +98,11 @@ def fetch_url_item_content(
     from kash.workspaces import current_ws
 
     ws = current_ws()
-    if not refetch and item.title and item.description and item.body:
+    # We could check for description too, but many pages don't have one.
+    has_key_content = item.title and (not item.has_body or item.body)
+    if not refetch and has_key_content:
         log.info(
-            "Already have title, description, and body, will not fetch: %s",
+            "Already have title so assuming metadata is up to date, will not fetch: %s",
             item.fmt_loc(),
         )
         return FetchItemResult(item, was_cached=True)

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/exec/llm_transforms.py

@@ -1,4 +1,5 @@
 from dataclasses import replace
+from typing import Unpack
 
 from chopdiff.docs import DiffFilter, TextDoc
 from chopdiff.transforms import WindowSettings, filtered_transform
@@ -12,7 +13,7 @@ from kash.llm_utils.fuzzy_parsing import strip_markdown_fence
 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
+from kash.model.items_model import Item, ItemType, ItemUpdateOptions
 from kash.utils.errors import InvalidInput
 from kash.utils.file_utils.file_formats_model import Format
 from kash.utils.text_handling.doc_normalization import normalize_formatting
@@ -88,10 +89,11 @@ def llm_transform_str(options: LLMOptions, input_str: str, check_no_results: boo
 def llm_transform_item(
     item: Item,
     model: LLMName | None = None,
+    *,
     normalize: bool = True,
     strip_fence: bool = True,
     check_no_results: bool = True,
-    format: Format | None = None,
+    **updates: Unpack[ItemUpdateOptions],
 ) -> Item:
     """
     Main function for running an LLM action on an item.
@@ -99,6 +101,14 @@ def llm_transform_item(
     Model may be overridden by an explicit model parameter.
     Also by default cleans up and normalizes output as Markdown.
     """
+    # Default to Markdown docs.
+    if "format" not in updates:
+        updates["format"] = Format.markdown
+    if "type" not in updates:
+        updates["type"] = ItemType.doc
+    if "body" not in updates:
+        updates["body"] = None
+
     if not item.context:
         raise InvalidInput(f"LLM actions expect a context on input item: {item}")
     action = item.context.action
@@ -112,13 +122,12 @@ def llm_transform_item(
     log.message("LLM transform from action `%s` on item: %s", action.name, item)
     log.message("LLM options: %s", action.llm_options)
 
-    format = format or item.format or Format.markdown
-    result_item = item.derived_copy(body=None, format=format)
+    result_item = item.derived_copy(**updates)
     result_str = llm_transform_str(llm_options, item.body, check_no_results=check_no_results)
     if strip_fence:
         result_str = strip_markdown_fence(result_str)
     if normalize:
-        result_str = normalize_formatting(result_str, format=format)
+        result_str = normalize_formatting(result_str, format=updates["format"])
 
     result_item.body = result_str
     return result_item

{kash_shell-0.3.30 → kash_shell-0.3.34}/src/kash/exec/runtime_settings.py

@@ -102,6 +102,7 @@ def kash_runtime(
     override_state: State | None = None,
     tmp_output: bool = False,
     no_format: bool = False,
+    sync_to_s3: bool = False,
 ) -> RuntimeSettingsManager:
     """
     Set a specific kash execution context for a with block.
@@ -131,5 +132,6 @@ def kash_runtime(
         override_state=override_state,
         tmp_output=tmp_output,
         no_format=no_format,
+        sync_to_s3=sync_to_s3,
     )
     return RuntimeSettingsManager(settings=settings)