supervaizer 0.10.19__tar.gz → 0.10.21__tar.gz

{supervaizer-0.10.19 → supervaizer-0.10.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: supervaizer
-Version: 0.10.19
+Version: 0.10.21
 Summary: Controller system for Supervaize
 Project-URL: Homepage, https://supervaize.com
 Project-URL: Repository, https://github.com/supervaize/supervaizer
@@ -56,6 +56,7 @@ Requires-Dist: respx>=0.22.0; extra == 'dev'
 Requires-Dist: ruff>=0.15.0; extra == 'dev'
 Requires-Dist: types-deprecated>=1.3.1; extra == 'dev'
 Requires-Dist: types-python-slugify>=8.0.2.20240310; extra == 'dev'
+Requires-Dist: types-pyyaml>=6.0.0; extra == 'dev'
 Description-Content-Type: text/markdown
 
 # SUPERVAIZER

{supervaizer-0.10.19 → supervaizer-0.10.21}/pyproject.toml

@@ -69,6 +69,7 @@ dev = [
     "respx>=0.22.0",
     "ruff>=0.15.0",
     "types-deprecated>=1.3.1",
+    "types-PyYAML>=6.0.0",
     "types-python-slugify>=8.0.2.20240310",
 
 ]
@@ -108,6 +109,10 @@ path = "src/supervaizer/__version__.py"
 combine-as-imports = true
 force-wrap-aliases = true
 
+[tool.ruff.format]
+# Match Cursor style: keep opening brace on same line as call, e.g. append({ ... })
+preview = true
+
 [tool.commitizen]
 name = "cz_gitmoji"
 
@@ -121,7 +126,7 @@ mypy_path = "src"
 disallow_any_expr = false
 
 [tool.bumpversion]
-current_version = "0.10.19"
+current_version = "0.10.21"
 commit = true
 tag = true
 tag_name = "v{new_version}"

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/__version__.py

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

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/admin/routes.py

@@ -931,28 +931,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)
@@ -1209,23 +1205,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.19 → supervaizer-0.10.21}/src/supervaizer/admin/templates/index.html

@@ -41,12 +41,7 @@
                             OpenAPI
                         </a>
                     </li>
-                    <li><strong>BASE:</strong> {{ base }}
-                        <br>
-                        <strong>PUBLIC_URL:</strong> {{ public_url }}
-                        <br>
-                        <strong>FULL_URL:</strong> {{ full_url }}
-                        <br>
+                    <li><strong>BASE URL:</strong> {{ base }}
                     </li>
 
                     {% if show_admin %}

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/deploy/commands/local.py

@@ -231,18 +231,16 @@ def _start_docker_compose(
 
     # Set environment variables for Docker Compose
     env = os.environ.copy()
-    env.update(
-        {
-            "SERVICE_NAME": service_name,
-            "SERVICE_PORT": str(port),
-            "SUPERVAIZER_API_KEY": secrets["api_key"],
-            "SV_RSA_PRIVATE_KEY": secrets["rsa_private_key"],
-            "SUPERVAIZER_ENVIRONMENT": "dev",
-            "SUPERVAIZER_HOST": "0.0.0.0",
-            "SUPERVAIZER_PORT": str(port),
-            "SV_LOG_LEVEL": "INFO",
-        }
-    )
+    env.update({
+        "SERVICE_NAME": service_name,
+        "SERVICE_PORT": str(port),
+        "SUPERVAIZER_API_KEY": secrets["api_key"],
+        "SV_RSA_PRIVATE_KEY": secrets["rsa_private_key"],
+        "SUPERVAIZER_ENVIRONMENT": "dev",
+        "SUPERVAIZER_HOST": "0.0.0.0",
+        "SUPERVAIZER_PORT": str(port),
+        "SV_LOG_LEVEL": "INFO",
+    })
 
     cmd = ["docker-compose", "-f", str(compose_file), "up", "-d"]
 

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/deploy/drivers/aws_app_runner.py

@@ -455,12 +455,10 @@ class AWSAppRunnerDriver(BaseDriver):
         # Build secret references
         secret_refs = []
         for secret_name in secrets.keys():
-            secret_refs.append(
-                {
-                    "Name": secret_name,
-                    "ValueFrom": f"arn:aws:secretsmanager:{self.region}:{account_id}:secret:{secret_name}",
-                }
-            )
+            secret_refs.append({
+                "Name": secret_name,
+                "ValueFrom": f"arn:aws:secretsmanager:{self.region}:{account_id}:secret:{secret_name}",
+            })
 
         # Service configuration
         service_config = {
@@ -560,12 +558,10 @@ class AWSAppRunnerDriver(BaseDriver):
             ]
 
             # Add the public URL
-            env_vars.append(
-                {
-                    "Name": "SUPERVAIZER_PUBLIC_URL",
-                    "Value": public_url,
-                }
-            )
+            env_vars.append({
+                "Name": "SUPERVAIZER_PUBLIC_URL",
+                "Value": public_url,
+            })
 
             # Update service
             self.apprunner_client.update_service(

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/deploy/drivers/cloud_run.py

@@ -451,17 +451,15 @@ class CloudRunDriver(BaseDriver):
         # Build secret references
         secret_refs = []
         for secret_name in secrets.keys():
-            secret_refs.append(
-                {
-                    "name": secret_name,
-                    "value_source": {
-                        "secret_key_ref": {
-                            "secret": f"projects/{self.project_id}/secrets/{secret_name}",
-                            "version": "latest",
-                        }
-                    },
-                }
-            )
+            secret_refs.append({
+                "name": secret_name,
+                "value_source": {
+                    "secret_key_ref": {
+                        "secret": f"projects/{self.project_id}/secrets/{secret_name}",
+                        "version": "latest",
+                    }
+                },
+            })
 
         # Service configuration
         service_config = {
@@ -532,12 +530,10 @@ class CloudRunDriver(BaseDriver):
                     env_vars.append(env_var)
 
             # Add the public URL
-            env_vars.append(
-                {
-                    "name": "SUPERVAIZER_PUBLIC_URL",
-                    "value": public_url,
-                }
-            )
+            env_vars.append({
+                "name": "SUPERVAIZER_PUBLIC_URL",
+                "value": public_url,
+            })
 
             # Update service
             service.template.containers[0].env = env_vars

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/deploy/drivers/do_app_platform.py

@@ -346,13 +346,11 @@ class DOAppPlatformDriver(BaseDriver):
         # Build secret references
         secret_refs = []
         for secret_name in secrets.keys():
-            secret_refs.append(
-                {
-                    "key": secret_name,
-                    "scope": "RUN_TIME",
-                    "type": "SECRET",
-                }
-            )
+            secret_refs.append({
+                "key": secret_name,
+                "scope": "RUN_TIME",
+                "type": "SECRET",
+            })
 
         # App spec
         app_spec = {

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/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(

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/protocol/a2a/model.py

@@ -56,51 +56,42 @@ def create_agent_card(agent: Agent, base_url: str) -> Dict[str, Any]:
     tools = []
 
     # Add basic job tools
-    tools.append(
-        {
-            "name": "job_start",
-            "description": (
-                agent.methods.job_start.description if agent.methods else None
-            )
-            or f"Start a job with {agent.name}",
-            "input_schema": {
-                "type": "object",
-                "properties": {
-                    "job_fields": {"type": "object"},
-                    "job_context": {"type": "object"},
-                },
-            },
-        }
-    )
-
-    tools.append(
-        {
-            "name": "job_status",
-            "description": "Check the status of a job",
-            "input_schema": {
-                "type": "object",
-                "properties": {"job_id": {"type": "string"}},
+    tools.append({
+        "name": "job_start",
+        "description": (agent.methods.job_start.description if agent.methods else None)
+        or f"Start a job with {agent.name}",
+        "input_schema": {
+            "type": "object",
+            "properties": {
+                "job_fields": {"type": "object"},
+                "job_context": {"type": "object"},
             },
-        }
-    )
+        },
+    })
+
+    tools.append({
+        "name": "job_status",
+        "description": "Check the status of a job",
+        "input_schema": {
+            "type": "object",
+            "properties": {"job_id": {"type": "string"}},
+        },
+    })
 
     # Add custom tools if available
     if agent.methods and agent.methods.custom:
         for name, method in agent.methods.custom.items():
-            tools.append(
-                {
-                    "name": name,
-                    "description": method.description
-                    or f"Execute {name} custom method",
-                    "input_schema": {
-                        "type": "object",
-                        "properties": {
-                            "method_name": {"type": "string", "const": name},
-                            "params": {"type": "object"},
-                        },
+            tools.append({
+                "name": name,
+                "description": method.description or f"Execute {name} custom method",
+                "input_schema": {
+                    "type": "object",
+                    "properties": {
+                        "method_name": {"type": "string", "const": name},
+                        "params": {"type": "object"},
                     },
-                }
-            )
+                },
+            })
 
     # Build authentication object
     authentication = {

{supervaizer-0.10.19 → supervaizer-0.10.21}/src/supervaizer/server.py

@@ -11,7 +11,7 @@ import time
 import uuid
 from datetime import datetime
 from pathlib import Path
-from typing import Any, ClassVar, Dict, List, Optional, TypeVar
+from typing import Any, ClassVar, Dict, List, Optional, TypeVar, cast
 from urllib.parse import urlunparse
 
 from cryptography.hazmat.backends import default_backend
@@ -23,7 +23,7 @@ from fastapi.exceptions import RequestValidationError
 from fastapi.responses import HTMLResponse, JSONResponse
 from fastapi.security import APIKeyHeader
 from fastapi.templating import Jinja2Templates
-from pydantic import BaseModel, field_validator, Field
+from pydantic import BaseModel, Field, field_validator
 from rich import inspect
 
 from supervaizer.__version__ import API_VERSION, VERSION
@@ -58,7 +58,7 @@ T = TypeVar("T")
 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:
+    if existing and len(existing) > 5:
         return existing
     new_id = str(uuid.uuid4())
     os.environ["SUPERVAIZER_SERVER_ID"] = new_id
@@ -68,13 +68,14 @@ def _get_or_create_server_id() -> str:
 def _get_or_create_private_key() -> RSAPrivateKey:
     """Use SUPERVAIZER_PRIVATE_KEY from env if set; else create key and set env."""
     pem = os.getenv("SUPERVAIZER_PRIVATE_KEY")
-    if pem:
+    if pem and len(pem) > 5:
         try:
-            return serialization.load_pem_private_key(
+            key = serialization.load_pem_private_key(
                 pem.encode("utf-8"),
                 password=None,
                 backend=default_backend(),
             )
+            return cast(RSAPrivateKey, key)
         except Exception as e:
             log.warning(
                 f"[Server] Invalid SUPERVAIZER_PRIVATE_KEY, generating new key: {e}"
@@ -117,16 +118,14 @@ 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(
@@ -167,16 +166,14 @@ def get_server_info_from_live(server_instance: "Server") -> ServerInfo:
     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,
+            })
     start_time = getattr(server_instance, "_start_time", time.time())
     return ServerInfo(
         host=getattr(server_instance, "host", "N/A"),
@@ -456,6 +453,9 @@ 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",