PyPI - kash-shell - Versions diffs - 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl - Mend

kash-shell 0.3.10py3-none-any.whl → 0.3.12py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

kash/actions/core/format_markdown_template.py +2 -5
kash/actions/core/markdownify.py +2 -4
kash/actions/core/readability.py +2 -4
kash/actions/core/render_as_html.py +30 -11
kash/actions/core/show_webpage.py +6 -11
kash/actions/core/strip_html.py +4 -8
kash/actions/core/{webpage_config.py → tabbed_webpage_config.py} +5 -3
kash/actions/core/{webpage_generate.py → tabbed_webpage_generate.py} +5 -4
kash/commands/base/basic_file_commands.py +21 -3
kash/commands/base/files_command.py +29 -10
kash/commands/extras/parse_uv_lock.py +12 -3
kash/commands/workspace/selection_commands.py +1 -1
kash/commands/workspace/workspace_commands.py +2 -3
kash/config/colors.py +2 -2
kash/config/env_settings.py +2 -42
kash/config/logger.py +30 -25
kash/config/logger_basic.py +6 -6
kash/config/settings.py +23 -7
kash/config/setup.py +33 -5
kash/config/text_styles.py +25 -22
kash/embeddings/cosine.py +12 -4
kash/embeddings/embeddings.py +16 -6
kash/embeddings/text_similarity.py +10 -4
kash/exec/__init__.py +3 -0
kash/exec/action_decorators.py +10 -25
kash/exec/action_exec.py +43 -23
kash/exec/llm_transforms.py +6 -3
kash/exec/preconditions.py +10 -12
kash/exec/resolve_args.py +4 -0
kash/exec/runtime_settings.py +134 -0
kash/exec/shell_callable_action.py +5 -3
kash/file_storage/file_store.py +37 -38
kash/file_storage/item_file_format.py +6 -3
kash/file_storage/store_filenames.py +6 -3
kash/help/function_param_info.py +1 -1
kash/llm_utils/init_litellm.py +16 -0
kash/llm_utils/llm_api_keys.py +6 -2
kash/llm_utils/llm_completion.py +11 -4
kash/local_server/local_server_routes.py +1 -7
kash/mcp/mcp_cli.py +3 -2
kash/mcp/mcp_server_routes.py +11 -12
kash/media_base/transcription_deepgram.py +15 -2
kash/model/__init__.py +1 -1
kash/model/actions_model.py +6 -54
kash/model/exec_model.py +79 -0
kash/model/items_model.py +102 -35
kash/model/operations_model.py +38 -15
kash/model/paths_model.py +2 -0
kash/shell/output/shell_output.py +10 -8
kash/shell/shell_main.py +2 -2
kash/shell/utils/exception_printing.py +2 -2
kash/shell/utils/shell_function_wrapper.py +15 -15
kash/text_handling/doc_normalization.py +16 -8
kash/text_handling/markdown_render.py +1 -0
kash/text_handling/markdown_utils.py +105 -2
kash/utils/common/format_utils.py +2 -8
kash/utils/common/function_inspect.py +360 -110
kash/utils/common/inflection.py +22 -0
kash/utils/common/task_stack.py +4 -15
kash/utils/errors.py +14 -9
kash/utils/file_utils/file_ext.py +4 -0
kash/utils/file_utils/file_formats_model.py +32 -1
kash/utils/file_utils/file_sort_filter.py +10 -3
kash/web_gen/__init__.py +0 -4
kash/web_gen/simple_webpage.py +52 -0
kash/web_gen/tabbed_webpage.py +23 -16
kash/web_gen/template_render.py +37 -2
kash/web_gen/templates/base_styles.css.jinja +84 -59
kash/web_gen/templates/base_webpage.html.jinja +85 -67
kash/web_gen/templates/item_view.html.jinja +47 -37
kash/web_gen/templates/simple_webpage.html.jinja +24 -0
kash/web_gen/templates/tabbed_webpage.html.jinja +42 -32
kash/workspaces/__init__.py +12 -3
kash/workspaces/workspace_dirs.py +58 -0
kash/workspaces/workspace_importing.py +1 -1
kash/workspaces/workspaces.py +26 -90
{kash_shell-0.3.10.dist-info → kash_shell-0.3.12.dist-info}/METADATA +7 -7
{kash_shell-0.3.10.dist-info → kash_shell-0.3.12.dist-info}/RECORD +81 -76
kash/shell/utils/argparse_utils.py +0 -20
kash/utils/lang_utils/inflection.py +0 -18
{kash_shell-0.3.10.dist-info → kash_shell-0.3.12.dist-info}/WHEEL +0 -0
{kash_shell-0.3.10.dist-info → kash_shell-0.3.12.dist-info}/entry_points.txt +0 -0
{kash_shell-0.3.10.dist-info → kash_shell-0.3.12.dist-info}/licenses/LICENSE +0 -0

kash/web_gen/templates/base_webpage.html.jinja CHANGED Viewed

@@ -2,10 +2,14 @@
 <html lang="en">
 <head>
+  {% block meta %}
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-  <title>{{ title }}</title>
+  {% endblock meta %}
+  {% block title %}<title>{{ title }}</title>{% endblock title %}
+  {% block head_basic %}
   <link rel="preconnect" href="https://fonts.googleapis.com" />
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
   <link rel="preconnect" href="https://cdn.jsdelivr.net" crossorigin />
@@ -26,12 +30,12 @@
   <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet" />
   <script src="https://cdn.jsdelivr.net/npm/feather-icons/dist/feather.min.js" defer></script>
+  {% endblock head_basic %}
-  {% if extra_head %}
-  {{ extra_head|safe }}
-  {% endif %}
+  {% block head_extra %}{% endblock head_extra %}
   <style>
+    {% block font_faces %}
     /* https://fontsource.org/fonts/pt-serif/cdn */
     /* pt-serif-latin-400-normal */
     @font-face {
@@ -88,84 +92,98 @@
       src: url(https://cdn.jsdelivr.net/fontsource/fonts/source-sans-3:vf@latest/latin-wght-italic.woff2) format('woff2-variations');
       unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;
     }
     {# Other decent sans serif options: Work Sans Variable, Nunito Sans Variable #}
+    {% endblock font_faces %}
+    {% block base_styles %}
     {% include "base_styles.css.jinja" %}
+    {% endblock base_styles %}
+    {% block content_styles %}
     {% include "content_styles.css.jinja" %}
-    {% if extra_css %}
-    {{ extra_css|safe }}
-    {% endif %}
+    {% endblock content_styles %}
+    {% block custom_styles %}{% endblock custom_styles %}
   </style>
 </head>
 <body>
-{{ content|safe }}
-<script>
-  document.addEventListener('DOMContentLoaded', () => {
-    // Send messages to the parent window, in case we are in a viewport where that matters
-    // (e.g. an iframe tooltip).
-    // Request a resize of the parent viewport. This iframe size message format isn't
-    // standardized by ResizeObserver, but is common. It is supported by Kerm.
-    const content = document.body;
-    console.log("Suggesting resize to parent:", content.offsetWidth, content.offsetHeight);
-    window.parent.postMessage({
-      type: 'resize',
-      width: Math.max(content.offsetWidth, 600),
-      height: Math.max(content.offsetHeight, 100)
-    }, '*');
-    // Wrap tables within the main content area for horizontal scrolling.
-    const containers = [];
-    document.querySelectorAll('.long-text').forEach(el => {
-      const pane = el.querySelector('.tab-pane');
-      containers.push(pane || el);
-    });
-    containers.forEach(container => {
-      // Grab all tables, then only wrap the ones whose parent is this container.
-      container.querySelectorAll('table').forEach(table => {
-        if (table.parentElement !== container) {
-          return; // Only direct children.
-        }
-        if (table.parentNode.classList.contains('table-container')) {
-          return; // Already wrapped.
-        }
-        const wrapper = document.createElement('div');
-        wrapper.className = 'table-container';
-        container.insertBefore(wrapper, table);
-        wrapper.appendChild(table);
-      });
-    });
+  {% block body_header %}{% endblock body_header %}
+  {% block main_content %}
+  {{ content|safe }}
+  {% endblock main_content %}
+  {% block body_footer %}{% endblock body_footer %}
+  {% block scripts %}
+  <script>
+    document.addEventListener('DOMContentLoaded', () => {
+      // Send messages to the parent window, in case we are in a viewport where that matters
+      // (e.g. an iframe tooltip).
+      // Request a resize of the parent viewport. This iframe size message format isn't
+      // standardized by ResizeObserver, but is common. It is supported by Kerm.
+      const content = document.body;
+      console.log("Suggesting resize to parent:", content.offsetWidth, content.offsetHeight);
-  });
+      window.parent.postMessage({
+        type: 'resize',
+        width: Math.max(content.offsetWidth, 600),
+        height: Math.max(content.offsetHeight, 100)
+      }, '*');
-  // Double-click to expand (e.g. expand tooltip to popover).
-  document.addEventListener('dblclick', () => {
-    console.log("Sending expand message to parent");
-    window.parent.postMessage({
-      type: 'expand'
-    }, '*');
-  });
+      // Wrap tables within the main content area for horizontal scrolling.
+      const containers = [];
+      document.querySelectorAll('.long-text').forEach(el => {
+        const pane = el.querySelector('.tab-pane');
+        containers.push(pane || el);
+      });
+      containers.forEach(container => {
+        // Find all tables within the container.
+        const tables = Array.from(container.querySelectorAll('table'));
+        tables.forEach(table => {
+          // Skip tables already in table-container divs
+          if (table.parentNode.classList.contains('table-container')) {
+            return;
+          }
+          try {
+            // Create the wrapper.
+            const wrapper = document.createElement('div');
+            wrapper.className = 'table-container';
+            // Get the parent and insert the wrapper where the table is, then move the table into the wrapper.
+            const parent = table.parentNode;
+            parent.insertBefore(wrapper, table);
+            wrapper.appendChild(table);
+          } catch (e) {
+            console.error("Error wrapping table:", e);
+          }
+        });
+      });
+    });
-  // Escape to close tooltip or popover.
-  document.addEventListener('keydown', (event) => {
-    if (event.key === 'Escape') {
-      console.log("Sending close message to parent");
+    // Double-click to expand (e.g. expand tooltip to popover).
+    document.addEventListener('dblclick', () => {
+      console.log("Sending expand message to parent");
       window.parent.postMessage({
-        type: 'close'
+        type: 'expand'
       }, '*');
-    }
-  });
+    });
-  {% if extra_footer_js %}
-  {{ extra_footer_js|safe }}
-  {% endif %}
-</script>
+    // Escape to close tooltip or popover.
+    document.addEventListener('keydown', (event) => {
+      if (event.key === 'Escape') {
+        console.log("Sending close message to parent");
+        window.parent.postMessage({
+          type: 'close'
+        }, '*');
+      }
+    });
+    {% block scripts_extra %}{% endblock scripts_extra %}
+  </script>
+  {% endblock scripts %}
+  {% block analytics %}{% endblock analytics %}
 </body>
 </html>

kash/web_gen/templates/item_view.html.jinja CHANGED Viewed

@@ -1,3 +1,4 @@
+{% block item_styles %}
 <style>
 .item-view {
   font-family: var(--font-sans);
@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -1,38 +1,47 @@
-<div class="long-text container max-w-3xl mx-auto bg-white py-8 px-6 md:px-16 md: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>
-</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");
@@ -45,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 CHANGED Viewed

@@ -1,19 +1,28 @@
 from kash.workspaces.selections import Selection, SelectionHistory
+from kash.workspaces.workspace_dirs import (
+    enclosing_ws_dir,
+    global_ws_dir,
+    is_global_ws_dir,
+    is_ws_dir,
+)
 from kash.workspaces.workspaces import (
     Workspace,
+    _switch_ws_settings,
     current_ignore,
     current_ws,
     get_global_ws,
     get_ws,
-    global_ws_dir,
     resolve_ws,
-    switch_to_ws,
     ws_param_value,
 )
 __all__ = [
     "Selection",
     "SelectionHistory",
+    "enclosing_ws_dir",
+    "global_ws_dir",
+    "is_global_ws_dir",
+    "is_ws_dir",
     "Workspace",
     "current_ignore",
     "current_ws",
@@ -21,6 +30,6 @@ __all__ = [
     "get_ws",
     "global_ws_dir",
     "resolve_ws",
+    "_switch_ws_settings",
     "ws_param_value",
-    "switch_to_ws",
 ]

kash/workspaces/workspace_dirs.py ADDED Viewed

@@ -0,0 +1,58 @@
+from __future__ import annotations
+import re
+from functools import cache
+from pathlib import Path
+from kash.config.logger import get_logger
+from kash.config.settings import global_settings, resolve_and_create_dirs
+from kash.file_storage.metadata_dirs import MetadataDirs
+from kash.utils.errors import InvalidInput
+log = get_logger(__name__)
+@cache
+def global_ws_dir() -> Path:
+    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
+def is_global_ws_dir(path: Path) -> bool:
+    return path.resolve() == global_settings().global_ws_dir
+def is_ws_dir(path: Path) -> bool:
+    dirs = MetadataDirs(path, False)
+    return dirs.is_initialized()
+def enclosing_ws_dir(path: Path | None = None) -> Path | None:
+    """
+    Get the workspace directory enclosing the given path, or of the current
+    working directory if no path is given.
+    """
+    if not path:
+        path = Path(".")
+    path = path.absolute()
+    while path != Path("/"):
+        if is_ws_dir(path):
+            return path
+        path = path.parent
+    return None
+def normalize_workspace_name(ws_name: str) -> str:
+    return str(ws_name).strip().rstrip("/")
+def check_strict_workspace_name(ws_name: str) -> str:
+    ws_name = normalize_workspace_name(ws_name)
+    if not re.match(r"^[\w.-]+$", ws_name):
+        raise InvalidInput(
+            f"Use an alphanumeric name (- and . also allowed) for the workspace name: `{ws_name}`"
+        )
+    return ws_name

kash/workspaces/workspace_importing.py CHANGED Viewed

@@ -45,7 +45,7 @@ def import_and_load(ws: FileStore, locator: Locator | str) -> Item:
             # It's already a StorePath.
             item = ws.load(locator)
         else:
-            log.message("Importing locator as local path: %r", locator)
+            log.info("Importing locator as local path: %r", locator)
             path = Path(locator)
             if not path.exists():
                 raise InvalidInput(f"File not found: {path}")

kash-shell 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

kash-shell 0.3.10py3-none-any.whl → 0.3.12py3-none-any.whl