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

kash/web_gen/templates/item_view.html.jinja

@@ -1,3 +1,4 @@
+{% block item_styles %}
 <style>
 .item-view {
   font-family: var(--font-sans);
@@ -19,9 +20,9 @@
 .item-type {
   font-family: var(--font-sans);
   text-transform: uppercase;
+  letter-spacing: 0.02em;
   font-size: var(--font-size-smaller);
-  font-weight: 800;
-  letter-spacing: 0.05em;
+  font-weight: var(--font-weight-sans-bold);
   padding-right: 1rem;
 }
 
@@ -176,9 +177,11 @@ h1.item-title {
   gap: 0.25rem;
 }
 </style>
+{% endblock item_styles %}
 
+{% block item_view %}
 <div class="item-view">
-
+  {% block item_path %}
   <div class="item-path">
     <div class="path-group">
       <div class="path-icon">
@@ -202,48 +205,52 @@ h1.item-title {
       {% endif %}
     </div>
   </div>
-
-    <div class="item-header">
-      {% if not brief_header %}
-        <div class="item-meta">
-          {% if item.type %}
-            <span class="item-type">{{ item.type.value }}</span>
-          {% endif %}
-          {% if item.format %}
-            <span class="item-label">Format:</span> <span class="item-format">{{ item.format.value }}</span>
-          {% endif %}
-          {% if item.state %}
-            <span class="item-label">State:</span> <span class="item-state">{{ item.state.value }}</span>
-          {% endif %}
-        </div>
-
-        {% if item.title %}
-          <h1 class="item-title">{{ item.title }}</h1>
+  {% endblock item_path %}
+
+  {% block item_header %}
+  <div class="item-header">
+    {% if not brief_header %}
+      <div class="item-meta">
+        {% if item.type %}
+          <span class="item-type">{{ item.type.value }}</span>
         {% endif %}
-
-        {% if item.url %}
-          <div class="item-url">
-            <div class="url-container">
-              <a href="{{ item.url }}" target="_blank" rel="noopener noreferrer">{{ item.url }}</a>
-              <i data-feather="copy" class="action-icon" onclick="copyDataValue(this.parentElement)" title="Copy URL"></i>
-            </div>
-          </div>
+        {% if item.format %}
+          <span class="item-label">Format:</span> <span class="item-format">{{ item.format.value }}</span>
         {% endif %}
-      {% endif %}
+        {% if item.state %}
+          <span class="item-label">State:</span> <span class="item-state">{{ item.state.value }}</span>
+        {% endif %}
+      </div>
 
-      {% if file_info_html %}
-        <div class="item-file-info">{{ file_info_html | safe }}</div>
+      {% if item.title %}
+        <h1 class="item-title">{{ item.title }}</h1>
       {% endif %}
 
-      {% if not brief_header %}
-        {% if item.description %}
-          <div class="item-description">
-            {{ item.description }}
+      {% if item.url %}
+        <div class="item-url">
+          <div class="url-container">
+            <a href="{{ item.url }}" target="_blank" rel="noopener noreferrer">{{ item.url }}</a>
+            <i data-feather="copy" class="action-icon" onclick="copyDataValue(this.parentElement)" title="Copy URL"></i>
           </div>
-        {% endif %}
+        </div>
       {% endif %}
-    </div>
+    {% endif %}
+
+    {% if file_info_html %}
+      <div class="item-file-info">{{ file_info_html | safe }}</div>
+    {% endif %}
+
+    {% if not brief_header %}
+      {% if item.description %}
+        <div class="item-description">
+          {{ item.description }}
+        </div>
+      {% endif %}
+    {% endif %}
+  </div>
+  {% endblock item_header %}
 
+  {% block item_content %}
   <div class="item-content">
     {% if body_text %}
       <div class="item-body">{{ body_text }}</div>
@@ -261,9 +268,11 @@ h1.item-title {
       {% endif %}
     {% endif %}
   </div>
-
+  {% endblock item_content %}
 </div>
+{% endblock item_view %}
 
+{% block item_scripts %}
 <script>
 function copyText(element, text) {
   navigator.clipboard.writeText(text).then(() => {
@@ -291,4 +300,5 @@ function copyDataValue(element) {
 document.addEventListener('DOMContentLoaded', () => {
   feather.replace();
 });
-</script>
+</script>
+{% endblock item_scripts %}

kash/web_gen/templates/simple_webpage.html.jinja

@@ -0,0 +1,24 @@
+{% extends "base_webpage.html.jinja" %}
+
+<!-- simple_webpage begin main_content block -->
+{% block main_content %}
+<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-6 md:px-16 md:shadow-lg">
+  {% block page_title %}
+  {% if title and add_title_h1 %}
+    <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>
+  {% endif %}
+  {% endblock page_title %}
+  
+  <div>
+    {% block page_content %}
+    {% if thumbnail_url %}
+    <img class="thumbnail" src="{{ thumbnail_url }}" alt="{{ title }}" />
+    {% endif %}
+    <div class="content">
+      {{ content_html | safe }}
+    </div>
+    {% endblock page_content %}
+  </div>
+</div>
+{% endblock main_content %}
+<!-- simple_webpage end main_content block -->

kash/web_gen/templates/tabbed_webpage.html.jinja

@@ -1,39 +1,47 @@
-<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-16 shadow-lg">
-  <h1 class="text-center text-4xl mt-6 mb-6">{{ title }}</h1>
-  <div>
-    <!-- Navigation Tabs -->
-    {% if show_tabs %}
-    <nav>
-      {% for tab in tabs %}
-      <button
-        class="tab-button {% if loop.first %}tab-button-active{% else %}tab-button-inactive{% endif %}"
-        onclick="showTab('{{ tab.id }}', this)"
-      >
-        {{ tab.label }}
-      </button>
-      {% endfor %}
-    </nav>
-    {% endif %}
-    <div class="tab-content mt-8">
-      <!-- Tab Content -->
-      {% for tab in tabs %}
-      <div
-        id="{{ tab.id }}"
-        class="tab-pane {% if not loop.first %}hidden{% endif %}"
-      >
-        {% if tab.thumbnail_url %}
-        <img class="thumbnail" src="{{ tab.thumbnail_url }}" alt="{{ tab.label }}" />
-        {% endif %}
-        {% if show_tabs %} <h2 class="text-2xl">{{ tab.label }}</h2> {% endif %}
-        <p>{{ tab.content_html | safe }}</p>
+{% extends "simple_webpage.html.jinja" %}
+
+<!-- tabbed_webpage begin page_content block -->
+{% block page_content %}
+  {% block tab_navigation %}
+  <!-- tab_navigation block -->
+  {% if show_tabs %}
+  <nav>
+    {% for tab in tabs %}
+    <button
+      class="tab-button {% if loop.first %}tab-button-active{% else %}tab-button-inactive{% endif %}"
+      onclick="showTab('{{ tab.id }}', this)"
+    >
+      {{ tab.label }}
+    </button>
+    {% endfor %}
+  </nav>
+  {% endif %}
+  {% endblock tab_navigation %}
+  
+  {% block tab_content_container %}
+  <!-- tab_content_container block -->
+  <div class="tab-content mt-8">
+    {% for tab in tabs %}
+    <div
+      id="{{ tab.id }}"
+      class="tab-pane {% if not loop.first %}hidden{% endif %}"
+    >
+      {% if tab.thumbnail_url %}
+      <img class="thumbnail" src="{{ tab.thumbnail_url }}" alt="{{ tab.label }}" />
+      {% endif %}
+      {% if show_tabs %} <h2 class="text-2xl">{{ tab.label }}</h2> {% endif %}
+      <div class="content">
+        {{ tab.content_html | safe }}
       </div>
-      {% endfor %}
     </div>
+    {% endfor %}
   </div>
-  <!-- TODO: Footer info (match with pdf export) -->
-</div>
+  {% endblock tab_content_container %}
+{% endblock page_content %}
+<!-- tabbed_webpage end page_content block -->
 
-<script>
+<!-- tabbed_webpage begin scripts_extra block -->
+{% block scripts_extra %}
   function showTab(tabId, element) {
     document.querySelectorAll(".tab-pane").forEach((tab) => {
       tab.classList.add("hidden");
@@ -46,4 +54,5 @@
     element.classList.add("tab-button-active");
     element.classList.remove("tab-button-inactive");
   }
-</script>
+{% endblock scripts_extra %}
+<!-- tabbed_webpage end scripts_extra block -->

kash/workspaces/__init__.py

@@ -1,5 +1,3 @@
-# flake8: noqa: F401
-
 from kash.workspaces.selections import Selection, SelectionHistory
 from kash.workspaces.workspaces import (
     Workspace,
@@ -9,5 +7,20 @@ from kash.workspaces.workspaces import (
     get_ws,
     global_ws_dir,
     resolve_ws,
+    switch_to_ws,
     ws_param_value,
 )
+
+__all__ = [
+    "Selection",
+    "SelectionHistory",
+    "Workspace",
+    "current_ignore",
+    "current_ws",
+    "get_global_ws",
+    "get_ws",
+    "global_ws_dir",
+    "resolve_ws",
+    "ws_param_value",
+    "switch_to_ws",
+]

kash/workspaces/selections.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from collections.abc import Callable, Sequence
 from functools import wraps
 from pathlib import Path
@@ -78,6 +80,12 @@ class Selection(BaseModel):
                 if current_path == old_path:
                     self.paths[idx] = new_path
 
+    def refresh(self, base_dir: Path) -> None:
+        """
+        Refresh the selection paths, dropping any that no longer exist.
+        """
+        self.paths[:] = [p for p in self.paths if (base_dir / p).exists()]
+
     def as_str(self, max_lines: int = SELECTION_DISPLAY_MAX) -> str:
         lines = [
             f"{fmt_count_items(len(self.paths), 'item')}:",
@@ -113,7 +121,7 @@ class SelectionHistory(BaseModel):
     }
 
     @classmethod
-    def init(cls, save_path: Path, max_history: int = SELECTION_HISTORY_MAX) -> "SelectionHistory":
+    def init(cls, save_path: Path, max_history: int = SELECTION_HISTORY_MAX) -> SelectionHistory:
         """
         Initialize selection history, loading from save_path if it exists.
         """
@@ -144,9 +152,9 @@ class SelectionHistory(BaseModel):
         yaml_util.write_yaml_file(data, str(self._save_path))
 
     @persist_after(_save)
-    def clear(self) -> None:
+    def clear_all(self) -> None:
         """
-        Clear the history.
+        Clear the entire selection history.
         """
         self.history.clear()
         self.current_index = 0
@@ -306,6 +314,13 @@ class SelectionHistory(BaseModel):
         for selection in self.history:
             selection.replace_values(replacements)
 
+    @persist_after(_save)
+    def refresh_current(self, base_dir: Path) -> None:
+        """
+        Refresh the current selection to drop any paths that no longer exist.
+        """
+        self.current.refresh(base_dir)
+
     def previous_n(self, n: int, expected_size: int | None = None) -> list[Selection]:
         """
         Get the `n` previous selections (backwards and including the current position),

kash/workspaces/source_items.py

@@ -7,7 +7,6 @@ from kash.model.items_model import Item
 from kash.model.paths_model import StorePath
 from kash.model.preconditions_model import Precondition
 from kash.utils.common.format_utils import fmt_loc
-from kash.utils.common.type_utils import not_none
 from kash.utils.errors import NoMatch
 from kash.workspaces import current_ws
 

kash/workspaces/workspaces.py

@@ -7,18 +7,14 @@ from typing import TYPE_CHECKING, TypeVar
 
 from prettyfmt import fmt_path
 
-from kash.config.logger import get_logger, reset_log_root
+from kash.config.logger import get_logger, reset_rich_logging
 from kash.config.settings import (
     GLOBAL_WS_NAME,
-    RECOMMENDED_API_KEYS,
-    get_global_ws_dir,
-    get_ws_root_dir,
     global_settings,
     resolve_and_create_dirs,
 )
 from kash.file_storage.metadata_dirs import MetadataDirs
 from kash.model.params_model import GLOBAL_PARAMS, RawParamValues
-from kash.shell.clideps.api_keys import print_api_key_setup
 from kash.utils.errors import FileNotFound, InvalidInput, InvalidState
 from kash.utils.file_utils.ignore_files import IgnoreFilter, is_ignored_default
 from kash.workspaces.workspace_registry import WorkspaceInfo, get_ws_registry
@@ -128,7 +124,7 @@ def resolve_ws(name: str | Path) -> WorkspaceInfo:
             resolved = name
             parent_dir = resolved.parent
         else:
-            parent_dir = get_ws_root_dir()
+            parent_dir = global_settings().ws_root_dir
             resolved = parent_dir / name
     elif name_str.startswith(".") or name_str.startswith("/"):
         # Explicit paths respected otherwise use workspace root.
@@ -136,7 +132,7 @@ def resolve_ws(name: str | Path) -> WorkspaceInfo:
         parent_dir = resolved.parent
         name = resolved.name
     else:
-        parent_dir = get_ws_root_dir()
+        parent_dir = global_settings().ws_root_dir
         resolved = parent_dir / Path(name_str)
 
     ws_name = check_strict_workspace_name(resolved.name)
@@ -161,7 +157,7 @@ def get_ws(name_or_path: str | Path, auto_init: bool = True) -> "FileStore":
 
 @cache
 def global_ws_dir() -> Path:
-    kb_path = resolve_and_create_dirs(get_global_ws_dir(), is_dir=True)
+    kb_path = resolve_and_create_dirs(global_settings().global_ws_dir, is_dir=True)
     log.debug("Global workspace path: %s", kb_path)
     return kb_path
 
@@ -190,7 +186,7 @@ def switch_to_ws(base_dir: Path) -> "FileStore":
     ws_dirs = MetadataDirs(base_dir=info.base_dir, is_global_ws=info.is_global_ws)
 
     # Use the global log root for the global_ws, and the workspace log root otherwise.
-    reset_log_root(None, info.name if not info.is_global_ws else None)
+    reset_rich_logging(None, info.name if not info.is_global_ws else None)
 
     if info.is_global_ws:
         # If not in a workspace, use the global cache locations.
@@ -237,8 +233,6 @@ def current_ws(silent: bool = False) -> "FileStore":
     ws = switch_to_ws(base_dir)
 
     if not silent:
-        # Delayed, once-only logging of any setup warnings.
-        print_api_key_setup(RECOMMENDED_API_KEYS, once=True)
         ws.log_workspace_info(once=True)
 
     return ws

kash/xonsh_custom/command_nl_utils.py

@@ -3,20 +3,16 @@ import re
 from prettyfmt import fmt_words
 
 INNER_PUNCT_CHARS = r"-'’–—"
-OUTER_PUNCT_CHARS = r".,'\"“”‘’:!?()"
+OUTER_PUNCT_CHARS = r".,'\"" "''':;!?()"
 
-WORD_PAT = (
-    rf"[{OUTER_PUNCT_CHARS}]{{0,2}}[\w]+(?:[{INNER_PUNCT_CHARS}\w]+)*[{OUTER_PUNCT_CHARS}]{{0,2}}"
-)
-"""
-Pattern to match a word in natural language text (i.e. words and natural
-language-only punctuation).
-"""
+ESCAPED_INNER_PUNCT_CHARS = re.escape(INNER_PUNCT_CHARS)
+ESCAPED_OUTER_PUNCT_CHARS = re.escape(OUTER_PUNCT_CHARS)
 
-NL_PAT = rf"^{WORD_PAT}(?:\s+{WORD_PAT})*$"
-"""
-Pattern to match natural language text in a command line.
-"""
+PUNCT_SEQ_RE = re.compile(rf"[{ESCAPED_INNER_PUNCT_CHARS}{ESCAPED_OUTER_PUNCT_CHARS}]+")
+
+ONLY_WORDS_RE = re.compile(rf"^[\w\s{ESCAPED_INNER_PUNCT_CHARS}]*$")
+
+PLAIN_WORD_RE = re.compile(r"^\w.*\w$")
 
 
 def as_nl_words(text: str) -> str:
@@ -30,18 +26,25 @@ def as_nl_words(text: str) -> str:
 
 def looks_like_nl(text: str) -> bool:
     """
-    Check if a text looks like plain natural language text, i.e. word chars,
-    possibly with ? or hyphens/apostrophes when inside words but not other
-    code or punctuation.
+    Check if a text looks like plain natural language text. Just very simple
+    based on words and only basic punctuation.
     """
-    return bool(re.match(NL_PAT, text.strip()))
+    is_only_word_chars = bool(ONLY_WORDS_RE.fullmatch(text))
+    without_punct = PUNCT_SEQ_RE.sub("", text)
+    is_only_words_punct = bool(ONLY_WORDS_RE.fullmatch(without_punct))
+    words = without_punct.strip().split()
+    one_longer_word = any(len(word) > 3 for word in words)
+
+    return one_longer_word and (
+        (is_only_words_punct and len(words) >= 3) or (is_only_word_chars and len(words) >= 2)
+    )
 
 
 ## Tests
 
 
 def test_as_nl_words():
-    assert as_nl_words("x=3+9; foo('bar')") == "x=3+9; foo('bar"
+    assert as_nl_words("x=3+9; foo('bar')") == "x=3+9 foo('bar"
     assert as_nl_words("cd ..") == "cd .."
     assert as_nl_words("transcribe some-file_23.mp3") == "transcribe some-file_23.mp3"
     assert as_nl_words("hello world ") == "hello world"
@@ -57,14 +60,32 @@ def test_looks_like_nl():
     assert looks_like_nl("hello world")
     assert looks_like_nl(" hello world ")
     assert looks_like_nl("what's up")
-    assert looks_like_nl("hello-world")
     assert looks_like_nl("is this a question?")
     assert looks_like_nl("'quoted text'")
     assert looks_like_nl("git push origin main")
+    assert looks_like_nl("this is natural language")
+    assert looks_like_nl(" what's up, doc? ")
+    assert looks_like_nl("multiple   spaces   here")
+    assert looks_like_nl("go to the store (buy milk)")
+    assert looks_like_nl("'quoted text' has three words")
+    assert looks_like_nl("git push origin main")
+    assert looks_like_nl("what's up")
 
+    assert not looks_like_nl("hello-world")
+    assert not looks_like_nl("cd ..")
+    assert not looks_like_nl("file_name.txt")
+    assert not looks_like_nl("ls -la")
+    assert not looks_like_nl("https://example.com")
+    assert not looks_like_nl("cmd | grep pattern")
+    assert not looks_like_nl("use a+b")
+    assert not looks_like_nl("x=3")
+    assert not looks_like_nl("a > b")
+    assert not looks_like_nl("file_name.txt")
+    assert not looks_like_nl("foo;")
+    assert not looks_like_nl("hello-world")
     assert not looks_like_nl("ls -la")
     assert not looks_like_nl("cd ..")
     assert not looks_like_nl("echo $HOME")
     assert not looks_like_nl("https://example.com")
-    assert not looks_like_nl("file.txt")
+    assert not looks_like_nl(text="file.txt")
     assert not looks_like_nl("cmd | grep pattern")

kash/xonsh_custom/custom_shell.py

@@ -1,15 +1,17 @@
 import os
-import sys
+import signal
 import threading
 import time
 from collections.abc import Callable
 from os.path import expanduser
-from typing import cast
+from subprocess import CalledProcessError
+from types import TracebackType
+from typing import TypeAlias, cast
 
 import xonsh.tools as xt
 from prompt_toolkit.formatted_text import FormattedText
 from pygments.token import Token
-from strif import abbrev_str
+from strif import abbrev_str, quote_if_needed
 from typing_extensions import override
 from xonsh.built_ins import XSH
 from xonsh.environ import xonshrc_context
@@ -27,7 +29,7 @@ from kash.config import colors
 from kash.config.lazy_imports import import_start_time  # usort:skip
 from kash.config.logger import get_console, get_log_settings, get_logger
 from kash.config.settings import APP_NAME, find_rcfiles
-from kash.config.text_styles import SPINNER, STYLE_ASSISTANCE
+from kash.config.text_styles import SPINNER, STYLE_ASSISTANCE, STYLE_HINT
 from kash.help.assistant import AssistanceType
 from kash.shell.output.shell_output import cprint
 from kash.shell.ui.shell_syntax import is_assist_request_str
@@ -108,12 +110,33 @@ class CustomPTKPromptFormatter(PTKPromptFormatter):
         return super().__call__(template=cast(str, template), **kwargs)
 
 
+def exit_code_str(e: CalledProcessError) -> str:
+    """
+    Prettier version of `CalledProcessError.__str__()`.
+    """
+    if isinstance(e.cmd, list):
+        cmd = "`" + " ".join(quote_if_needed(c) for c in e.cmd) + "`"
+    else:
+        cmd = str(e.cmd)
+    if e.returncode and e.returncode < 0:
+        try:
+            signal_name = signal.Signals(-e.returncode).name
+            return f"Command died with {signal_name} ({e.returncode}): {cmd}"
+        except ValueError:
+            return f"Command died with unknown signal {e.returncode}: {cmd}"
+    else:
+        return f"Command returned non-zero exit status {e.returncode}: {cmd}"
+
+
 # Base shell can be ReadlineShell or PromptToolkitShell.
 # Completer can be RankingCompleter or the standard Completer.
 # from xonsh.completer import Completer
 # from xonsh.shells.readline_shell import ReadlineShell
 from xonsh.shells.ptk_shell import PromptToolkitShell
 
+ExcInfo: TypeAlias = tuple[type[BaseException], BaseException, TracebackType]
+OptExcInfo: TypeAlias = ExcInfo | tuple[None, None, None]
+
 
 class CustomAssistantShell(PromptToolkitShell):
     """
@@ -122,7 +145,6 @@ class CustomAssistantShell(PromptToolkitShell):
     We're trying to reuse code where possible but need to change some of xonsh's
     behavior. Note event hooks in xonsh do let you customize handling but don't
     let you disable xonsh's processing, so it seems like this is necessary.
-    so it seems like this is necessary.
     """
 
     def __init__(self, **kwargs):
@@ -186,16 +208,24 @@ class CustomAssistantShell(PromptToolkitShell):
         exc_info = (None, None, None)
         try:
             log.info("Running shell code: %r", src)
-            exc_info = run_compiled_code(code, self.ctx, None, "single")
-            if exc_info != (None, None, None):
-                raise exc_info[1]  # pyright: ignore
+            exc_info: OptExcInfo = run_compiled_code(code, self.ctx, None, "single")  # pyright: ignore
+            log.debug("Completed shell code: %r", src)
+            _type, exc, _traceback = exc_info
+            if exc:
+                log.info("Shell exception info: %s", exc)
+                raise exc
             ts1 = time.time()
             if hist is not None and hist.last_cmd_rtn is None:
                 hist.last_cmd_rtn = 0  # returncode for success
-            log.info("Shell code completed successfully: %s", src)
+        except CalledProcessError as e:
+            # No point in logging stack trace here as it is only the shell stack,
+            # not the original code.
+            log.warning("%s", exit_code_str(e))
+            cprint("See `logs` for more details.", style=STYLE_HINT)
+            # print(e.args[0], file=sys.stderr)
         except xt.XonshError as e:
             log.info("Shell exception details: %s", e, exc_info=True)
-            print(e.args[0], file=sys.stderr)
+            # print(e.args[0], file=sys.stderr)
             if hist is not None and hist.last_cmd_rtn is None:  # pyright: ignore
                 hist.last_cmd_rtn = 1  # return code for failure
         except (SystemExit, KeyboardInterrupt) as err:
@@ -323,7 +353,9 @@ def customize_xonsh_settings(is_interactive: bool):
         # Disable suggest for command not found errors (we handle this ourselves).
         "SUGGEST_COMMANDS": False,
         # TODO: Consider enabling and adapting auto-suggestions.
-        "AUTO_SUGGEST": False,
+        "AUTO_SUGGEST": True,
+        # Show auto-suggestions in the completion menu.
+        "AUTO_SUGGEST_IN_COMPLETIONS": False,
         # Completions can be "none", "single", "multi", or "readline".
         # "single" lets us have rich completions with descriptions alongside.
         # https://xon.sh/envvars.html#completions-display