llms-py 3.0.10__py3-none-any.whl → 3.0.18__py3-none-any.whl

llms/extensions/providers/google.py

@@ -1,3 +1,4 @@
+import asyncio
 import base64
 import io
 import json
@@ -63,6 +64,50 @@ def install_google(ctx):
                 to[k] = v
         return to
 
+    def sanitize_parameters(params):
+        """Sanitize tool parameters for Google provider."""
+
+        if not isinstance(params, dict):
+            return params
+
+        # Create a copy to avoid modifying original tool definition
+        p = params.copy()
+
+        # Remove forbidden fields
+        for forbidden in ["$schema", "additionalProperties"]:
+            if forbidden in p:
+                del p[forbidden]
+
+        # Recursively sanitize known nesting fields
+        # 1. Properties (dict of schemas)
+        if "properties" in p:
+            for k, v in p["properties"].items():
+                p["properties"][k] = sanitize_parameters(v)
+
+        # 2. Items (schema or list of schemas)
+        if "items" in p:
+            if isinstance(p["items"], list):
+                p["items"] = [sanitize_parameters(i) for i in p["items"]]
+            else:
+                p["items"] = sanitize_parameters(p["items"])
+
+        # 3. Combinators (list of schemas)
+        for combinator in ["allOf", "anyOf", "oneOf"]:
+            if combinator in p:
+                p[combinator] = [sanitize_parameters(i) for i in p[combinator]]
+
+        # 4. Not (schema)
+        if "not" in p:
+            p["not"] = sanitize_parameters(p["not"])
+
+        # 5. Definitions (dict of schemas)
+        for def_key in ["definitions", "$defs"]:
+            if def_key in p:
+                for k, v in p[def_key].items():
+                    p[def_key][k] = sanitize_parameters(v)
+
+        return p
+
     class GoogleProvider(OpenAiCompatible):
         sdk = "@ai-sdk/google"
 
@@ -112,11 +157,12 @@ def install_google(ctx):
                 for tool in chat["tools"]:
                     if tool["type"] == "function":
                         f = tool["function"]
+
                         function_declarations.append(
                             {
                                 "name": f["name"],
                                 "description": f.get("description"),
-                                "parameters": f.get("parameters"),
+                                "parameters": sanitize_parameters(f.get("parameters")),
                             }
                         )
                     elif tool["type"] == "file_search":
@@ -183,13 +229,19 @@ def install_google(ctx):
                             if name:
                                 # content is the string response
                                 # Some implementations pass the content directly.
-                                # Google docs say: response: { "name": "...", "content": { ... } }
-                                # Actually "response" field in functionResponse is a Struct/Map.
+                                # Google docs say: response: { "key": "value" }
+                                try:
+                                    response_data = json.loads(message["content"])
+                                    if not isinstance(response_data, dict):
+                                        response_data = {"content": message["content"]}
+                                except Exception:
+                                    response_data = {"content": message["content"]}
+
                                 parts.append(
                                     {
                                         "functionResponse": {
                                             "name": name,
-                                            "response": {"name": name, "content": message["content"]},
+                                            "response": response_data,
                                         }
                                     }
                                 )
@@ -309,36 +361,62 @@ def install_google(ctx):
                 ctx.log(gemini_chat_summary(gemini_chat))
                 started_at = time.time()
 
-                if ctx.MOCK and "modalities" in chat:
-                    print("Mocking Google Gemini Image")
-                    with open(f"{ctx.MOCK_DIR}/gemini-image.json") as f:
-                        obj = json.load(f)
-                else:
-                    try:
-                        async with session.post(
-                            gemini_chat_url,
-                            headers=self.headers,
-                            data=json.dumps(gemini_chat),
-                            timeout=aiohttp.ClientTimeout(total=120),
-                        ) as res:
-                            obj = await self.response_json(res)
-                            if context is not None:
-                                context["providerResponse"] = obj
-                    except Exception as e:
-                        ctx.log(f"Error: {res.status} {res.reason}: {e}")
-                        text = await res.text()
+                max_retries = 3
+                for attempt in range(max_retries):
+                    if ctx.MOCK and "modalities" in chat:
+                        print("Mocking Google Gemini Image")
+                        with open(f"{ctx.MOCK_DIR}/gemini-image.json") as f:
+                            obj = json.load(f)
+                    else:
+                        res = None
                         try:
-                            obj = json.loads(text)
-                        except:
-                            ctx.log(text)
-                            raise e
-
-                if "error" in obj:
-                    ctx.log(f"Error: {obj['error']}")
-                    raise Exception(obj["error"]["message"])
-
-                if ctx.debug:
-                    ctx.dbg(json.dumps(gemini_response_summary(obj), indent=2))
+                            if attempt > 0:
+                                await asyncio.sleep(attempt * 0.5)
+                                ctx.log(f"Retrying request (attempt {attempt + 1}/{max_retries})...")
+
+                            async with session.post(
+                                gemini_chat_url,
+                                headers=self.headers,
+                                data=json.dumps(gemini_chat),
+                                timeout=aiohttp.ClientTimeout(total=120),
+                            ) as res:
+                                obj = await self.response_json(res)
+                                if context is not None:
+                                    context["providerResponse"] = obj
+                        except Exception as e:
+                            if res:
+                                ctx.err(f"{res.status} {res.reason}", e)
+                                try:
+                                    text = await res.text()
+                                    obj = json.loads(text)
+                                except Exception as parseEx:
+                                    ctx.err("Failed to parse error response:\n" + text, parseEx)
+                                    raise e from None
+                            else:
+                                ctx.err(f"Request failed: {str(e)}")
+                                raise e from None
+
+                    if "error" in obj:
+                        ctx.log(f"Error: {obj['error']}")
+                        raise Exception(obj["error"]["message"])
+
+                    if ctx.debug:
+                        ctx.dbg(json.dumps(gemini_response_summary(obj), indent=2))
+
+                    # Check for empty response "anomaly"
+                    has_candidates = obj.get("candidates") and len(obj["candidates"]) > 0
+                    if has_candidates:
+                        candidate = obj["candidates"][0]
+                        raw_content = candidate.get("content", {})
+                        raw_parts = raw_content.get("parts", [])
+
+                        if not raw_parts and attempt < max_retries - 1:
+                            # It's an empty response candidates list
+                            ctx.dbg("Empty candidates parts detected. Retrying...")
+                            continue
+
+                    # If we got here, it's either a good response or we ran out of retries
+                    break
 
                 # calculate cost per generation
                 cost = None
@@ -453,7 +531,7 @@ def install_google(ctx):
                         "finish_reason": candidate.get("finishReason", "stop"),
                         "message": {
                             "role": role,
-                            "content": content if content else None,
+                            "content": content if content else "",
                         },
                     }
                     if reasoning:

llms/extensions/skills/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

llms/extensions/skills/__init__.py

@@ -0,0 +1,130 @@
+import os
+import shutil
+from pathlib import Path
+from typing import Annotated
+
+import aiohttp
+
+from .parser import read_properties
+
+g_skills = {}
+
+
+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
+
+    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
+    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)
+
+    skill_roots = {}
+
+    # add .claude skills first, so they can be overridden by .agent skills
+    if os.path.exists("~/.claude/skills"):
+        skill_roots["~/.claude/skills"] = "~/.claude/skills"
+
+    if os.path.exists(os.path.join(".claude", "skills")):
+        skill_roots[".claude/skills"] = os.path.join(".claude", "skills")
+
+    skill_roots["~/.llms/.agents"] = home_skills
+
+    if os.path.exists(os.path.join(".agent", "skills")):
+        skill_roots[".agents"] = os.path.join(".agent", "skills")
+
+    g_skills = {}
+    for group, root in skill_roots.items():
+        if not os.path.exists(root):
+            continue
+        try:
+            for entry in os.scandir(root):
+                if (
+                    entry.is_dir()
+                    and os.path.exists(os.path.join(entry.path, "SKILL.md"))
+                    or os.path.exists(os.path.join(entry.path, "skill.md"))
+                ):
+                    skill_dir = Path(entry.path).resolve()
+                    props = read_properties(skill_dir)
+
+                    # recursivly list all files in this directory
+                    files = []
+                    for file in skill_dir.glob("**/*"):
+                        if file.is_file():
+                            full_path = str(file)
+                            rel_path = full_path[len(str(skill_dir)) + 1 :]
+                            files.append(rel_path)
+
+                    skill_props = props.to_dict()
+                    skill_props.update(
+                        {
+                            "group": group,
+                            "location": str(skill_dir),
+                            "files": files,
+                        }
+                    )
+                    g_skills[props.name] = skill_props
+
+        except OSError:
+            pass
+
+    async def get_skills(request):
+        return aiohttp.web.json_response(g_skills)
+
+    ctx.add_get("", get_skills)
+
+    async def get_skill(request):
+        name = request.match_info.get("name")
+        file = request.query.get("file")
+        return aiohttp.web.Response(text=skill(name, file))
+
+    ctx.add_get("contents/{name}", get_skill)
+
+    ctx.register_tool(skill, group="core_tools")
+
+
+__install__ = install

llms/extensions/skills/errors.py

@@ -0,0 +1,25 @@
+"""Skill-related exceptions."""
+
+
+class SkillError(Exception):
+    """Base exception for all skill-related errors."""
+
+    pass
+
+
+class ParseError(SkillError):
+    """Raised when SKILL.md parsing fails."""
+
+    pass
+
+
+class ValidationError(SkillError):
+    """Raised when skill properties are invalid.
+
+    Attributes:
+        errors: List of validation error messages (may contain just one)
+    """
+
+    def __init__(self, message: str, errors: list[str] | None = None):
+        super().__init__(message)
+        self.errors = errors if errors is not None else [message]

llms/extensions/skills/models.py

@@ -0,0 +1,39 @@
+"""Data models for Agent Skills."""
+
+from dataclasses import dataclass, field
+from typing import Optional
+
+
+@dataclass
+class SkillProperties:
+    """Properties parsed from a skill's SKILL.md frontmatter.
+
+    Attributes:
+        name: Skill name in kebab-case (required)
+        description: What the skill does and when the model should use it (required)
+        license: License for the skill (optional)
+        compatibility: Compatibility information for the skill (optional)
+        allowed_tools: Tool patterns the skill requires (optional, experimental)
+        metadata: Key-value pairs for client-specific properties (defaults to
+            empty dict; omitted from to_dict() output when empty)
+    """
+
+    name: str
+    description: str
+    license: Optional[str] = None
+    compatibility: Optional[str] = None
+    allowed_tools: Optional[str] = None
+    metadata: dict[str, str] = field(default_factory=dict)
+
+    def to_dict(self) -> dict:
+        """Convert to dictionary, excluding None values."""
+        result = {"name": self.name, "description": self.description}
+        if self.license is not None:
+            result["license"] = self.license
+        if self.compatibility is not None:
+            result["compatibility"] = self.compatibility
+        if self.allowed_tools is not None:
+            result["allowed-tools"] = self.allowed_tools
+        if self.metadata:
+            result["metadata"] = self.metadata
+        return result