llms-py 3.0.11__tar.gz → 3.0.13__tar.gz

{llms_py-3.0.11 → llms_py-3.0.13}/PKG-INFO

@@ -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 → llms_py-3.0.13}/README.md

@@ -4,6 +4,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 → llms_py-3.0.13}/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_py-3.0.11 → llms_py-3.0.13}/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_py-3.0.11 → llms_py-3.0.13}/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_py-3.0.11 → llms_py-3.0.13}/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_py-3.0.11 → llms_py-3.0.13}/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_py-3.0.11 → llms_py-3.0.13}/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 → llms_py-3.0.13}/llms_py.egg-info/PKG-INFO

@@ -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 → llms_py-3.0.13}/llms_py.egg-info/SOURCES.txt

@@ -184,7 +184,9 @@ llms_py.egg-info/requires.txt
 llms_py.egg-info/top_level.txt
 tests/test_async.py
 tests/test_config.py
+tests/test_core_tools_direct.py
 tests/test_extensions.py
+tests/test_gemini_tool_calling.py
 tests/test_gemini_upload.py
 tests/test_integration.py
 tests/test_interleaved_thinking.py

{llms_py-3.0.11 → llms_py-3.0.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "llms-py"
-version = "3.0.11"
+version = "3.0.13"
 description = "A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers"
 readme = "README.md"
 license = "BSD-3-Clause"

{llms_py-3.0.11 → llms_py-3.0.13}/setup.py

@@ -15,7 +15,7 @@ with open(os.path.join(this_directory, "requirements.txt"), encoding="utf-8") as
 
 setup(
     name="llms-py",
-    version="3.0.11",
+    version="3.0.13",
     author="ServiceStack",
     author_email="team@servicestack.net",
     description="A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers",

llms_py-3.0.13/tests/test_core_tools_direct.py

@@ -0,0 +1,38 @@
+import os
+import sys
+import unittest
+from unittest.mock import MagicMock
+
+# Add project root to path
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
+import llms.extensions.core_tools as core_tools
+
+# Mock g_ctx
+core_tools.g_ctx = MagicMock()
+
+
+class TestCoreToolsDirect(unittest.TestCase):
+    def test_calc(self):
+        print("Running tests...")
+
+        # Simple list comprehension
+        res = core_tools.calc("sum([x * 2 for x in [1, 2, 3]])")
+        print(f"sum([x * 2 for x in [1, 2, 3]]) = {res}")
+        assert res == 12
+
+        # List comprehension with condition
+        res = core_tools.calc("sum([x for x in [1, 2, 3, 4] if x > 2])")
+        print(f"sum([x for x in [1, 2, 3, 4] if x > 2]) = {res}")
+        assert res == 7
+
+        # Range support (I added range support too)
+        res = core_tools.calc("sum([x for x in range(5)])")
+        print(f"sum([x for x in range(5)]) = {res}")
+        assert res == 10
+
+        print("All tests passed!")
+
+
+if __name__ == "__main__":
+    unittest.main()

llms_py-3.0.13/tests/test_gemini_tool_calling.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+"""
+Unit tests for utility functions in llms.main module.
+"""
+
+import inspect
+import json
+import os
+import sys
+import unittest
+
+# from dotenv import load_dotenv
+
+# Add parent directory to path to import llms module
+sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+
+from llms.main import (
+    cli,
+    get_app,
+    load_config,
+)
+
+# Load environment variables from .env file
+# load_dotenv(os.path.join(os.path.dirname(__file__), "..", ".env"))
+
+config_path = os.path.join(os.path.dirname(__file__), "..", "llms", "llms.json")
+with open(config_path) as f:
+    config = json.load(f)
+providers_path = os.path.join(os.path.dirname(__file__), "..", "llms", "providers.json")
+with open(providers_path) as f:
+    providers = json.load(f)
+
+g_app = None
+
+
+class TestGeminiToolCalling(unittest.IsolatedAsyncioTestCase):
+    """Test Gemini Tool Calling."""
+
+    def setUp(self):
+        load_config(
+            config, providers, debug=True, verbose=True, disable_extensions=["duckduckgo", "fast_mcp", "gemini", "xmas"]
+        )
+        cli("ls minimax")
+        global g_app
+        g_app = get_app()
+
+    @classmethod
+    def tearDownClass(cls):
+        g_app.shutdown()
+
+    async def test_gemini_tool_calling(self):
+        provider = g_app.get_providers()["google"]
+        chat = {
+            "model": "Gemini Flash-Lite Latest",
+            "messages": [
+                {"role": "user", "content": "Calculate 12 * 34 + 56"},
+            ],
+        }
+        response = await provider.chat(chat)
+        print("GEMINI RESPONSE:")
+        print(json.dumps(response, indent=2))
+        print("GEMINI RESULT:")
+        content = response["choices"][0]["message"]["content"]
+        print(content)
+        self.assertIn("464", content)
+
+    async def test_gemini_multi_step_tool_calling(self):
+        # provider = g_app.get_providers()["google"]
+        filename = "test_multi_step.txt"
+        content_to_write = "Multi-step test content"
+
+        # Ensure cleanup
+        if os.path.exists(filename):
+            os.remove(filename)
+
+        chat = {
+            "model": "Gemini Flash-Lite Latest",
+            "messages": [
+                {
+                    "role": "user",
+                    "content": f"Create a file named '{filename}' with the content '{content_to_write}', and then read it back to me.",
+                },
+            ],
+        }
+
+        response = await g_app.chat_completion(chat)
+
+        last_message = response["choices"][0]["message"]
+        print(f"GEMINI RESULT (Multi-step):\n{json.dumps(last_message, indent=2)}")
+
+        # Verify file exists and content
+        with open(filename) as f:
+            self.assertEqual(f.read(), content_to_write)
+
+        # Cleanup
+        if os.path.exists(filename):
+            os.remove(filename)
+
+
+if __name__ == "__main__":
+    unittest.main()

{llms_py-3.0.11 → llms_py-3.0.13}/tests/test_provider_config.py

@@ -229,3 +229,7 @@ class TestProviderConfiguration(unittest.TestCase):
         provider = create_provider(create_provider_kwargs(config["providers"]["openrouter"], providers["openrouter"]))
         self.assertEqual(provider.__class__.__name__, "OpenAiCompatible")
         self.assertEqual(len(provider.models), 96)
+
+
+if __name__ == "__main__":
+    unittest.main()