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

llms/ui/ctx.mjs

@@ -1,5 +1,5 @@
 
-import { reactive } from 'vue'
+import { reactive, markRaw } from 'vue'
 import { EventBus, humanize, combinePaths } from "@servicestack/client"
 import { storageObject } from './utils.mjs'
 
@@ -19,33 +19,83 @@ export class ExtensionScope {
     setPrefs(o) {
         storageObject(this.storageKey, Object.assign(this.prefs, o))
     }
+    savePrefs() {
+        storageObject(this.storageKey, this.prefs)
+    }
     get(url, options) {
         return this.ctx.ai.get(combinePaths(this.baseUrl, url), options)
     }
+    delete(url, options) {
+        return this.ctx.ai.get(combinePaths(this.baseUrl, url), {
+            ...options,
+            method: 'DELETE'
+        })
+    }
     async getJson(url, options) {
         return this.ctx.ai.getJson(combinePaths(this.baseUrl, url), options)
     }
+    async deleteJson(url, options) {
+        return this.ctx.ai.getJson(combinePaths(this.baseUrl, url), {
+            ...options,
+            method: 'DELETE'
+        })
+    }
     post(url, options) {
         return this.ctx.ai.post(combinePaths(this.baseUrl, url), options)
     }
-    async postJson(url, options) {
-        return this.ctx.ai.postJson(combinePaths(this.baseUrl, url), options)
+    async postForm(url, options) {
+        return await this.ctx.ai.postForm(combinePaths(this.baseUrl, url), options)
+    }
+    async postJson(url, body) {
+        return this.ctx.ai.postJson(combinePaths(this.baseUrl, url), {
+            body: body instanceof FormData ? body : JSON.stringify(body)
+        })
+    }
+    async putJson(url, body) {
+        return this.ctx.ai.postJson(combinePaths(this.baseUrl, url), {
+            method: 'PUT',
+            body: body instanceof FormData ? body : JSON.stringify(body)
+        })
+    }
+    async patchJson(url, body) {
+        return this.ctx.ai.postJson(combinePaths(this.baseUrl, url), {
+            method: 'PATCH',
+            body: body instanceof FormData ? body : JSON.stringify(body)
+        })
+    }
+    async createJsonResult(res) {
+        return this.ctx.ai.createJsonResult(res)
+    }
+    createErrorResult(e) {
+        return this.ctx.ai.createErrorResult(e)
+    }
+    setError(e, msg = null) {
+        const prefix = this.id ? `[${this.id}] ` : ''
+        this.ctx.setError(e, msg ? `${prefix} ${msg}` : prefix)
+    }
+    clearError() {
+        this.ctx.clearError()
+    }
+    toast(msg) {
+        this.ctx.toast(msg)
     }
 }
 
 export class AppContext {
-    constructor({ app, routes, ai, fmt, utils }) {
+    constructor({ app, routes, ai, fmt, utils, marked }) {
         this.app = app
         this.routes = routes
         this.ai = ai
         this.fmt = fmt
         this.utils = utils
         this._components = {}
+        this.marked = marked
 
         this.state = reactive({})
         this.events = new EventBus()
         this.modalComponents = {}
         this.extensions = []
+        this.markedFilters = []
         this.chatRequestFilters = []
         this.chatResponseFilters = []
         this.chatErrorFilters = []
@@ -55,6 +105,8 @@ export class AppContext {
         this.left = {}
         this.layout = reactive(storageObject(`llms.layout`))
         this.prefs = reactive(storageObject(ai.prefsKey))
+        this._onRouterBeforeEach = []
+        this._onClass = []
 
         if (!Array.isArray(this.layout.hide)) {
             this.layout.hide = []
@@ -75,6 +127,9 @@ export class AppContext {
     }
     async init() {
         Object.assign(this.state, await this.ai.init(this))
+        Object.assign(this.fmt, {
+            markdown: this.renderMarkdown.bind(this)
+        })
     }
     setGlobals(globals) {
         Object.entries(globals).forEach(([name, global]) => {
@@ -130,8 +185,9 @@ export class AppContext {
     }
     modals(modals) {
         Object.keys(modals).forEach(name => {
-            this.modalComponents[name] = modals[name]
-            this.component(name, modals[name])
+            const modal = markRaw(modals[name])
+            this.modalComponents[name] = modal
+            this.component(name, modal)
         })
     }
     openModal(name) {
@@ -182,24 +238,104 @@ export class AppContext {
     layoutVisible(key) {
         return !this.layout.hide.includes(key)
     }
-    toggleTop(name) {
-        console.log('toggleTop', name)
-        this.layout.top = this.layout.top == name ? undefined : name
+    toggleTop(name, toggle) {
+        if (toggle === false) {
+            this.layout.top = undefined
+        } else if (toggle === true) {
+            this.layout.top = name
+        } else {
+            this.layout.top = this.layout.top == name ? undefined : name
+        }
         storageObject(`llms.layout`, this.layout)
+        console.log('toggleTop', name, toggle, this.layout.top, this.layout.top === name)
+        return this.layout.top === name
     }
-    togglePath(path) {
+    togglePath(path, toggle) {
         const currentPath = this.router.currentRoute.value?.path
-        console.log('togglePath', path, currentPath)
-        if (currentPath == path) {
-            this.toggleLayout('left')
-        } else {
+        console.log('togglePath', path, currentPath, toggle)
+        if (currentPath != path) {
+            if (toggle === undefined) {
+                toggle = true
+            }
             this.router.push({ path })
         }
+        this.toggleLayout('left', toggle)
+        return toggle
     }
-    getJson(url, options) {
-        return this.ai.getJson(url, options)
+
+    setError(error, msg = null) {
+        this.state.error = error
+        if (error) {
+            if (msg) {
+                console.error(error.message, msg, error)
+            } else {
+                console.error(error.message, error)
+            }
+        }
+    }
+    clearError() {
+        this.state.error = null
+    }
+
+    async getJson(url, options) {
+        return await this.ai.getJson(url, options)
+    }
+    async post(url, options) {
+        return await this.ai.post(url, options)
+    }
+    async postForm(url, options) {
+        return await this.ai.postForm(url, options)
+    }
+    async postJson(url, options) {
+        return await this.ai.postJson(url, options)
+    }
+    to(route) {
+        if (typeof route == 'string') {
+            route = route.startsWith(this.ai.base)
+                ? route
+                : combinePaths(this.ai.base, route)
+            const path = { path: route }
+            console.log('to', path)
+            this.router.push(path)
+        } else {
+            route.path = route.path.startsWith(this.ai.base)
+                ? route.path
+                : combinePaths(this.ai.base, route.path)
+            console.log('to', route)
+            this.router.push(route)
+        }
     }
-    postJson(url, options) {
-        return this.ai.postJson(url, options)
+
+    // Events
+    onRouterBeforeEach(callback) {
+        this._onRouterBeforeEach.push(callback)
+    }
+
+    onClass(callback) {
+        this._onClass.push(callback)
+    }
+
+    cls(id, cls) {
+        if (this._onClass.length) {
+            this._onClass.forEach(callback => {
+                cls = callback(id, cls) ?? cls
+            })
+        }
+        return cls
+    }
+    toast(msg) {
+        this.setState({ toast: msg })
+    }
+
+    renderMarkdown(content) {
+        if (Array.isArray(content)) {
+            content = content.filter(c => c.type === 'text').map(c => c.text).join('\n')
+        }
+        // if (content) {
+        //     content = content
+        //         .replaceAll(`\\[ \\boxed{`, '\n<span class="inline-block text-xl text-blue-500 bg-blue-50 dark:text-blue-400 dark:bg-blue-950 px-3 py-1 rounded">')
+        //         .replaceAll('} \\]', '</span>\n')
+        // }
+        return this.marked.parse(content || '')
     }
 }

llms/ui/index.mjs

@@ -6,12 +6,9 @@ import App from './App.mjs'
 import ai from './ai.mjs'
 import LayoutModule from './modules/layout.mjs'
 import ChatModule from './modules/chat/index.mjs'
-import ThreadsModule from './modules/threads/index.mjs'
 import ModelSelectorModule from './modules/model-selector.mjs'
-import AnalyticsModule from './modules/analytics.mjs'
-import ToolsModule from './modules/tools.mjs'
 import { utilsFunctions, utilsFormatters } from './utils.mjs'
-import { markdownFormatters } from './markdown.mjs'
+import { marked, markdownFormatters } from './markdown.mjs'
 import { AppContext } from './ctx.mjs'
 
 const Components = {
@@ -20,10 +17,7 @@ const Components = {
 const BuiltInModules = {
     LayoutModule,
     ChatModule,
-    ThreadsModule,
     ModelSelectorModule,
-    AnalyticsModule,
-    ToolsModule,
 }
 
 
@@ -35,11 +29,11 @@ export async function createContext() {
         app.component(name, Components[name])
     })
 
-    const fmt = Object.assign({}, useFormatters(), utilsFormatters(), markdownFormatters())
+    const fmt = Object.assign({}, useFormatters(), utilsFormatters())
     const utils = Object.assign({}, utilsFunctions())
     const routes = []
 
-    const ctx = new AppContext({ app, routes, ai, fmt, utils })
+    const ctx = new AppContext({ app, routes, ai, fmt, utils, marked })
     app.provide('ctx', ctx)
     await ctx.init()
 
@@ -48,13 +42,17 @@ export async function createContext() {
     ctx.modules = await Promise.all(validExtensions.map(async extension => {
         try {
             const module = await import(extension.path)
-            return { extension, module }
+            const order = module.default.order || 0
+            return { extension, module, order }
         } catch (e) {
             console.error(`Failed to load extension module ${extension.name}:`, e)
             return null
         }
     }))
 
+    // sort modules by order
+    ctx.modules.sort((a, b) => a.order - b.order)
+
     const installedModules = []
 
     // Install built-in modules sequentially
@@ -97,16 +95,21 @@ export async function createContext() {
 
     ctx.router.beforeEach((to, from) => {
         const title = to.meta.title || 'Chat'
-        console.log('beforeEach', to.path, title)
+        console.debug('router:change', to.path, title)
         ctx.setLayout({ path: to.path })
         ctx.setState({ title })
         document.title = title
         return true
     })
+    ctx._onRouterBeforeEach.forEach(ctx.router.beforeEach)
 
-    if (ctx.layout.path && location.pathname === '/' && !location.search) {
-        console.log('redirecting to saved path: ', ctx.layout.path)
-        ctx.router.push({ path: ctx.layout.path })
+    if (ai.hasAccess) {
+        if (ctx.layout.path && location.pathname === '/' && !location.search) {
+            console.log('redirecting to saved path: ', ctx.layout.path)
+            ctx.router.push({ path: ctx.layout.path })
+        }
+    } else {
+        ctx.router.push({ path: '/' })
     }
 
     const loadModules = installedModules.filter(x => x.module.default && x.module.default.load)