supervaizer 0.10.5__py3-none-any.whl → 0.10.15__py3-none-any.whl

supervaizer/__init__.py

@@ -13,6 +13,8 @@ from supervaizer.agent import (
     AgentMethod,
     AgentMethodParams,
     AgentMethods,
+    AgentMethodField,
+    FieldTypeEnum,
 )
 from supervaizer.case import (
     Case,
@@ -50,6 +52,7 @@ __all__ = [
     "Agent",
     "AgentCustomMethodParams",
     "AgentMethod",
+    "AgentMethodField",
     "AgentMethodParams",
     "AgentMethods",
     "AgentRegisterEvent",
@@ -57,11 +60,11 @@ __all__ = [
     "ApiResult",
     "ApiSuccess",
     "Case",
-    "CaseNodeUpdate",
-    "CaseNodeType",
-    "Cases",
     "CaseNode",
     "CaseNodes",
+    "CaseNodeType",
+    "CaseNodeUpdate",
+    "Cases",
     "CaseStartEvent",
     "CaseUpdateEvent",
     "create_error_response",
@@ -75,6 +78,7 @@ __all__ = [
     "ErrorType",
     "Event",
     "EventType",
+    "FieldTypeEnum",
     "Job",
     "JobContext",
     "JobFinishedEvent",

supervaizer/__version__.py

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

supervaizer/account.py

@@ -8,7 +8,7 @@
 from typing import TYPE_CHECKING, Any, ClassVar, Dict, Optional, Union
 
 import httpx
-from pydantic import Field
+from pydantic import Field, field_validator
 
 from supervaizer.__version__ import VERSION
 from supervaizer.common import ApiError, ApiResult, ApiSuccess, SvBaseModel
@@ -55,6 +55,14 @@ class AccountAbstract(SvBaseModel):
         description="The URL of the Supervaize SaaS API provided by Supervaize.com"
     )
 
+    @field_validator("workspace_id", "api_key", "api_url", mode="before")
+    @classmethod
+    def strip_whitespace(cls, v: Any) -> Any:
+        """Strip leading/trailing whitespace (e.g. newlines from env vars)."""
+        if isinstance(v, str):
+            return v.strip()
+        return v
+
     model_config = {
         "reference_group": "Core",
         "json_schema_extra": {
@@ -62,7 +70,7 @@ class AccountAbstract(SvBaseModel):
                 {
                     "workspace_id": "ws_1234567890abcdef",
                     "api_key": "sk_1234567890abcdef",
-                    "api_url": "https://api.supervaize.com",
+                    "api_url": "https://app.supervaize.com",
                 }
             ]
         },
@@ -121,7 +129,7 @@ class Account(AccountAbstract):
         """URL for the Supervaize Control API.
         Tested in tests/test_account.py
         """
-        return f"{self.api_url_w_v1}/ctrl-events/"
+        return f"{self.api_url_w_v1}/ctrl-events/".strip()
 
     def get_url(self, pattern_name: str, **kwargs: Any) -> str:
         """Generate a URL using the predefined patterns.
@@ -191,7 +199,13 @@ class Account(AccountAbstract):
         from supervaizer.event import ServerRegisterEvent
 
         event = ServerRegisterEvent(server=server, account=self)
-        return self.send_event(sender=server, event=event)
+        result = self.send_event(sender=server, event=event)
+        if isinstance(result, ApiSuccess):
+            log.success(result.message)
+            # TODO: Update server with the server ID from the response. store this ID in env variable.
+        else:
+            log.error(result.message)
+        return result
 
     def _create_api_result(
         self,

supervaizer/account_service.py

@@ -59,14 +59,17 @@ def send_event(
 
     headers = account.api_headers
     payload = event.payload
+    url_event = (
+        account.url_event.strip()
+    )  # defensive: env vars often have trailing newline
 
     # Generate curl equivalent for debugging
 
     curl_headers = " ".join([f'-H "{k}: {v}"' for k, v in headers.items()])
-    curl_cmd = f"curl -X 'GET' '{account.url_event}'  {curl_headers}"
+    curl_cmd = f"curl -X 'GET' '{url_event}'  {curl_headers}"
 
     try:
-        response = _httpx_client.post(account.url_event, headers=headers, json=payload)
+        response = _httpx_client.post(url_event, headers=headers, json=payload)
 
         # Log response details before raising for status
 
@@ -76,6 +79,13 @@ def send_event(
         )
 
         log.success(result.log_message)
+    except (httpx.ConnectError, httpx.ConnectTimeout) as e:
+        log.error(
+            f"Supervaize controller is not available at {url_event}. "
+            "Connection refused or timed out. Is the controller server running?"
+        )
+        log.error(f"❌ Error sending event {event.type.name}: {e!s}")
+        raise e
     except httpx.HTTPError as e:
         # Enhanced error logging
         log.error("[Send event] HTTP Error occurred")
@@ -83,7 +93,7 @@ def send_event(
 
         error_result = ApiError(
             message=f"Error sending event {event.type.name}",
-            url=account.url_event,
+            url=url_event,
             payload=event.payload,
             exception=e,
         )

supervaizer/admin/routes.py

@@ -20,8 +20,8 @@ from pathlib import Path
 from typing import Any, AsyncGenerator, Dict, List, Optional
 
 import psutil
-from fastapi import APIRouter, HTTPException, Query, Request, Security
-from fastapi.responses import HTMLResponse, Response
+from fastapi import APIRouter, Depends, HTTPException, Query, Request, Security
+from fastapi.responses import HTMLResponse, JSONResponse, Response
 from fastapi.security import APIKeyHeader
 from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel
@@ -267,6 +267,7 @@ def create_admin_routes() -> APIRouter:
                     "db_name": "TinyDB",
                     "data_storage_path": str(storage.db_path.absolute()),
                     "api_key": os.getenv("SUPERVAIZER_API_KEY"),
+                    "server_id": os.getenv("SUPERVAIZER_SERVER_ID"),
                 },
             )
         except Exception as e:
@@ -413,6 +414,59 @@ def create_admin_routes() -> APIRouter:
             log.error(f"Get server status API error: {e}")
             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."""
+        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):
+                raise HTTPException(
+                    status_code=503,
+                    detail="Server instance not available (admin not running with live server)",
+                )
+            if not getattr(server, "supervisor_account", None):
+                raise HTTPException(
+                    status_code=503,
+                    detail="No supervisor account configured",
+                )
+            result = server.supervisor_account.register_server(server=server)
+            if isinstance(result, ApiSuccess):
+                return JSONResponse(
+                    status_code=200,
+                    content={
+                        "success": True,
+                        "message": result.message,
+                        "detail": result.detail,
+                    },
+                )
+            # ApiError
+            return JSONResponse(
+                status_code=502,
+                content={
+                    "success": False,
+                    "message": result.message,
+                    "detail": getattr(result, "detail", None),
+                },
+            )
+        except HTTPException:
+            raise
+        except Exception as e:
+            log.error(f"Server register API error: {e}")
+            raise HTTPException(status_code=500, detail=str(e))
+
     @router.get("/api/agents")
     async def get_agents_api(
         request: Request,
@@ -872,28 +926,24 @@ def create_admin_routes() -> APIRouter:
             # Combine and sort by created_at
             activities = []
             for job in recent_jobs:
-                activities.append(
-                    {
-                        "type": "job",
-                        "id": job.get("id"),
-                        "name": job.get("name"),
-                        "status": job.get("status"),
-                        "created_at": job.get("created_at"),
-                        "agent_name": job.get("agent_name"),
-                    }
-                )
+                activities.append({
+                    "type": "job",
+                    "id": job.get("id"),
+                    "name": job.get("name"),
+                    "status": job.get("status"),
+                    "created_at": job.get("created_at"),
+                    "agent_name": job.get("agent_name"),
+                })
 
             for case in recent_cases:
-                activities.append(
-                    {
-                        "type": "case",
-                        "id": case.get("id"),
-                        "name": case.get("name"),
-                        "status": case.get("status"),
-                        "created_at": case.get("created_at"),
-                        "job_id": case.get("job_id"),
-                    }
-                )
+                activities.append({
+                    "type": "case",
+                    "id": case.get("id"),
+                    "name": case.get("name"),
+                    "status": case.get("status"),
+                    "created_at": case.get("created_at"),
+                    "job_id": case.get("job_id"),
+                })
 
             # Sort by created_at descending
             activities.sort(key=lambda x: str(x.get("created_at", "")), reverse=True)
@@ -1150,23 +1200,23 @@ def get_dashboard_stats(storage: StorageManager) -> AdminStats:
 
         # Calculate job stats
         job_total = len(all_jobs)
-        job_running = len(
-            [j for j in all_jobs if j.get("status") in ["in_progress", "awaiting"]]
-        )
+        job_running = len([
+            j for j in all_jobs if j.get("status") in ["in_progress", "awaiting"]
+        ])
         job_completed = len([j for j in all_jobs if j.get("status") == "completed"])
-        job_failed = len(
-            [j for j in all_jobs if j.get("status") in ["failed", "cancelled"]]
-        )
+        job_failed = len([
+            j for j in all_jobs if j.get("status") in ["failed", "cancelled"]
+        ])
 
         # Calculate case stats
         case_total = len(all_cases)
-        case_running = len(
-            [c for c in all_cases if c.get("status") in ["in_progress", "awaiting"]]
-        )
+        case_running = len([
+            c for c in all_cases if c.get("status") in ["in_progress", "awaiting"]
+        ])
         case_completed = len([c for c in all_cases if c.get("status") == "completed"])
-        case_failed = len(
-            [c for c in all_cases if c.get("status") in ["failed", "cancelled"]]
-        )
+        case_failed = len([
+            c for c in all_cases if c.get("status") in ["failed", "cancelled"]
+        ])
 
         # TinyDB collections count (tables)
         collections_count = len(storage._db.tables())

supervaizer/admin/templates/index.html

@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Supervaizer API</title>
+    <!-- Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+</head>
+<body class="bg-gray-50 min-h-screen">
+    <main class="max-w-7xl mx-auto py-6 sm:px-6 lg:px-8">
+        <div class="px-4 py-6 sm:px-0">
+            <h1 class="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
+                Supervaizer API
+            </h1>
+            <p class="mt-2 text-sm text-gray-500">
+                Controller version {{ version }} · API version {{ api_version }}
+            </p>
+            <p class="mt-1 text-xs text-gray-400 font-mono">Server ID: {{ server_id }}</p>
+
+            <div class="mt-8">
+                <h2 class="text-lg font-medium text-gray-900 mb-4">Links</h2>
+                <ul class="space-y-2">
+                    <li>
+                        <a href="{{ base }}/docs" class="text-blue-600 hover:text-blue-800 font-medium">
+                            Swagger UI
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{{ base }}/redoc" class="text-blue-600 hover:text-blue-800 font-medium">
+                            ReDoc
+                        </a>
+                    </li>
+                    <li>
+                        <a href="{{ base }}/openapi.json" class="text-blue-600 hover:text-blue-800 font-medium">
+                            OpenAPI
+                        </a>
+                    </li>
+                    <li><strong>BASE:</strong> {{ base }} 
+                        <br>
+                        <strong>PUBLIC_URL:</strong> {{ public_url }}
+                        <br>
+                        <strong>FULL_URL:</strong> {{ full_url }}
+                        <br>
+                    </li>
+               
+                    {% if show_admin %}
+                    <li>
+                        <a href="{{ base }}/admin" class="text-blue-600 hover:text-blue-800 font-medium">
+                            Admin
+                        </a>
+                    </li>
+                    {% endif %}
+                </ul>
+            </div>
+        </div>
+<hr>
+        <div class="mt-8">
+                TO REPLACE THIS FILE, create an index.html at the root of the project and it will be served as the home page.
+        </div>
+    </main>
+</body>
+</html>

supervaizer/admin/templates/server.html

@@ -12,7 +12,15 @@
             </h2>
             <p class="mt-1 text-sm text-gray-500">Monitor server health and configuration</p>
         </div>
-        <div class="mt-4 flex md:mt-0">
+        <div class="mt-4 flex md:mt-0 gap-2">
+            <button
+                id="register-supervisor-btn"
+                type="button"
+                class="inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
+            >
+                <span id="register-indicator" class="htmx-indicator -ml-1 mr-2 h-4 w-4 border-2 border-white border-t-transparent rounded-full animate-spin"></span>
+                Register with supervisor
+            </button>
             <button
                 hx-get="/admin/api/server/status"
                 hx-target="#server-status-container"
@@ -26,6 +34,7 @@
                 Refresh
             </button>
         </div>
+        <div id="register-result" class="mt-2 text-sm hidden" role="alert"></div>
     </div>
 
     <!-- Server Status Cards -->
@@ -91,15 +100,52 @@
 </div>
 
 <script>
-    // Auto-refresh server status every 30 seconds
     document.addEventListener('DOMContentLoaded', function() {
-        // Set up auto-refresh interval
+        // Auto-refresh server status every 30 seconds
         setInterval(function() {
             const refreshButton = document.querySelector('[hx-get="/admin/api/server/status"]');
             if (refreshButton) {
                 htmx.trigger(refreshButton, 'click');
             }
-        }, 30000); // Refresh every 30 seconds
+        }, 30000);
+
+        // Register with supervisor button
+        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 data = await res.json().catch(function() { return {}; });
+                    registerResult.classList.remove('hidden');
+                    if (res.ok && data.success) {
+                        registerResult.className = 'mt-2 text-sm text-green-700';
+                        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.');
+                        }
+                    }
+                } catch (e) {
+                    registerResult.classList.remove('hidden');
+                    registerResult.className = 'mt-2 text-sm text-red-700';
+                    registerResult.textContent = 'Request failed: ' + (e.message || String(e));
+                } finally {
+                    registerIndicator.classList.add('htmx-indicator');
+                    registerBtn.disabled = false;
+                }
+            });
+        }
     });
 </script>
 {% endblock %}

supervaizer/agent.py

@@ -78,7 +78,7 @@ class AgentMethodField(BaseModel):
     type: Any = Field(
         description="Python type of the field for pydantic validation - note , ChoiceField and MultipleChoiceField are a list[str]"
     )
-    field_type: FieldTypeEnum = Field(
+    field_type: FieldTypeEnum | str = Field(
         default=FieldTypeEnum.CHAR, description="Field type for persistence"
     )
     description: str | None = Field(
@@ -185,6 +185,7 @@ class AgentMethodAbstract(BaseModel):
         default=None,
         description="A list of field specifications for generating forms/UI, following the django.forms.fields definition",
     )
+
     description: str | None = Field(
         default=None, description="Optional description of what the method does"
     )

supervaizer/deploy/cli.py

@@ -10,6 +10,7 @@ Deployment CLI Commands
 This module contains the main CLI commands for the deploy subcommand.
 """
 
+import importlib.util
 import typer
 from pathlib import Path
 from rich.console import Console
@@ -168,9 +169,7 @@ def plan(
 ) -> None:
     """Plan deployment changes without applying them."""
     # Check if deploy extras are installed (e.g., docker, cloud SDKs)
-    try:
-        import docker
-    except ImportError:
+    if importlib.util.find_spec("docker") is None:
         console.print(
             "[bold red]Error:[/] 'deploy' extra requirements are not installed. "
             "Install them with: [bold]pip install supervaizer[deploy][/]"

supervaizer/deploy/templates/index.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Supervaizer API</title>
+    <!-- Tailwind CSS -->
+    <script src="https://cdn.tailwindcss.com"></script>
+</head>
+<body class="bg-gray-50 min-h-screen">
+    <main class="max-w-7xl mx-auto py-6 sm:px-6 lg:px-8">
+        <div class="px-4 py-6 sm:px-0">
+            <h1 class="text-2xl font-bold leading-7 text-gray-900 sm:truncate sm:text-3xl sm:tracking-tight">
+                Supervaizer API
+            </h1>
+            <p class="mt-2 text-sm text-gray-500">
+                Controller version {{ version }} · API version {{ api_version }}
+            </p>
+
+            <div class="mt-8">
+                <h2 class="text-lg font-medium text-gray-900 mb-4">Links</h2>
+                <ul class="space-y-2">
+                    <li>
+                        <a href="/docs" class="text-blue-600 hover:text-blue-800 font-medium">
+                            Swagger UI
+                        </a>
+                    </li>
+                    <li>
+                        <a href="/redoc" class="text-blue-600 hover:text-blue-800 font-medium">
+                            ReDoc
+                        </a>
+                    </li>
+                    <li>
+                        <a href="/openapi.json" class="text-blue-600 hover:text-blue-800 font-medium">
+                            OpenAPI
+                        </a>
+                    </li>
+                    {% if show_admin %}
+                    <li>
+                        <a href="/admin" class="text-blue-600 hover:text-blue-800 font-medium">
+                            Admin
+                        </a>
+                    </li>
+                    {% endif %}
+                    <li>
+                        <a href="/console" class="text-blue-600 hover:text-blue-800 font-medium">
+                            Console
+                        </a>
+                    </li>   
+                    <li>   BASE: {{ base }} 
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </main>
+</body>
+</html>

supervaizer/examples/controller_template.py

@@ -34,28 +34,26 @@ DEV_PUBLIC_URL = "https://myagent-dev.loca.lt"
 PROD_PUBLIC_URL = "https://myagent.cloud-hosting.net:8001"
 
 # Define the parameters and secrets expected by the agent
-agent_parameters: ParametersSetup | None = ParametersSetup.from_list(
-    [
-        Parameter(
-            name="OPEN_API_KEY",
-            description="OpenAPI Key",
-            is_environment=True,
-            is_secret=True,
-        ),
-        Parameter(
-            name="SERPER_API",
-            description="Server API key updated",
-            is_environment=True,
-            is_secret=True,
-        ),
-        Parameter(
-            name="COMPETITOR_SUMMARY_URL",
-            description="Competitor Summary URL",
-            is_environment=True,
-            is_secret=False,
-        ),
-    ]
-)
+agent_parameters: ParametersSetup | None = ParametersSetup.from_list([
+    Parameter(
+        name="OPEN_API_KEY",
+        description="OpenAPI Key",
+        is_environment=True,
+        is_secret=True,
+    ),
+    Parameter(
+        name="SERPER_API",
+        description="Server API key updated",
+        is_environment=True,
+        is_secret=True,
+    ),
+    Parameter(
+        name="COMPETITOR_SUMMARY_URL",
+        description="Competitor Summary URL",
+        is_environment=True,
+        is_secret=False,
+    ),
+])
 
 # Define the method used to start a job
 job_start_method: AgentMethod = AgentMethod(
@@ -180,7 +178,7 @@ agent: Agent = Agent(
 account: Account = Account(
     workspace_id=os.getenv("SUPERVAIZE_WORKSPACE_ID") or "dummy_workspace_id",
     api_key=os.getenv("SUPERVAIZE_API_KEY") or "dummy_api_key",
-    api_url=os.getenv("SUPERVAIZE_API_URL") or "https://api.supervaize.com",
+    api_url=os.getenv("SUPERVAIZE_API_URL") or "https://app.supervaize.com",
 )
 
 # Define the supervaizer server capabilities

supervaizer/server.py

@@ -10,6 +10,7 @@ import sys
 import time
 import uuid
 from datetime import datetime
+from pathlib import Path
 from typing import Any, ClassVar, Dict, List, Optional, TypeVar
 from urllib.parse import urlunparse
 
@@ -19,8 +20,9 @@ from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey, RSAPublicKey
 from fastapi import FastAPI, HTTPException, Request, Security, status
 from fastapi.exceptions import RequestValidationError
-from fastapi.responses import JSONResponse
+from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.security import APIKeyHeader
+from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel, field_validator, Field
 from rich import inspect
 
@@ -53,6 +55,16 @@ T = TypeVar("T")
 # Additional imports for server persistence
 
 
+def _get_or_create_server_id() -> str:
+    """Use SUPERVAIZER_SERVER_ID from env if set; else create uuid and set env."""
+    existing = os.getenv("SUPERVAIZER_SERVER_ID")
+    if existing:
+        return existing
+    new_id = str(uuid.uuid4())
+    os.environ["SUPERVAIZER_SERVER_ID"] = new_id
+    return new_id
+
+
 class ServerInfo(BaseModel):
     """Complete server information for storage."""
 
@@ -76,21 +88,20 @@ def save_server_info_to_storage(server_instance: "Server") -> None:
         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,
-                    }
-                )
+                agents.append({
+                    "name": agent.name,
+                    "description": agent.description,
+                    "version": agent.version,
+                    "api_path": agent.path,
+                    "slug": agent.slug,
+                    "instructions_path": agent.instructions_path,
+                })
 
         # Create server info
         server_info = ServerInfo(
-            host=getattr(server_instance, "host", "0.0.0.0"),
-            port=getattr(server_instance, "port", 8000),
+            id=getattr(server_instance, "server_id", "N/A"),
+            host=getattr(server_instance, "host", "N/A"),
+            port=getattr(server_instance, "port", "N/A"),
             api_version=API_VERSION,
             environment=os.getenv("SUPERVAIZER_ENVIRONMENT", "development"),
             agents=agents,
@@ -148,6 +159,10 @@ class ServerAbstract(SvBaseModel):
     """
 
     supervaizer_VERSION: ClassVar[str] = VERSION
+    server_id: str = Field(
+        default_factory=_get_or_create_server_id,
+        description="Unique server id (SUPERVAIZER_SERVER_ID env or persisted uuid)",
+    )
     scheme: str = Field(description="URL scheme (http or https)")
     host: str = Field(
         description="Host to bind the server to (e.g., 0.0.0.0 for all interfaces)"
@@ -354,6 +369,8 @@ class Server(ServerAbstract):
             **kwargs,
         )
 
+        log.info(f"[Server launch] Server ID: {self.server_id}")
+
         # Create routes
         if self.supervisor_account:
             log.info(
@@ -377,6 +394,26 @@ class Server(ServerAbstract):
             # Save server info to storage for admin interface
             save_server_info_to_storage(self)
 
+        # Home page (template in admin/templates)
+        _home_templates = Jinja2Templates(
+            directory=str(Path(__file__).parent / "admin" / "templates")
+        )
+
+        @self.app.get("/", response_class=HTMLResponse)
+        async def home_page(request: Request) -> HTMLResponse:
+            base = self.public_url or f"{self.scheme}://{self.host}:{self.port}"
+            return _home_templates.TemplateResponse(
+                "index.html",
+                {
+                    "request": request,
+                    "base": base,
+                    "version": VERSION,
+                    "api_version": API_VERSION,
+                    "show_admin": bool(self.api_key and admin_interface),
+                    "server_id": self.server_id,
+                },
+            )
+
         # Load running entities from storage into memory
         try:
             load_running_entities_on_startup()
@@ -444,6 +481,7 @@ class Server(ServerAbstract):
         """Get registration info for the server."""
         assert self.public_key is not None, "Public key not initialized"
         return {
+            "server_id": self.server_id,
             "url": self.public_url,
             "uri": self.uri,
             "api_version": API_VERSION,

{supervaizer-0.10.5.dist-info → supervaizer-0.10.15.dist-info}/METADATA

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

{supervaizer-0.10.5.dist-info → supervaizer-0.10.15.dist-info}/RECORD

@@ -1,8 +1,8 @@
-supervaizer/__init__.py,sha256=eBbGjduMBH-FDjcGlSqeR4Kf4uo60Cf1DrRur8VGkJo,2341
-supervaizer/__version__.py,sha256=qlIH8dSecrW9K7OJHX-wf9QuxYRMhfsImO-0ebKqOpM,348
-supervaizer/account.py,sha256=-K1pd590Lp2TncZ2jn442kBLxnm482G3WnQavVFxZ1s,11102
-supervaizer/account_service.py,sha256=z4lw8qp8XvCrU6Ndf4VHRnQwY_071410ts5_7E8YDAs,3046
-supervaizer/agent.py,sha256=Clenvdr_v-lV7_v6YCcevp8dj5JUNvpTWrBZBYM82lg,36509
+supervaizer/__init__.py,sha256=UNFcgJT-2708tLRFXohWr3320LVAzh3_WZZhrU9j1Iw,2427
+supervaizer/__version__.py,sha256=Oe_Vfg1WOw027ZNCTKD35vUMGykGwCa00Szf8CAsyS8,349
+supervaizer/account.py,sha256=POChw9c2ZjBNvesz6JmvBzYmMD40M5oxtz5IupuMqsw,11683
+supervaizer/account_service.py,sha256=ZgZ0fhsbSVA076c-35ZZoYJBrQZsAwfFS7namVeoD3s,3459
+supervaizer/agent.py,sha256=EtmqBH9fsO4k8YcHnjj55_4uOmb5URZwLlIIJReWg7A,36516
 supervaizer/case.py,sha256=dOgRujyf4MFcZ-937zxJbqLIPduKg6ZspHuhnWiq13Q,14385
 supervaizer/cli.py,sha256=3KH4gZXTiJ9GtY375kGm5HaKCGV2V8WEbcWdF_sWWEc,13936
 supervaizer/common.py,sha256=6ygNS1YxliP-e6OEVX7vDuC8YAaT2rYhjqQ_8txnWlg,10066
@@ -13,11 +13,12 @@ supervaizer/job_service.py,sha256=22Qe7Z5_u3R28tcNH_21YMIYciWFtJaM7I-MXtIhBMU,46
 supervaizer/lifecycle.py,sha256=5CunJN7MsM5blyNiFMJMLFDUBmTmmAsPE24QC-gSbYA,13958
 supervaizer/parameter.py,sha256=sYDuGof_w6mlix0oxjB6odV0sO0QSBL1KwFZa3Y2cOA,8157
 supervaizer/routes.py,sha256=o3u7pGGLE0MQzWtQNdd5xk1M0G9Y_BR_JiLVmCFtdC4,34319
-supervaizer/server.py,sha256=cXwB2XfIBQJ6zFaUde4OTCPgHpb_tpsUy9cRkkXqA-Q,20805
+supervaizer/server.py,sha256=JLavzhd8PVTDtqfupaHGnshnY5GCi5rxTC4ThGcml9M,22270
 supervaizer/server_utils.py,sha256=FMglpADQBJynkR2v-pfwANu6obsaPvR9j0BQc5Otpac,1590
 supervaizer/storage.py,sha256=WLX8ggwt1AGF07DrfD1K6PyP2-N45c_Ep4CL0iPLVbI,15332
 supervaizer/telemetry.py,sha256=XSYw8ZwoY8W6C7mhwHU67t7trJzWd7CBkkSNdsDT_HA,2596
-supervaizer/admin/routes.py,sha256=r9hucWtNiTGQHgv9DsRkVpwnLbyLFaqrbse1orl-oTA,45627
+supervaizer/admin/routes.py,sha256=utXv4Agn9Cz9V6IG8XCKSJnRPK4qi7Ge7Ti9ZUlSB4w,47694
+supervaizer/admin/static/favicon.ico,sha256=wFyXw96AplZoEcW45dJBeC1pHTcPSH07HGWbtrc49mI,5558
 supervaizer/admin/static/js/job-start-form.js,sha256=s--AGVYzgc9mE20POYeM0BNm0Wy41aBZVv99tc0cSPU,11938
 supervaizer/admin/templates/agent_detail.html,sha256=DFOGfjuQNC39FOLYUW_jD0A01WpBY1umatGCslyJ0_c,7581
 supervaizer/admin/templates/agents.html,sha256=orB_z1iMFE2MKhFm9XejwZjmzMC1PVT69oB-F9YZPHQ,12678
@@ -28,17 +29,18 @@ supervaizer/admin/templates/cases_list.html,sha256=UV4SfULzxNiOpG8aNddablpwf6hVN
 supervaizer/admin/templates/cases_table.html,sha256=VyL5mEF003FTNHym1UYBD8JkvhA9wR328ciTKNKxdb8,6619
 supervaizer/admin/templates/console.html,sha256=tLGGf8vHjGK77Il6SYlgparoU_xz3nbvNpGVQRkVNCc,13966
 supervaizer/admin/templates/dashboard.html,sha256=3Pu5bR78QUcPNp5MyXkyibfp-wxYdJyyf77v3O_f_hU,7873
+supervaizer/admin/templates/index.html,sha256=3MFAQ53gptvUgBBfzQoCLOFLAd7JYOV5Ak4NEPsU1f4,2500
 supervaizer/admin/templates/job_detail.html,sha256=LDTMWLURyVCp7SMTxQ4M8AFqNpbbUVUx253negp9JNA,10790
 supervaizer/admin/templates/job_start_test.html,sha256=eAogAit0JfuMU4N5YR7N03w0nD_Bi9mtiX8uJ7dHLPg,4270
 supervaizer/admin/templates/jobs_list.html,sha256=VJ2VYe62dHXvjQQgUAVyKcn58rO5919UuP3VKgxLVhM,9136
 supervaizer/admin/templates/jobs_table.html,sha256=BCOI_7QlxJ5XOra7WKou48a2lNwQYASCMFTtgzHNotw,5974
 supervaizer/admin/templates/navigation.html,sha256=Ci_CMLqBuIKRt3JCFtn9Vjz1AAkqC75WMT6IQUiByFI,11724
 supervaizer/admin/templates/recent_activity.html,sha256=hL06GXF1a-C_tkj3pRLrDTTDqG0KplcWMZFengFMuEc,4843
-supervaizer/admin/templates/server.html,sha256=m3qIQsEojogXQKTSD6ljKj4_lrwaLJTpTbMpfnWZHxU,5650
+supervaizer/admin/templates/server.html,sha256=CScvNTNdc0Wi2entmzZHSnqrBjqIOZUsbQrWD58pBYM,8527
 supervaizer/admin/templates/server_status_cards.html,sha256=yJ36hkfgQpscYkiaodFDQPnmJWeb2W7gey09Z3T6JsY,7882
 supervaizer/admin/templates/supervaize_instructions.html,sha256=LTLla1xgIeLpFf7bond_lxH5qdQQ2ak52Fd7hqChi1I,10225
 supervaizer/deploy/__init__.py,sha256=DvngGQu8tS_Yz5FU4kKCvPpod11IGCtZWkUNeB5aVHI,557
-supervaizer/deploy/cli.py,sha256=SeG2rIT5cKl-I5s4qvpLLl9OXxmzelqKRDKcfH1GsSM,10183
+supervaizer/deploy/cli.py,sha256=6najlZXh_3kSY_sfJdilf-iW5BqaudI2bKKrhzXN09A,10201
 supervaizer/deploy/docker.py,sha256=FLMKHOnbnjMFTcULdRdgwKJwT-q8JtVwbN1iSemh21w,13810
 supervaizer/deploy/driver_factory.py,sha256=Qm6DYVUfV3mlRHUglk5YlslGg6JYZ754uKeoiyxXw10,1487
 supervaizer/deploy/health.py,sha256=vh4SMOxy43QXi1fanQjWfWqoGTy_z1VXwwfy4Fq2bHg,13764
@@ -61,7 +63,8 @@ supervaizer/deploy/templates/debug_env.py,sha256=WFlxfiCAlkxM1NybNvtmmG5zJnoSvjW
 supervaizer/deploy/templates/docker-compose.yml.template,sha256=ZcW8WyhmqMElaxBpokuZG12n0tFJL8BY7k7Tvdz6tdw,1100
 supervaizer/deploy/templates/dockerignore.template,sha256=bYFRn6QGsjtRDH-Y7vzWk3-u3jIp90FajV2Ed94ah5M,515
 supervaizer/deploy/templates/entrypoint.sh,sha256=z079VUotu6DJX92fJiBB3eVwCEgcP6B9D9Fvwv_FL9w,463
-supervaizer/examples/controller_template.py,sha256=gAmA3GnDTdYkDk3NpVe-6Adbsl4Oxs-iZKN6mrO3WEg,6419
+supervaizer/deploy/templates/index.html,sha256=z2ocEOYbWbl1Rz3Toc5JZkN7OAoW_GFV1yKKhdyC3vw,2160
+supervaizer/examples/controller_template.py,sha256=bQRtZdq9Z8Pg0b3bRy4oVy6YIIM_e5DzhXVPOr1gFvk,6337
 supervaizer/protocol/__init__.py,sha256=00GHbUsLNsf0a1rQrUPpVN2Uy-7rDz72Ps6TUVD91tE,389
 supervaizer/protocol/a2a/__init__.py,sha256=1ACfPGLzS6XdZPiFxn1nVamvbasqtJJ7U1BBbSmT-nI,625
 supervaizer/protocol/a2a/model.py,sha256=sWzatlA_fcva_fdtM8Yh4cioRq0KbwV5AXpNCnsOtQo,7198
@@ -69,8 +72,8 @@ supervaizer/protocol/a2a/routes.py,sha256=rkQTNBD1NTYimKCb8iOk4bVf9ldDP1LqHfOsyh
 supervaizer/utils/__init__.py,sha256=fd0NFwN_cen3QPms2SOnuz4jcetay3f_31dit2As7EA,458
 supervaizer/utils/version_check.py,sha256=-tsOURpHVh0LNTbpQsyJDJENKszC-NzXDSO_EToEQPE,1893
 supervaizer/py.typed,sha256=bHhvLx7c6MqrzXVPbdK3qAOcSxzp4wDtTx4QifMC2EY,74
-supervaizer-0.10.5.dist-info/METADATA,sha256=PanDorKt110d-c25DnRY995GBEp0upFeCAELBXOL1BE,12647
-supervaizer-0.10.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-supervaizer-0.10.5.dist-info/entry_points.txt,sha256=vL_IBR_AeEI2u2-6YL4PY9k2Mar4-gprG8-UxERWjmg,52
-supervaizer-0.10.5.dist-info/licenses/LICENSE.md,sha256=dmdnt1vfpxNPr8Lt0BnxKE5uzUwK3CWTthTUStgOXjY,15327
-supervaizer-0.10.5.dist-info/RECORD,,
+supervaizer-0.10.15.dist-info/METADATA,sha256=-c3Opx2tY7d8zsKm14IRFJFE3ELjquXaPEFGYrGHhtQ,12648
+supervaizer-0.10.15.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+supervaizer-0.10.15.dist-info/entry_points.txt,sha256=vL_IBR_AeEI2u2-6YL4PY9k2Mar4-gprG8-UxERWjmg,52
+supervaizer-0.10.15.dist-info/licenses/LICENSE.md,sha256=dmdnt1vfpxNPr8Lt0BnxKE5uzUwK3CWTthTUStgOXjY,15327
+supervaizer-0.10.15.dist-info/RECORD,,