devops-bot-sdk 1.4.139__tar.gz → 1.4.141__tar.gz

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/PKG-INFO

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

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/devops_bot_sdk.egg-info/PKG-INFO

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

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/devops_bot_sdk.egg-info/SOURCES.txt

@@ -86,4 +86,5 @@ sdk/ui/static/styles.css
 sdk/ui/static/tickets.html
 tests/test_agent_chat_features.py
 tests/test_agent_prompt_models.py
-tests/test_agents_connectors_builder.py
+tests/test_agents_connectors_builder.py
+tests/test_git_action.py

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/sdk/__init__.py

@@ -1,6 +1,6 @@
 """AgentOS Desktop SDK — thin HTTPS/SSE client for the Electron app.
 
-Version: 1.4.139
+Version: 1.4.141
 
 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.139"   # SINGLE SOURCE OF TRUTH — bump on every change; pyproject,
+__version__ = "1.4.141"   # 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.139 → devops_bot_sdk-1.4.141}/sdk/git_ops.py

@@ -410,3 +410,36 @@ async def finish_pr(
 
     return {"pushed": pushed, "pr_url": pr_url, "pr_error": pr_error,
             "committed": committed, "pr_unavailable": pr_unavailable}
+
+
+async def push_branch(
+    project_path: str, branch: str, github_token: str | None,
+    title: str = "chore: sync work",
+) -> dict:
+    """Stage all, commit, and push ``branch`` — WITHOUT opening a PR. Best-effort.
+
+    The push-only sibling of :func:`finish_pr`: same commit + ``--force-with-lease``
+    push transport (HTTPS+token when a token is available, else the box's SSH keys),
+    but it deliberately never opens, merges, or touches a pull request. Used by the
+    cross-VPS ``git_push`` action (a Lead pushing a member's work to the remote
+    without raising a PR).
+
+    Returns ``{"pushed": bool, "committed": bool, "branch": str,
+    "push_error": str | None}`` — never raises.
+    """
+    path = str(Path(project_path).expanduser())
+    env = _git_env(github_token)
+
+    await _run(["git", "add", "-A"], path, env)
+    commit_rc, _, _ = await _run(["git", "commit", "-m", title], path, env)
+    committed = commit_rc == 0
+
+    rc, _, push_err = await _run(
+        ["git", "push", "-u", "origin", branch, "--force-with-lease"],
+        path, env, timeout=300.0,
+    )
+    pushed = rc == 0
+    if not pushed:
+        logger.warning("git_ops.push_only_failed branch=%s error=%s", branch, push_err[:300])
+    return {"pushed": pushed, "committed": committed, "branch": branch,
+            "push_error": None if pushed else f"push failed: {push_err[:200]}"}

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/sdk/ui/api.py

@@ -19,6 +19,7 @@ from sdk.ui.models import (
     AgentRunRequest,
     AllowlistEntry,
     ConfigureRequest,
+    GitActionRequest,
     PromptRegenerateRequest,
     PromptRunRequest,
     PromptVerifyRequest,
@@ -142,6 +143,47 @@ async def remove_from_allowlist(ip: str = Query(...)) -> dict:
         raise HTTPException(status_code=400, detail=str(exc))
 
 
+# ── GitHub trigger (PR-only / push-only; never merges) ───────────────────────
+# Standalone git action for the cross-VPS `git_pr` / `git_push` intents: a Lead
+# opens a PR or pushes a member's work on THIS VPS. Delegates to `git_ops`
+# (finish_pr / push_branch — both best-effort, neither ever merges). The GitHub
+# token is fetched server-side from the backend, never taken from the request.
+
+@router.post("/git", dependencies=[_auth])
+async def git_action(body: GitActionRequest) -> dict:
+    """Open a PR (``operation="pr"``) or push a branch (``operation="push"``).
+
+    Body: ``GitActionRequest{operation, project_path, branch, base?, title?, body?,
+    repo_url?}``. Returns the ``git_ops`` result verbatim (``pushed``, ``pr_url``,
+    ``pr_unavailable`` …). An SSH-only box with no token/``gh`` reports
+    ``pr_unavailable`` (a soft warning), not an error. 502 if the path is not a
+    usable git repo.
+    """
+    from sdk.client import BackendClient
+    from sdk.git_ops import ensure_repo, finish_pr, push_branch
+
+    github_token = await BackendClient.from_config().github_token()
+
+    ok = await ensure_repo(body.project_path, body.repo_url or None, github_token)
+    if not ok:
+        raise HTTPException(
+            status_code=502,
+            detail=f"{body.project_path} is not a usable git repo (and could not be cloned).",
+        )
+
+    title = body.title or f"chore: {body.operation} {body.branch}"
+    if body.operation == "push":
+        result = await push_branch(body.project_path, body.branch, github_token, title=title)
+    else:
+        # base blank → pass the branch so finish_pr's base==head guard resolves
+        # the real default branch (never opens a PR against itself).
+        base = body.base or body.branch
+        result = await finish_pr(
+            body.project_path, body.branch, base, title, body.body, github_token,
+        )
+    return {"engine": "git", "operation": body.operation, **result}
+
+
 @router.post("/configure", dependencies=[_auth])
 async def configure(body: ConfigureRequest) -> dict:
     from sdk import config as sdk_config

{devops_bot_sdk-1.4.139 → devops_bot_sdk-1.4.141}/sdk/ui/models.py

@@ -93,6 +93,45 @@ class WorkspaceRequest(BaseModel):
         return value or None
 
 
+class GitActionRequest(BaseModel):
+    """Body for ``POST /api/ui/git`` — a standalone GitHub trigger.
+
+    Mirrors the cross-VPS ``git_pr`` / ``git_push`` actions (devops-bot-ai
+    ``modules/cross_vps/action_router.py``). PR-only or push-only; the SDK NEVER
+    merges (see ``git_ops.finish_pr`` contract). The GitHub token is fetched
+    server-side (``BackendClient.github_token``) — it is not accepted in the body.
+    """
+
+    operation: str = Field(..., examples=["pr", "push"])
+    project_path: str = Field(..., description="Absolute path to the repo working dir on this VPS.")
+    branch: str = Field(..., description="The feature branch to commit + push (never the base).")
+    base: str = Field("", description="PR base branch; the default branch is resolved when blank.")
+    title: str = Field("", description="Commit message + PR title.")
+    body: str = Field("", description="PR description (ignored for push).")
+    repo_url: str = Field("", description="Optional clone URL if the path is empty/missing.")
+
+    @field_validator("operation")
+    @classmethod
+    def _op(cls, value: str) -> str:
+        value = (value or "").strip().lower()
+        if value not in {"pr", "push"}:
+            raise ValueError("operation must be 'pr' or 'push'.")
+        return value
+
+    @field_validator("project_path", "branch")
+    @classmethod
+    def _required(cls, value: str) -> str:
+        value = (value or "").strip()
+        if not value:
+            raise ValueError("project_path and branch are required and must be non-empty.")
+        return value
+
+    @field_validator("base", "title", "body", "repo_url")
+    @classmethod
+    def _strip_opt(cls, value: str) -> str:
+        return (value or "").strip()
+
+
 class TicketRequest(BaseModel):
     """Body for ``POST /api/ui/ticket`` — one or more Jira ticket keys."""
 

devops_bot_sdk-1.4.141/tests/test_git_action.py

@@ -0,0 +1,103 @@
+"""Tests for the standalone GitHub trigger — model + route (PRD-3 / DBAI-103).
+
+``POST /api/ui/git`` (``sdk/ui/api.py``) backs the cross-VPS ``git_pr`` / ``git_push``
+actions: the devops-bot-ai action router proxies here so a Lead can open a PR or
+push a member's work on this VPS. The SDK NEVER merges (``git_ops.finish_pr`` /
+``push_branch`` contract). The GitHub token is fetched server-side, never taken
+from the request body.
+
+Validation tests need only ``pydantic``; the route test needs the ``[ui]`` extra
+(``fastapi``) and is skipped when it is absent.
+"""
+from __future__ import annotations
+
+from unittest.mock import AsyncMock, patch
+
+import pytest
+from pydantic import ValidationError
+
+from sdk.ui.models import GitActionRequest
+
+
+# ── GitActionRequest validation ───────────────────────────────────────
+class TestGitActionRequest:
+    def test_pr_minimal_ok(self):
+        m = GitActionRequest(operation="pr", project_path="/srv/repo", branch="feature/x")
+        assert (m.operation, m.project_path, m.branch) == ("pr", "/srv/repo", "feature/x")
+        assert m.base == "" and m.title == "" and m.body == "" and m.repo_url == ""
+
+    def test_operation_normalised(self):
+        assert GitActionRequest(operation="PUSH", project_path="/r", branch="b").operation == "push"
+
+    def test_strips_path_and_branch(self):
+        m = GitActionRequest(operation="pr", project_path="  /srv/r  ", branch="  feat  ")
+        assert m.project_path == "/srv/r" and m.branch == "feat"
+
+    @pytest.mark.parametrize("op", ["merge", "rebase", "", "delete"])
+    def test_bad_operation_rejected(self, op):
+        with pytest.raises(ValidationError):
+            GitActionRequest(operation=op, project_path="/r", branch="b")
+
+    @pytest.mark.parametrize("field", ["project_path", "branch"])
+    def test_blank_required_rejected(self, field):
+        kwargs = {"operation": "pr", "project_path": "/r", "branch": "b"}
+        kwargs[field] = "   "
+        with pytest.raises(ValidationError):
+            GitActionRequest(**kwargs)
+
+
+# ── POST /api/ui/git route ────────────────────────────────────────────
+fastapi = pytest.importorskip("fastapi")
+from fastapi.testclient import TestClient  # noqa: E402
+
+from sdk.ui.api import require_token, router  # noqa: E402
+
+
+def _app():
+    app = fastapi.FastAPI()
+    app.include_router(router)
+    app.dependency_overrides[require_token] = lambda: None
+    return TestClient(app)
+
+
+class TestGitRoute:
+    def test_pr_calls_finish_pr_never_merges(self):
+        finish = AsyncMock(return_value={"pushed": True, "pr_url": "http://pr/1", "pr_unavailable": False})
+        with patch("sdk.client.BackendClient.from_config") as m_cfg, \
+             patch("sdk.git_ops.ensure_repo", AsyncMock(return_value=True)), \
+             patch("sdk.git_ops.finish_pr", finish), \
+             patch("sdk.git_ops.push_branch", AsyncMock()) as m_push:
+            m_cfg.return_value.github_token = AsyncMock(return_value="gho_x")
+            resp = _app().post("/api/ui/git", json={
+                "operation": "pr", "project_path": "/srv/repo", "branch": "feature/x",
+                "title": "My PR", "body": "desc",
+            })
+        assert resp.status_code == 200
+        data = resp.json()
+        assert data["engine"] == "git" and data["operation"] == "pr" and data["pr_url"] == "http://pr/1"
+        finish.assert_awaited_once()
+        m_push.assert_not_called()
+
+    def test_push_calls_push_branch_no_pr(self):
+        push = AsyncMock(return_value={"pushed": True, "committed": True, "branch": "feature/x", "push_error": None})
+        with patch("sdk.client.BackendClient.from_config") as m_cfg, \
+             patch("sdk.git_ops.ensure_repo", AsyncMock(return_value=True)), \
+             patch("sdk.git_ops.push_branch", push), \
+             patch("sdk.git_ops.finish_pr", AsyncMock()) as m_finish:
+            m_cfg.return_value.github_token = AsyncMock(return_value=None)
+            resp = _app().post("/api/ui/git", json={
+                "operation": "push", "project_path": "/srv/repo", "branch": "feature/x",
+            })
+        assert resp.status_code == 200
+        assert resp.json()["operation"] == "push"
+        push.assert_awaited_once()
+        m_finish.assert_not_called()
+
+    def test_unusable_repo_502(self):
+        with patch("sdk.client.BackendClient.from_config") as m_cfg, \
+             patch("sdk.git_ops.ensure_repo", AsyncMock(return_value=False)):
+            m_cfg.return_value.github_token = AsyncMock(return_value=None)
+            resp = _app().post("/api/ui/git", json={
+                "operation": "pr", "project_path": "/nope", "branch": "b",
+            })
+        assert resp.status_code == 502