llms-py 3.0.26__py3-none-any.whl → 3.0.27__py3-none-any.whl

llms/extensions/computer/filesystem.py

@@ -496,15 +496,20 @@ def move_file(source: Annotated[str, "Source path"], destination: Annotated[str,
 
 
 def search_files(
-    path: Annotated[str, "Path to search in"],
     pattern: Annotated[str, "Glob pattern to match"],
+    path: Annotated[str, "Path to search in"] = None,
     exclude_patterns: Annotated[List[str], "Glob patterns to exclude"] = None,
+    sort_by: Annotated[Literal["path", "modified", "size"], "Sort by path, modified or size"] = "path",
+    max_results: int = 200,
 ) -> str:
     """
     Recursively search for files and directories matching a pattern. The patterns should be glob-style patterns that match paths relative to the working directory.
     Use pattern like '.ext' to match files in current directory, and '**/.ext' to match files in all subdirectories.
     Returns full paths to all matching items. Great for finding files when you don't know their exact location. Only searches within allowed directories.
+    If no path is provided, searches in the first allowed directory.
     """
+    if not path:
+        path = get_allowed_directories()[0]
     valid_path = _validate_path(path)
     results = []
     if exclude_patterns is None:
@@ -533,6 +538,16 @@ def search_files(
     except Exception as e:
         raise RuntimeError(f"Error searching files in {valid_path}: {e}") from e
 
+    if sort_by == "size":
+        results.sort(key=lambda p: os.path.getsize(p) if os.path.exists(p) else 0, reverse=True)
+    elif sort_by == "modified":
+        results.sort(key=lambda p: os.path.getmtime(p) if os.path.exists(p) else 0, reverse=True)
+    else:  # path
+        results.sort()
+
+    if max_results > 0:
+        results = results[:max_results]
+
     if not results:
         return "No matches found"
 

llms/extensions/core_tools/__init__.py

@@ -4,8 +4,6 @@ Core System Tools providing essential file operations, memory persistence, math
 
 import ast
 import contextlib
-import glob
-import json
 import math
 import operator
 import os
@@ -21,165 +19,6 @@ from aiohttp import web
 
 g_ctx = None
 
-# -----------------------------
-# In-memory storage (replace later)
-# -----------------------------
-
-_MEMORY_STORE: Dict[str, Any] = {}
-_SEMANTIC_STORE: List[Dict[str, Any]] = []  # {id, text, metadata}
-
-
-# -----------------------------
-# Memory tools
-# -----------------------------
-
-
-def memory_read(key: str) -> Any:
-    """Read a value from persistent memory."""
-    return _MEMORY_STORE.get(key)
-
-
-def memory_write(key: str, value: Any) -> bool:
-    """Write a value to persistent memory."""
-    _MEMORY_STORE[key] = value
-    return True
-
-
-# -----------------------------
-# Path safety helpers
-# -----------------------------
-
-# Limit tools to only access files and folders within LLMS_BASE_DIR if specified, otherwise the current working directory
-_BASE_DIR = os.environ.get("LLMS_BASE_DIR") or os.path.realpath(os.getcwd())
-
-
-def _resolve_safe_path(path: str) -> str:
-    """
-    Resolve a path and ensure it stays within the current working directory.
-    Raises ValueError if the path escapes the base directory.
-    """
-    resolved = os.path.realpath(os.path.join(_BASE_DIR, path))
-    if not resolved.startswith(_BASE_DIR + os.sep) and resolved != _BASE_DIR:
-        raise ValueError("Access denied: path is outside the working directory")
-    return resolved
-
-
-# -----------------------------
-# Semantic search (placeholder)
-# -----------------------------
-
-
-def semantic_search(query: str, top_k: int = 5) -> List[Dict[str, Any]]:
-    """
-    Naive semantic search placeholder.
-    Replace with embeddings + vector DB.
-    """
-    results = []
-    for item in _SEMANTIC_STORE:
-        if query.lower() in item["text"].lower():
-            results.append(item)
-    return results[:top_k]
-
-
-# -----------------------------
-# File system tools (restricted to CWD)
-# -----------------------------
-
-
-def read_file(path: str) -> str:
-    """Read a text file from disk within the current working directory."""
-    safe_path = _resolve_safe_path(path)
-    with open(safe_path, encoding="utf-8") as f:
-        return f.read()
-
-
-def write_file(path: str, content: str) -> bool:
-    """Write text to a file within the current working directory (overwrites)."""
-    safe_path = _resolve_safe_path(path)
-    os.makedirs(os.path.dirname(safe_path) or _BASE_DIR, exist_ok=True)
-    with open(safe_path, "w", encoding="utf-8") as f:
-        f.write(content)
-    return True
-
-
-def list_directory(path: str) -> str:
-    """List directory contents"""
-    safe_path = _resolve_safe_path(path)
-    if not os.path.exists(safe_path):
-        return f"Error: Path not found: {path}"
-
-    entries = []
-    try:
-        for entry in os.scandir(safe_path):
-            stat = entry.stat()
-            entries.append(
-                {
-                    "name": "/" + entry.name if entry.is_dir() else entry.name,
-                    "size": stat.st_size,
-                    "mtime": datetime.fromtimestamp(stat.st_mtime).isoformat(),
-                }
-            )
-        return json.dumps({"path": os.path.relpath(safe_path, _BASE_DIR), "entries": entries}, indent=2)
-    except Exception as e:
-        return f"Error listing directory: {e}"
-
-
-def glob_paths(
-    pattern: str,
-    extensions: Optional[List[str]] = None,
-    sort_by: str = "path",  # "path" | "modified" | "size"
-    max_results: int = 100,
-) -> Dict[str, List[Dict[str, str]]]:
-    """
-    Find files and directories matching a glob pattern
-    """
-    if sort_by not in {"path", "modified", "size"}:
-        raise ValueError("sort_by must be one of: path, modified, size")
-
-    safe_pattern = _resolve_safe_path(pattern)
-
-    results = []
-
-    for path in glob.glob(safe_pattern, recursive=True):
-        resolved = os.path.realpath(path)
-
-        # Enforce CWD restriction (important for symlinks)
-        if not resolved.startswith(_BASE_DIR):
-            continue
-
-        is_dir = os.path.isdir(resolved)
-
-        # Extension filtering (files only)
-        if extensions and not is_dir:
-            ext = os.path.splitext(resolved)[1].lower().lstrip(".")
-            if ext not in {e.lower().lstrip(".") for e in extensions}:
-                continue
-
-        stat = os.stat(resolved)
-
-        results.append(
-            {
-                "path": os.path.relpath(resolved, _BASE_DIR),
-                "type": "directory" if is_dir else "file",
-                "size_bytes": stat.st_size,
-                "modified_time": stat.st_mtime,
-            }
-        )
-
-        if len(results) >= max_results:
-            break
-
-    # Sorting
-    if sort_by == "path":
-        results.sort(key=lambda x: x["path"])
-    elif sort_by == "modified":
-        results.sort(key=lambda x: x["modified_time"], reverse=True)
-    elif sort_by == "size":
-        results.sort(key=lambda x: x["size_bytes"], reverse=True)
-
-    return {"pattern": pattern, "count": len(results), "results": results}
-
-
 # -----------------------------
 # Expression evaluation tools
 # -----------------------------
@@ -522,19 +361,12 @@ def install(ctx):
     g_ctx = ctx
     group = "core_tools"
     # Examples of registering tools using automatic definition generation
-    ctx.register_tool(memory_read, group=group)
-    ctx.register_tool(memory_write, group=group)
-    # ctx.register_tool(semantic_search) # TODO: implement
-    ctx.register_tool(read_file, group=group)
-    ctx.register_tool(write_file, group=group)
-    ctx.register_tool(list_directory, group=group)
-    ctx.register_tool(glob_paths, group=group)
+    ctx.register_tool(get_current_time, group=group)
     ctx.register_tool(calc, group=group)
     ctx.register_tool(run_python, group=group)
     ctx.register_tool(run_typescript, group=group)
     ctx.register_tool(run_javascript, group=group)
     ctx.register_tool(run_csharp, group=group)
-    ctx.register_tool(get_current_time, group=group)
 
     def exec_language(language: str, code: str) -> Dict[str, Any]:
         if language == "python":

llms/extensions/skills/ui/index.mjs

@@ -921,14 +921,23 @@ export default {
                 },
                 show({ thread }) {
                     if (thread.messages.length < 2) return false
-                    const msgRoles = thread.messages.map(m => m.role)
-                    if (msgRoles[msgRoles.length - 1] != "assistant") return false
+
+                    const lastMessage = thread.messages[thread.messages.length - 1]
+                    // only show if the last message is from the assistant
+                    if (lastMessage.role != "assistant") return false
+
+                    // and it has a skill tool call
                     const hasSkillToolCall = thread.messages.some(m =>
                         m.tool_calls?.some(tc => tc.type == "function" && tc.function.name == "skill"))
+                    // or a plan system prompt
                     const systemPrompt = thread.messages.find(m => m.role == "system")?.content.toLowerCase() || ''
                     const line1 = leftPart(systemPrompt.trim(), "\n")
                     const hasPlanSystemPrompt = line1.includes("plan") || systemPrompt.includes("# plan")
-                    return hasSkillToolCall || hasPlanSystemPrompt
+
+                    // or the last message has no content but has reasoning
+                    const hasOnlyThinking = !lastMessage.content?.trim() && lastMessage.reasoning?.trim()
+
+                    return hasSkillToolCall || hasPlanSystemPrompt || hasOnlyThinking
                 }
             }
         })

llms/main.py

@@ -57,7 +57,7 @@ except ImportError:
     HAS_PIL = False
 
 _ROOT = None
-VERSION = "3.0.26"
+VERSION = "3.0.27"
 DEBUG = os.getenv("DEBUG") == "1"
 MOCK = os.getenv("MOCK") == "1"
 MOCK_DIR = os.getenv("MOCK_DIR")

llms/ui/ai.mjs

@@ -6,7 +6,7 @@ const headers = { 'Accept': 'application/json' }
 const prefsKey = 'llms.prefs'
 
 export const o = {
-    version: '3.0.26',
+    version: '3.0.27',
     base,
     prefsKey,
     welcome: 'Welcome to llms.py',

{llms_py-3.0.26.dist-info → llms_py-3.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.26
+Version: 3.0.27
 Summary: A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers
 Home-page: https://github.com/ServiceStack/llms
 Author: ServiceStack

{llms_py-3.0.26.dist-info → llms_py-3.0.27.dist-info}/RECORD

@@ -3,7 +3,7 @@ llms/__main__.py,sha256=hrBulHIt3lmPm1BCyAEVtB6DQ0Hvc3gnIddhHCmJasg,151
 llms/db.py,sha256=oozp5I5lECVO8oZEFwcZl3ES5mARqWeR1BkoqG5kSqM,11687
 llms/index.html,sha256=nGk1Djtn9p7l6LuKp4Kg0JIB9fCzxtTWXFfmDb4ggpc,1658
 llms/llms.json,sha256=ar7f5uti80RrYhbsYLtCuqdHSFWWlwyVeV0nPCgUzeA,11564
-llms/main.py,sha256=I_Qn2-z-JLRvO4IC5Hww_3fTjYE3PnpIaFcV_GLzTtE,176657
+llms/main.py,sha256=JETnTf2TkJd14WTM6nkfiaqH6VZ72JnaXY_ySWb2uZY,176657
 llms/providers-extra.json,sha256=_6DmGBiQY9LM6_Y0zOiObYn7ba4g3akSNQfmHcYlENc,11101
 llms/providers.json,sha256=yls3OUqPIBLSf2rk0xgwUHKkvd-8drGq4JW7w49rEws,299324
 llms/extensions/analytics/ui/index.mjs,sha256=m1XwaqYCLwK267JAUCAltkN_nOXep0GxfpvGNS5i4_w,69547
@@ -19,11 +19,11 @@ llms/extensions/computer/base.py,sha256=Igio5R6kPQOxIbmpaA7X6j6eC4cpF3jwTTR8rURf
 llms/extensions/computer/bash.py,sha256=-xo67wVAdrqxtXgR7MK-iAkJ4Wne7Dm1JmnuHC2xW8o,5953
 llms/extensions/computer/computer.py,sha256=wehwcrYwi9usCRcziE_loMhWDbVgfjLk_T4_4TZa4W4,19642
 llms/extensions/computer/edit.py,sha256=QluhvRhYSSQJfbih4QyfC4M8W8aVqiOApfYXZgZTI5M,12725
-llms/extensions/computer/filesystem.py,sha256=DoyCwu8PJxhtstX39MV7cdjXu7uKzWz9yyCEEYXhzqA,21196
+llms/extensions/computer/filesystem.py,sha256=V6UI2rtGxreQyPvYnXfeQQuLocTDloAQU1k_jCTybnY,21825
 llms/extensions/computer/platform.py,sha256=w5ECar8lM4Lag7rTYUQmU7wEWaqCeejNXwwM3CB8ulQ,14866
 llms/extensions/computer/run.py,sha256=ZIcoYyy2cc3IKR_T4yJgx6IUHu2m7UusIJi9Dx1s7dA,1566
 llms/extensions/core_tools/CALCULATOR.md,sha256=pJRtCVF01BgxFrSNh2Ys_lrRi3SFwLgJzAX93AGh93Q,1944
-llms/extensions/core_tools/__init__.py,sha256=w8ovJRgXsvrcL8NF-XOrhuBE1oQXfnSQo-Xu7ww3NQY,21641
+llms/extensions/core_tools/__init__.py,sha256=YazB9yM5mLEtZWmCb_Dguz9XU2aPw4O6QU2Jk0vWI44,16422
 llms/extensions/core_tools/ui/index.mjs,sha256=KycJ2FcQ6BieBY7fjWGxVBGHN6WuFx712OFrO6flXww,31770
 llms/extensions/core_tools/ui/codemirror/codemirror.css,sha256=60lOqXLSZh74b39qxlbdZ4bXIeScnBtG4euWfktvm_M,8720
 llms/extensions/core_tools/ui/codemirror/codemirror.js,sha256=7cA89SlK249o7tVfiEWIiqDEA6ZEWxX4CoZmofVA14s,402008
@@ -156,7 +156,7 @@ llms/extensions/skills/installer.py,sha256=GfNYRK6LbYSZtIOesQ_fQvjtBsiZC9sTXLVuU
 llms/extensions/skills/models.py,sha256=xmRfz8BMeOdzZXhW6MYFjkOVHOKD6bMDynId8aysans,1461
 llms/extensions/skills/parser.py,sha256=Mb4NOtoY3Ip4Nng8ixb26oE8U_Sp5CI3n3l_qxbg1UM,5500
 llms/extensions/skills/validator.py,sha256=te49hTfIPJWcMcLLCApSJ2Ru3lrqVF8ayDXtPEZF9sU,5154
-llms/extensions/skills/ui/index.mjs,sha256=1hdvU9dOcYWzNosqoKtGhmy6PwpQx3FX0KAhFi_fxkI,63207
+llms/extensions/skills/ui/index.mjs,sha256=YYVaa4qWiLrcj9USnQWHz6NVblXzahV7R9SVJ-irUPc,63587
 llms/extensions/skills/ui/data/skills-top-5000.json,sha256=e8fUF_NQSUZRK0rGRUqBFecW5JEX6QO6H_P3WqTBBQ4,540056
 llms/extensions/skills/ui/skills/create-plan/SKILL.md,sha256=ZAtiM2qPHcc8Z3Ongl1NgX5ythITPwyvcIqisgqWrGA,2493
 llms/extensions/skills/ui/skills/skill-creator/LICENSE.txt,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
@@ -173,7 +173,7 @@ llms/extensions/system_prompts/ui/prompts.json,sha256=t5DD3bird-87wFa4OlW-bC2wdo
 llms/extensions/tools/__init__.py,sha256=PRZe0QMfsOymJ3jTqO0VFppNEWI4f2bYSOImK_YrGQM,2036
 llms/extensions/tools/ui/index.mjs,sha256=1TgCn74oX_rUAhxO8w54HlIgNkHnI5ma-GCqXp-qYVY,39434
 llms/ui/App.mjs,sha256=8yljf7M7LUp4q7XPEHTCUKpJB3X2d8ePnatRamwTM00,7622
-llms/ui/ai.mjs,sha256=7IO43ppX3hHoVcIEqdSB5dstw9pGsiZly4TtITgLp9U,6540
+llms/ui/ai.mjs,sha256=s3DYVkugdmqbkjePM4-koPoy7kPIFyAqGU8M__K2sI8,6540
 llms/ui/app.css,sha256=SVVzmFhTd0chuGq5yhv3FjgNudgo6WXlM2fnb-csK4c,190220
 llms/ui/ctx.mjs,sha256=4x-LTmofhf6OvLThSlDSTQOsLkzyBFOEMRGIOLHszqs,14974
 llms/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
@@ -199,9 +199,9 @@ llms/ui/modules/model-selector.mjs,sha256=6U4rAZ7vmQELFRQGWk4YEtq02v3lyHdMq6yUOp
 llms/ui/modules/chat/ChatBody.mjs,sha256=OyjAQPHNIbdqEhQq01ysbx7Cbt1CezUERbgFpcbnrNI,58081
 llms/ui/modules/chat/SettingsDialog.mjs,sha256=HMBJTwrapKrRIAstIIqp0QlJL5O-ho4hzgvfagPfsX8,19930
 llms/ui/modules/chat/index.mjs,sha256=nS_L6G1RSuCybgnA6n-q8Sn3OeSbQWL2iW3-zCIFqJk,39548
-llms_py-3.0.26.dist-info/licenses/LICENSE,sha256=bus9cuAOWeYqBk2OuhSABVV1P4z7hgrEFISpyda_H5w,1532
-llms_py-3.0.26.dist-info/METADATA,sha256=iuijSDRsS7hynJZwGv__4nT6Yh_smbtGmSGn-lLEY6U,2195
-llms_py-3.0.26.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-llms_py-3.0.26.dist-info/entry_points.txt,sha256=WswyE7PfnkZMIxboC-MS6flBD6wm-CYU7JSUnMhqMfM,40
-llms_py-3.0.26.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
-llms_py-3.0.26.dist-info/RECORD,,
+llms_py-3.0.27.dist-info/licenses/LICENSE,sha256=bus9cuAOWeYqBk2OuhSABVV1P4z7hgrEFISpyda_H5w,1532
+llms_py-3.0.27.dist-info/METADATA,sha256=Ojx7FD0AjI3enkul3b9wiEqEVnDf0Yo_QN-3uynyN4c,2195
+llms_py-3.0.27.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+llms_py-3.0.27.dist-info/entry_points.txt,sha256=WswyE7PfnkZMIxboC-MS6flBD6wm-CYU7JSUnMhqMfM,40
+llms_py-3.0.27.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
+llms_py-3.0.27.dist-info/RECORD,,