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

llms/extensions/skills/__init__.py

@@ -9,9 +9,6 @@ import aiohttp
 
 from .parser import read_properties
 
-g_skills = {}
-g_home_skills = None
-
 # Example of what's returned from https://skills.sh/api/skills?limit=5000&offset=0 > ui/data/skills-top-5000.json
 # {
 #  "id": "vercel-react-best-practices",
@@ -47,84 +44,27 @@ def get_skill_files(skill_dir: Path) -> list:
     return files
 
 
-def reload_skill(name: str, location: str, group: str):
-    """Reload a single skill's metadata."""
-    global g_skills
-    skill_dir = Path(location).resolve()
-    if not skill_dir.exists():
-        if name in g_skills:
-            del g_skills[name]
-        return None
-
-    props = read_properties(skill_dir)
-    files = get_skill_files(skill_dir)
-
-    skill_props = props.to_dict()
-    skill_props.update(
-        {
-            "group": group,
-            "location": str(skill_dir),
-            "files": files,
-        }
-    )
-    g_skills[props.name] = skill_props
-    return skill_props
-
-
 def sanitize(name: str) -> str:
     return name.replace(" ", "").replace("_", "").replace("-", "").lower()
 
 
-def skill(name: Annotated[str, "skill name"], file: Annotated[str | None, "skill file"] = None):
-    """Get the content of a skill or a specific file within a skill."""
-    skill = g_skills.get(name)
-
-    if not skill:
-        sanitized_name = sanitize(name)
-        for k, v in g_skills.items():
-            if sanitize(k) == sanitized_name:
-                skill = v
-                break
+def resolve_user_skills_path(ctx, user):
+    if not user:
+        raise ValueError("User is required")
+    user_path = ctx.get_user_path(user)
+    return os.path.join(user_path, "skills")
 
-    if not skill:
-        return f"Error: Skill {name} not found. Available skills: {', '.join(g_skills.keys())}"
-    location = skill.get("location")
-    if not location or not os.path.exists(location):
-        return f"Error: Skill {name} not found at location {location}"
-
-    if file:
-        if file.startswith(location):
-            file = file[len(location) + 1 :]
-        if not os.path.exists(os.path.join(location, file)):
-            return f"Error: File {file} not found in skill {name}. Available files: {', '.join(skill.get('files', []))}"
-        with open(os.path.join(location, file)) as f:
-            return f.read()
-
-    with open(os.path.join(location, "SKILL.md")) as f:
-        content = f.read()
-
-        files = skill.get("files")
-        if files and len(files) > 1:
-            content += "\n\n## Skill Files:\n```\n"
-            for file in files:
-                content += f"{file}\n"
-            content += "```\n"
-        return content
-
-
-def install(ctx):
-    global g_skills, g_home_skills
+def resolve_skills_write_path(ctx, user=None):
+    if user:
+        user_skills_path = resolve_user_skills_path(ctx, user)
+        os.makedirs(user_skills_path, exist_ok=True)
+        return user_skills_path
     home_skills = ctx.get_home_path(os.path.join(".agent", "skills"))
-    g_home_skills = home_skills
-    # if not folder exists
-    if not os.path.exists(home_skills):
-        os.makedirs(ctx.get_home_path(os.path.join(".agent")), exist_ok=True)
-        ctx.log(f"Creating initial skills folder: {home_skills}")
-        # os.makedirs(home_skills)
-        # copy ui/skills to home_skills
-        ui_skills = os.path.join(ctx.path, "ui", "skills")
-        shutil.copytree(ui_skills, home_skills)
+    os.makedirs(home_skills, exist_ok=True)
+    return home_skills
 
+def resolve_all_skills(ctx, user=None):
+    home_skills = ctx.get_home_path(os.path.join(".agent", "skills"))
     skill_roots = {}
 
     # add .claude skills first, so they can be overridden by .agent skills
@@ -142,7 +82,13 @@ def install(ctx):
         local_skills = str(Path(local_skills).resolve())
         skill_roots[LLMS_LOCAL_SKILLS] = local_skills
 
-    g_skills = {}
+    user_skills_path = None
+    if user:
+        user_skills_path = resolve_user_skills_path(ctx, user)
+        if os.path.exists(user_skills_path):
+            skill_roots[f"{user}/skills"] = user_skills_path
+
+    ret = {}
     for group, root in skill_roots.items():
         if not os.path.exists(root):
             continue
@@ -164,18 +110,55 @@ def install(ctx):
                             rel_path = full_path[len(str(skill_dir)) + 1 :]
                             files.append(rel_path)
 
+                    writable = False
+                    if ctx.is_auth_enabled():
+                        writable = user_skills_path and is_safe_path(user_skills_path, skill_dir)
+                    else:
+                        writable = is_safe_path(home_skills, skill_dir) or is_safe_path(local_skills, skill_dir)
+
                     skill_props = props.to_dict()
                     skill_props.update(
                         {
                             "group": group,
                             "location": str(skill_dir),
                             "files": files,
+                            "writable": bool(writable),
                         }
                     )
-                    g_skills[props.name] = skill_props
+                    ret[props.name] = skill_props
 
         except OSError:
             pass
+    return ret
+
+def assert_valid_location(ctx, location, user):
+    if ctx.is_auth_enabled() and not user:
+        raise Exception("Unauthorized")
+
+    # if user is specified, only allow modifications to skills in user directory
+    if user:
+        write_skill_path = resolve_skills_write_path(ctx, user=user)
+        if not is_safe_path(write_skill_path, location):
+            raise Exception("Cannot modify skills outside of allowed user directory")
+        return
+
+    home_skills_path = ctx.get_home_path(os.path.join(".agent", "skills"))
+    local_skills_path = os.path.join(".agent", "skills")
+
+    # Otherwise only allow modifications to skills in home or local .agent directory
+    if not is_safe_path(home_skills_path, location) and not is_safe_path(local_skills_path, location):
+        raise Exception("Cannot modify skills outside of allowed directories")
+
+def install(ctx):
+    home_skills = ctx.get_home_path(os.path.join(".agent", "skills"))
+    # if not folder exists
+    if not os.path.exists(home_skills):
+        os.makedirs(ctx.get_home_path(os.path.join(".agent")), exist_ok=True)
+        ctx.log(f"Creating initial skills folder: {home_skills}")
+        # os.makedirs(home_skills)
+        # copy ui/skills to home_skills
+        ui_skills = os.path.join(ctx.path, "ui", "skills")
+        shutil.copytree(ui_skills, home_skills)
 
     g_available_skills = []
     try:
@@ -186,7 +169,8 @@ def install(ctx):
         pass
 
     async def get_skills(request):
-        return aiohttp.web.json_response(g_skills)
+        skills = resolve_all_skills(ctx, user=ctx.get_username(request))
+        return aiohttp.web.json_response(skills)
 
     ctx.add_get("", get_skills)
 
@@ -220,35 +204,22 @@ def install(ctx):
         if not source:
             raise Exception(f"Skill '{id}' has no source repository")
 
+        user = ctx.assert_username(request)
+        write_skill_path = resolve_skills_write_path(ctx, user=user)
+        
         # Install from GitHub
         from .installer import install_from_github
 
+        ctx.log(f"Installing skill '{id}' from '{source}' to '{write_skill_path}'")
         result = await install_from_github(
             repo_url=f"https://github.com/{source}.git",
             skill_names=[id],
-            target_dir=home_skills,
+            target_dir=write_skill_path,
         )
 
         if not result.get("success"):
             raise Exception(result.get("error", "Installation failed"))
 
-        # Reload the installed skills into the registry
-        for installed in result.get("installed", []):
-            skill_path = installed.get("path")
-            if skill_path and os.path.exists(skill_path):
-                skill_dir = Path(skill_path).resolve()
-                props = read_properties(skill_dir)
-                files = get_skill_files(skill_dir)
-                skill_props = props.to_dict()
-                skill_props.update(
-                    {
-                        "group": LLMS_HOME_SKILLS,
-                        "location": str(skill_dir),
-                        "files": files,
-                    }
-                )
-                g_skills[props.name] = skill_props
-
         return aiohttp.web.json_response(result)
 
     ctx.add_post("install/{id}", install_skill)
@@ -256,7 +227,8 @@ def install(ctx):
     async def get_skill(request):
         name = request.match_info.get("name")
         file = request.query.get("file")
-        return aiohttp.web.Response(text=skill(name, file))
+        user = ctx.assert_username(request)
+        return aiohttp.web.Response(text=skill(name, file, user=user))
 
     ctx.add_get("contents/{name}", get_skill)
 
@@ -264,8 +236,10 @@ def install(ctx):
         """Get the content of a specific file in a skill."""
         name = request.match_info.get("name")
         file_path = request.match_info.get("path")
+        user = ctx.assert_username(request)
+        skills = resolve_all_skills(ctx, user=user)
 
-        skill_info = g_skills.get(name)
+        skill_info = skills.get(name)
         if not skill_info:
             raise Exception(f"Skill '{name}' not found")
 
@@ -288,7 +262,7 @@ def install(ctx):
     ctx.add_get("file/{name}/{path:.*}", get_file_content)
 
     async def save_file(request):
-        """Save/update a file in a skill. Only works for skills in home directory."""
+        """Save/update a file in a skill. Only works for skills in user home or local directory."""
         name = request.match_info.get("name")
 
         try:
@@ -302,15 +276,15 @@ def install(ctx):
         if not file_path or content is None:
             raise Exception("Missing 'path' or 'content' in request body")
 
-        skill_info = g_skills.get(name)
+        user = ctx.assert_username(request)
+        skills = resolve_all_skills(ctx, user=user)
+        skill_info = skills.get(name)
         if not skill_info:
             raise Exception(f"Skill '{name}' not found")
 
         location = skill_info.get("location")
 
-        # 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")
+        assert_valid_location(ctx, location, user)
 
         full_path = os.path.join(location, file_path)
 
@@ -324,10 +298,10 @@ def install(ctx):
                 f.write(content)
 
             # Reload skill metadata
-            group = skill_info.get("group", LLMS_HOME_SKILLS)
-            updated_skill = reload_skill(name, location, group)
+            skills = resolve_all_skills(ctx, user=user)
+            skill_info = skills.get(name)
 
-            return aiohttp.web.json_response({"path": file_path, "skill": updated_skill})
+            return aiohttp.web.json_response({"path": file_path, "skill": skill_info})
         except Exception as e:
             raise Exception(str(e)) from e
 
@@ -341,15 +315,14 @@ def install(ctx):
         if not file_path:
             raise Exception("Missing 'path' query parameter")
 
-        skill_info = g_skills.get(name)
+        user = ctx.assert_username(request)
+        skills = resolve_all_skills(ctx, user=user)
+        skill_info = skills.get(name)
         if not skill_info:
             raise Exception(f"Skill '{name}' not found")
 
         location = skill_info.get("location")
-
-        # 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")
+        assert_valid_location(ctx, location, user)
 
         full_path = os.path.join(location, file_path)
 
@@ -376,10 +349,10 @@ def install(ctx):
                     break
 
             # Reload skill metadata
-            group = skill_info.get("group", LLMS_HOME_SKILLS)
-            updated_skill = reload_skill(name, location, group)
+            skills = resolve_all_skills(ctx, user=user)
+            skill_info = skills.get(name)
 
-            return aiohttp.web.json_response({"path": file_path, "skill": updated_skill})
+            return aiohttp.web.json_response({"path": file_path, "skill": skill_info})
         except Exception as e:
             raise Exception(str(e)) from e
 
@@ -405,7 +378,9 @@ def install(ctx):
         if len(skill_name) > 40:
             raise Exception("Skill name must be 40 characters or less")
 
-        skill_dir = os.path.join(home_skills, skill_name)
+        user = ctx.assert_username(request)
+        write_skill_path = resolve_skills_write_path(ctx, user=user)
+        skill_dir = os.path.join(write_skill_path, skill_name)
 
         if os.path.exists(skill_dir):
             raise Exception(f"Skill '{skill_name}' already exists")
@@ -419,8 +394,9 @@ def install(ctx):
         try:
             import subprocess
 
+            ctx.log(f"Creating skill '{skill_name}' in '{write_skill_path}'")
             result = subprocess.run(
-                [sys.executable, init_script, skill_name, "--path", home_skills],
+                [sys.executable, init_script, skill_name, "--path", write_skill_path],
                 capture_output=True,
                 text=True,
                 timeout=30,
@@ -431,21 +407,9 @@ def install(ctx):
 
             # Load the new skill
             if os.path.exists(skill_dir):
-                skill_dir_path = Path(skill_dir).resolve()
-                props = read_properties(skill_dir_path)
-                files = get_skill_files(skill_dir_path)
-
-                skill_props = props.to_dict()
-                skill_props.update(
-                    {
-                        "group": LLMS_HOME_SKILLS,
-                        "location": str(skill_dir_path),
-                        "files": files,
-                    }
-                )
-                g_skills[props.name] = skill_props
-
-                return aiohttp.web.json_response({"skill": skill_props, "output": result.stdout})
+                skills = resolve_all_skills(ctx, user=user)
+                skill_info = skills.get(skill_name)
+                return aiohttp.web.json_response({"skill": skill_info, "output": result.stdout})
 
             raise Exception("Skill directory not created")
 
@@ -460,27 +424,26 @@ def install(ctx):
         """Delete an entire skill. Only works for skills in home directory."""
         name = request.match_info.get("name")
 
-        skill_info = g_skills.get(name)
+        user = ctx.assert_username(request)
+        skills = resolve_all_skills(ctx, user=user)
+        skill_info = skills.get(name)
 
         if skill_info:
             location = skill_info.get("location")
         else:
-            # Check if orphaned directory exists on disk (not loaded in g_skills)
+            # Check if orphaned directory exists on disk (not loaded in skills)
             potential_location = os.path.join(home_skills, name)
-            if os.path.exists(potential_location) and is_safe_path(home_skills, potential_location):
+            if os.path.exists(potential_location):
                 location = potential_location
             else:
                 raise Exception(f"Skill '{name}' not found")
 
-        # 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")
+        # Only allow deletion of skills in allowed directories
+        assert_valid_location(ctx, location, user)
 
         try:
             if os.path.exists(location):
                 shutil.rmtree(location)
-            if name in g_skills:
-                del g_skills[name]
 
             return aiohttp.web.json_response({"deleted": name})
         except Exception as e:
@@ -488,6 +451,42 @@ def install(ctx):
 
     ctx.add_delete("skill/{name}", delete_skill)
 
+    def skill(name: Annotated[str, "skill name"], file: Annotated[str | None, "skill file"] = None, user=None):
+        """Get the content of a skill or a specific file within a skill."""
+        ctx.log(f"skill tool '{name}', file='{file}', user='{user}'")
+
+        skills = resolve_all_skills(ctx, user=user)
+        skill = skills.get(name)
+
+        if not skill:
+            sanitized_name = sanitize(name)
+            for k, v in skills.items():
+                if sanitize(k) == sanitized_name:
+                    skill = v
+                    break
+
+        if not skill:
+            return f"Error: Skill {name} not found. Available skills: {', '.join(skills.keys())}"
+        location = skill.get("location")
+        if not location or not os.path.exists(location):
+            return f"Error: Skill {name} not found at location {location}"
+
+        if file:
+            if file.startswith(location):
+                file = file[len(location) + 1 :]
+            if not os.path.exists(os.path.join(location, file)):
+                return f"Error: File {file} not found in skill {name}. Available files: {', '.join(skill.get('files', []))}"
+            with open(os.path.join(location, file)) as f:
+                return f.read()
+
+        with open(os.path.join(location, "SKILL.md")) as f:
+            content = f.read()
+
+            files = skill.get("files")
+            if files and len(files) > 1:
+                content += "\n\n## Skill Files:\n```\n"
+                return content
+
     ctx.register_tool(skill, group="core_tools")
 
 

llms/extensions/skills/ui/index.mjs

@@ -3,9 +3,6 @@ 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">
@@ -122,10 +119,10 @@ const SkillSelector = {
                 skills
             }))
 
-            // Sort groups: writable (~/.llms/.agent/skills,.agent/skills) first, then alphabetically
+            // Sort groups: writable first, then alphabetically
             definedGroups.sort((a, b) => {
-                const aEditable = a.name === LLMS_HOME_SKILLS || a.name === LLMS_LOCAL_SKILLS
-                const bEditable = b.name === LLMS_HOME_SKILLS || b.name === LLMS_LOCAL_SKILLS
+                const aEditable = a.skills.some(s => s.writable)
+                const bEditable = b.skills.some(s => s.writable)
                 if (aEditable !== bEditable) return aEditable ? -1 : 1
                 return a.name.localeCompare(b.name)
             })
@@ -392,6 +389,7 @@ const SkillPage = {
         const editorRef = ref(null)
         const expandedSkills = ref({})
         const skills = computed(() => ctx.state.skills || {})
+
         const skillGroups = computed(() => {
             const grouped = {}
             const query = searchQuery.value.toLowerCase()
@@ -402,8 +400,8 @@ const SkillPage = {
                 grouped[group].push(skill)
             })
             return Object.entries(grouped).sort((a, b) => {
-                const aEditable = a[0] === LLMS_HOME_SKILLS || a[0] === LLMS_LOCAL_SKILLS
-                const bEditable = b[0] === LLMS_HOME_SKILLS || b[0] === LLMS_LOCAL_SKILLS
+                const aEditable = a[1].some(s => s.writable)
+                const bEditable = b[1].some(s => s.writable)
                 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)) }))
@@ -426,8 +424,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_HOME_SKILLS || groupName === LLMS_LOCAL_SKILLS }
-        function isEditable(skill) { return skill?.group === LLMS_HOME_SKILLS || skill?.group === LLMS_LOCAL_SKILLS }
+        function isGroupEditable(groupName) { return Object.values(skills.value).some(s => s.group === groupName && s.writable) }
+        function isEditable(skill) { return skill?.writable }
         function isSkillExpanded(name) { return !!expandedSkills.value[name] }
         function toggleSkillExpand(skill) {
             expandedSkills.value[skill.name] = !expandedSkills.value[skill.name]

llms/llms.json

@@ -1,14 +1,5 @@
 {
     "version": 3,
-    "auth": {
-        "enabled": false,
-        "github": {
-            "client_id": "GITHUB_CLIENT_ID",
-            "client_secret": "GITHUB_CLIENT_SECRET",
-            "redirect_uri": "http://localhost:8000/auth/github/callback",
-            "restrict_to": "GITHUB_USERS"
-        }
-    },
     "disable_extensions": [],
     "defaults": {
         "headers": {
@@ -133,6 +124,7 @@
         }
     },
     "limits": {
+        "client_timeout": 120,
         "client_max_size": 20971520
     },
     "convert": {