llms-py 3.0.0b7__py3-none-any.whl → 3.0.0b8__py3-none-any.whl

llms/extensions/providers/anthropic.py

@@ -58,6 +58,23 @@ def install_anthropic(ctx):
                 if message.get("role") == "system":
                     continue
 
+                if message.get("role") == "tool":
+                    # Convert OpenAI tool response to Anthropic tool_result
+                    tool_call_id = message.get("tool_call_id")
+                    content = ctx.to_content(message.get("content", ""))
+                    if not isinstance(content, (str, list)):
+                        content = str(content)
+
+                    tool_result = {"type": "tool_result", "tool_use_id": tool_call_id, "content": content}
+
+                    # Anthropic requires tool results to be in a user message
+                    # Check if the last message was a user message, if so append to it
+                    if anthropic_request["messages"] and anthropic_request["messages"][-1]["role"] == "user":
+                        anthropic_request["messages"][-1]["content"].append(tool_result)
+                    else:
+                        anthropic_request["messages"].append({"role": "user", "content": [tool_result]})
+                    continue
+
                 anthropic_message = {"role": message.get("role"), "content": []}
 
                 content = message.get("content", "")
@@ -106,7 +123,18 @@ def install_anthropic(ctx):
             if "stream" in chat:
                 anthropic_request["stream"] = chat["stream"]
             if "tools" in chat:
-                anthropic_request["tools"] = chat["tools"]
+                anthropic_tools = []
+                for tool in chat["tools"]:
+                    if tool.get("type") == "function":
+                        function = tool.get("function", {})
+                        anthropic_tool = {
+                            "name": function.get("name"),
+                            "description": function.get("description"),
+                            "input_schema": function.get("parameters"),
+                        }
+                        anthropic_tools.append(anthropic_tool)
+                if anthropic_tools:
+                    anthropic_request["tools"] = anthropic_tools
             if "tool_choice" in chat:
                 anthropic_request["tool_choice"] = chat["tool_choice"]
 
@@ -138,6 +166,7 @@ def install_anthropic(ctx):
             # Transform content blocks to message content
             content_parts = []
             thinking_parts = []
+            tool_calls = []
 
             for block in response.get("content", []):
                 if block.get("type") == "text":
@@ -145,6 +174,16 @@ def install_anthropic(ctx):
                 elif block.get("type") == "thinking":
                     # Store thinking blocks separately (some models include reasoning)
                     thinking_parts.append(block.get("thinking", ""))
+                elif block.get("type") == "tool_use":
+                    tool_call = {
+                        "id": block.get("id"),
+                        "type": "function",
+                        "function": {
+                            "name": block.get("name"),
+                            "arguments": json.dumps(block.get("input", {})),
+                        },
+                    }
+                    tool_calls.append(tool_call)
 
             # Combine all text content
             message_content = "\n".join(content_parts) if content_parts else ""
@@ -160,6 +199,10 @@ def install_anthropic(ctx):
             if thinking_parts:
                 choice["message"]["thinking"] = "\n".join(thinking_parts)
 
+            # Add tool_calls if present
+            if tool_calls:
+                choice["message"]["tool_calls"] = tool_calls
+
             ret["choices"].append(choice)
 
             # Transform usage

llms/extensions/system_prompts/ui/index.mjs

@@ -278,7 +278,8 @@ export default {
     },
 
     async load(ctx) {
-        const prompts = await ext.getJson(`/prompts.json`)
+        const api = await ext.getJson(`/prompts.json`)
+        const prompts = api.response || []
         ctx.setState({ prompts })
     }
 }

llms/extensions/tools/__init__.py

@@ -0,0 +1,5 @@
+from aiohttp import web
+
+
+def install(ctx):
+    ctx.add_get("/", lambda r: web.json_response(ctx.app.tool_definitions))

llms/extensions/tools/ui/index.mjs

@@ -11,7 +11,7 @@ const Tools = {
         </div>
 
         <div class="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4">
-            <div v-for="tool in ($state.tools || [])" :key="tool.function.name"
+            <div v-for="tool in (Array.isArray($state.tools) ? $state.tools : []).filter(x => x.function)" :key="tool.function.name"
                 class="bg-white dark:bg-gray-800 rounded-lg border border-gray-200 dark:border-gray-700 overflow-hidden flex flex-col">
                 
                 <div class="p-4 border-b border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800/50">
@@ -100,7 +100,7 @@ const ToolSelector = {
     setup() {
         const ctx = inject('ctx')
 
-        const availableTools = computed(() => ctx.state.tools || [])
+        const availableTools = computed(() => (Array.isArray(ctx.state.tools) ? ctx.state.tools : []).filter(x => x.function))
 
         function isToolActive(name) {
             const only = ctx.prefs.onlyTools
@@ -145,12 +145,12 @@ export default {
             ToolSelector,
         })
 
-        const svg = (attrs, title) => `<svg ${attrs} xmlns="http://www.w4.org/2000/svg" viewBox="0 0 24 24">${title ? "<title>" + title + "</title>" : ''}<path fill="currentColor" d="M5.33 3.272a3.5 3.5 0 0 1 4.472 4.473L20.647 18.59l-2.122 2.122L7.68 9.867a3.5 3.5 0 0 1-4.472-4.474L5.444 7.63a1.5 1.5 0 0 0 2.121-2.121zm10.367 1.883l3.182-1.768l1.414 1.415l-1.768 3.182l-1.768.353l-2.12 2.121l-1.415-1.414l2.121-2.121zm-7.071 7.778l2.121 2.122l-4.95 4.95A1.5 1.5 0 0 1 3.58 17.99l.097-.107z"/></svg>`
+        const svg = (attrs, title) => `<svg ${attrs} xmlns="http://www.w4.org/2000/svg" viewBox="0 0 24 24">${title ? "<title>" + title + "</title>" : ''}<path fill="currentColor" d="M5.33 3.272a3.5 3.5 0 0 1 4.472 4.473L20.647 18.59l-2.122 2.122L7.68 9.867a3.5 3.5 0 0 1-4.472-4.474L5.444 7.63a1.5 1.5 0 0 0 2.121-2.121zm10.367 1.883l3.182-1.768l1.414 1.415l-1.768 3.182l-1.768.353l-2.12 2.121l-1.415-1.414l2.121-2.121zm-7.071 7.778l2.121 2.122l-4.95 4.95A1.5 1.5 0 0 1 3.58 17.99l.097-.107z" /></svg>`
 
         ctx.setLeftIcons({
             tools: {
                 component: {
-                    template: svg('@click=$ctx.togglePath("/tools")'),
+                    template: svg(`@click="$ctx.togglePath('/tools')"`),
                 },
                 isActive({ path }) {
                     return path === '/tools'
@@ -162,7 +162,7 @@ export default {
             tools: {
                 component: {
                     template: svg([
-                        `@click=$ctx.toggleTop("ToolSelector")`,
+                        `@click="$ctx.toggleTop('ToolSelector')"`,
                         `:class="$prefs.onlyTools == null ? 'text-green-600 dark:text-green-300' : $prefs.onlyTools.length ? 'text-blue-600! dark:text-blue-300!' : ''"`
                     ].join(' ')),
                     // , "{{$prefs.onlyTools == null ? 'Include All Tools' : $prefs.onlyTools.length ? 'Include Selected Tools' : 'All Tools Excluded'}}"
@@ -185,12 +185,12 @@ export default {
             const prefs = ctx.prefs
             if (prefs.onlyTools != null) {
                 if (Array.isArray(prefs.onlyTools)) {
-                    request.metadata.only_tools = prefs.onlyTools.length > 0
+                    request.metadata.tools = prefs.onlyTools.length > 0
                         ? prefs.onlyTools.join(',')
                         : 'none'
                 }
             } else {
-                request.metadata.only_tools = 'all'
+                request.metadata.tools = 'all'
             }
         })
 
@@ -199,6 +199,6 @@ export default {
 
     async load(ctx) {
         const ext = ctx.scope('tools')
-        ctx.state.tools = await ext.getJson('/')
+        ctx.state.tools = (await ext.getJson('/')).response || []
     }
 }

llms/index.html

@@ -23,48 +23,36 @@
             cursor: pointer;
         }
     </style>
+    <script type="importmap"></script>
+
 </head>
-<script type="importmap">
-    {
-        "imports": {
-            "vue": "/ui/lib/vue.min.mjs",
-            "vue-router": "/ui/lib/vue-router.min.mjs",
-            "@servicestack/client": "/ui/lib/servicestack-client.mjs",
-            "@servicestack/vue": "/ui/lib/servicestack-vue.mjs",
-            "idb": "/ui/lib/idb.min.mjs",
-            "marked": "/ui/lib/marked.min.mjs",
-            "highlight.js": "/ui/lib/highlight.min.mjs",
-            "chart.js": "/ui/lib/chart.js",
-            "color.js": "/ui/lib/color.js",
-            "ctx.mjs": "/ui/ctx.mjs"
-        }
-    }
-</script>
 
 <body>
     <div id="app"></div>
-</body>
-<script>
-    let colorScheme = location.search === "?dark"
-        ? "dark"
-        : location.search === "?light"
-            ? "light"
-            : localStorage.getItem('color-scheme')
-    let darkMode = colorScheme != null
-        ? colorScheme === 'dark'
-        : window.matchMedia('(prefers-color-scheme: dark)').matches
-    let html = document.documentElement
-    html.classList.toggle('dark', darkMode)
-    html.style.setProperty('color-scheme', darkMode ? 'dark' : null)
-    if (localStorage.getItem('color-scheme') === null) {
-        localStorage.setItem('color-scheme', darkMode ? 'dark' : 'light')
-    }    
-</script>
-<script type="module">
-    import { createContext } from '/ui/index.mjs'
 
-    const context = await createContext()
-    context.app.mount('#app')
-</script>
+    <script>
+        let colorScheme = location.search === "?dark"
+            ? "dark"
+            : location.search === "?light"
+                ? "light"
+                : localStorage.getItem('color-scheme')
+        let darkMode = colorScheme != null
+            ? colorScheme === 'dark'
+            : window.matchMedia('(prefers-color-scheme: dark)').matches
+        let html = document.documentElement
+        html.classList.toggle('dark', darkMode)
+        html.style.setProperty('color-scheme', darkMode ? 'dark' : null)
+        if (localStorage.getItem('color-scheme') === null) {
+            localStorage.setItem('color-scheme', darkMode ? 'dark' : 'light')
+        }    
+    </script>
+    <script type="module">
+        import { createContext } from '/ui/index.mjs'
+
+        const context = await createContext()
+        context.app.mount('#app')
+    </script>
+
+</body>
 
 </html>

llms/llms.json

@@ -9,7 +9,10 @@
             "restrict_to": "GITHUB_USERS"
         }
     },
-    "disable_extensions": [],
+    "disable_extensions": [
+        "xmas",
+        "duckduckgo"
+    ],
     "defaults": {
         "headers": {
             "Content-Type": "application/json",