llms-py 3.0.19__tar.gz → 3.0.21__tar.gz

{llms_py-3.0.19/llms_py.egg-info → llms_py-3.0.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.19
+Version: 3.0.21
 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.19 → llms_py-3.0.21}/llms/extensions/app/__init__.py

@@ -223,7 +223,10 @@ def install(ctx):
                 await ctx.chat_completion(chat_req, context=context_req)
             except Exception as ex:
                 ctx.err("run_chat", ex)
-                # not necessary to update thread in db with error as it's done in chat_error filter
+                # shouldn't be necessary to update thread in db with error as it's done in chat_error filter
+                thread = thread_dto(g_db.get_thread(id, user=ctx.get_username(request)))
+                if thread and not thread.get("error"):
+                    await chat_error(ex, context)
 
         asyncio.create_task(run_chat(chat, context))
 

{llms_py-3.0.19 → llms_py-3.0.21}/llms/extensions/computer/filesystem.py

@@ -406,7 +406,7 @@ def directory_tree(
 ) -> str:
     """
     Get a recursive tree view of files and directories as a JSON structure. Each entry includes 'name', 'type' (file/directory), and 'children' for directories.
-    Files have no children array, while directories always have a children array (which may be empty).
+    Files have no children array, while directories always have a children array (which may be empty). Respects any .gitignore rules from the root directory together with any exclude_patterns.
     The output is formatted with 2-space indentation for readability. Only works within allowed directories.
     """
     import json
@@ -416,6 +416,24 @@ def directory_tree(
     if exclude_patterns is None:
         exclude_patterns = []
 
+    def _parse_gitignore(directory: str) -> List[str]:
+        gitignore_path = os.path.join(directory, ".gitignore")
+        patterns = []
+        if os.path.exists(gitignore_path) and os.path.isfile(gitignore_path):
+            try:
+                with open(gitignore_path, encoding="utf-8") as f:
+                    for line in f:
+                        line = line.strip()
+                        if line and not line.startswith("#"):
+                            patterns.append(line)
+            except Exception as e:
+                logger.warning(f"Error reading .gitignore in {directory}: {e}")
+        return patterns
+
+    # Parse .gitignore only in the root directory (Simple Global Mappings)
+    gitignore_patterns = _parse_gitignore(valid_path)
+    all_exclude_patterns = exclude_patterns + gitignore_patterns
+
     def _build_tree(current_path: str) -> List[Dict[str, Any]]:
         entries = []
         try:
@@ -423,14 +441,27 @@ def directory_tree(
                 items = sorted(it, key=lambda x: x.name)
 
             for entry in items:
-                # Check exclusion
-                rel_path = entry.path[root_path_len:]
-                # Check against patterns
+                # 1. Check exclusion patterns
+                rel_path_from_root = entry.path[root_path_len:]
+
                 should_exclude = False
-                for pattern in exclude_patterns:
-                    if fnmatch.fnmatch(rel_path, pattern) or fnmatch.fnmatch(entry.name, pattern):
+                for pattern in all_exclude_patterns:
+                    # Match against relative path or name
+                    # Support ending with / for directory matching
+                    is_dir_pattern = pattern.endswith("/")
+                    norm_pattern = pattern.rstrip("/")
+
+                    if fnmatch.fnmatch(rel_path_from_root, pattern) or fnmatch.fnmatch(entry.name, pattern):
                         should_exclude = True
                         break
+
+                    # Handle patterns like "node_modules/" matching "node_modules" directory
+                    if fnmatch.fnmatch(entry.name, norm_pattern):
+                        if is_dir_pattern and not entry.is_dir():
+                            continue
+                        should_exclude = True
+                        break
+
                 if should_exclude:
                     continue
 

{llms_py-3.0.19 → llms_py-3.0.21}/llms/extensions/providers/openrouter.py

@@ -14,7 +14,7 @@ def install_openrouter(ctx):
         def __init__(self, **kwargs):
             super().__init__(**kwargs)
 
-        def to_response(self, response, chat, started_at):
+        def to_response(self, response, chat, started_at, context=None):
             # go through all image responses and save them to cache
             cost = None
             if "usage" in response and "cost" in response["usage"]:

{llms_py-3.0.19 → llms_py-3.0.21}/llms/main.py

@@ -57,7 +57,7 @@ try:
 except ImportError:
     HAS_PIL = False
 
-VERSION = "3.0.19"
+VERSION = "3.0.21"
 _ROOT = None
 DEBUG = os.getenv("DEBUG") == "1"
 MOCK = os.getenv("MOCK") == "1"
@@ -874,8 +874,18 @@ def save_image_to_cache(base64_data, filename, image_info, ignore_info=False):
 async def response_json(response):
     text = await response.text()
     if response.status >= 400:
-        _dbg(f"HTTP {response.status} {response.reason}: {text}")
-        raise HTTPError(response.status, reason=response.reason, body=text, headers=dict(response.headers))
+        message = "HTTP " + str(response.status) + " " + response.reason
+        _dbg(f"HTTP {response.status} {response.reason}\n{dict(response.headers)}\n{text}")
+        try:
+            body = json.loads(text)
+            if "message" in body:
+                message = body["message"]
+            elif "error" in body:
+                message = body["error"]
+        except Exception:
+            if text:
+                message += ": " + text[:100]
+        raise Exception(message)
     response.raise_for_status()
     body = json.loads(text)
     return body
@@ -1946,12 +1956,11 @@ async def g_chat_completion(chat, context=None):
                 first_exception = e
                 context["stackTrace"] = traceback.format_exc()
             _err(f"Provider {provider_name} failed", first_exception)
-            await g_app.on_chat_error(e, context)
-
             continue
 
     # If we get here, all providers failed
     if first_exception:
+        await g_app.on_chat_error(first_exception, context or {"chat": chat})
         raise first_exception
 
     e = Exception("All providers failed")
@@ -3871,8 +3880,8 @@ def cli_exec(cli_args, extra_args):
         asyncio.run(update_extensions(cli_args.update))
         return ExitCode.SUCCESS
 
-    g_app.add_allowed_directory(home_llms_path(".agent"))  # info for agents, e.g: skills
     g_app.add_allowed_directory(os.getcwd())  # add current directory
+    g_app.add_allowed_directory(home_llms_path(".agent"))  # info for agents, e.g: skills
     g_app.add_allowed_directory(tempfile.gettempdir())  # add temp directory
 
     g_app.extensions = install_extensions()