llms-py 3.0.17__tar.gz → 3.0.19__tar.gz

{llms_py-3.0.17/llms_py.egg-info → llms_py-3.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.17
+Version: 3.0.19
 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.17 → llms_py-3.0.19}/llms/extensions/providers/openai.py

@@ -18,6 +18,11 @@ def install_openai(ctx):
             super().__init__(**kwargs)
             self.modalities["image"] = OpenAiGenerator(**kwargs)
 
+        async def process_chat(self, chat, provider_id=None):
+            ret = await super().process_chat(chat, provider_id)
+            chat.pop("modalities", None)  # openai chat completion doesn't support modalities
+            return ret
+
     # https://platform.openai.com/docs/api-reference/images
     class OpenAiGenerator(GeneratorBase):
         sdk = "openai/image"

{llms_py-3.0.17 → llms_py-3.0.19}/llms/extensions/skills/ui/index.mjs

@@ -11,14 +11,21 @@ const SkillSelector = {
             <div class="flex items-center justify-between mb-4">
                 <span class="text-xs font-bold uppercase text-gray-500 tracking-wider">Include Skills</span>
                 <div class="flex items-center gap-2">
-                    <button @click="$ctx.setPrefs({ onlySkills: null })"
+                    <button type="button" v-if="!$ctx.tools?.isToolEnabled('skill')"
+                        class="px-3 py-1 rounded-md text-xs font-medium border transition-colors select-none cursor-pointer bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-400 border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600"
+                        @click="$ctx.tools?.enableTool('skill')"
+                        title="'skill' tool needs to be enabled to use Skills"
+                        >
+                        <span class="text-xs font-semibold text-red-700 dark:text-red-300">⚠️ Enable skill tool</span>
+                    </button>
+                    <button type="button" @click="$ctx.setPrefs({ onlySkills: null })"
                         class="px-3 py-1 rounded-md text-xs font-medium border transition-colors select-none"
                         :class="$prefs.onlySkills == null
                             ? 'bg-green-100 dark:bg-green-900/40 text-green-800 dark:text-green-300 border-green-300 dark:border-green-800' 
                             : 'cursor-pointer bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-400 border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'">
                         All Skills
                     </button>
-                    <button @click="$ctx.setPrefs({ onlySkills:[] })"
+                    <button type="button" @click="$ctx.setPrefs({ onlySkills:[] })"
                         class="px-3 py-1 rounded-md text-xs font-medium border transition-colors select-none"
                         :class="$prefs.onlySkills?.length === 0
                             ? 'bg-fuchsia-100 dark:bg-fuchsia-900/40 text-fuchsia-800 dark:text-fuchsia-300 border-fuchsia-200 dark:border-fuchsia-800' 
@@ -264,24 +271,31 @@ export default {
                 component: {
                     template: svg([
                         `@click="$ctx.toggleTop('SkillSelector')"`,
-                        `:class="$prefs.onlySkills == null ? 'text-green-600 dark:text-green-300' : $prefs.onlySkills.length ? 'text-blue-600! dark:text-blue-300!' : ''"`
+                        `:class="!$tools?.isToolEnabled('skill') ? '' : $prefs.onlySkills == null ? 'text-green-600 dark:text-green-300' : $prefs.onlySkills.length ? 'text-blue-600! dark:text-blue-300!' : ''"`
                     ].join(' ')),
                 },
                 isActive({ top }) {
                     return top === 'SkillSelector'
                 },
                 get title() {
-                    return ctx.prefs.onlySkills == null
-                        ? `All Skills Included`
-                        : ctx.prefs.onlySkills.length
-                            ? `${ctx.prefs.onlySkills.length} ${ctx.utils.pluralize('Skill', ctx.prefs.onlySkills.length)} Included`
-                            : 'No Skills Included'
+                    return !ctx.tools?.isToolEnabled('skill')
+                        ? `skill tool not enabled`
+                        : ctx.prefs.onlySkills == null
+                            ? `All Skills Included`
+                            : ctx.prefs.onlySkills.length
+                                ? `${ctx.prefs.onlySkills.length} ${ctx.utils.pluralize('Skill', ctx.prefs.onlySkills.length)} Included`
+                                : 'No Skills Included'
                 }
             }
         })
 
         ctx.chatRequestFilters.push(({ request, thread, context }) => {
 
+            if (!ctx.tools?.isToolEnabled('skill')) {
+                console.log(`skills.chatRequestFilters: 'skill' tool is not enabled`)
+                return
+            }
+
             const prefs = ctx.prefs
             if (prefs.onlySkills != null) {
                 if (Array.isArray(prefs.onlySkills)) {

{llms_py-3.0.17 → llms_py-3.0.19}/llms/extensions/tools/ui/index.mjs

@@ -2,6 +2,86 @@ import { inject, computed, ref, onMounted } from "vue"
 
 let ext
 
+function useTools(ctx) {
+
+    const availableTools = computed(() => ctx.state.tool.definitions.filter(x => x.function))
+    const toolPageHeaders = {}
+
+    function setToolPageHeaders(components) {
+        Object.assign(toolPageHeaders, components)
+    }
+
+    function selectTool({ group, tool }) {
+        ext.setPrefs({ selectedGroup: group, selectedTool: tool })
+    }
+
+    function getToolDefinition(name) {
+        return ctx.state.tool.definitions.find(d => d.function?.name === name)
+    }
+
+    function isToolEnabled(name) {
+        const toolDef = getToolDefinition(name)
+        if (!toolDef) return false
+        const onlyTools = ctx.prefs.onlyTools
+        if (onlyTools == null) return true
+        return Array.isArray(onlyTools) && onlyTools.includes(name)
+    }
+
+    function enableTool(name) {
+        let onlyTools = ctx.prefs.onlyTools
+        if (onlyTools == null) return // All tools are enabled
+
+        if (!Array.isArray(onlyTools)) {
+            onlyTools = [onlyTools]
+        }
+        else if (!onlyTools.includes(name)) {
+            onlyTools.push(name)
+        } else {
+            return // Already enabled
+        }
+        ctx.setPrefs({ onlyTools })
+    }
+
+    function disableTool(name) {
+        let onlyTools = ctx.prefs.onlyTools
+        if (onlyTools == null) {
+            // If currently 'All', clicking a tool means we enter custom mode with all OTHER tools selected
+            onlyTools = availableTools.value.map(t => t.function.name).filter(t => t !== name)
+        } else if (!Array.isArray(onlyTools)) {
+            onlyTools = []
+        } else {
+            onlyTools = onlyTools.filter(t => t !== name)
+        }
+        ctx.setPrefs({ onlyTools })
+    }
+
+    function toggleTool(name, enable = null) {
+        if (enable == null) {
+            enable = !isToolEnabled(name)
+        }
+        if (enable) {
+            enableTool(name)
+        } else {
+            disableTool(name)
+        }
+    }
+
+    return {
+        availableTools,
+        toolPageHeaders,
+        setToolPageHeaders,
+        selectTool,
+        getToolDefinition,
+        isToolEnabled,
+        enableTool,
+        disableTool,
+        toggleTool,
+        get selectedGroup() { return ext.prefs.selectedGroup },
+        get selectedTool() { return ext.prefs.selectedTool },
+    }
+}
+
+
 const ToolResult = {
     template: `
     <div>
@@ -487,14 +567,14 @@ const ToolSelector = {
                 <div class="flex items-center gap-2">
                     <button @click="$ctx.setPrefs({ onlyTools: null })"
                         class="px-3 py-1 rounded-md text-xs font-medium border transition-colors select-none"
-                        :class="$prefs.onlyTools == null
+                        :class="prefs.onlyTools == null
                             ? 'bg-green-100 dark:bg-green-900/40 text-green-800 dark:text-green-300 border-green-300 dark:border-green-800' 
                             : 'cursor-pointer bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-400 border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'">
                         All Tools
                     </button>
                     <button @click="$ctx.setPrefs({ onlyTools:[] })"
                         class="px-3 py-1 rounded-md text-xs font-medium border transition-colors select-none"
-                        :class="$prefs.onlyTools?.length === 0
+                        :class="prefs.onlyTools?.length === 0
                             ? 'bg-fuchsia-100 dark:bg-fuchsia-900/40 text-fuchsia-800 dark:text-fuchsia-300 border-fuchsia-200 dark:border-fuchsia-800' 
                             : 'cursor-pointer bg-white dark:bg-gray-800 text-gray-600 dark:text-gray-400 border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'">
                         No Tools
@@ -547,10 +627,10 @@ const ToolSelector = {
                      <div v-show="!isCollapsed(group.name)" class="p-3 bg-white dark:bg-gray-900 border-t border-gray-100 dark:border-gray-800">
                          <div class="flex flex-wrap gap-2">
                             <button v-for="tool in group.tools" :key="tool.function.name" type="button"
-                                @click="toggleTool(tool.function.name)"
+                                @click="$tools.toggleTool(tool.function.name)"
                                 :title="tool.function.description"
                                 class="px-2.5 py-1 rounded-full text-xs font-medium border transition-colors select-none text-left truncate max-w-[200px]"
-                                :class="isToolActive(tool.function.name)
+                                :class="$tools.isToolEnabled(tool.function.name)
                                     ? 'bg-blue-100 dark:bg-blue-900/40 text-blue-800 dark:text-blue-300 border-blue-200 dark:border-blue-800' 
                                     : 'bg-gray-50 dark:bg-gray-800 text-gray-600 dark:text-gray-400 border-gray-200 dark:border-gray-700 hover:border-gray-300 dark:hover:border-gray-600'">
                                 {{ tool.function.name }}
@@ -565,10 +645,10 @@ const ToolSelector = {
         const ctx = inject('ctx')
         const collapsedState = ref({})
 
-        const availableTools = computed(() => ctx.state.tool.definitions.filter(x => x.function))
+        const prefs = computed(() => ctx.prefs)
 
         const toolGroups = computed(() => {
-            const defs = availableTools.value
+            const defs = ctx.tools.availableTools.value
             const groups = ctx.state.tool.groups || {}
 
             const definedGroups = []
@@ -591,33 +671,6 @@ const ToolSelector = {
             return definedGroups
         })
 
-        function isToolActive(name) {
-            const only = ctx.prefs.onlyTools
-            if (only == null) return true
-            if (Array.isArray(only)) {
-                return only.includes(name)
-            }
-            return false
-        }
-
-        function toggleTool(name) {
-            let onlyTools = ctx.prefs.onlyTools
-
-            // If currently 'All', clicking a tool means we enter custom mode with all OTHER tools selected (deselecting clicked)
-            if (onlyTools == null) {
-                onlyTools = availableTools.value.map(t => t.function.name).filter(t => t !== name)
-            } else {
-                // Currently Custom or None
-                if (onlyTools.includes(name)) {
-                    onlyTools = onlyTools.filter(t => t !== name)
-                } else {
-                    onlyTools = [...onlyTools, name]
-                }
-            }
-
-            ctx.setPrefs({ onlyTools })
-        }
-
         function toggleCollapse(groupName) {
             const key = groupName || '_other_'
             collapsedState.value[key] = !collapsedState.value[key]
@@ -630,19 +683,19 @@ const ToolSelector = {
 
         function setGroupTools(group, enable) {
             const groupToolNames = group.tools.map(t => t.function.name)
-            let onlyTools = ctx.prefs.onlyTools
+            let onlyTools = prefs.value.onlyTools
 
             if (enable) {
                 if (onlyTools == null) return
                 const newSet = new Set(onlyTools)
                 groupToolNames.forEach(n => newSet.add(n))
                 onlyTools = Array.from(newSet)
-                if (onlyTools.length === availableTools.value.length) {
+                if (onlyTools.length === ctx.tools.availableTools.value.length) {
                     onlyTools = null
                 }
             } else {
                 if (onlyTools == null) {
-                    onlyTools = availableTools.value
+                    onlyTools = ctx.tools.availableTools.value
                         .map(t => t.function.name)
                         .filter(n => !groupToolNames.includes(n))
                 } else {
@@ -654,16 +707,14 @@ const ToolSelector = {
         }
 
         function getActiveCount(group) {
-            const onlyTools = ctx.prefs.onlyTools
+            const onlyTools = prefs.value.onlyTools
             if (onlyTools == null) return group.tools.length
             return group.tools.filter(t => onlyTools.includes(t.function.name)).length
         }
 
         return {
-            availableTools,
+            prefs,
             toolGroups,
-            isToolActive,
-            toggleTool,
             toggleCollapse,
             isCollapsed,
             setGroupTools,
@@ -672,26 +723,6 @@ const ToolSelector = {
     }
 }
 
-function useTools(ctx) {
-    const toolPageHeaders = {}
-
-    function setToolPageHeaders(components) {
-        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 },
-    }
-}
-
 export default {
     order: 10 - 100,
 

{llms_py-3.0.17 → llms_py-3.0.19}/llms/main.py

@@ -57,7 +57,7 @@ try:
 except ImportError:
     HAS_PIL = False
 
-VERSION = "3.0.17"
+VERSION = "3.0.19"
 _ROOT = None
 DEBUG = os.getenv("DEBUG") == "1"
 MOCK = os.getenv("MOCK") == "1"
@@ -1305,7 +1305,7 @@ class GroqProvider(OpenAiCompatible):
         super().__init__(**kwargs)
 
     async def process_chat(self, chat, provider_id=None):
-        ret = await process_chat(chat, provider_id)
+        ret = await super().process_chat(chat, provider_id)
         chat.pop("modalities", None)  # groq doesn't support modalities
         messages = chat.get("messages", []).copy()
         for message in messages:

{llms_py-3.0.17 → llms_py-3.0.19}/llms/ui/ai.mjs

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

{llms_py-3.0.17 → llms_py-3.0.19/llms_py.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: llms-py
-Version: 3.0.17
+Version: 3.0.19
 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.17 → llms_py-3.0.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "llms-py"
-version = "3.0.17"
+version = "3.0.19"
 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.17 → llms_py-3.0.19}/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.17",
+    version="3.0.19",
     author="ServiceStack",
     author_email="team@servicestack.net",
     description="A lightweight CLI tool and OpenAI-compatible server for querying multiple Large Language Model (LLM) providers",