supervaizer 0.10.13__tar.gz → 0.10.15__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervaizer
-Version: 0.10.13
+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.13 → supervaizer-0.10.15}/pyproject.toml

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

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

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

{supervaizer-0.10.13 → supervaizer-0.10.15}/src/supervaizer/account.py

@@ -199,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-0.10.13 → supervaizer-0.10.15}/src/supervaizer/admin/routes.py

@@ -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:
@@ -445,7 +446,11 @@ def create_admin_routes() -> APIRouter:
             if isinstance(result, ApiSuccess):
                 return JSONResponse(
                     status_code=200,
-                    content={"success": True, "message": result.message, "detail": result.detail},
+                    content={
+                        "success": True,
+                        "message": result.message,
+                        "detail": result.detail,
+                    },
                 )
             # ApiError
             return JSONResponse(
@@ -921,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)
@@ -1199,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-0.10.13 → supervaizer-0.10.15}/src/supervaizer/admin/templates/index.html

@@ -16,6 +16,7 @@
             <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>

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

@@ -20,7 +20,7 @@ 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 FileResponse, HTMLResponse, JSONResponse
+from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.security import APIKeyHeader
 from fastapi.templating import Jinja2Templates
 from pydantic import BaseModel, field_validator, Field
@@ -46,11 +46,7 @@ from supervaizer.routes import (
     create_utils_routes,
     get_server,
 )
-from supervaizer.storage import (
-    PERSISTENCE_ENABLED,
-    StorageManager,
-    load_running_entities_on_startup,
-)
+from supervaizer.storage import StorageManager, load_running_entities_on_startup
 
 insp = inspect
 
@@ -59,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."""
 
@@ -74,9 +80,7 @@ class ServerInfo(BaseModel):
 
 
 def save_server_info_to_storage(server_instance: "Server") -> None:
-    """Save server information to storage (only when persistence is enabled)."""
-    if not PERSISTENCE_ENABLED:
-        return
+    """Save server information to storage."""
     try:
         storage = StorageManager()
 
@@ -95,6 +99,7 @@ def save_server_info_to_storage(server_instance: "Server") -> None:
 
         # Create server info
         server_info = ServerInfo(
+            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,
@@ -154,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)"
@@ -242,10 +251,10 @@ class Server(ServerAbstract):
         supervisor_account: Optional[Account] = None,
         a2a_endpoints: bool = True,
         admin_interface: bool = True,
-        scheme: str = os.getenv("SUPERVAIZER_SCHEME", "https"),
+        scheme: str = "http",
         environment: str = os.getenv("SUPERVAIZER_ENVIRONMENT", "dev"),
         host: str = os.getenv("SUPERVAIZER_HOST", "0.0.0.0"),
-        port: int = int(os.getenv("SUPERVAIZER_PORT", 443)),
+        port: int = int(os.getenv("SUPERVAIZER_PORT", 8000)),
         debug: bool = False,
         reload: bool = False,
         mac_addr: str = "",
@@ -360,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(
@@ -383,13 +394,6 @@ class Server(ServerAbstract):
             # Save server info to storage for admin interface
             save_server_info_to_storage(self)
 
-        # Favicon (served at root so /docs, /redoc, etc. pick it up)
-        _favicon_path = Path(__file__).parent / "admin" / "static" / "favicon.ico"
-
-        @self.app.get("/favicon.ico", include_in_schema=False)
-        async def favicon() -> FileResponse:
-            return FileResponse(_favicon_path, media_type="image/x-icon")
-
         # Home page (template in admin/templates)
         _home_templates = Jinja2Templates(
             directory=str(Path(__file__).parent / "admin" / "templates")
@@ -397,20 +401,16 @@ class Server(ServerAbstract):
 
         @self.app.get("/", response_class=HTMLResponse)
         async def home_page(request: Request) -> HTMLResponse:
-            root_index = Path.cwd() / "index.html"
-            if root_index.is_file():
-                return HTMLResponse(content=root_index.read_text(encoding="utf-8"))
             base = self.public_url or f"{self.scheme}://{self.host}:{self.port}"
             return _home_templates.TemplateResponse(
                 "index.html",
                 {
                     "request": request,
                     "base": base,
-                    "public_url": self.public_url,
-                    "full_url": f"{self.scheme}://{self.host}:{self.port}",
                     "version": VERSION,
                     "api_version": API_VERSION,
                     "show_admin": bool(self.api_key and admin_interface),
+                    "server_id": self.server_id,
                 },
             )
 
@@ -481,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,
@@ -500,9 +501,7 @@ class Server(ServerAbstract):
             "agents": [agent.registration_info for agent in self.agents],
         }
 
-    def launch(
-        self, log_level: Optional[str] = "INFO", start_uvicorn: bool = False
-    ) -> None:
+    def launch(self, log_level: Optional[str] = "INFO") -> None:
         if log_level:
             log.remove()
             log.add(
@@ -561,16 +560,15 @@ class Server(ServerAbstract):
                 if updated_agent:
                     log.info(f"[Server launch] Updated agent {updated_agent.name}")
 
-        if start_uvicorn:
-            import uvicorn
+        import uvicorn
 
-            uvicorn.run(
-                self.app,
-                host=self.host,
-                port=self.port,
-                reload=self.reload,
-                log_level=log_level,
-            )
+        uvicorn.run(
+            self.app,
+            host=self.host,
+            port=self.port,
+            reload=self.reload,
+            log_level=log_level,
+        )
 
     def instructions(self) -> None:
         server_url = f"http://{self.host}:{self.port}"