feat(git): add git resource (#45)

* feat(git): add git resource

Author: Datata1

src/codesphere/resources/workspace/__init__.py

@@ -1,12 +1,13 @@
+from .git import GitHead, WorkspaceGitManager
+from .resources import WorkspacesResource
 from .schemas import (
+    CommandInput,
+    CommandOutput,
     Workspace,
     WorkspaceCreate,
-    WorkspaceUpdate,
     WorkspaceStatus,
-    CommandInput,
-    CommandOutput,
+    WorkspaceUpdate,
 )
-from .resources import WorkspacesResource
 
 __all__ = [
     "Workspace",
@@ -16,4 +17,6 @@
     "WorkspacesResource",
     "CommandInput",
     "CommandOutput",
+    "WorkspaceGitManager",
+    "GitHead",
 ]

src/codesphere/resources/workspace/git/__init__.py

@@ -0,0 +1,4 @@
+from .models import WorkspaceGitManager
+from .schema import GitHead
+
+__all__ = ["WorkspaceGitManager", "GitHead"]

src/codesphere/resources/workspace/git/models.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+import logging
+from typing import Optional
+
+from ....core.handler import _APIOperationExecutor
+from ....http_client import APIHttpClient
+from .operations import (
+    _GET_HEAD_OP,
+    _PULL_OP,
+    _PULL_WITH_REMOTE_AND_BRANCH_OP,
+    _PULL_WITH_REMOTE_OP,
+)
+from .schema import GitHead
+
+log = logging.getLogger(__name__)
+
+
+class WorkspaceGitManager(_APIOperationExecutor):
+    """Manager for git operations on a workspace."""
+
+    def __init__(self, http_client: APIHttpClient, workspace_id: int):
+        self._http_client = http_client
+        self._workspace_id = workspace_id
+        self.id = workspace_id
+
+    async def get_head(self) -> GitHead:
+        return await self._execute_operation(_GET_HEAD_OP)
+
+    async def pull(
+        self,
+        remote: Optional[str] = None,
+        branch: Optional[str] = None,
+    ) -> None:
+        if remote is not None and branch is not None:
+            await self._execute_operation(
+                _PULL_WITH_REMOTE_AND_BRANCH_OP, remote=remote, branch=branch
+            )
+        elif remote is not None:
+            await self._execute_operation(_PULL_WITH_REMOTE_OP, remote=remote)
+        else:
+            await self._execute_operation(_PULL_OP)

src/codesphere/resources/workspace/git/operations.py

@@ -0,0 +1,28 @@
+from __future__ import annotations
+
+from ....core.operations import APIOperation
+from .schema import GitHead
+
+_GET_HEAD_OP = APIOperation(
+    method="GET",
+    endpoint_template="/workspaces/{id}/git/head",
+    response_model=GitHead,
+)
+
+_PULL_OP = APIOperation(
+    method="POST",
+    endpoint_template="/workspaces/{id}/git/pull",
+    response_model=type(None),
+)
+
+_PULL_WITH_REMOTE_OP = APIOperation(
+    method="POST",
+    endpoint_template="/workspaces/{id}/git/pull/{remote}",
+    response_model=type(None),
+)
+
+_PULL_WITH_REMOTE_AND_BRANCH_OP = APIOperation(
+    method="POST",
+    endpoint_template="/workspaces/{id}/git/pull/{remote}/{branch}",
+    response_model=type(None),
+)

src/codesphere/resources/workspace/git/schema.py

@@ -0,0 +1,7 @@
+from __future__ import annotations
+
+from ....core.base import CamelModel
+
+
+class GitHead(CamelModel):
+    head: str

src/codesphere/resources/workspace/pipeline/resources.py

@@ -9,6 +9,7 @@
 from ...core.base import CamelModel
 from ...utils import update_model_fields
 from .envVars import EnvVar, WorkspaceEnvVarManager
+from .git import WorkspaceGitManager
 from .landscape import WorkspaceLandscapeManager
 
 log = logging.getLogger(__name__)
@@ -137,3 +138,9 @@ def landscape(self) -> WorkspaceLandscapeManager:
         """Manager for landscape operations (Multi Server Deployments)."""
         http_client = self.validate_http_client()
         return WorkspaceLandscapeManager(http_client, workspace_id=self.id)
+
+    @cached_property
+    def git(self) -> WorkspaceGitManager:
+        """Manager for git operations (head, pull)."""
+        http_client = self.validate_http_client()
+        return WorkspaceGitManager(http_client, workspace_id=self.id)

src/codesphere/resources/workspace/schemas.py

@@ -16,7 +16,6 @@
 
 
 def pytest_addoption(parser):
-    """Add custom command line options for integration tests."""
     parser.addoption(
         "--run-integration",
         action="store_true",
@@ -26,14 +25,12 @@ def pytest_addoption(parser):
 
 
 def pytest_configure(config):
-    """Register custom markers."""
     config.addinivalue_line(
         "markers", "integration: mark test as integration test (requires API token)"
     )
 
 
 def pytest_collection_modifyitems(config, items):
-    """Skip integration tests unless --run-integration is passed."""
     if config.getoption("--run-integration"):
         return
 
@@ -121,19 +118,27 @@ async def test_workspaces(
 ) -> AsyncGenerator[List[Workspace], None]:
     created_workspaces: List[Workspace] = []
 
-    for i in range(2):
-        workspace_name = f"{TEST_WORKSPACE_PREFIX}-{i + 1}"
+    workspace_configs = [
+        {"name": f"{TEST_WORKSPACE_PREFIX}-1", "git_url": None},
+        {
+            "name": f"{TEST_WORKSPACE_PREFIX}-git",
+            "git_url": "https://github.com/octocat/Hello-World.git",
+        },
+    ]
+
+    for config in workspace_configs:
         payload = WorkspaceCreate(
             team_id=test_team_id,
-            name=workspace_name,
+            name=config["name"],
             plan_id=test_plan_id,
+            git_url=config["git_url"],
         )
         try:
             workspace = await session_sdk_client.workspaces.create(payload=payload)
             created_workspaces.append(workspace)
             log.info(f"Created test workspace: {workspace.name} (ID: {workspace.id})")
         except Exception as e:
-            log.error(f"Failed to create test workspace {workspace_name}: {e}")
+            log.error(f"Failed to create test workspace {config['name']}: {e}")
             for ws in created_workspaces:
                 try:
                     await ws.delete()
@@ -155,3 +160,17 @@ async def test_workspaces(
 @pytest.fixture(scope="session")
 async def test_workspace(test_workspaces: List[Workspace]) -> Workspace:
     return test_workspaces[0]
+
+
+@pytest.fixture(scope="session")
+def git_workspace_id(test_workspaces: List[Workspace]) -> int:
+    return test_workspaces[1].id
+
+
+@pytest.fixture
+async def workspace_with_git(
+    sdk_client: CodesphereSDK, git_workspace_id: int
+) -> Workspace:
+    workspace = await sdk_client.workspaces.get(workspace_id=git_workspace_id)
+    await workspace.wait_until_running(timeout=120.0)
+    return workspace

tests/integration/conftest.py

@@ -0,0 +1,26 @@
+import pytest
+
+from codesphere.resources.workspace import Workspace
+
+pytestmark = pytest.mark.integration
+
+
+class TestGitIntegration:
+    @pytest.mark.asyncio
+    async def test_get_head(self, workspace_with_git: Workspace):
+        result = await workspace_with_git.git.get_head()
+
+        assert result.head is not None
+        assert len(result.head) > 0
+
+    @pytest.mark.asyncio
+    async def test_pull_default(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull()
+
+    @pytest.mark.asyncio
+    async def test_pull_with_remote(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull(remote="origin")
+
+    @pytest.mark.asyncio
+    async def test_pull_with_remote_and_branch(self, workspace_with_git: Workspace):
+        await workspace_with_git.git.pull(remote="origin", branch="master")