llms-py 3.0.11__py3-none-any.whl → 3.0.13__py3-none-any.whl

llms/extensions/providers/google.py

@@ -63,6 +63,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 +156,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 +228,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,
                                         }
                                     }
                                 )

llms/extensions/tools/ui/index.mjs

@@ -18,7 +18,7 @@ const ToolResult = {
                 preview
             </span>
         </div>
-        <div class="not-prose px-3 py-2">
+        <div class="not-prose py-2">
             <pre v-if="ext.prefs.toolFormat !== 'preview'" class="tool-output">{{ origResult }}</pre>
             <div v-else>
                 <ViewTypes v-if="Array.isArray(result)" :results="result" />
@@ -191,7 +191,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 filteredTools" :key="tool.function.name"
+            <div v-for="tool in filteredTools" :key="tool.function.name" :id="'tool-' + 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 flex justify-between items-center">
@@ -262,7 +262,6 @@ const Tools = {
         const ctx = inject('ctx')
 
         // Execution State
-        const executingTool = ref(null)
         const execForm = ref({})
         const execResult = ref(null)
         const execError = ref(null)
@@ -270,6 +269,12 @@ const Tools = {
         const refForm = ref()
         const refTop = ref()
 
+        const executingTool = computed(() => {
+            const tool = ext.prefs.selectedTool
+            if (!tool) return null
+            return ctx.state.tool.definitions.find(x => x.function.name === tool)
+        })
+
         // UI State
         const expandedDescriptions = ref({})
 
@@ -284,7 +289,7 @@ const Tools = {
         })
 
         function startExec(tool) {
-            executingTool.value = tool
+            ext.setPrefs({ selectedTool: tool.function.name })
             execForm.value = {}
             execResult.value = null
             execError.value = null
@@ -309,7 +314,7 @@ const Tools = {
         }
 
         function closeExec() {
-            executingTool.value = null
+            ext.setPrefs({ selectedTool: null })
             execForm.value = {}
             execResult.value = null
             execError.value = null
@@ -588,9 +593,16 @@ function useTools(ctx) {
         Object.assign(toolPageHeaders, components)
     }
 
+    function selectTool({ group, tool }) {
+        ext.setPrefs({ selectedGroup: group, selectedTool: tool })
+    }
+
     return {
         toolPageHeaders,
         setToolPageHeaders,
+        selectTool,
+        get selectedGroup() { return ext.prefs.selectedGroup },
+        get selectedTool() { return ext.prefs.selectedTool },
     }
 }
 

llms/main.py

@@ -43,7 +43,7 @@ try:
 except ImportError:
     HAS_PIL = False
 
-VERSION = "3.0.11"
+VERSION = "3.0.13"
 _ROOT = None
 DEBUG = os.getenv("DEBUG") == "1"
 MOCK = os.getenv("MOCK") == "1"
@@ -1513,6 +1513,7 @@ def g_tool_result(result, function_name: Optional[str] = None, function_args: Op
     content = []
     resources = []
     args = function_args or {}
+    _dbg(f"{function_name} tool result type: {type(result)}")
     if isinstance(result, dict):
         text, res = tool_result_part(result, function_name, args)
         if text:
@@ -1555,7 +1556,7 @@ def group_resources(resources: list):
     {"images": [{"type": "image_url", "image_url": {"url": "/image.jpg"}}] }
     """
     grouped = {}
-    for res in resources:
+    for res in resources or []:
         type = res.get("type")
         if not type:
             continue
@@ -1628,10 +1629,15 @@ async def g_chat_completion(chat, context=None):
             tool_history = []
             final_response = None
 
-            for _ in range(max_iterations):
+            for request_count in range(max_iterations):
                 if should_cancel_thread(context):
                     return
 
+                if DEBUG:
+                    messages = current_chat.get("messages", [])
+                    last_message = messages[-1] if messages else None
+                    _dbg(f"Provider {provider_name}, request {request_count}:\n{json.dumps(last_message, indent=2)}")
+
                 response = await provider.chat(current_chat, context=context)
 
                 if should_cancel_thread(context):

llms/ui/ai.mjs

@@ -6,7 +6,7 @@ const headers = { 'Accept': 'application/json' }
 const prefsKey = 'llms.prefs'
 
 export const o = {
-    version: '3.0.11',
+    version: '3.0.13',
     base,
     prefsKey,
     welcome: 'Welcome to llms.py',

llms/ui/modules/chat/ChatBody.mjs

@@ -56,7 +56,7 @@ function embedHtml(html) {
 export const TypeText = {
     template: `
         <div v-if="text.type === 'text'">
-            <div v-html="html"></div>
+            <div v-html="html?.trim()" class="whitespace-pre-wrap"></div>
         </div>
     `,
     props: {
@@ -72,7 +72,7 @@ export const TypeText = {
                 return ctx.fmt.markdown(props.text.text)
             } catch (e) {
                 console.error('TypeText: markdown', e)
-                return `<div class="whitespace-pre-wrap">${props.text.text}</div>`
+                return `<div>${props.text.text}</div>`
             }
         })
         return { html }

llms/ui/modules/chat/index.mjs

@@ -950,7 +950,7 @@ export default {
         ctx.setLeftIcons({
             chat: {
                 component: {
-                    template: `<svg @click="$ctx.togglePath('/')" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M8 2.19c3.13 0 5.68 2.25 5.68 5s-2.55 5-5.68 5a5.7 5.7 0 0 1-1.89-.29l-.75-.26l-.56.56a14 14 0 0 1-2 1.55a.13.13 0 0 1-.07 0v-.06a6.58 6.58 0 0 0 .15-4.29a5.25 5.25 0 0 1-.55-2.16c0-2.77 2.55-5 5.68-5M8 .94c-3.83 0-6.93 2.81-6.93 6.27a6.4 6.4 0 0 0 .64 2.64a5.53 5.53 0 0 1-.18 3.48a1.32 1.32 0 0 0 2 1.5a15 15 0 0 0 2.16-1.71a6.8 6.8 0 0 0 2.31.36c3.83 0 6.93-2.81 6.93-6.27S11.83.94 8 .94"/><ellipse cx="5.2" cy="7.7" fill="currentColor" rx=".8" ry=".75"/><ellipse cx="8" cy="7.7" fill="currentColor" rx=".8" ry=".75"/><ellipse cx="10.8" cy="7.7" fill="currentColor" rx=".8" ry=".75"/></svg>`,
+                    template: `<svg @click="$ctx.togglePath($ctx.layout.path?.startsWith('/c/') ? $ctx.layout.path : '/')" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="currentColor" d="M8 2.19c3.13 0 5.68 2.25 5.68 5s-2.55 5-5.68 5a5.7 5.7 0 0 1-1.89-.29l-.75-.26l-.56.56a14 14 0 0 1-2 1.55a.13.13 0 0 1-.07 0v-.06a6.58 6.58 0 0 0 .15-4.29a5.25 5.25 0 0 1-.55-2.16c0-2.77 2.55-5 5.68-5M8 .94c-3.83 0-6.93 2.81-6.93 6.27a6.4 6.4 0 0 0 .64 2.64a5.53 5.53 0 0 1-.18 3.48a1.32 1.32 0 0 0 2 1.5a15 15 0 0 0 2.16-1.71a6.8 6.8 0 0 0 2.31.36c3.83 0 6.93-2.81 6.93-6.27S11.83.94 8 .94"/><ellipse cx="5.2" cy="7.7" fill="currentColor" rx=".8" ry=".75"/><ellipse cx="8" cy="7.7" fill="currentColor" rx=".8" ry=".75"/><ellipse cx="10.8" cy="7.7" fill="currentColor" rx=".8" ry=".75"/></svg>`,
                 },
                 isActive({ path }) {
                     return path === '/' || path.startsWith('/c/')

{llms_py-3.0.11.dist-info → llms_py-3.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.11
+Version: 3.0.13
 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
@@ -44,6 +44,6 @@ Lightweight CLI, API and ChatGPT-like alternative to Open WebUI for accessing mu
 
 [llmspy.org](https://llmspy.org)
 
-[![](https://github.com/ServiceStack/llmspy.org/blob/main/public/img/llmspy-home.webp?raw=true)](https://llmspy.org)
+[![](https://github.com/ServiceStack/llmspy.org/blob/main/public/img/llmspy-home-v3.webp?raw=true)](https://llmspy.org)
 
 GitHub: [llmspy.org](https://github.com/ServiceStack/llmspy.org)

{llms_py-3.0.11.dist-info → llms_py-3.0.13.dist-info}/RECORD

@@ -3,7 +3,7 @@ llms/__main__.py,sha256=hrBulHIt3lmPm1BCyAEVtB6DQ0Hvc3gnIddhHCmJasg,151
 llms/db.py,sha256=oozp5I5lECVO8oZEFwcZl3ES5mARqWeR1BkoqG5kSqM,11687
 llms/index.html,sha256=nGk1Djtn9p7l6LuKp4Kg0JIB9fCzxtTWXFfmDb4ggpc,1658
 llms/llms.json,sha256=NEr9kJRkUGZ2YZHbWC-haGPlVVL2Qtnx4kKZENGH1wk,11494
-llms/main.py,sha256=IoKt4rGaAKAcc-Y2M-cTbxyIqOy9tmeiWxnrHjzHHv0,173872
+llms/main.py,sha256=Bnn7qUbPskaY1A_mGwB3tfWXn3H-aqTijIIb_M2-Bks,174231
 llms/providers-extra.json,sha256=_6DmGBiQY9LM6_Y0zOiObYn7ba4g3akSNQfmHcYlENc,11101
 llms/providers.json,sha256=yjhDurlwo70xqfV0HNLiZaCpw3WvtIgkjoLahQIKX2w,282530
 llms/extensions/analytics/ui/index.mjs,sha256=m1XwaqYCLwK267JAUCAltkN_nOXep0GxfpvGNS5i4_w,69547
@@ -131,7 +131,7 @@ llms/extensions/providers/__init__.py,sha256=C5zOBQEOB2L96rAZdjV42fPVk_dZxSh2Dv3
 llms/extensions/providers/anthropic.py,sha256=V9mechnhyoX-5Z5AkwyQ-UzLax6cqG7j7GLvGTZF9no,10941
 llms/extensions/providers/cerebras.py,sha256=HaeFW0GwbD6V6Zrrwqyv78kQb0VXg9oHmykvJfIOOYE,1417
 llms/extensions/providers/chutes.py,sha256=5ZrfbqoOhgzKLQy_qULcp4jlvW5WXPR0jP9kN2Jzb9g,6229
-llms/extensions/providers/google.py,sha256=9P90bEefRA18tpjfEuAz1T5YpwzdOngrTFhw-LI3eXg,24434
+llms/extensions/providers/google.py,sha256=oCCTE2KAw-WWE2v14XpKzgAMdFIWbjTBoa6GWuqT4dw,26215
 llms/extensions/providers/nvidia.py,sha256=C6cwqn3EufYDfRIgbc8MDkQNyD6w3c7hbjfYaHJSDik,4279
 llms/extensions/providers/openai.py,sha256=hkE-LVsw6M92_qEbpayuPo17Z1OWKHe7lm2wduLMng8,6138
 llms/extensions/providers/openrouter.py,sha256=5SfCJKo1aGKoDGez6HXYQe9elMMo9sSEDFqqdxamAgA,3330
@@ -141,9 +141,9 @@ llms/extensions/system_prompts/__init__.py,sha256=TZy1CS2dPkBNBA_Ovf9BlVetZqTt2N
 llms/extensions/system_prompts/ui/index.mjs,sha256=_pVCreAebSzE9dzcHF2kiYODwP-fDHCqtUQB-X5Io9Q,12107
 llms/extensions/system_prompts/ui/prompts.json,sha256=t5DD3bird-87wFa4OlW-bC2wdoYDrVzfyc8TO5OaotI,128489
 llms/extensions/tools/__init__.py,sha256=u76604Cn_sRFQRqeA_pkVEty27V688Mt9Z7Kh63yDr8,4825
-llms/extensions/tools/ui/index.mjs,sha256=IbGB2FQJ5VL4a8arwoR9C79vUCNrz8VIyQnHZ4vxU9o,34486
+llms/extensions/tools/ui/index.mjs,sha256=-Rby2y1Rx83JFcqYqn86uYZjVd_WlF4wSajZ1M31LWg,34997
 llms/ui/App.mjs,sha256=CoUzO9mV__-jV19NKHYIbwHsjWMnO11jyNSbnJhe1gQ,7486
-llms/ui/ai.mjs,sha256=GVyxu3Thsuck0b1Akvqk2c5w-maSzONU06QN-TUWoJk,6541
+llms/ui/ai.mjs,sha256=wBkkhbg60HS6TGc2wkSg6pmJoxUwvykLZYtzVNh47eM,6541
 llms/ui/app.css,sha256=vfXErYVdVlE3pL8oZ-2G_OC-_reJzmaL0p91EVv48uo,186490
 llms/ui/ctx.mjs,sha256=X4scgXEQ9bMUfQl36sM4A3o2Ufad3LRwItxfmSu1xwc,12838
 llms/ui/fav.svg,sha256=_R6MFeXl6wBFT0lqcUxYQIDWgm246YH_3hSTW0oO8qw,734
@@ -166,12 +166,12 @@ llms/ui/lib/vue.mjs,sha256=75FuLhUTPk19sncwNIrm0BGEL0_Qw298-_v01fPWYoI,542872
 llms/ui/modules/icons.mjs,sha256=LGcH0ys0QLS2ZKCO42qHpwPYbBV_EssoWLezU4XZEzU,27751
 llms/ui/modules/layout.mjs,sha256=8pAxs8bedQI3b3eRA9nrfpLZznLmrpp4BZvigYAQjpQ,12572
 llms/ui/modules/model-selector.mjs,sha256=6U4rAZ7vmQELFRQGWk4YEtq02v3lyHdMq6yUOp-ArXg,43184
-llms/ui/modules/chat/ChatBody.mjs,sha256=5yWjo6tWmcKidDpRvKFeHqx3lXO3DB-3rTyXY72gB4U,49122
+llms/ui/modules/chat/ChatBody.mjs,sha256=L2925VM-LmrvWM1MAIBN9dGTPfyFJUIN4QF54TBtROU,49130
 llms/ui/modules/chat/SettingsDialog.mjs,sha256=HMBJTwrapKrRIAstIIqp0QlJL5O-ho4hzgvfagPfsX8,19930
-llms/ui/modules/chat/index.mjs,sha256=lfSbERMaM3bLsKhdJJPWwL4-FGr8U_ftlvqW5vC3T1s,39762
-llms_py-3.0.11.dist-info/licenses/LICENSE,sha256=bus9cuAOWeYqBk2OuhSABVV1P4z7hgrEFISpyda_H5w,1532
-llms_py-3.0.11.dist-info/METADATA,sha256=90LpikNrckf1EaRrQHKGLOGobshThyJsRcX75csIs1Y,2192
-llms_py-3.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-llms_py-3.0.11.dist-info/entry_points.txt,sha256=WswyE7PfnkZMIxboC-MS6flBD6wm-CYU7JSUnMhqMfM,40
-llms_py-3.0.11.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
-llms_py-3.0.11.dist-info/RECORD,,
+llms/ui/modules/chat/index.mjs,sha256=FZ0fJ53JXQnTDiSOFhyGp3J5OMuEDQ2YZJGKC5VwS0E,39819
+llms_py-3.0.13.dist-info/licenses/LICENSE,sha256=bus9cuAOWeYqBk2OuhSABVV1P4z7hgrEFISpyda_H5w,1532
+llms_py-3.0.13.dist-info/METADATA,sha256=dIAc0K49R183BqM2sAS5SC3DFCEU6BciWnTPOv1sKdI,2195
+llms_py-3.0.13.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+llms_py-3.0.13.dist-info/entry_points.txt,sha256=WswyE7PfnkZMIxboC-MS6flBD6wm-CYU7JSUnMhqMfM,40
+llms_py-3.0.13.dist-info/top_level.txt,sha256=gC7hk9BKSeog8gyg-EM_g2gxm1mKHwFRfK-10BxOsa4,5
+llms_py-3.0.13.dist-info/RECORD,,

{llms_py-3.0.11.dist-info → llms_py-3.0.13.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any