devops-bot-sdk 1.4.120__tar.gz → 1.4.125__tar.gz

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.120
+Version: 1.4.125
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/devops_bot_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devops-bot-sdk
-Version: 1.4.120
+Version: 1.4.125
 Summary: DevOps Bot Desktop SDK — thin client for the AgentOS Electron desktop app
 Author: noumanaziz2128
 License-Expression: LicenseRef-Proprietary

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.4.120
+Version: 1.4.125
 
 Public surface:
   BackendClient.from_config()        — create client from ~/.agentos/config.toml
@@ -30,7 +30,7 @@ Rules:
   - All data egress through submit_webhook only
 """
 
-__version__ = "1.4.120"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
+__version__ = "1.4.125"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
 __author__  = "AgentOS"   # sdk.client.SDK_VERSION and the UI server version all read this.
 
 from sdk.client import BackendClient

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/sdk/agents/inventory.py

@@ -16,22 +16,39 @@ import subprocess
 from pathlib import Path
 
 from sdk.agents import usage as usage_mod
-from sdk.agents.manifest import load_agents, load_skills
-from sdk.agents.prompt_vars import extract_variables
+from sdk.agents.manifest import load_skills
 
 logger = logging.getLogger("sdk.agents.inventory")
 
 
-def _custom_agents() -> list[dict]:
-    out: list[dict] = []
-    for m in load_agents():
-        out.append({
-            "name": m.name, "engine": m.engine, "trigger": m.trigger.type,
-            "description": m.description, "integrations": list(m.integrations),
-            "skills": list(m.skills), "variables": extract_variables(m.prompt),
-            "source": "custom",
-        })
-    return out
+def _map_backend_agent(row: dict, source: str) -> dict:
+    """Project a backend prompt-based ``agents`` row into the inventory shape."""
+    prompt = row.get("prompt") or {}
+    sys_prompt = prompt.get("system_prompt", "") if isinstance(prompt, dict) else ""
+    pvars = prompt.get("variables", []) if isinstance(prompt, dict) else []
+    return {
+        "name": row.get("name"),
+        "description": sys_prompt[:200],
+        "variables": [v.get("name") for v in pvars if isinstance(v, dict) and v.get("name")],
+        "skills": row.get("skills", []),
+        "status": row.get("status", "active"),
+        "source": source,
+    }
+
+
+async def _custom_agents() -> list[dict]:
+    """The caller's custom agents (``relation_type=person``) from the backend.
+
+    Backend is the source of truth — agents are authored in the web app and read
+    via GET /api/v1/agents. Best-effort: degrades to empty on any error.
+    """
+    try:
+        from sdk.client import BackendClient
+        rows = await BackendClient.from_config().list_custom_agents()
+        return [_map_backend_agent(r, "custom") for r in rows]
+    except Exception as exc:  # noqa: BLE001
+        logger.debug("custom-agent inventory failed: %s", exc)
+        return []
 
 
 def _skills() -> list[dict]:
@@ -101,31 +118,26 @@ def _claude_subagents() -> list[dict]:
 
 
 async def _default_agents() -> list[dict]:
-    """Department default agents from the bundled SDK library (best-effort).
+    """Department default agents (``relation_type=department`` + org-wide common)
+    from the backend (best-effort).
 
-    Resolves the caller's department by *name* (the ``title`` on the backend
-    profile, e.g. "Machine Learning") to a library slug and loads that
-    department's templates locally — no AI-backend ``/departments/{id}/
-    default-agents`` call.
+    Reads the live rows via GET /api/v1/department-agents — the source of truth —
+    rather than the bundled SDK library. Degrades to empty on any error.
     """
     try:
         from sdk.client import BackendClient
-        from sdk.agents.library import (
-            load_common_templates, load_department, resolve_department_slug,
-        )
-
         client = BackendClient.from_config()
-        profile = await client.profile()
-        title = profile.department_title or ""
-        slug = resolve_department_slug(title)
-        # A resolved department already includes the common agents; a department
-        # with no library entry still surfaces the common defaults.
-        templates = load_department(slug) if slug else load_common_templates(title=title)
-        return [{"name": t.manifest.name, "engine": t.manifest.engine,
-                 "description": t.manifest.description, "source": "default",
-                 "department": title,
-                 "department_id": profile.department_id,
-                 "min_role_tier": t.min_role_tier} for t in templates]
+        try:
+            title = (await client.profile()).department_title or ""
+        except Exception:  # noqa: BLE001 — department label is cosmetic
+            title = ""
+        rows = await client.list_department_agents()
+        out = []
+        for r in rows:
+            entry = _map_backend_agent(r, "default")
+            entry["department"] = title
+            out.append(entry)
+        return out
     except Exception as exc:  # noqa: BLE001
         logger.debug("default-agent inventory failed: %s", exc)
         return []
@@ -133,7 +145,7 @@ async def _default_agents() -> list[dict]:
 
 async def build_inventory() -> dict:
     """The full snapshot: agents, subagents, tools, plugins + per-agent usage."""
-    customs = _custom_agents()
+    customs = await _custom_agents()
     usage = usage_mod.summary()
     # Attach utilisation to each custom agent.
     for a in customs:

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/sdk/ui/api.py

@@ -265,75 +265,95 @@ async def connectors() -> dict:
 
 @router.get("/agents", dependencies=[_auth])
 async def agents() -> dict:
-    """Locally-installed agents (name, engine, trigger, integrations, variables)."""
-    from sdk.agents.manifest import load_agents
-    from sdk.agents.prompt_vars import extract_variables
+    """The caller's custom agents (``relation_type=person``) from the backend.
 
-    return {
-        "agents": [
-            {"name": m.name, "engine": m.engine, "trigger": m.trigger.type,
-             "integrations": m.integrations, "description": m.description,
-             "variables": extract_variables(m.prompt)}
-            for m in load_agents()
-        ]
+    Backend is the source of truth — agents are authored in the web app and read
+    here via GET /api/v1/agents (prompt-based shape: prompt = {system_prompt,
+    variables:[…]}; skills = [{name,…}]). Best-effort: on backend error the list
+    is empty with an ``error`` string the UI can surface.
+    """
+    from sdk.client import BackendClient
+    from sdk.exceptions import BackendFeatureMissing
+
+    try:
+        rows = await BackendClient.from_config().list_custom_agents()
+    except BackendFeatureMissing:
+        return {"agents": [], "error": ("Custom agents aren't available on this "
+                                        "backend — it may be running an older version.")}
+    except Exception as exc:  # noqa: BLE001 — degrade to empty, surface the reason
+        return {"agents": [], "error": str(exc)}
+    return {"agents": rows, "error": ""}
+
+
+def _flat_agent(row: dict, source: str, *, chattable: bool, department_id: str = "") -> dict:
+    """Flatten a backend prompt-based ``agents`` row into the picker shape the UI
+    expects (``name``/``description``/``variables``/``skills``/``source``)."""
+    prompt = row.get("prompt") or {}
+    sys_prompt = prompt.get("system_prompt", "") if isinstance(prompt, dict) else ""
+    pvars = prompt.get("variables", []) if isinstance(prompt, dict) else []
+    entry = {
+        "name": row.get("name"),
+        "description": sys_prompt[:200],
+        "variables": [v.get("name") for v in pvars if isinstance(v, dict) and v.get("name")],
+        "skills": row.get("skills", []),
+        "status": row.get("status", "active"),
+        "source": source,
+        "chattable": chattable,
     }
+    if department_id:
+        entry["department_id"] = department_id
+    return entry
 
 
 @router.get("/agents/all", dependencies=[_auth])
 async def agents_all(department_id: str = Query("")) -> dict:
-    """Every agent a person can pick to chat: local custom + department defaults.
-
-    Custom agents are chattable immediately; a default must be activated (cloned
-    locally) first — surfaced via ``chattable`` and ``source``. Each entry carries
-    its detected ``{{variables}}`` so the UI can render input fields. Defaults are
-    best-effort (empty if the backend is unreachable).
+    """Every agent a person can pick to chat: their custom agents + department
+    defaults, both read from the backend (source of truth).
+
+    Custom agents (``relation_type=person``) come from GET /api/v1/agents; defaults
+    (``relation_type=department`` + org-wide common) from GET /api/v1/department-agents.
+    Custom wins on a name collision. Each entry carries its detected variables so
+    the UI can render input fields. Both are best-effort — an unreachable backend
+    yields an empty list plus an error string rather than a hard failure.
     """
-    from sdk.agents.manifest import load_agents
-    from sdk.agents.prompt_vars import extract_variables
-
-    locals_ = load_agents()
-    local_names = {m.name for m in locals_}
-    out = [
-        {"name": m.name, "engine": m.engine, "description": m.description,
-         "variables": extract_variables(m.prompt), "source": "custom",
-         "chattable": True}
-        for m in locals_
-    ]
+    from sdk.client import BackendClient
+    from sdk.exceptions import BackendFeatureMissing
 
+    out: list[dict] = []
+    seen: set[str] = set()
     dept = department_id
     defaults_error = ""
+
     try:
-        from sdk.client import BackendClient
-        from sdk.exceptions import BackendFeatureMissing
         client = BackendClient.from_config()
         if not dept:
             profile = await client.bootstrap()
             dept = getattr(profile, "department_id", None) or ""
-        if dept:
-            try:
-                # Department defaults are now plain `agents` rows (relation_type=
-                # department), read from /department-agents in the new prompt-based
-                # schema: prompt = {system_prompt, variables:[{name,...}]}.
-                rows = await client.list_department_agents()
-            except BackendFeatureMissing:
-                rows = []
-                defaults_error = ("Department default agents aren't available on this "
-                                  "backend — it may be running an older version.")
-            for r in rows:
+
+        # Custom agents first so they win any name collision with a default.
+        try:
+            for r in await client.list_custom_agents():
+                nm = r.get("name")
+                if not nm or nm in seen:
+                    continue
+                seen.add(nm)
+                out.append(_flat_agent(r, "custom", chattable=True))
+        except BackendFeatureMissing:
+            defaults_error = ("Custom agents aren't available on this backend — "
+                              "it may be running an older version.")
+
+        # Department defaults (a default must be activated/cloned before it runs).
+        try:
+            for r in await client.list_department_agents():
                 nm = r.get("name")
-                if not nm or nm in local_names:
+                if not nm or nm in seen:
                     continue
-                prompt = r.get("prompt") or {}
-                sys_prompt = prompt.get("system_prompt", "") if isinstance(prompt, dict) else ""
-                pvars = prompt.get("variables", []) if isinstance(prompt, dict) else []
-                out.append({
-                    "name": nm,
-                    "description": sys_prompt[:200],
-                    "variables": [v.get("name") for v in pvars if isinstance(v, dict) and v.get("name")],
-                    "skills": r.get("skills", []),
-                    "source": "default", "department_id": dept, "chattable": False,
-                })
-    except Exception:  # noqa: BLE001 — defaults are best-effort
+                seen.add(nm)
+                out.append(_flat_agent(r, "default", chattable=False, department_id=dept))
+        except BackendFeatureMissing:
+            defaults_error = ("Department default agents aren't available on this "
+                              "backend — it may be running an older version.")
+    except Exception:  # noqa: BLE001 — best-effort; return whatever we gathered
         pass
 
     return {"agents": out, "department_id": dept, "defaults_error": defaults_error}

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/sdk/ui/static/app.js

@@ -650,26 +650,40 @@
       try {
         const d = await api("/api/ui/agents");
         const rows = d.agents || [];
+        if (!rows.length && d.error) {
+          $("local-agents").innerHTML = `<div class="empty">${esc(d.error)}</div>`;
+          const kaSel0 = $("key-agent");
+          if (kaSel0) { kaSel0.innerHTML = `<option value="">(no agents yet)</option>`; onAgentSelect(); }
+          return;
+        }
         caMeta = {}; rows.forEach(a => { caMeta[a.name] = a; });
         const kaSel = $("key-agent");
         if (kaSel) {
           kaSel.innerHTML = rows.length
-            ? rows.map(a => `<option value="${esc(a.name)}">${esc(a.name)} (${esc(a.engine)})</option>`).join("")
+            ? rows.map(a => `<option value="${esc(a.name)}">${esc(a.name)}</option>`).join("")
             : `<option value="">(no agents yet)</option>`;
           onAgentSelect();
         }
-        $("local-agents").innerHTML = rows.length ? rows.map(a =>
-          `<div class="agent-card">
-             <div class="agent-head"><span class="agent-name">${esc(a.name)}</span><span class="pill on">${esc(a.engine)}</span></div>
-             <div class="agent-meta">${esc(a.trigger)}${a.integrations.length ? " · " + a.integrations.map(esc).join(", ") : ""}${a.variables && a.variables.length ? " · " + a.variables.length + " input(s)" : ""}</div>
-             <div class="agent-desc">${esc(a.description || "")}</div>
+        $("local-agents").innerHTML = rows.length ? rows.map(a => {
+          const prompt = a.prompt || {};
+          const summary = (prompt.system_prompt || "").trim().slice(0, 200);
+          const nvars = (prompt.variables || []).length;
+          const nskills = (a.skills || []).length;
+          return `<div class="agent-card">
+             <div class="agent-head">
+               <span class="agent-name">${esc(a.name)}</span>
+               <span class="pill ${a.status === "disabled" ? "off" : "on"}">${esc(a.status || "active")}</span>
+             </div>
+             <div class="agent-meta">${nvars} variable(s) · ${nskills} skill(s)</div>
+             <div class="agent-desc">${esc(summary)}</div>
              <div class="agent-actions">
                <a class="btn primary" href="/agents.html?agent=${encodeURIComponent(a.name)}">Run</a>
                <button class="btn" data-enable="${esc(a.name)}">Enable</button>
                <button class="btn" data-disable="${esc(a.name)}">Disable</button>
                <button class="btn danger" data-del="${esc(a.name)}">Delete</button>
              </div>
-           </div>`).join("")
+           </div>`;
+        }).join("")
           : "<div class='empty'>No custom agents assigned to you yet. Agents are created in the web app.</div>";
 
         $("local-agents").querySelectorAll("[data-enable]").forEach(b => b.onclick = () => setStatus(b.dataset.enable, "active"));
@@ -734,11 +748,20 @@
       return out;
     }
 
+    function collapseKeyAdd() {
+      const box = $("key-add"); if (!box) return;
+      box.style.display = "none";
+      if ($("key-name")) $("key-name").value = "";
+      if ($("key-value")) $("key-value").value = "";
+      if ($("key-add-toggle")) $("key-add-toggle").textContent = "+ Add API key";
+    }
+
     function onAgentSelect() {
       const m = caMeta[$("key-agent") && $("key-agent").value];
       if ($("ca-about")) $("ca-about").textContent = m ? (m.description || "No description provided.") : "Pick an agent.";
       if ($("ca-output")) $("ca-output").style.display = "none";
       if ($("ca-run-status")) $("ca-run-status").textContent = "";
+      collapseKeyAdd();
       loadVars();
       loadKeys();
     }
@@ -772,6 +795,14 @@
       }
     }
 
+    if ($("key-add-toggle")) $("key-add-toggle").onclick = () => {
+      const box = $("key-add"); if (!box) return;
+      const show = box.style.display === "none";
+      box.style.display = show ? "" : "none";
+      $("key-add-toggle").textContent = show ? "Cancel" : "+ Add API key";
+      if (show && $("key-name")) $("key-name").focus();
+    };
+
     if ($("key-agent")) $("key-agent").addEventListener("change", onAgentSelect);
     if ($("ca-run")) $("ca-run").onclick = caRun;
     if ($("ca-stop")) $("ca-stop").onclick = () => { if (caRunJob) { cancelJob(caRunJob); toast("Stopping…"); } };
@@ -782,7 +813,7 @@
       if (!v) { toast("Enter a value", "err"); return; }
       try {
         await api("/api/ui/agents/keys", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ name, keys: { [k]: v } }) });
-        $("key-name").value = ""; $("key-value").value = "";
+        collapseKeyAdd();
         toast("Saved " + k + " for " + name, "ok"); loadKeys();
       } catch (e) { toast("Save failed: " + (e.message || ""), "err"); }
     };

{devops_bot_sdk-1.4.120 → devops_bot_sdk-1.4.125}/sdk/ui/static/custom-agents.html

@@ -52,9 +52,12 @@
             Leave blank to keep the current one; enter a value to change it.
           </p>
           <div id="key-list" class="vars"><div class="muted">Pick an agent to see its stored keys.</div></div>
-          <div class="field"><label>Key name (e.g. OPENAI_API_KEY)</label><input id="key-name" placeholder="ENV_VAR_NAME" autocomplete="off" /></div>
-          <div class="field"><label>Value</label><input id="key-value" type="password" placeholder="paste the secret (hidden)" autocomplete="off" /></div>
-          <button class="btn" id="key-save">Save key</button>
+          <button class="btn sm" id="key-add-toggle" style="margin-top:.4em">+ Add API key</button>
+          <div id="key-add" style="display:none;margin-top:.5em">
+            <div class="field"><label>Key name (e.g. OPENAI_API_KEY)</label><input id="key-name" placeholder="ENV_VAR_NAME" autocomplete="off" /></div>
+            <div class="field"><label>Value</label><input id="key-value" type="password" placeholder="paste the secret (hidden)" autocomplete="off" /></div>
+            <button class="btn" id="key-save">Save key</button>
+          </div>
         </div>
       </div>
     </div>