supervaizer 0.10.15__tar.gz → 0.10.17__tar.gz

{supervaizer-0.10.15 → supervaizer-0.10.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervaizer
-Version: 0.10.15
+Version: 0.10.17
 Summary: Controller system for Supervaize
 Project-URL: Homepage, https://supervaize.com
 Project-URL: Repository, https://github.com/supervaize/supervaizer

{supervaizer-0.10.15 → supervaizer-0.10.17}/pyproject.toml

@@ -121,7 +121,7 @@ mypy_path = "src"
 disallow_any_expr = false
 
 [tool.bumpversion]
-current_version = "0.10.15"
+current_version = "0.10.17"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{supervaizer-0.10.15 → supervaizer-0.10.17}/src/supervaizer/__version__.py

@@ -5,6 +5,6 @@
 # https://mozilla.org/MPL/2.0/.
 
 
-VERSION = "0.10.15"
+VERSION = "0.10.17"
 API_VERSION = "v1"
 TELEMETRY_VERSION = "v1"

{supervaizer-0.10.15 → supervaizer-0.10.17}/src/supervaizer/admin/routes.py

@@ -20,7 +20,7 @@ from pathlib import Path
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
 import psutil
-from fastapi import APIRouter, Depends, HTTPException, Query, Request, Security
+from fastapi import APIRouter, HTTPException, Query, Request, Security
 from fastapi.responses import HTMLResponse, JSONResponse, Response
 from fastapi.security import APIKeyHeader
 from fastapi.templating import Jinja2Templates
@@ -168,12 +168,26 @@ def format_uptime(seconds: int) -> str:
         return f"{minutes}m"
 
 
-def get_server_status() -> ServerStatus:
-    """Get current server status and metrics."""
-    # Get server info from storage - required, no fallback
-    from supervaizer.server import get_server_info_from_storage
+def _get_server_info(request: Optional[Request]) -> Optional[Any]:
+    """Get server info from storage, or from live server (app.state.server) when no persistence."""
+    from supervaizer.server import (
+        get_server_info_from_live,
+        get_server_info_from_storage,
+    )
 
     server_info = get_server_info_from_storage()
+    if server_info is not None:
+        return server_info
+    if request is not None:
+        live = getattr(request.app.state, "server", None)
+        if live is not None:
+            return get_server_info_from_live(live)
+    return None
+
+
+def get_server_status(request: Optional[Request] = None) -> ServerStatus:
+    """Get current server status and metrics."""
+    server_info = _get_server_info(request)
     if not server_info:
         raise HTTPException(
             status_code=503,
@@ -217,12 +231,11 @@ def get_server_status() -> ServerStatus:
     )
 
 
-def get_server_configuration(storage: StorageManager) -> ServerConfiguration:
+def get_server_configuration(
+    storage: StorageManager, request: Optional[Request] = None
+) -> ServerConfiguration:
     """Get server configuration details."""
-    # Get server info from storage - required, no fallback
-    from supervaizer.server import get_server_info_from_storage
-
-    server_info = get_server_info_from_storage()
+    server_info = _get_server_info(request)
     if not server_info:
         raise HTTPException(
             status_code=503,
@@ -304,9 +317,9 @@ def create_admin_routes() -> APIRouter:
     async def admin_server_page(request: Request) -> Response:
         """Server status and configuration page."""
         try:
-            # Get initial server data
-            server_status = get_server_status()
-            server_config = get_server_configuration(storage)
+            # Get initial server data (from storage or live when no persistence)
+            server_status = get_server_status(request)
+            server_config = get_server_configuration(storage, request)
 
             return templates.TemplateResponse(
                 request,
@@ -327,9 +340,7 @@ def create_admin_routes() -> APIRouter:
     async def admin_agents_page(request: Request) -> Response:
         """Agents management page."""
         try:
-            from supervaizer.server import get_server_info_from_storage
-
-            server_info = get_server_info_from_storage()
+            server_info = _get_server_info(request)
             if not server_info:
                 raise HTTPException(
                     status_code=503, detail="Server information not available"
@@ -400,7 +411,7 @@ def create_admin_routes() -> APIRouter:
     async def get_server_status_api(request: Request) -> Response:
         """Get current server status for HTMX refresh."""
         try:
-            server_status = get_server_status()
+            server_status = get_server_status(request)
 
             return templates.TemplateResponse(
                 request,
@@ -415,24 +426,22 @@ def create_admin_routes() -> APIRouter:
             raise HTTPException(status_code=500, detail=str(e))
 
     @router.post("/api/server/register")
-    async def register_server_with_supervisor(
-        request: Request,
-        _: bool = Depends(verify_admin_access),
-    ) -> JSONResponse:
-        """Trigger SERVER_REGISTER to the supervaizer supervisor."""
+    async def register_server_with_supervisor(request: Request) -> JSONResponse:
+        """Trigger SERVER_REGISTER to the supervaizer supervisor (no frontend API key; backend sends to SUPERVAIZE_API_URL)."""
         try:
             from supervaizer.common import ApiSuccess
             from supervaizer.routes import get_server
 
-            get_current = request.app.dependency_overrides.get(get_server)
-            if get_current is None:
-                raise HTTPException(
-                    status_code=503,
-                    detail="Server instance not available (admin not running with live server)",
-                )
-            try:
-                server = await get_current()
-            except (NotImplementedError, TypeError):
+            # Prefer app.state.server (set at launch), else dependency override
+            server = getattr(request.app.state, "server", None)
+            if server is None:
+                get_current = request.app.dependency_overrides.get(get_server)
+                if get_current is not None:
+                    try:
+                        server = await get_current()
+                    except (NotImplementedError, TypeError):
+                        pass
+            if server is None:
                 raise HTTPException(
                     status_code=503,
                     detail="Server instance not available (admin not running with live server)",
@@ -477,9 +486,7 @@ def create_admin_routes() -> APIRouter:
     ) -> Response:
         """Get agents with filtering for HTMX refresh."""
         try:
-            from supervaizer.server import get_server_info_from_storage
-
-            server_info = get_server_info_from_storage()
+            server_info = _get_server_info(request)
             if not server_info:
                 raise HTTPException(
                     status_code=503, detail="Server information not available"
@@ -548,9 +555,7 @@ def create_admin_routes() -> APIRouter:
     ) -> Response:
         """Get detailed agent information."""
         try:
-            from supervaizer.server import get_server_info_from_storage
-
-            server_info = get_server_info_from_storage()
+            server_info = _get_server_info(request)
             if not server_info:
                 raise HTTPException(
                     status_code=503, detail="Server information not available"

{supervaizer-0.10.15 → supervaizer-0.10.17}/src/supervaizer/admin/templates/base.html

@@ -31,8 +31,18 @@
         .htmx-request { opacity: 0.5; }
         .htmx-request.htmx-swapping { opacity: 1; }
     </style>
+    <script>
+        // Persist admin API key from URL so it survives navigation (e.g. Register with supervisor)
+        (function() {
+            var m = /[?&]key=([^&]+)/.exec(window.location.search);
+            if (m) try {
+                var k = decodeURIComponent(m[1]);
+                if (k !== 'None' && k !== 'undefined') sessionStorage.setItem('admin_api_key', k);
+            } catch (e) {}
+        })();
+    </script>
 </head>
-<body class="bg-gray-50 min-h-screen">
+<body class="bg-gray-50 min-h-screen" data-admin-key="{{ (api_key or '')|e }}">
     <!-- Navigation -->
     {% include "navigation.html" %}
 

{supervaizer-0.10.15 → supervaizer-0.10.17}/src/supervaizer/admin/templates/server.html

@@ -109,20 +109,17 @@
             }
         }, 30000);
 
-        // Register with supervisor button
+        // Register with supervisor button — no API key; backend sends SERVER_REGISTER to SUPERVAIZE_API_URL
         const registerBtn = document.getElementById('register-supervisor-btn');
         const registerIndicator = document.getElementById('register-indicator');
         const registerResult = document.getElementById('register-result');
         if (registerBtn) {
             registerBtn.addEventListener('click', async function() {
-                const params = new URLSearchParams(window.location.search);
-                const key = params.get('key');
-                const url = key ? '/admin/api/server/register?key=' + encodeURIComponent(key) : '/admin/api/server/register';
                 registerResult.classList.add('hidden');
                 registerIndicator.classList.remove('htmx-indicator');
                 registerBtn.disabled = true;
                 try {
-                    const res = await fetch(url, { method: 'POST' });
+                    const res = await fetch('/admin/api/server/register', { method: 'POST' });
                     const data = await res.json().catch(function() { return {}; });
                     registerResult.classList.remove('hidden');
                     if (res.ok && data.success) {
@@ -130,11 +127,7 @@
                         registerResult.textContent = data.message || 'Registered successfully.';
                     } else {
                         registerResult.className = 'mt-2 text-sm text-red-700';
-                        if (res.status === 403) {
-                            registerResult.textContent = 'Authentication required. Open this page with ?key=...';
-                        } else {
-                            registerResult.textContent = (data.detail && typeof data.detail === 'object' && data.detail.message) ? data.detail.message : (data.message || 'Registration failed.');
-                        }
+                        registerResult.textContent = (data.detail && typeof data.detail === 'object' && data.detail.message) ? data.detail.message : (data.message || data.detail || 'Registration failed.');
                     }
                 } catch (e) {
                     registerResult.classList.remove('hidden');

{supervaizer-0.10.15 → supervaizer-0.10.17}/src/supervaizer/server.py

@@ -131,6 +131,32 @@ def get_server_info_from_storage() -> Optional[ServerInfo]:
     return None
 
 
+def get_server_info_from_live(server_instance: "Server") -> ServerInfo:
+    """Build ServerInfo from a live Server instance (for when storage has no ServerInfo, e.g. no persistence)."""
+    agents = []
+    if hasattr(server_instance, "agents") and server_instance.agents:
+        for agent in server_instance.agents:
+            agents.append({
+                "name": agent.name,
+                "description": agent.description,
+                "version": agent.version,
+                "api_path": agent.path,
+                "slug": agent.slug,
+                "instructions_path": agent.instructions_path,
+            })
+    start_time = getattr(server_instance, "_start_time", time.time())
+    return ServerInfo(
+        host=getattr(server_instance, "host", "N/A"),
+        port=getattr(server_instance, "port", 0),
+        api_version=API_VERSION,
+        environment=os.getenv("SUPERVAIZER_ENVIRONMENT", "development"),
+        agents=agents,
+        start_time=start_time,
+        created_at=datetime.now().isoformat(),
+        updated_at=datetime.now().isoformat(),
+    )
+
+
 class ServerAbstract(SvBaseModel):
     """
     API Server for the Supervaize Controller.
@@ -428,6 +454,10 @@ class Server(ServerAbstract):
         # Update the dependency
         self.app.dependency_overrides[get_server] = get_current_server
 
+        # Expose live server for admin when storage has no ServerInfo (e.g. no persistence)
+        self._start_time = time.time()
+        self.app.state.server = self
+
         if api_key:
             log.info("[Server launch] API Key authentication enabled")
             # Print the API key if it was generated