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
92 lines
2.7 KiB
Python
92 lines
2.7 KiB
Python
from datetime import datetime
|
|
from typing import Any
|
|
|
|
from pydantic import BaseModel
|
|
|
|
|
|
class NodeBase(BaseModel):
|
|
type: str
|
|
label: str
|
|
hostname: str | None = None
|
|
ip: str | None = None
|
|
mac: str | None = None
|
|
os: str | None = None
|
|
status: str = "unknown"
|
|
check_method: str | None = None
|
|
check_target: str | None = None
|
|
services: list[Any] = []
|
|
notes: str | None = None
|
|
pos_x: float = 0
|
|
pos_y: float = 0
|
|
parent_id: str | None = None
|
|
container_mode: bool = False
|
|
custom_colors: dict[str, Any] | None = None
|
|
custom_icon: str | None = None
|
|
cpu_count: int | None = None
|
|
cpu_model: str | None = None
|
|
ram_gb: float | None = None
|
|
disk_gb: float | None = None
|
|
show_hardware: bool = False
|
|
show_port_numbers: bool = False
|
|
properties: list[dict[str, Any]] = []
|
|
width: float | None = None
|
|
height: float | None = None
|
|
bottom_handles: int = 1
|
|
top_handles: int = 1
|
|
left_handles: int = 0
|
|
right_handles: int = 0
|
|
|
|
|
|
class NodeCreate(NodeBase):
|
|
design_id: str | None = None
|
|
# When a node with the same ip/mac already exists on the target design, the
|
|
# create/approve endpoints reject with 409 so the UI can ask the user. Set
|
|
# force=True to bypass that guard and create the duplicate deliberately.
|
|
force: bool = False
|
|
|
|
|
|
class NodeUpdate(BaseModel):
|
|
type: str | None = None
|
|
label: str | None = None
|
|
hostname: str | None = None
|
|
ip: str | None = None
|
|
mac: str | None = None
|
|
os: str | None = None
|
|
status: str | None = None
|
|
check_method: str | None = None
|
|
check_target: str | None = None
|
|
services: list[Any] | None = None
|
|
notes: str | None = None
|
|
pos_x: float | None = None
|
|
pos_y: float | None = None
|
|
parent_id: str | None = None
|
|
container_mode: bool | None = None
|
|
custom_colors: dict[str, Any] | None = None
|
|
custom_icon: str | None = None
|
|
cpu_count: int | None = None
|
|
cpu_model: str | None = None
|
|
ram_gb: float | None = None
|
|
disk_gb: float | None = None
|
|
show_hardware: bool | None = None
|
|
show_port_numbers: bool | None = None
|
|
properties: list[dict[str, Any]] | None = None
|
|
width: float | None = None
|
|
height: float | None = None
|
|
bottom_handles: int | None = None
|
|
top_handles: int | None = None
|
|
left_handles: int | None = None
|
|
right_handles: int | None = None
|
|
|
|
|
|
class NodeResponse(NodeBase):
|
|
id: str
|
|
design_id: str | None = None
|
|
ieee_address: str | None = None
|
|
last_seen: datetime | None = None
|
|
last_scan: datetime | None = None
|
|
response_time_ms: int | None = None
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
|
|
model_config = {"from_attributes": True}
|