llms-py 3.0.22__py3-none-any.whl → 3.0.24__py3-none-any.whl

llms/extensions/skills/README.md

@@ -33,14 +33,21 @@ Access the skills panel by clicking the **Skills** icon in the top toolbar. The
 
 ### Skill Groups
 
-Skills are organized into groups based on their source:
+Skills are organized into groups based on their source location. Skills are discovered from these directories in order:
 
-| Group | Description | Editable |
-|-------|-------------|----------|
-| `~/.llms/.agents` | Your personal skills collection | ✓ Yes |
-| Built-in | Skills bundled with the extension | ✗ No |
+| Group | Location | Description | Editable |
+|-------|----------|-------------|----------|
+| Project (Agent) | `.agent/skills/` | Skills local to the current project | ✓ Yes |
+| Project (Claude) | `.claude/skills/` | Claude-format skills in the current project | ✓ Yes |
+| User (Agent) | `~/.llms/.agents/skills/` | Your personal skills collection | ✓ Yes |
+| User (Claude) | `~/.claude/skills/` | Claude-format skills in your home directory | ✓ Yes |
+| Built-in | Extension directory | Skills bundled with the extension | ✗ No |
 
-Your personal skills (`~/.llms/.agents`) are fully editable. Built-in skills provide reference implementations you can learn from.
+**Project-level skills** (`.agent/` and `.claude/`) are specific to the workspace you're working in. They're ideal for project-specific workflows, coding standards, or team conventions.
+
+**User-level skills** (`~/.llms/.agents/` and `~/.claude/`) are available across all projects. Use these for personal workflows and preferences.
+
+Both `.agent` and `.claude` directory formats are supported for compatibility with different tooling conventions.
 
 ### Selecting Skills for a Conversation
 

llms/extensions/skills/__init__.py

@@ -21,6 +21,9 @@ g_home_skills = None
 # }
 g_available_skills = []
 
+LLMS_HOME_SKILLS = "~/.llms/.agent/skills"
+LLMS_LOCAL_SKILLS = ".agent/skills"
+
 
 def is_safe_path(base_path: str, requested_path: str) -> bool:
     """Check if the requested path is safely within the base path."""
@@ -132,10 +135,12 @@ def install(ctx):
     if os.path.exists(os.path.join(".claude", "skills")):
         skill_roots[".claude/skills"] = os.path.join(".claude", "skills")
 
-    skill_roots["~/.llms/.agents"] = home_skills
+    skill_roots[LLMS_HOME_SKILLS] = home_skills
 
-    if os.path.exists(os.path.join(".agent", "skills")):
-        skill_roots[".agents"] = os.path.join(".agent", "skills")
+    local_skills = os.path.join(".agent", "skills")
+    if os.path.exists(local_skills):
+        local_skills = str(Path(local_skills).resolve())
+        skill_roots[LLMS_LOCAL_SKILLS] = local_skills
 
     g_skills = {}
     for group, root in skill_roots.items():
@@ -237,7 +242,7 @@ def install(ctx):
                 skill_props = props.to_dict()
                 skill_props.update(
                     {
-                        "group": "~/.llms/.agents",
+                        "group": LLMS_HOME_SKILLS,
                         "location": str(skill_dir),
                         "files": files,
                     }
@@ -303,9 +308,9 @@ def install(ctx):
 
         location = skill_info.get("location")
 
-        # Only allow modifications to skills in home directory
-        if not is_safe_path(home_skills, location):
-            raise Exception("Cannot modify skills outside of home directory")
+        # Only allow modifications to skills in home or local .agent directory
+        if not is_safe_path(home_skills, location) and not (local_skills and is_safe_path(local_skills, location)):
+            raise Exception("Cannot modify skills outside of allowed directories")
 
         full_path = os.path.join(location, file_path)
 
@@ -319,7 +324,7 @@ def install(ctx):
                 f.write(content)
 
             # Reload skill metadata
-            group = skill_info.get("group", "~/.llms/.agents")
+            group = skill_info.get("group", LLMS_HOME_SKILLS)
             updated_skill = reload_skill(name, location, group)
 
             return aiohttp.web.json_response({"path": file_path, "skill": updated_skill})
@@ -342,9 +347,9 @@ def install(ctx):
 
         location = skill_info.get("location")
 
-        # Only allow modifications to skills in home directory
-        if not is_safe_path(home_skills, location):
-            raise Exception("Cannot modify skills outside of home directory")
+        # Only allow modifications to skills in home or local .agent directory
+        if not is_safe_path(home_skills, location) and not (local_skills and is_safe_path(local_skills, location)):
+            raise Exception("Cannot modify skills outside of allowed directories")
 
         full_path = os.path.join(location, file_path)
 
@@ -371,7 +376,7 @@ def install(ctx):
                     break
 
             # Reload skill metadata
-            group = skill_info.get("group", "~/.llms/.agents")
+            group = skill_info.get("group", LLMS_HOME_SKILLS)
             updated_skill = reload_skill(name, location, group)
 
             return aiohttp.web.json_response({"path": file_path, "skill": updated_skill})
@@ -433,7 +438,7 @@ def install(ctx):
                 skill_props = props.to_dict()
                 skill_props.update(
                     {
-                        "group": "~/.llms/.agents",
+                        "group": LLMS_HOME_SKILLS,
                         "location": str(skill_dir_path),
                         "files": files,
                     }
@@ -467,9 +472,9 @@ def install(ctx):
             else:
                 raise Exception(f"Skill '{name}' not found")
 
-        # Only allow deletion of skills in home directory
-        if not is_safe_path(home_skills, location):
-            raise Exception("Cannot delete skills outside of home directory")
+        # Only allow deletion of skills in home or local .agent directory
+        if not is_safe_path(home_skills, location) and not (local_skills and is_safe_path(local_skills, location)):
+            raise Exception("Cannot delete skills outside of allowed directories")
 
         try:
             if os.path.exists(location):

llms/extensions/skills/ui/index.mjs

@@ -3,6 +3,9 @@ import { leftPart } from "@servicestack/client"
 
 let ext
 
+const LLMS_HOME_SKILLS = "~/.llms/.agent/skills"
+const LLMS_LOCAL_SKILLS = ".agent/skills"
+
 const SkillSelector = {
     template: `
         <div class="px-4 py-4 bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 max-h-[80vh] overflow-y-auto">
@@ -119,10 +122,10 @@ const SkillSelector = {
                 skills
             }))
 
-            // Sort groups: writable (~/.llms/.agents) first, then alphabetically
+            // Sort groups: writable (~/.llms/.agent/skills,.agent/skills) first, then alphabetically
             definedGroups.sort((a, b) => {
-                const aEditable = a.name === '~/.llms/.agents'
-                const bEditable = b.name === '~/.llms/.agents'
+                const aEditable = a.name === LLMS_HOME_SKILLS || a.name === LLMS_LOCAL_SKILLS
+                const bEditable = b.name === LLMS_HOME_SKILLS || b.name === LLMS_LOCAL_SKILLS
                 if (aEditable !== bEditable) return aEditable ? -1 : 1
                 return a.name.localeCompare(b.name)
             })
@@ -158,6 +161,10 @@ const SkillSelector = {
                     onlySkills = onlySkills.filter(s => s !== name)
                 } else {
                     onlySkills = [...onlySkills, name]
+                    // If has all skills set to 'All' (null)
+                    if (onlySkills.length === availableSkills.value.length) {
+                        onlySkills = null
+                    }
                 }
             }
 
@@ -395,8 +402,8 @@ const SkillPage = {
                 grouped[group].push(skill)
             })
             return Object.entries(grouped).sort((a, b) => {
-                const aEditable = a[0] === '~/.llms/.agents'
-                const bEditable = b[0] === '~/.llms/.agents'
+                const aEditable = a[0] === LLMS_HOME_SKILLS || a[0] === LLMS_LOCAL_SKILLS
+                const bEditable = b[0] === LLMS_HOME_SKILLS || b[0] === LLMS_LOCAL_SKILLS
                 if (aEditable !== bEditable) return aEditable ? -1 : 1
                 return a[0].localeCompare(b[0])
             }).map(([name, skills]) => ({ name, skills: skills.sort((a, b) => a.name.localeCompare(b.name)) }))
@@ -419,8 +426,8 @@ const SkillPage = {
             return tree.sort((a, b) => { if (a.isFile !== b.isFile) return a.isFile ? 1 : -1; return a.name.localeCompare(b.name) })
         }
         const hasUnsavedChanges = computed(() => isEditing.value && editContent.value !== fileContent.value)
-        function isGroupEditable(groupName) { return groupName === '~/.llms/.agents' }
-        function isEditable(skill) { return skill?.group === '~/.llms/.agents' }
+        function isGroupEditable(groupName) { return groupName === LLMS_HOME_SKILLS || groupName === LLMS_LOCAL_SKILLS }
+        function isEditable(skill) { return skill?.group === LLMS_HOME_SKILLS || skill?.group === LLMS_LOCAL_SKILLS }
         function isSkillExpanded(name) { return !!expandedSkills.value[name] }
         function toggleSkillExpand(skill) {
             expandedSkills.value[skill.name] = !expandedSkills.value[skill.name]
@@ -579,7 +586,7 @@ const SkillStore = {
         <div class="h-full flex flex-col">
             <div class="px-4 py-3 bg-gray-50 dark:bg-gray-800 border-b border-gray-200 dark:border-gray-700 flex items-center justify-between flex-shrink-0">
                 <div>
-                    <h1 class="text-xl font-bold text-gray-900 dark:text-gray-100">Skill Store</h1>
+                    <h1 class="text-xl font-bold text-gray-900 dark:text-gray-100">Discover Skills</h1>
                     <p class="text-sm text-gray-500 dark:text-gray-400">{{ total.toLocaleString() }} skills available</p>
                 </div>
                 <div class="flex items-center gap-2">

llms/llms.json

@@ -235,17 +235,29 @@
             "enabled": true,
             "temperature": 1.0
         },
+        "lmstudio": {
+            "enabled": false,
+            "npm": "lmstudio",
+            "api": "http://127.0.0.1:1234/v1",
+            "models": {}
+        },
         "ollama": {
             "enabled": false,
             "id": "ollama",
             "npm": "ollama",
             "api": "http://localhost:11434"
         },
-        "lmstudio": {
+        "ollama-cloud": {
+            "enabled": true,
+            "env": [
+                "OLLAMA_API_KEY"
+            ]
+        },
+        "openai-local": {
             "enabled": false,
-            "npm": "lmstudio",
-            "api": "http://127.0.0.1:1234/v1",
-            "models": {}
+            "npm": "openai-local",
+            "api": "http://localhost:8000/v1",
+            "api_key": "$OPENAI_LOCAL_API_KEY"
         },
         "google": {
             "enabled": true,

llms/main.py

@@ -57,7 +57,7 @@ try:
 except ImportError:
     HAS_PIL = False
 
-VERSION = "3.0.22"
+VERSION = "3.0.24"
 _ROOT = None
 DEBUG = os.getenv("DEBUG") == "1"
 MOCK = os.getenv("MOCK") == "1"
@@ -871,8 +871,7 @@ def save_image_to_cache(base64_data, filename, image_info, ignore_info=False):
     return url, info
 
 
-async def response_json(response):
-    text = await response.text()
+def http_error_to_message(response, text):
     if response.status >= 400:
         message = "HTTP " + str(response.status) + " " + response.reason
         _dbg(f"HTTP {response.status} {response.reason}\n{dict(response.headers)}\n{text}")
@@ -885,6 +884,13 @@ async def response_json(response):
         except Exception:
             if text:
                 message += ": " + text[:100]
+        return message
+
+
+async def response_json(response):
+    text = await response.text()
+    if response.status >= 400:
+        message = http_error_to_message(response, text)
         raise Exception(message)
     response.raise_for_status()
     body = json.loads(text)
@@ -1394,6 +1400,7 @@ class OllamaProvider(OpenAiCompatible):
                 "id": k,
                 "name": v.replace(":", " "),
                 "modalities": {"input": ["text"], "output": ["text"]},
+                "tool_call": True,
                 "cost": {
                     "input": 0,
                     "output": 0,
@@ -1431,6 +1438,10 @@ class LMStudioProvider(OllamaProvider):
         return ret
 
 
+class OpenAiLocalProvider(LMStudioProvider):
+    sdk = "openai-local"
+
+
 def get_provider_model(model_name):
     for provider in g_handlers.values():
         provider_model = provider.provider_model(model_name)
@@ -2229,7 +2240,7 @@ async def get_text(url):
         async with session.get(url) as resp:
             text = await resp.text()
             if resp.status >= 400:
-                raise HTTPError(resp.status, reason=resp.reason, body=text, headers=dict(resp.headers))
+                raise Exception(http_error_to_message(resp, text))
             return text
 
 
@@ -2838,6 +2849,7 @@ class AppExtensions:
             CodestralProvider,
             OllamaProvider,
             LMStudioProvider,
+            OpenAiLocalProvider,
         ]
         self.aspect_ratios = {
             "1:1": "1024×1024",
@@ -2953,7 +2965,7 @@ class AppExtensions:
         for filter_func in self.chat_error_filters:
             try:
                 task = filter_func(e, context)
-                if asyncio.isfuture(task):
+                if inspect.iscoroutine(task):
                     await task
             except Exception as e:
                 _err("chat error filter failed", e)