PyPI - llms-py - Versions diffs - 2.0.25__py3-none-any.whl → 2.0.27__py3-none-any.whl - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (30) hide show

llms/index.html +17 -1
llms/llms.json +9 -0
llms/main.py +254 -4
llms/ui/Analytics.mjs +73 -73
llms/ui/App.mjs +8 -3
llms/ui/Avatar.mjs +61 -4
llms/ui/Brand.mjs +4 -4
llms/ui/ChatPrompt.mjs +110 -9
llms/ui/Main.mjs +42 -38
llms/ui/ModelSelector.mjs +3 -4
llms/ui/OAuthSignIn.mjs +92 -0
llms/ui/ProviderStatus.mjs +12 -12
llms/ui/Recents.mjs +13 -13
llms/ui/SettingsDialog.mjs +65 -65
llms/ui/Sidebar.mjs +17 -17
llms/ui/SystemPromptEditor.mjs +5 -5
llms/ui/SystemPromptSelector.mjs +4 -4
llms/ui/Welcome.mjs +2 -2
llms/ui/ai.mjs +68 -5
llms/ui/app.css +422 -0
llms/ui/markdown.mjs +8 -8
llms/ui/tailwind.input.css +2 -0
llms/ui/typography.css +50 -34
{llms_py-2.0.25.dist-info → llms_py-2.0.27.dist-info}/METADATA +59 -51
llms_py-2.0.27.dist-info/RECORD +48 -0
llms_py-2.0.25.dist-info/RECORD +0 -47
{llms_py-2.0.25.dist-info → llms_py-2.0.27.dist-info}/WHEEL +0 -0
{llms_py-2.0.25.dist-info → llms_py-2.0.27.dist-info}/entry_points.txt +0 -0
{llms_py-2.0.25.dist-info → llms_py-2.0.27.dist-info}/licenses/LICENSE +0 -0
{llms_py-2.0.25.dist-info → llms_py-2.0.27.dist-info}/top_level.txt +0 -0

llms/index.html CHANGED Viewed

@@ -1,8 +1,8 @@
 <html>
 <head>
     <title>llms.py</title>
-    <link rel="stylesheet" href="/ui/typography.css">
     <link rel="stylesheet" href="/ui/app.css">
+    <link rel="stylesheet" href="/ui/typography.css">
     <link rel="icon" type="image/svg" href="/ui/fav.svg">
     <style>
         [type='button'],button[type='submit']{cursor:pointer}
@@ -38,6 +38,22 @@
 <body>
 <div id="app"></div>
 </body>
+<script>
+let colorScheme = location.search === "?dark"
+        ? "dark"
+        : location.search === "?light"
+            ? "light"
+            : localStorage.getItem('color-scheme')
+let darkMode = colorScheme != null
+    ? colorScheme === 'dark'
+    : window.matchMedia('(prefers-color-scheme: dark)').matches
+let html = document.documentElement
+html.classList.toggle('dark', darkMode)
+html.style.setProperty('color-scheme', darkMode ? 'dark' : null)
+if (localStorage.getItem('color-scheme') === null) {
+    localStorage.setItem('color-scheme', darkMode ? 'dark' : 'light')
+}
+</script>
 <script type="module">
 import { createApp, defineAsyncComponent } from 'vue'
 import { createWebHistory, createRouter } from "vue-router"

llms/llms.json CHANGED Viewed

@@ -1,4 +1,12 @@
 {
+    "auth": {
+        "enabled": false,
+        "github": {
+            "client_id": "$GITHUB_CLIENT_ID",
+            "client_secret": "$GITHUB_CLIENT_SECRET",
+            "redirect_uri": "http://localhost:8000/auth/github/callback"
+        }
+    },
     "defaults": {
         "headers": {
             "Content-Type": "application/json",
@@ -113,6 +121,7 @@
                 "mai-ds-r1": "microsoft/mai-ds-r1:free",
                 "llama3.3:70b": "meta-llama/llama-3.3-70b-instruct:free",
                 "nemotron-nano:9b": "nvidia/nemotron-nano-9b-v2:free",
+                "nemotron-nano:12b":"nvidia/nemotron-nano-12b-v2-vl:free",
                 "deepseek-r1-distill-llama:70b": "deepseek/deepseek-r1-distill-llama-70b:free",
                 "gpt-oss:20b": "openai/gpt-oss-20b:free",
                 "mistral-small3.2:24b": "mistralai/mistral-small-3.2-24b-instruct:free",

llms/main.py CHANGED Viewed

@@ -14,7 +14,8 @@ import mimetypes
 import traceback
 import sys
 import site
-from urllib.parse import parse_qs
+import secrets
+from urllib.parse import parse_qs, urlencode
 import aiohttp
 from aiohttp import web
@@ -22,7 +23,7 @@ from aiohttp import web
 from pathlib import Path
 from importlib import resources   # Py≥3.9  (pip install importlib_resources for 3.7/3.8)
-VERSION = "2.0.25"
+VERSION = "2.0.27"
 _ROOT = None
 g_config_path = None
 g_ui_path = None
@@ -31,6 +32,8 @@ g_handlers = {}
 g_verbose = False
 g_logprefix=""
 g_default_model=""
+g_sessions = {}  # OAuth session storage: {session_token: {userId, userName, displayName, profileUrl, email, created}}
+g_oauth_states = {}  # CSRF protection: {state: {created, redirect_uri}}
 def _log(message):
     """Helper method for logging from the global polling task."""
@@ -1456,9 +1459,61 @@ def main():
             print(f"UI not found at {g_ui_path}")
             exit(1)
+        # Validate auth configuration if enabled
+        auth_enabled = g_config.get('auth', {}).get('enabled', False)
+        if auth_enabled:
+            github_config = g_config.get('auth', {}).get('github', {})
+            client_id = github_config.get('client_id', '')
+            client_secret = github_config.get('client_secret', '')
+            # Expand environment variables
+            if client_id.startswith('$'):
+                client_id = os.environ.get(client_id[1:], '')
+            if client_secret.startswith('$'):
+                client_secret = os.environ.get(client_secret[1:], '')
+            if not client_id or not client_secret:
+                print("ERROR: Authentication is enabled but GitHub OAuth is not properly configured.")
+                print("Please set GITHUB_CLIENT_ID and GITHUB_CLIENT_SECRET environment variables,")
+                print("or disable authentication by setting 'auth.enabled' to false in llms.json")
+                exit(1)
+            _log("Authentication enabled - GitHub OAuth configured")
         app = web.Application()
+        # Authentication middleware helper
+        def check_auth(request):
+            """Check if request is authenticated. Returns (is_authenticated, user_data)"""
+            if not auth_enabled:
+                return True, None
+            # Check for OAuth session token
+            session_token = request.query.get('session') or request.headers.get('X-Session-Token')
+            if session_token and session_token in g_sessions:
+                return True, g_sessions[session_token]
+            # Check for API key
+            auth_header = request.headers.get('Authorization', '')
+            if auth_header.startswith('Bearer '):
+                api_key = auth_header[7:]
+                if api_key:
+                    return True, {"authProvider": "apikey"}
+            return False, None
         async def chat_handler(request):
+            # Check authentication if enabled
+            is_authenticated, user_data = check_auth(request)
+            if not is_authenticated:
+                return web.json_response({
+                    "error": {
+                        "message": "Authentication required",
+                        "type": "authentication_error",
+                        "code": "unauthorized"
+                    }
+                }, status=401)
             try:
                 chat = await request.json()
                 response = await chat_completion(chat)
@@ -1504,6 +1559,198 @@ def main():
             })
         app.router.add_post('/providers/{provider}', provider_handler)
+        # OAuth handlers
+        async def github_auth_handler(request):
+            """Initiate GitHub OAuth flow"""
+            if 'auth' not in g_config or 'github' not in g_config['auth']:
+                return web.json_response({"error": "GitHub OAuth not configured"}, status=500)
+            auth_config = g_config['auth']['github']
+            client_id = auth_config.get('client_id', '')
+            redirect_uri = auth_config.get('redirect_uri', '')
+            # Expand environment variables
+            if client_id.startswith('$'):
+                client_id = os.environ.get(client_id[1:], '')
+            if redirect_uri.startswith('$'):
+                redirect_uri = os.environ.get(redirect_uri[1:], '')
+            if not client_id:
+                return web.json_response({"error": "GitHub client_id not configured"}, status=500)
+            # Generate CSRF state token
+            state = secrets.token_urlsafe(32)
+            g_oauth_states[state] = {
+                'created': time.time(),
+                'redirect_uri': redirect_uri
+            }
+            # Clean up old states (older than 10 minutes)
+            current_time = time.time()
+            expired_states = [s for s, data in g_oauth_states.items() if current_time - data['created'] > 600]
+            for s in expired_states:
+                del g_oauth_states[s]
+            # Build GitHub authorization URL
+            params = {
+                'client_id': client_id,
+                'redirect_uri': redirect_uri,
+                'state': state,
+                'scope': 'read:user user:email'
+            }
+            auth_url = f"https://github.com/login/oauth/authorize?{urlencode(params)}"
+            return web.HTTPFound(auth_url)
+        async def github_callback_handler(request):
+            """Handle GitHub OAuth callback"""
+            code = request.query.get('code')
+            state = request.query.get('state')
+            if not code or not state:
+                return web.Response(text="Missing code or state parameter", status=400)
+            # Verify state token (CSRF protection)
+            if state not in g_oauth_states:
+                return web.Response(text="Invalid state parameter", status=400)
+            state_data = g_oauth_states.pop(state)
+            if 'auth' not in g_config or 'github' not in g_config['auth']:
+                return web.json_response({"error": "GitHub OAuth not configured"}, status=500)
+            auth_config = g_config['auth']['github']
+            client_id = auth_config.get('client_id', '')
+            client_secret = auth_config.get('client_secret', '')
+            redirect_uri = auth_config.get('redirect_uri', '')
+            # Expand environment variables
+            if client_id.startswith('$'):
+                client_id = os.environ.get(client_id[1:], '')
+            if client_secret.startswith('$'):
+                client_secret = os.environ.get(client_secret[1:], '')
+            if redirect_uri.startswith('$'):
+                redirect_uri = os.environ.get(redirect_uri[1:], '')
+            if not client_id or not client_secret:
+                return web.json_response({"error": "GitHub OAuth credentials not configured"}, status=500)
+            # Exchange code for access token
+            async with aiohttp.ClientSession() as session:
+                token_url = "https://github.com/login/oauth/access_token"
+                token_data = {
+                    'client_id': client_id,
+                    'client_secret': client_secret,
+                    'code': code,
+                    'redirect_uri': redirect_uri
+                }
+                headers = {'Accept': 'application/json'}
+                async with session.post(token_url, data=token_data, headers=headers) as resp:
+                    token_response = await resp.json()
+                    access_token = token_response.get('access_token')
+                    if not access_token:
+                        error = token_response.get('error_description', 'Failed to get access token')
+                        return web.Response(text=f"OAuth error: {error}", status=400)
+                # Fetch user info
+                user_url = "https://api.github.com/user"
+                headers = {
+                    "Authorization": f"Bearer {access_token}",
+                    "Accept": "application/json"
+                }
+                async with session.get(user_url, headers=headers) as resp:
+                    user_data = await resp.json()
+            # Create session
+            session_token = secrets.token_urlsafe(32)
+            g_sessions[session_token] = {
+                "userId": str(user_data.get('id', '')),
+                "userName": user_data.get('login', ''),
+                "displayName": user_data.get('name', ''),
+                "profileUrl": user_data.get('avatar_url', ''),
+                "email": user_data.get('email', ''),
+                "created": time.time()
+            }
+            # Redirect to UI with session token
+            return web.HTTPFound(f"/?session={session_token}")
+        async def session_handler(request):
+            """Validate and return session info"""
+            session_token = request.query.get('session') or request.headers.get('X-Session-Token')
+            if not session_token or session_token not in g_sessions:
+                return web.json_response({"error": "Invalid or expired session"}, status=401)
+            session_data = g_sessions[session_token]
+            # Clean up old sessions (older than 24 hours)
+            current_time = time.time()
+            expired_sessions = [token for token, data in g_sessions.items() if current_time - data['created'] > 86400]
+            for token in expired_sessions:
+                del g_sessions[token]
+            return web.json_response({
+                **session_data,
+                "sessionToken": session_token
+            })
+        async def logout_handler(request):
+            """End OAuth session"""
+            session_token = request.query.get('session') or request.headers.get('X-Session-Token')
+            if session_token and session_token in g_sessions:
+                del g_sessions[session_token]
+            return web.json_response({"success": True})
+        async def auth_handler(request):
+            """Check authentication status and return user info"""
+            # Check for OAuth session token
+            session_token = request.query.get('session') or request.headers.get('X-Session-Token')
+            if session_token and session_token in g_sessions:
+                session_data = g_sessions[session_token]
+                return web.json_response({
+                    "userId": session_data.get("userId", ""),
+                    "userName": session_data.get("userName", ""),
+                    "displayName": session_data.get("displayName", ""),
+                    "profileUrl": session_data.get("profileUrl", ""),
+                    "authProvider": "github"
+                })
+            # Check for API key in Authorization header
+            # auth_header = request.headers.get('Authorization', '')
+            # if auth_header.startswith('Bearer '):
+            #     # For API key auth, return a basic response
+            #     # You can customize this based on your API key validation logic
+            #     api_key = auth_header[7:]
+            #     if api_key:  # Add your API key validation logic here
+            #         return web.json_response({
+            #             "userId": "1",
+            #             "userName": "apiuser",
+            #             "displayName": "API User",
+            #             "profileUrl": "",
+            #             "authProvider": "apikey"
+            #         })
+            # Not authenticated - return error in expected format
+            return web.json_response({
+                "responseStatus": {
+                    "errorCode": "Unauthorized",
+                    "message": "Not authenticated"
+                }
+            }, status=401)
+        app.router.add_get('/auth', auth_handler)
+        app.router.add_get('/auth/github', github_auth_handler)
+        app.router.add_get('/auth/github/callback', github_callback_handler)
+        app.router.add_get('/auth/session', session_handler)
+        app.router.add_post('/auth/logout', logout_handler)
         async def ui_static(request: web.Request) -> web.Response:
             path = Path(request.match_info["path"])
@@ -1543,9 +1790,12 @@ def main():
                 enabled, disabled = provider_status()
                 ui['status'] = {
                     "all": list(g_config['providers'].keys()),
-                    "enabled": enabled,
-                    "disabled": disabled
+                    "enabled": enabled,
+                    "disabled": disabled
                 }
+                # Add auth configuration
+                ui['requiresAuth'] = auth_enabled
+                ui['authType'] = 'oauth' if auth_enabled else 'apikey'
                 return web.json_response(ui)
         app.router.add_get('/config', ui_config_handler)

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

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