unifi-network-maps 1.4.10__tar.gz → 1.4.12__tar.gz

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/CHANGELOG.md

@@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.12] - 2026-01-21
+### Added
+- Filter UniFi clients with --only-unifi, and not only neighbors
+
+### Fixed
+- inconsistencies in --only-unifi
+
+## [1.4.11] - 2026-01-19
+### Added
+- Add data-edge-left/right attributes to SVG paths
+
+### Fixed
+- Regression in identifying wireless/wired clients
+
 ## [1.4.10] - 2026-01-18
 ### Added
 - Add speed and channel fields to Edge dataclass
@@ -169,7 +183,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Introduced SVG renderer and tree layout fixes.
 - Increased test coverage and added coverage tooling.
 
-[Unreleased]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.10...HEAD
+[Unreleased]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.12...HEAD
+[1.4.12]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.11...v1.4.12
+[1.4.11]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.10...v1.4.11
 [1.4.10]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.9...v1.4.10
 [1.4.9]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.8...v1.4.9
 [1.4.8]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.7...v1.4.8

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.10
+Version: 1.4.12
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -223,7 +223,7 @@ Functional:
 - `--include-ports`: show port labels (Mermaid shows both ends; SVG shows compact labels).
 - `--include-clients`: add active wired clients as leaf nodes.
 - `--client-scope wired|wireless|all`: which client types to include (default wired).
-- `--only-unifi`: only include neighbors that are UniFi devices.
+- `--only-unifi`: only include neighbors that are UniFi devices; when clients are included, filters to UniFi-managed clients (by explicit UniFi flags or vendor/OUI).
 - `--no-cache`: disable UniFi API cache reads and writes.
 
 Mermaid:

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/README.md

@@ -186,7 +186,7 @@ Functional:
 - `--include-ports`: show port labels (Mermaid shows both ends; SVG shows compact labels).
 - `--include-clients`: add active wired clients as leaf nodes.
 - `--client-scope wired|wireless|all`: which client types to include (default wired).
-- `--only-unifi`: only include neighbors that are UniFi devices.
+- `--only-unifi`: only include neighbors that are UniFi devices; when clients are included, filters to UniFi-managed clients (by explicit UniFi flags or vendor/OUI).
 - `--no-cache`: disable UniFi API cache reads and writes.
 
 Mermaid:

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unifi-network-maps"
-version = "1.4.10"
+version = "1.4.12"
 description = "Dynamic UniFi -> network maps in mermaid or svg"
 readme = "README.md"
 requires-python = ">=3.12"

unifi_network_maps-1.4.12/src/unifi_network_maps/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.4.12"

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps/cli/render.py

@@ -62,7 +62,12 @@ def render_mermaid_output(
         direction=args.direction,
         groups=groups,
         group_order=group_order,
-        node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+        node_types=build_node_type_map(
+            devices,
+            clients,
+            client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
+        ),
         theme=mermaid_theme,
     )
     if args.markdown:
@@ -97,13 +102,23 @@ def render_svg_output(
 
         return render_svg_isometric(
             edges,
-            node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+            node_types=build_node_type_map(
+                devices,
+                clients,
+                client_mode=args.client_scope,
+                only_unifi=args.only_unifi,
+            ),
             options=options,
             theme=svg_theme,
         )
     return render_svg(
         edges,
-        node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+        node_types=build_node_type_map(
+            devices,
+            clients,
+            client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
+        ),
         options=options,
         theme=svg_theme,
     )
@@ -190,6 +205,7 @@ def render_lldp_format(
         include_ports=args.include_ports,
         show_clients=args.include_clients,
         client_mode=args.client_scope,
+        only_unifi=args.only_unifi,
     )
     write_output(content, output_path=args.output, stdout=args.stdout)
     return 0

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps/cli/runtime.py

@@ -95,6 +95,7 @@ def build_edges_with_clients(
             device_index,
             include_ports=args.include_ports,
             client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
         )
     return edges, clients
 
@@ -153,5 +154,10 @@ def resolve_mkdocs_client_ports(
         clients = list(fetch_clients(config, site=site))
     else:
         clients = mock_clients
-    client_ports = build_client_port_map(devices, clients, client_mode=args.client_scope)
+    client_ports = build_client_port_map(
+        devices,
+        clients,
+        client_mode=args.client_scope,
+        only_unifi=args.only_unifi,
+    )
     return client_ports, None

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps/model/topology.py

@@ -460,7 +460,13 @@ def _client_field(client: object, name: str) -> object | None:
 
 
 def _client_display_name(client: object) -> str | None:
-    for key in ("name", "hostname", "mac"):
+    raw_name = _client_field(client, "name")
+    if isinstance(raw_name, str) and raw_name.strip():
+        return raw_name.strip()
+    preferred = _client_ucore_display_name(client)
+    if preferred:
+        return preferred
+    for key in ("hostname", "mac"):
         value = _client_field(client, key)
         if isinstance(value, str) and value.strip():
             return value.strip()
@@ -482,20 +488,31 @@ def _client_uplink_mac(client: object) -> str | None:
 
 
 def _client_uplink_port(client: object) -> int | None:
-    for key in ("uplink_remote_port", "sw_port", "ap_port"):
-        value = _client_field(client, key)
-        if isinstance(value, int):
-            return value
-        if isinstance(value, str) and value.isdigit():
-            return int(value)
+    for value in _client_port_values(client):
+        parsed = _parse_port_value(value)
+        if parsed is not None:
+            return parsed
+    return None
+
+
+def _client_port_values(client: object) -> Iterable[object | None]:
+    for key in ("uplink_remote_port", "sw_port", "ap_port", "port_idx"):
+        yield _client_field(client, key)
     for key in ("uplink", "last_uplink"):
         nested = _client_field(client, key)
         if isinstance(nested, dict):
-            value = nested.get("uplink_remote_port")
-            if isinstance(value, int):
-                return value
-            if isinstance(value, str) and value.isdigit():
-                return int(value)
+            for nested_key in ("uplink_remote_port", "port_idx"):
+                yield nested.get(nested_key)
+
+
+def _parse_port_value(value: object | None) -> int | None:
+    if isinstance(value, int):
+        return value
+    if isinstance(value, str):
+        stripped = value.strip()
+        if stripped.isdigit():
+            return int(stripped)
+        return extract_port_number(stripped)
     return None
 
 
@@ -503,6 +520,73 @@ def _client_is_wired(client: object) -> bool:
     return bool(_client_field(client, "is_wired"))
 
 
+def _client_unifi_flag(client: object) -> bool | None:
+    for key in ("is_unifi", "is_unifi_device", "is_ubnt", "is_uap", "is_managed"):
+        value = _client_field(client, key)
+        if isinstance(value, bool):
+            return value
+        if isinstance(value, int):
+            return value != 0
+    return None
+
+
+def _client_vendor(client: object) -> str | None:
+    for key in ("oui", "vendor", "vendor_name", "manufacturer", "manufacturer_name"):
+        value = _client_field(client, key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_ucore_info(client: object) -> dict[str, object] | None:
+    info = _client_field(client, "unifi_device_info_from_ucore")
+    if isinstance(info, dict):
+        return info
+    return None
+
+
+def _client_ucore_display_name(client: object) -> str | None:
+    ucore = _client_ucore_info(client)
+    if not ucore:
+        return None
+    for key in ("name", "computed_model", "product_model", "product_shortname"):
+        value = ucore.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_hostname_source(client: object) -> str | None:
+    value = _client_field(client, "hostname_source")
+    if isinstance(value, str) and value.strip():
+        return value.strip()
+    return None
+
+
+def _client_is_unifi(client: object) -> bool:
+    flag = _client_unifi_flag(client)
+    if flag is not None:
+        return flag
+    ucore = _client_ucore_info(client)
+    if ucore:
+        managed = ucore.get("managed")
+        if isinstance(managed, bool) and managed:
+            return True
+        if isinstance(ucore.get("product_line"), str) and ucore.get("product_line"):
+            return True
+        if isinstance(ucore.get("product_shortname"), str) and ucore.get("product_shortname"):
+            return True
+        for key in ("name", "computed_model", "product_model"):
+            value = ucore.get(key)
+            if isinstance(value, str) and value.strip():
+                return True
+    vendor = _client_vendor(client)
+    if not vendor:
+        return False
+    normalized = vendor.lower()
+    return "ubiquiti" in normalized or "unifi" in normalized
+
+
 def _client_channel(client: object) -> int | None:
     for key in ("channel", "radio_channel", "wifi_channel"):
         value = _client_field(client, key)
@@ -522,17 +606,26 @@ def _client_matches_mode(client: object, mode: str) -> bool:
     return wired
 
 
+def _client_matches_filters(client: object, *, client_mode: str, only_unifi: bool) -> bool:
+    if not _client_matches_mode(client, client_mode):
+        return False
+    if only_unifi and not _client_is_unifi(client):
+        return False
+    return True
+
+
 def build_client_edges(
     clients: Iterable[object],
     device_index: dict[str, str],
     *,
     include_ports: bool = False,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> list[Edge]:
     edges: list[Edge] = []
     seen: set[tuple[str, str]] = set()
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)
@@ -569,13 +662,14 @@ def build_node_type_map(
     clients: Iterable[object] | None = None,
     *,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> dict[str, str]:
     node_types: dict[str, str] = {}
     for device in devices:
         node_types[device.name] = classify_device_type(device)
     if clients:
         for client in clients:
-            if not _client_matches_mode(client, client_mode):
+            if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
                 continue
             name = _client_display_name(client)
             if name:
@@ -672,11 +766,12 @@ def build_client_port_map(
     clients: Iterable[object],
     *,
     client_mode: str,
+    only_unifi: bool = False,
 ) -> ClientPortMap:
     device_index = build_device_index(devices)
     port_map: ClientPortMap = {}
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps/render/lldp_md.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from collections.abc import Iterable
 
 from ..model.lldp import LLDPEntry, local_port_label
+from ..model.ports import extract_port_number
 from ..model.topology import Device, build_client_port_map, build_device_index, build_port_map
 from .device_ports_md import render_device_port_details
 from .markdown_tables import markdown_table_lines
@@ -22,7 +23,13 @@ def _client_field(client: object, name: str) -> object | None:
 
 
 def _client_display_name(client: object) -> str | None:
-    for key in ("name", "hostname", "mac"):
+    raw_name = _client_field(client, "name")
+    if isinstance(raw_name, str) and raw_name.strip():
+        return raw_name.strip()
+    preferred = _client_ucore_display_name(client)
+    if preferred:
+        return preferred
+    for key in ("hostname", "mac"):
         value = _client_field(client, key)
         if isinstance(value, str) and value.strip():
             return value.strip()
@@ -44,20 +51,31 @@ def _client_uplink_mac(client: object) -> str | None:
 
 
 def _client_uplink_port(client: object) -> int | None:
-    for key in ("uplink_remote_port", "sw_port", "ap_port"):
-        value = _client_field(client, key)
-        if isinstance(value, int):
-            return value
-        if isinstance(value, str) and value.isdigit():
-            return int(value)
+    for value in _client_port_values(client):
+        parsed = _parse_port_value(value)
+        if parsed is not None:
+            return parsed
+    return None
+
+
+def _client_port_values(client: object) -> Iterable[object | None]:
+    for key in ("uplink_remote_port", "sw_port", "ap_port", "port_idx"):
+        yield _client_field(client, key)
     for key in ("uplink", "last_uplink"):
         nested = _client_field(client, key)
         if isinstance(nested, dict):
-            value = nested.get("uplink_remote_port")
-            if isinstance(value, int):
-                return value
-            if isinstance(value, str) and value.isdigit():
-                return int(value)
+            for nested_key in ("uplink_remote_port", "port_idx"):
+                yield nested.get(nested_key)
+
+
+def _parse_port_value(value: object | None) -> int | None:
+    if isinstance(value, int):
+        return value
+    if isinstance(value, str):
+        stripped = value.strip()
+        if stripped.isdigit():
+            return int(stripped)
+        return extract_port_number(stripped)
     return None
 
 
@@ -65,6 +83,73 @@ def _client_is_wired(client: object) -> bool:
     return bool(_client_field(client, "is_wired"))
 
 
+def _client_unifi_flag(client: object) -> bool | None:
+    for key in ("is_unifi", "is_unifi_device", "is_ubnt", "is_uap", "is_managed"):
+        value = _client_field(client, key)
+        if isinstance(value, bool):
+            return value
+        if isinstance(value, int):
+            return value != 0
+    return None
+
+
+def _client_vendor(client: object) -> str | None:
+    for key in ("oui", "vendor", "vendor_name", "manufacturer", "manufacturer_name"):
+        value = _client_field(client, key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_ucore_info(client: object) -> dict[str, object] | None:
+    info = _client_field(client, "unifi_device_info_from_ucore")
+    if isinstance(info, dict):
+        return info
+    return None
+
+
+def _client_ucore_display_name(client: object) -> str | None:
+    ucore = _client_ucore_info(client)
+    if not ucore:
+        return None
+    for key in ("name", "computed_model", "product_model", "product_shortname"):
+        value = ucore.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_hostname_source(client: object) -> str | None:
+    value = _client_field(client, "hostname_source")
+    if isinstance(value, str) and value.strip():
+        return value.strip()
+    return None
+
+
+def _client_is_unifi(client: object) -> bool:
+    flag = _client_unifi_flag(client)
+    if flag is not None:
+        return flag
+    ucore = _client_ucore_info(client)
+    if ucore:
+        managed = ucore.get("managed")
+        if isinstance(managed, bool) and managed:
+            return True
+        if isinstance(ucore.get("product_line"), str) and ucore.get("product_line"):
+            return True
+        if isinstance(ucore.get("product_shortname"), str) and ucore.get("product_shortname"):
+            return True
+        for key in ("name", "computed_model", "product_model"):
+            value = ucore.get(key)
+            if isinstance(value, str) and value.strip():
+                return True
+    vendor = _client_vendor(client)
+    if not vendor:
+        return False
+    normalized = vendor.lower()
+    return "ubiquiti" in normalized or "unifi" in normalized
+
+
 def _client_matches_mode(client: object, mode: str) -> bool:
     wired = _client_is_wired(client)
     if mode == "all":
@@ -74,6 +159,14 @@ def _client_matches_mode(client: object, mode: str) -> bool:
     return wired
 
 
+def _client_matches_filters(client: object, *, client_mode: str, only_unifi: bool) -> bool:
+    if not _client_matches_mode(client, client_mode):
+        return False
+    if only_unifi and not _client_is_unifi(client):
+        return False
+    return True
+
+
 def _lldp_sort_key(entry: LLDPEntry) -> tuple[int, str, str]:
     port_label = local_port_label(entry) or ""
     port_number = "".join(ch for ch in port_label if ch.isdigit())
@@ -187,10 +280,11 @@ def _client_rows(
     *,
     include_ports: bool,
     client_mode: str,
+    only_unifi: bool,
 ) -> dict[str, list[tuple[str, str | None]]]:
     rows_by_device: dict[str, list[tuple[str, str | None]]] = {}
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)
@@ -215,6 +309,7 @@ def _prepare_lldp_maps(
     include_ports: bool,
     show_clients: bool,
     client_mode: str,
+    only_unifi: bool,
 ) -> tuple[
     dict[tuple[str, str], str],
     dict[str, list[tuple[int, str]]] | None,
@@ -222,7 +317,13 @@ def _prepare_lldp_maps(
 ]:
     device_index = build_device_index(devices)
     client_rows = (
-        _client_rows(clients, device_index, include_ports=include_ports, client_mode=client_mode)
+        _client_rows(
+            clients,
+            device_index,
+            include_ports=include_ports,
+            client_mode=client_mode,
+            only_unifi=only_unifi,
+        )
         if clients
         else {}
     )
@@ -231,7 +332,12 @@ def _prepare_lldp_maps(
     if include_ports:
         port_map = build_port_map(devices, only_unifi=False)
         if clients and show_clients:
-            client_port_map = build_client_port_map(devices, clients, client_mode=client_mode)
+            client_port_map = build_client_port_map(
+                devices,
+                clients,
+                client_mode=client_mode,
+                only_unifi=only_unifi,
+            )
     return port_map, client_port_map, client_rows
 
 
@@ -306,6 +412,7 @@ def render_lldp_md(
     include_ports: bool = False,
     show_clients: bool = False,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> str:
     device_index = build_device_index(devices)
     port_map, client_port_map, client_rows = _prepare_lldp_maps(
@@ -314,6 +421,7 @@ def render_lldp_md(
         include_ports=include_ports,
         show_clients=show_clients,
         client_mode=client_mode,
+        only_unifi=only_unifi,
     )
     sections: list[str] = []
     for device in sorted(devices, key=lambda item: item.name.lower()):

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps/render/svg.py

@@ -547,8 +547,11 @@ def _render_svg_edges(
                 f"L {dst_cx} {mid_y} L {dst_cx} {dst_top}"
             )
         dash = ' stroke-dasharray="6 4"' if edge.wireless else ""
+        left_attr = _escape_attr(edge.left, quote=True)
+        right_attr = _escape_attr(edge.right, quote=True)
         lines.append(
-            f'<path d="{path}" stroke="{color}" stroke-width="{width_px}" fill="none"{dash}/>'
+            f'<path d="{path}" stroke="{color}" stroke-width="{width_px}" fill="none"{dash} '
+            f'data-edge-left="{left_attr}" data-edge-right="{right_attr}"/>'
         )
         if edge.poe:
             icon_x = dst_cx
@@ -834,9 +837,12 @@ def _render_iso_edges(
             dst_cy,
         )
         dash = ' stroke-dasharray="8 6"' if edge.wireless else ""
+        left_attr = _escape_attr(edge.left, quote=True)
+        right_attr = _escape_attr(edge.right, quote=True)
         lines.append(
             f'<path d="{" ".join(path_cmds)}" stroke="{color}" stroke-width="{width_px}" '
-            f'fill="none" stroke-linecap="round" stroke-linejoin="round"{dash}/>'
+            f'fill="none" stroke-linecap="round" stroke-linejoin="round"{dash} '
+            f'data-edge-left="{left_attr}" data-edge-right="{right_attr}"/>'
         )
         if edge.poe:
             icon_x = dst_cx

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/src/unifi_network_maps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.10
+Version: 1.4.12
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -223,7 +223,7 @@ Functional:
 - `--include-ports`: show port labels (Mermaid shows both ends; SVG shows compact labels).
 - `--include-clients`: add active wired clients as leaf nodes.
 - `--client-scope wired|wireless|all`: which client types to include (default wired).
-- `--only-unifi`: only include neighbors that are UniFi devices.
+- `--only-unifi`: only include neighbors that are UniFi devices; when clients are included, filters to UniFi-managed clients (by explicit UniFi flags or vendor/OUI).
 - `--no-cache`: disable UniFi API cache reads and writes.
 
 Mermaid:

{unifi_network_maps-1.4.10 → unifi_network_maps-1.4.12}/tests/test_clients.py

@@ -57,6 +57,58 @@ def test_build_client_edges_includes_uplink_port_label():
     assert edges[0].label == "Switch A: Port 3 <-> Laptop"
 
 
+def test_build_client_edges_only_unifi_filters_non_unifi():
+    device_index = {"aa:bb:cc:dd:ee:ff": "Switch A"}
+    clients = [
+        {"name": "Desk PC", "is_wired": True, "sw_mac": "aa:bb:cc:dd:ee:ff", "is_unifi": False},
+        {"name": "Protect Cam", "is_wired": True, "sw_mac": "aa:bb:cc:dd:ee:ff", "is_unifi": True},
+    ]
+    edges = build_client_edges(clients, device_index, only_unifi=True)
+    assert [edge.right for edge in edges] == ["Protect Cam"]
+
+
+def test_build_client_edges_only_unifi_vendor_fallback():
+    device_index = {"aa:bb:cc:dd:ee:ff": "Switch A"}
+    clients = [
+        {
+            "name": "UniFi Sensor",
+            "is_wired": True,
+            "sw_mac": "aa:bb:cc:dd:ee:ff",
+            "oui": "Ubiquiti Inc.",
+        }
+    ]
+    edges = build_client_edges(clients, device_index, only_unifi=True)
+    assert edges[0].right == "UniFi Sensor"
+
+
+def test_build_client_edges_only_unifi_ucore_managed():
+    device_index = {"aa:bb:cc:dd:ee:ff": "Switch A"}
+    clients = [
+        {
+            "name": "Doorbell Lite",
+            "is_wired": True,
+            "sw_mac": "aa:bb:cc:dd:ee:ff",
+            "unifi_device_info_from_ucore": {"managed": True},
+        }
+    ]
+    edges = build_client_edges(clients, device_index, only_unifi=True)
+    assert edges[0].right == "Doorbell Lite"
+
+
+def test_build_client_edges_prefers_ucore_name_over_hostname():
+    device_index = {"aa:bb:cc:dd:ee:ff": "Switch A"}
+    clients = [
+        {
+            "hostname": "espressif",
+            "is_wired": True,
+            "sw_mac": "aa:bb:cc:dd:ee:ff",
+            "unifi_device_info_from_ucore": {"name": "Smart PoE Chime"},
+        }
+    ]
+    edges = build_client_edges(clients, device_index, only_unifi=True)
+    assert edges[0].right == "Smart PoE Chime"
+
+
 def test_build_node_type_map_skips_wireless_clients():
     devices = [
         Device(name="Gateway", model_name="", model="", mac="aa", ip="", type="udm", lldp_info=[])
@@ -64,3 +116,16 @@ def test_build_node_type_map_skips_wireless_clients():
     clients = [{"name": "Phone", "is_wired": False}]
     node_types = build_node_type_map(devices, clients)
     assert "Phone" not in node_types
+
+
+def test_build_node_type_map_only_unifi_filters_clients():
+    devices = [
+        Device(name="Gateway", model_name="", model="", mac="aa", ip="", type="udm", lldp_info=[])
+    ]
+    clients = [
+        {"name": "Desk PC", "is_wired": True, "is_unifi": False},
+        {"name": "Protect Cam", "is_wired": True, "is_unifi": True},
+    ]
+    node_types = build_node_type_map(devices, clients, only_unifi=True)
+    assert "Protect Cam" in node_types
+    assert "Desk PC" not in node_types