Pouzor
0792105b96
Single-device approve now guards duplicates per-design the same way bulk approve does, and asks the user instead of failing or silently merging: - create_node and approve_device reject a same-design duplicate (ieee, ip or mac) with 409 + the existing node; a force flag creates it anyway. - Frontend shows a confirm dialog: go to existing node, add duplicate anyway, or cancel. - approve_device no longer rejects a device already on another canvas (status is global, canvas membership is per-design) — it can be placed on a new design, matching bulk approve. - IEEE (Zigbee/Z-Wave) devices now use the same prompt as ip/mac instead of auto-merging into the existing node. - bulk approve reports which devices it skipped as duplicates. Closes #260 ha-relevant: maybe
77 lines
3.3 KiB
Python
77 lines
3.3 KiB
Python
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.api.deps import get_current_user
|
|
from app.db.database import get_db
|
|
from app.db.models import Design, Node
|
|
from app.schemas.nodes import NodeCreate, NodeResponse, NodeUpdate
|
|
from app.services.node_dedupe import find_duplicate_node
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
@router.get("", response_model=list[NodeResponse])
|
|
async def list_nodes(db: AsyncSession = Depends(get_db), _: str = Depends(get_current_user)) -> list[Node]:
|
|
result = await db.execute(select(Node))
|
|
return list(result.scalars().all())
|
|
|
|
|
|
@router.post("", response_model=NodeResponse, status_code=status.HTTP_201_CREATED)
|
|
async def create_node(body: NodeCreate, db: AsyncSession = Depends(get_db), _: str = Depends(get_current_user)) -> Node:
|
|
data = body.model_dump()
|
|
# `force` bypasses the duplicate guard below; it is not a Node column.
|
|
force = data.pop("force", False)
|
|
# Attach to a design so the node lands on a canvas. Clients that don't send a
|
|
# design_id (e.g. the MCP write tools) would otherwise create design_id=null
|
|
# nodes that exist in the DB but never render in the UI until a container
|
|
# restart reconciles them. Fall back to the first design, matching bulk-approve.
|
|
if data.get("design_id") is None:
|
|
first_design = (await db.execute(select(Design).order_by(Design.created_at).limit(1))).scalar()
|
|
data["design_id"] = first_design.id if first_design else None
|
|
|
|
# Reject a silent duplicate: a node with the same ip OR mac already on the
|
|
# target design. Scripts/MCP clients get a clear 409 (with the existing id)
|
|
# instead of a second card for the same host. Pass force=True to override.
|
|
if not force:
|
|
dup = await find_duplicate_node(db, data["design_id"], data.get("ip"), data.get("mac"))
|
|
if dup is not None:
|
|
raise HTTPException(status_code=status.HTTP_409_CONFLICT, detail=dup)
|
|
|
|
node = Node(**data)
|
|
db.add(node)
|
|
await db.commit()
|
|
await db.refresh(node)
|
|
return node
|
|
|
|
|
|
@router.get("/{node_id}", response_model=NodeResponse)
|
|
async def get_node(node_id: str, db: AsyncSession = Depends(get_db), _: str = Depends(get_current_user)) -> Node:
|
|
node = await db.get(Node, node_id)
|
|
if not node:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Node not found")
|
|
return node
|
|
|
|
|
|
@router.patch("/{node_id}", response_model=NodeResponse)
|
|
async def update_node(
|
|
node_id: str, body: NodeUpdate, db: AsyncSession = Depends(get_db), _: str = Depends(get_current_user)
|
|
) -> Node:
|
|
node = await db.get(Node, node_id)
|
|
if not node:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Node not found")
|
|
for field, value in body.model_dump(exclude_unset=True).items():
|
|
setattr(node, field, value)
|
|
await db.commit()
|
|
await db.refresh(node)
|
|
return node
|
|
|
|
|
|
@router.delete("/{node_id}", status_code=status.HTTP_204_NO_CONTENT)
|
|
async def delete_node(node_id: str, db: AsyncSession = Depends(get_db), _: str = Depends(get_current_user)) -> None:
|
|
node = await db.get(Node, node_id)
|
|
if not node:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Node not found")
|
|
await db.delete(node)
|
|
await db.commit()
|