refactor: enhance docstrings for clarity and consistency across multiple files
This commit is contained in:
@@ -1,15 +1,21 @@
|
||||
"""Board group CRUD, snapshot, and heartbeat endpoints."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
from typing import Any, cast
|
||||
from typing import TYPE_CHECKING, Any, cast
|
||||
from uuid import UUID, uuid4
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, status
|
||||
from sqlalchemy import func
|
||||
from sqlmodel import col, select
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
|
||||
from app.api.deps import ActorContext, require_admin_or_agent, require_org_admin, require_org_member
|
||||
from app.api.deps import (
|
||||
ActorContext,
|
||||
require_admin_or_agent,
|
||||
require_org_admin,
|
||||
require_org_member,
|
||||
)
|
||||
from app.core.time import utcnow
|
||||
from app.db import crud
|
||||
from app.db.pagination import paginate
|
||||
@@ -20,7 +26,6 @@ from app.models.board_group_memory import BoardGroupMemory
|
||||
from app.models.board_groups import BoardGroup
|
||||
from app.models.boards import Board
|
||||
from app.models.gateways import Gateway
|
||||
from app.models.organization_members import OrganizationMember
|
||||
from app.schemas.board_group_heartbeat import (
|
||||
BoardGroupHeartbeatApply,
|
||||
BoardGroupHeartbeatApplyResult,
|
||||
@@ -29,7 +34,10 @@ from app.schemas.board_groups import BoardGroupCreate, BoardGroupRead, BoardGrou
|
||||
from app.schemas.common import OkResponse
|
||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||
from app.schemas.view_models import BoardGroupSnapshot
|
||||
from app.services.agent_provisioning import DEFAULT_HEARTBEAT_CONFIG, sync_gateway_agent_heartbeats
|
||||
from app.services.agent_provisioning import (
|
||||
DEFAULT_HEARTBEAT_CONFIG,
|
||||
sync_gateway_agent_heartbeats,
|
||||
)
|
||||
from app.services.board_group_snapshot import build_group_snapshot
|
||||
from app.services.organizations import (
|
||||
OrganizationContext,
|
||||
@@ -41,7 +49,16 @@ from app.services.organizations import (
|
||||
member_all_boards_write,
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
|
||||
from app.models.organization_members import OrganizationMember
|
||||
|
||||
router = APIRouter(prefix="/board-groups", tags=["board-groups"])
|
||||
SESSION_DEP = Depends(get_session)
|
||||
ORG_MEMBER_DEP = Depends(require_org_member)
|
||||
ORG_ADMIN_DEP = Depends(require_org_admin)
|
||||
ACTOR_DEP = Depends(require_admin_or_agent)
|
||||
|
||||
|
||||
def _slugify(value: str) -> str:
|
||||
@@ -68,7 +85,8 @@ async def _require_group_access(
|
||||
return group
|
||||
|
||||
board_ids = [
|
||||
board.id for board in await Board.objects.filter_by(board_group_id=group_id).all(session)
|
||||
board.id
|
||||
for board in await Board.objects.filter_by(board_group_id=group_id).all(session)
|
||||
]
|
||||
if not board_ids:
|
||||
if is_org_admin(member):
|
||||
@@ -83,14 +101,17 @@ async def _require_group_access(
|
||||
|
||||
@router.get("", response_model=DefaultLimitOffsetPage[BoardGroupRead])
|
||||
async def list_board_groups(
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_member),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_MEMBER_DEP,
|
||||
) -> DefaultLimitOffsetPage[BoardGroupRead]:
|
||||
"""List board groups in the active organization."""
|
||||
if member_all_boards_read(ctx.member):
|
||||
statement = select(BoardGroup).where(col(BoardGroup.organization_id) == ctx.organization.id)
|
||||
statement = select(BoardGroup).where(
|
||||
col(BoardGroup.organization_id) == ctx.organization.id,
|
||||
)
|
||||
else:
|
||||
accessible_boards = select(Board.board_group_id).where(
|
||||
board_access_filter(ctx.member, write=False)
|
||||
board_access_filter(ctx.member, write=False),
|
||||
)
|
||||
statement = select(BoardGroup).where(
|
||||
col(BoardGroup.organization_id) == ctx.organization.id,
|
||||
@@ -103,9 +124,10 @@ async def list_board_groups(
|
||||
@router.post("", response_model=BoardGroupRead)
|
||||
async def create_board_group(
|
||||
payload: BoardGroupCreate,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_admin),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_ADMIN_DEP,
|
||||
) -> BoardGroup:
|
||||
"""Create a board group in the active organization."""
|
||||
data = payload.model_dump()
|
||||
if not (data.get("slug") or "").strip():
|
||||
data["slug"] = _slugify(data.get("name") or "")
|
||||
@@ -116,21 +138,28 @@ async def create_board_group(
|
||||
@router.get("/{group_id}", response_model=BoardGroupRead)
|
||||
async def get_board_group(
|
||||
group_id: UUID,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_member),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_MEMBER_DEP,
|
||||
) -> BoardGroup:
|
||||
return await _require_group_access(session, group_id=group_id, member=ctx.member, write=False)
|
||||
"""Get a board group by id."""
|
||||
return await _require_group_access(
|
||||
session, group_id=group_id, member=ctx.member, write=False,
|
||||
)
|
||||
|
||||
|
||||
@router.get("/{group_id}/snapshot", response_model=BoardGroupSnapshot)
|
||||
async def get_board_group_snapshot(
|
||||
group_id: UUID,
|
||||
*,
|
||||
include_done: bool = False,
|
||||
per_board_task_limit: int = 5,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_member),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_MEMBER_DEP,
|
||||
) -> BoardGroupSnapshot:
|
||||
group = await _require_group_access(session, group_id=group_id, member=ctx.member, write=False)
|
||||
"""Get a snapshot across boards in a group."""
|
||||
group = await _require_group_access(
|
||||
session, group_id=group_id, member=ctx.member, write=False,
|
||||
)
|
||||
if per_board_task_limit < 0:
|
||||
raise HTTPException(status_code=status.HTTP_422_UNPROCESSABLE_ENTITY)
|
||||
snapshot = await build_group_snapshot(
|
||||
@@ -141,22 +170,22 @@ async def get_board_group_snapshot(
|
||||
per_board_task_limit=per_board_task_limit,
|
||||
)
|
||||
if not member_all_boards_read(ctx.member) and snapshot.boards:
|
||||
allowed_ids = set(await list_accessible_board_ids(session, member=ctx.member, write=False))
|
||||
snapshot.boards = [item for item in snapshot.boards if item.board.id in allowed_ids]
|
||||
allowed_ids = set(
|
||||
await list_accessible_board_ids(session, member=ctx.member, write=False),
|
||||
)
|
||||
snapshot.boards = [
|
||||
item for item in snapshot.boards if item.board.id in allowed_ids
|
||||
]
|
||||
return snapshot
|
||||
|
||||
|
||||
@router.post("/{group_id}/heartbeat", response_model=BoardGroupHeartbeatApplyResult)
|
||||
async def apply_board_group_heartbeat(
|
||||
async def _authorize_heartbeat_actor(
|
||||
session: AsyncSession,
|
||||
*,
|
||||
group_id: UUID,
|
||||
payload: BoardGroupHeartbeatApply,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
actor: ActorContext = Depends(require_admin_or_agent),
|
||||
) -> BoardGroupHeartbeatApplyResult:
|
||||
group = await BoardGroup.objects.by_id(group_id).first(session)
|
||||
if group is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
|
||||
|
||||
group: BoardGroup,
|
||||
actor: ActorContext,
|
||||
) -> None:
|
||||
if actor.actor_type == "user":
|
||||
if actor.user is None:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
|
||||
@@ -173,53 +202,58 @@ async def apply_board_group_heartbeat(
|
||||
member=member,
|
||||
write=True,
|
||||
)
|
||||
elif actor.actor_type == "agent":
|
||||
agent = actor.agent
|
||||
if agent is None:
|
||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED)
|
||||
if agent.board_id is None:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
|
||||
if not agent.is_board_lead:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
|
||||
board = await Board.objects.by_id(agent.board_id).first(session)
|
||||
if board is None or board.board_group_id != group_id:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
|
||||
return
|
||||
agent = actor.agent
|
||||
if agent is None or agent.board_id is None or not agent.is_board_lead:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
|
||||
board = await Board.objects.by_id(agent.board_id).first(session)
|
||||
if board is None or board.board_group_id != group_id:
|
||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN)
|
||||
|
||||
|
||||
async def _agents_for_group_heartbeat(
|
||||
session: AsyncSession,
|
||||
*,
|
||||
group_id: UUID,
|
||||
include_board_leads: bool,
|
||||
) -> tuple[dict[UUID, Board], list[Agent]]:
|
||||
boards = await Board.objects.filter_by(board_group_id=group_id).all(session)
|
||||
board_by_id = {board.id: board for board in boards}
|
||||
board_ids = list(board_by_id.keys())
|
||||
if not board_ids:
|
||||
return BoardGroupHeartbeatApplyResult(
|
||||
board_group_id=group_id,
|
||||
requested=payload.model_dump(mode="json"),
|
||||
updated_agent_ids=[],
|
||||
failed_agent_ids=[],
|
||||
)
|
||||
|
||||
return board_by_id, []
|
||||
agents = await Agent.objects.by_field_in("board_id", board_ids).all(session)
|
||||
if not payload.include_board_leads:
|
||||
if not include_board_leads:
|
||||
agents = [agent for agent in agents if not agent.is_board_lead]
|
||||
return board_by_id, agents
|
||||
|
||||
updated_agent_ids: list[UUID] = []
|
||||
for agent in agents:
|
||||
raw = agent.heartbeat_config
|
||||
heartbeat: dict[str, Any] = (
|
||||
cast(dict[str, Any], dict(raw))
|
||||
if isinstance(raw, dict)
|
||||
else cast(dict[str, Any], DEFAULT_HEARTBEAT_CONFIG.copy())
|
||||
)
|
||||
heartbeat["every"] = payload.every
|
||||
if payload.target is not None:
|
||||
heartbeat["target"] = payload.target
|
||||
elif "target" not in heartbeat:
|
||||
heartbeat["target"] = DEFAULT_HEARTBEAT_CONFIG.get("target", "none")
|
||||
agent.heartbeat_config = heartbeat
|
||||
agent.updated_at = utcnow()
|
||||
session.add(agent)
|
||||
updated_agent_ids.append(agent.id)
|
||||
|
||||
await session.commit()
|
||||
def _update_agent_heartbeat(
|
||||
*,
|
||||
agent: Agent,
|
||||
payload: BoardGroupHeartbeatApply,
|
||||
) -> None:
|
||||
raw = agent.heartbeat_config
|
||||
heartbeat: dict[str, Any] = (
|
||||
cast(dict[str, Any], dict(raw))
|
||||
if isinstance(raw, dict)
|
||||
else cast(dict[str, Any], DEFAULT_HEARTBEAT_CONFIG.copy())
|
||||
)
|
||||
heartbeat["every"] = payload.every
|
||||
if payload.target is not None:
|
||||
heartbeat["target"] = payload.target
|
||||
elif "target" not in heartbeat:
|
||||
heartbeat["target"] = DEFAULT_HEARTBEAT_CONFIG.get("target", "none")
|
||||
agent.heartbeat_config = heartbeat
|
||||
agent.updated_at = utcnow()
|
||||
|
||||
|
||||
async def _sync_gateway_heartbeats(
|
||||
session: AsyncSession,
|
||||
*,
|
||||
board_by_id: dict[UUID, Board],
|
||||
agents: list[Agent],
|
||||
) -> list[UUID]:
|
||||
agents_by_gateway_id: dict[UUID, list[Agent]] = {}
|
||||
for agent in agents:
|
||||
board_id = agent.board_id
|
||||
@@ -243,6 +277,51 @@ async def apply_board_group_heartbeat(
|
||||
await sync_gateway_agent_heartbeats(gateway, gateway_agents)
|
||||
except OpenClawGatewayError:
|
||||
failed_agent_ids.extend([agent.id for agent in gateway_agents])
|
||||
return failed_agent_ids
|
||||
|
||||
|
||||
@router.post("/{group_id}/heartbeat", response_model=BoardGroupHeartbeatApplyResult)
|
||||
async def apply_board_group_heartbeat(
|
||||
group_id: UUID,
|
||||
payload: BoardGroupHeartbeatApply,
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
actor: ActorContext = ACTOR_DEP,
|
||||
) -> BoardGroupHeartbeatApplyResult:
|
||||
"""Apply heartbeat settings to agents in a board group."""
|
||||
group = await BoardGroup.objects.by_id(group_id).first(session)
|
||||
if group is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND)
|
||||
await _authorize_heartbeat_actor(
|
||||
session,
|
||||
group_id=group_id,
|
||||
group=group,
|
||||
actor=actor,
|
||||
)
|
||||
board_by_id, agents = await _agents_for_group_heartbeat(
|
||||
session,
|
||||
group_id=group_id,
|
||||
include_board_leads=payload.include_board_leads,
|
||||
)
|
||||
if not agents:
|
||||
return BoardGroupHeartbeatApplyResult(
|
||||
board_group_id=group_id,
|
||||
requested=payload.model_dump(mode="json"),
|
||||
updated_agent_ids=[],
|
||||
failed_agent_ids=[],
|
||||
)
|
||||
|
||||
updated_agent_ids: list[UUID] = []
|
||||
for agent in agents:
|
||||
_update_agent_heartbeat(agent=agent, payload=payload)
|
||||
session.add(agent)
|
||||
updated_agent_ids.append(agent.id)
|
||||
|
||||
await session.commit()
|
||||
failed_agent_ids = await _sync_gateway_heartbeats(
|
||||
session,
|
||||
board_by_id=board_by_id,
|
||||
agents=agents,
|
||||
)
|
||||
|
||||
return BoardGroupHeartbeatApplyResult(
|
||||
board_group_id=group_id,
|
||||
@@ -256,12 +335,19 @@ async def apply_board_group_heartbeat(
|
||||
async def update_board_group(
|
||||
payload: BoardGroupUpdate,
|
||||
group_id: UUID,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_admin),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_ADMIN_DEP,
|
||||
) -> BoardGroup:
|
||||
group = await _require_group_access(session, group_id=group_id, member=ctx.member, write=True)
|
||||
"""Update a board group."""
|
||||
group = await _require_group_access(
|
||||
session, group_id=group_id, member=ctx.member, write=True,
|
||||
)
|
||||
updates = payload.model_dump(exclude_unset=True)
|
||||
if "slug" in updates and updates["slug"] is not None and not updates["slug"].strip():
|
||||
if (
|
||||
"slug" in updates
|
||||
and updates["slug"] is not None
|
||||
and not updates["slug"].strip()
|
||||
):
|
||||
updates["slug"] = _slugify(updates.get("name") or group.name)
|
||||
updates["updated_at"] = utcnow()
|
||||
return await crud.patch(session, group, updates)
|
||||
@@ -270,10 +356,13 @@ async def update_board_group(
|
||||
@router.delete("/{group_id}", response_model=OkResponse)
|
||||
async def delete_board_group(
|
||||
group_id: UUID,
|
||||
session: AsyncSession = Depends(get_session),
|
||||
ctx: OrganizationContext = Depends(require_org_admin),
|
||||
session: AsyncSession = SESSION_DEP,
|
||||
ctx: OrganizationContext = ORG_ADMIN_DEP,
|
||||
) -> OkResponse:
|
||||
await _require_group_access(session, group_id=group_id, member=ctx.member, write=True)
|
||||
"""Delete a board group."""
|
||||
await _require_group_access(
|
||||
session, group_id=group_id, member=ctx.member, write=True,
|
||||
)
|
||||
|
||||
# Boards reference groups, so clear the FK first to keep deletes simple.
|
||||
await crud.update_where(
|
||||
@@ -284,8 +373,13 @@ async def delete_board_group(
|
||||
commit=False,
|
||||
)
|
||||
await crud.delete_where(
|
||||
session, BoardGroupMemory, col(BoardGroupMemory.board_group_id) == group_id, commit=False
|
||||
session,
|
||||
BoardGroupMemory,
|
||||
col(BoardGroupMemory.board_group_id) == group_id,
|
||||
commit=False,
|
||||
)
|
||||
await crud.delete_where(
|
||||
session, BoardGroup, col(BoardGroup.id) == group_id, commit=False,
|
||||
)
|
||||
await crud.delete_where(session, BoardGroup, col(BoardGroup.id) == group_id, commit=False)
|
||||
await session.commit()
|
||||
return OkResponse()
|
||||
|
||||
Reference in New Issue
Block a user