llms-py 2.0.25__py3-none-any.whl → 2.0.27__py3-none-any.whl

llms/ui/ai.mjs

@@ -6,12 +6,13 @@ const headers = { 'Accept': 'application/json' }
 const prefsKey = 'llms.prefs'
 
 export const o = {
-    version: '2.0.25',
+    version: '2.0.27',
     base,
     prefsKey,
     welcome: 'Welcome to llms.py',
     auth: null,
     requiresAuth: false,
+    authType: 'apikey',  // 'oauth' or 'apikey' - controls which SignIn component to use
     headers,
     
     resolveUrl(url){
@@ -50,26 +51,88 @@ export const o = {
         this.auth = auth
         if (auth?.apiKey) {
             this.headers.Authorization = `Bearer ${auth.apiKey}`
-        } else if (this.headers.Authorization) {
+            //localStorage.setItem('llms:auth', JSON.stringify({ apiKey: auth.apiKey }))
+        } else if (auth?.sessionToken) {
+            this.headers['X-Session-Token'] = auth.sessionToken
+            localStorage.setItem('llms:auth', JSON.stringify({ sessionToken: auth.sessionToken }))
+        } else {
+            if (this.headers.Authorization) {
+                delete this.headers.Authorization
+            }
+            if (this.headers['X-Session-Token']) {
+                delete this.headers['X-Session-Token']
+            }
+        }
+    },
+    async signOut() {
+        if (this.auth?.sessionToken) {
+            // Call logout endpoint for OAuth sessions
+            try {
+                await this.post('/auth/logout', {
+                    headers: {
+                        'X-Session-Token': this.auth.sessionToken
+                    }
+                })
+            } catch (error) {
+                console.error('Logout error:', error)
+            }
+        }
+        this.auth = null
+        if (this.headers.Authorization) {
             delete this.headers.Authorization
         }
+        if (this.headers['X-Session-Token']) {
+            delete this.headers['X-Session-Token']
+        }
+        localStorage.removeItem('llms:auth')
     },
     async init() {
         // Load models and prompts
         const { initDB } = useThreadStore()
-        const [_, configRes, modelsRes, authRes] = await Promise.all([
+        const [_, configRes, modelsRes] = await Promise.all([
             initDB(),
             this.getConfig(),
             this.getModels(),
-            this.getAuth(),
         ])
         const config = await configRes.json()
         const models = await modelsRes.json()
-        const auth = this.requiresAuth 
+
+        // Update auth settings from server config
+        if (config.requiresAuth != null) {
+            this.requiresAuth = config.requiresAuth
+        }
+        if (config.authType != null) {
+            this.authType = config.authType
+        }
+
+        // Try to restore session from localStorage
+        if (this.requiresAuth) {
+            const storedAuth = localStorage.getItem('llms:auth')
+            if (storedAuth) {
+                try {
+                    const authData = JSON.parse(storedAuth)
+                    if (authData.sessionToken) {
+                        this.headers['X-Session-Token'] = authData.sessionToken
+                    } 
+                    // else if (authData.apiKey) {
+                    //     this.headers.Authorization = `Bearer ${authData.apiKey}`
+                    // }
+                } catch (e) {
+                    console.error('Failed to restore auth from localStorage:', e)
+                    localStorage.removeItem('llms:auth')
+                }
+            }
+        }
+
+        // Get auth status
+        const authRes = await this.getAuth()
+        const auth = this.requiresAuth
             ? await authRes.json()
             : null
         if (auth?.responseStatus?.errorCode) {
             console.error(auth.responseStatus.errorCode, auth.responseStatus.message)
+            // Clear invalid session from localStorage
+            localStorage.removeItem('llms:auth')
         } else {
             this.signIn(auth)
         }