supervaizer 0.10.11__py3-none-any.whl → 0.10.13__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.11"
+VERSION = "0.10.13"
 API_VERSION = "v1"
 TELEMETRY_VERSION = "v1"

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

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-0.10.11.dist-info → supervaizer-0.10.13.dist-info}/METADATA

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

{supervaizer-0.10.11.dist-info → supervaizer-0.10.13.dist-info}/RECORD

@@ -1,8 +1,8 @@
-supervaizer/__init__.py,sha256=eBbGjduMBH-FDjcGlSqeR4Kf4uo60Cf1DrRur8VGkJo,2341
-supervaizer/__version__.py,sha256=nMELcLDyp7XnPLe74EnEqTFcqZkxnRP1_s0G43H3RDQ,349
+supervaizer/__init__.py,sha256=UNFcgJT-2708tLRFXohWr3320LVAzh3_WZZhrU9j1Iw,2427
+supervaizer/__version__.py,sha256=wRbe-Q7prh4XO5nZ2QCM3r5X1kyop9Z1iXGnIAsvsXY,349
 supervaizer/account.py,sha256=TZQdDo1OdjquFsLFxPvUUqzOcdMOIAQHHaREghD5SJ4,11421
 supervaizer/account_service.py,sha256=ZgZ0fhsbSVA076c-35ZZoYJBrQZsAwfFS7namVeoD3s,3459
-supervaizer/agent.py,sha256=Clenvdr_v-lV7_v6YCcevp8dj5JUNvpTWrBZBYM82lg,36509
+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
@@ -17,7 +17,7 @@ supervaizer/server.py,sha256=79MtQcB4fpV9VgFh-dBsbwbHf097waeLmBnArhClVb8,22473
 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=g69rpjYcMIyMrqnRMyf3YZbYLMa6GBMWWPF1-vh2M6s,47662
 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
@@ -36,7 +36,7 @@ supervaizer/admin/templates/jobs_list.html,sha256=VJ2VYe62dHXvjQQgUAVyKcn58rO591
 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
@@ -72,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.11.dist-info/METADATA,sha256=Ec_LGKWoFOmqjOks7mlaIHaE46hCCZMqSlDUFS8zif0,12648
-supervaizer-0.10.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-supervaizer-0.10.11.dist-info/entry_points.txt,sha256=vL_IBR_AeEI2u2-6YL4PY9k2Mar4-gprG8-UxERWjmg,52
-supervaizer-0.10.11.dist-info/licenses/LICENSE.md,sha256=dmdnt1vfpxNPr8Lt0BnxKE5uzUwK3CWTthTUStgOXjY,15327
-supervaizer-0.10.11.dist-info/RECORD,,
+supervaizer-0.10.13.dist-info/METADATA,sha256=DQHnw0z-YcxPDQwAQNF3qMxS9_EKQ1gVqWf_8Vq7KEg,12648
+supervaizer-0.10.13.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+supervaizer-0.10.13.dist-info/entry_points.txt,sha256=vL_IBR_AeEI2u2-6YL4PY9k2Mar4-gprG8-UxERWjmg,52
+supervaizer-0.10.13.dist-info/licenses/LICENSE.md,sha256=dmdnt1vfpxNPr8Lt0BnxKE5uzUwK3CWTthTUStgOXjY,15327
+supervaizer-0.10.13.dist-info/RECORD,,