llms-py 3.0.7__tar.gz → 3.0.9__tar.gz

{llms_py-3.0.7 → llms_py-3.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.7
+Version: 3.0.9
 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

{llms_py-3.0.7 → llms_py-3.0.9}/llms/extensions/app/ui/Recents.mjs

@@ -67,7 +67,7 @@ const RecentResults = {
 
         const normalized = (s) => (s || '').toString().toLowerCase()
         const replaceChars = new Set('<>`*|#'.split(''))
-        const clean = s => [...s].map(c => replaceChars.has(c) ? ' ' : c).join('')
+        const clean = s => [...(s || '')].map(c => replaceChars.has(c) ? ' ' : c).join('')
 
         const loadMore = async (reset = false) => {
             if (reset) {

{llms_py-3.0.7 → llms_py-3.0.9}/llms/extensions/app/ui/threadStore.mjs

@@ -139,10 +139,11 @@ async function updateThread(threadId, updates) {
     }
 }
 
-async function deleteMessageFromThread(threadId, messageId) {
+async function deleteMessageFromThread(threadId, timestamp) {
     const thread = await getThread(threadId)
     if (!thread) throw new Error('Thread not found')
-    const updatedMessages = thread.messages.filter(m => m.id !== messageId)
+    const updatedMessages = thread.messages.filter(m => m.timestamp !== timestamp)
+    console.log('deleteMessageFromThread', threadId, timestamp, updatedMessages)
     await updateThread(threadId, { messages: updatedMessages })
 }
 
@@ -150,7 +151,7 @@ async function updateMessageInThread(threadId, messageId, updates) {
     const thread = await getThread(threadId)
     if (!thread) throw new Error('Thread not found')
 
-    const messageIndex = thread.messages.findIndex(m => m.id === messageId)
+    const messageIndex = thread.messages.findIndex(m => m.timestamp === messageId)
     if (messageIndex === -1) throw new Error('Message not found')
 
     const updatedMessages = [...thread.messages]

{llms_py-3.0.7 → llms_py-3.0.9}/llms/extensions/core_tools/__init__.py

@@ -538,12 +538,13 @@ def get_current_time(tz_name: Optional[str] = None) -> str:
 def install(ctx):
     global g_ctx
     g_ctx = ctx
+    group = "core_tools"
     # Examples of registering tools using automatic definition generation
-    ctx.register_tool(memory_read)
-    ctx.register_tool(memory_write)
+    ctx.register_tool(memory_read, group=group)
+    ctx.register_tool(memory_write, group=group)
     # ctx.register_tool(semantic_search) # TODO: implement
-    ctx.register_tool(read_file)
-    ctx.register_tool(write_file)
+    ctx.register_tool(read_file, group=group)
+    ctx.register_tool(write_file, group=group)
     ctx.register_tool(
         edit_file,
         {
@@ -562,15 +563,16 @@ def install(ctx):
                 },
             },
         },
+        group=group,
     )
-    ctx.register_tool(list_directory)
-    ctx.register_tool(glob_paths)
-    ctx.register_tool(calc)
-    ctx.register_tool(run_python)
-    ctx.register_tool(run_typescript)
-    ctx.register_tool(run_javascript)
-    ctx.register_tool(run_csharp)
-    ctx.register_tool(get_current_time)
+    ctx.register_tool(list_directory, group=group)
+    ctx.register_tool(glob_paths, group=group)
+    ctx.register_tool(calc, group=group)
+    ctx.register_tool(run_python, group=group)
+    ctx.register_tool(run_typescript, group=group)
+    ctx.register_tool(run_javascript, group=group)
+    ctx.register_tool(run_csharp, group=group)
+    ctx.register_tool(get_current_time, group=group)
 
     def exec_language(language: str, code: str) -> Dict[str, Any]:
         if language == "python":

{llms_py-3.0.7 → llms_py-3.0.9}/llms/extensions/providers/google.py

@@ -471,9 +471,9 @@ def install_google(ctx):
                 if "usageMetadata" in obj:
                     usage = obj["usageMetadata"]
                     response["usage"] = {
-                        "completion_tokens": usage["candidatesTokenCount"],
-                        "total_tokens": usage["totalTokenCount"],
-                        "prompt_tokens": usage["promptTokenCount"],
+                        "completion_tokens": usage.get("candidatesTokenCount", 0),
+                        "total_tokens": usage.get("totalTokenCount", 0),
+                        "prompt_tokens": usage.get("promptTokenCount", 0),
                     }
 
                 return ctx.log_json(self.to_response(response, chat, started_at))

llms_py-3.0.9/llms/extensions/tools/__init__.py

@@ -0,0 +1,144 @@
+import json
+
+from aiohttp import web
+
+
+def install(ctx):
+    async def tools_handler(request):
+        return web.json_response(
+            {
+                "groups": ctx.app.tool_groups,
+                "definitions": ctx.app.tool_definitions,
+            }
+        )
+
+    ctx.add_get("", tools_handler)
+
+    def prop_def_types(prop_def):
+        prop_type = prop_def.get("type")
+        if not prop_type:
+            any_of = prop_def.get("anyOf")
+            if any_of:
+                return [item.get("type") for item in any_of]
+            else:
+                return []
+        return [prop_type]
+
+    def tool_prop_value(value, prop_def):
+        """
+        Convert a value to the specified type.
+        types: string, number, integer, boolean, object, array, null
+        example prop_def = [
+            {
+                "type": "string"
+            },
+            {
+                "default": "name",
+                "type": "string",
+                "enum": ["name", "size"]
+            },
+            {
+                "default": [],
+                "type": "array",
+                "items": {
+                    "type": "string"
+                }
+            },
+            {
+                "anyOf": [
+                    {
+                        "type": "string"
+                    },
+                    {
+                        "type": "null"
+                    }
+                ],
+                "default": null,
+            },
+        ]
+        """
+        if value is None:
+            default = prop_def.get("default")
+            if default is not None:
+                default = tool_prop_value(default, prop_def)
+            return default
+
+        prop_types = prop_def_types(prop_def)
+        if "integer" in prop_types:
+            return int(value)
+        elif "number" in prop_types:
+            return float(value)
+        elif "boolean" in prop_types:
+            return bool(value)
+        elif "object" in prop_types:
+            return value if isinstance(value, dict) else json.loads(value)
+        elif "array" in prop_types:
+            return value if isinstance(value, list) else value.split(",")
+        else:
+            enum = prop_def.get("enum")
+            if enum and value not in enum:
+                raise Exception(f"'{value}' is not in {enum}")
+            return value
+
+    async def exec_handler(request):
+        name = request.match_info.get("name")
+        args = await request.json()
+
+        tool_def = ctx.get_tool_definition(name)
+        if not tool_def:
+            raise Exception(f"Tool '{name}' not found")
+
+        type = tool_def.get("type")
+        if type != "function":
+            raise Exception(f"Tool '{name}' of type '{type}' is not supported")
+
+        ctx.dbg(f"Executing tool '{name}' with args:\n{json.dumps(args, indent=2)}")
+        function_args = {}
+        parameters = tool_def.get("function", {}).get("parameters")
+        if parameters:
+            properties = parameters.get("properties")
+            required_props = parameters.get("required", [])
+            if properties:
+                for prop_name, prop_def in properties.items():
+                    prop_title = prop_def.get("title", prop_name)
+                    prop_types = prop_def_types(prop_def)
+                    value = None
+                    if prop_name in args:
+                        value = tool_prop_value(args[prop_name], prop_def)
+                    elif prop_name in required_props:
+                        if "null" in prop_types:
+                            value = None
+                        elif "default" in prop_def:
+                            value = tool_prop_value(prop_def["default"], prop_def)
+                        else:
+                            raise Exception(f"Missing required parameter '{prop_title}' for tool '{name}'")
+                    if value is not None or "null" in prop_types:
+                        function_args[prop_name] = value
+            else:
+                ctx.dbg(f"tool '{name}' has no properties:\n{json.dumps(tool_def, indent=2)}")
+        else:
+            ctx.dbg(f"tool '{name}' has no parameters:\n{json.dumps(tool_def, indent=2)}")
+
+        try:
+            text, resources = await ctx.exec_tool(name, function_args)
+
+            results = []
+            if text:
+                results.append(
+                    {
+                        "type": "text",
+                        "text": text,
+                    }
+                )
+            if resources:
+                results.extend(resources)
+
+            return web.json_response(results)
+        except Exception as e:
+            ctx.err(f"Failed to execute tool '{name}' with args:\n{json.dumps(function_args, indent=2)}", e)
+            raise e
+
+    ctx.add_post("exec/{name}", exec_handler)
+
+
+__install__ = install