unifi-network-maps 1.4.9__tar.gz → 1.4.11__tar.gz

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/CHANGELOG.md

@@ -5,6 +5,17 @@ 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.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
+
 ## [1.4.9] - 2026-01-15
 ### Changed
 - Declared support for Python 3.12+ (3.13 preferred) and added CI coverage for 3.12.
@@ -165,7 +176,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.9...HEAD
+[Unreleased]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.11...HEAD
+[1.4.11]:https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.10...v1.4.111
+[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
 [1.4.7]: https://github.com/merlijntishauser/unifi-network-maps/compare/v1.4.6...v1.4.7

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.9
+Version: 1.4.11
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -32,7 +32,7 @@ Requires-Dist: pre-commit==4.5.1; extra == "dev"
 Requires-Dist: pytest==9.0.2; extra == "dev"
 Requires-Dist: pytest-cov==7.0.0; extra == "dev"
 Requires-Dist: pyright==1.1.408; extra == "dev"
-Requires-Dist: ruff==0.14.11; extra == "dev"
+Requires-Dist: ruff==0.14.13; extra == "dev"
 Dynamic: license-file
 
 # unifi-network-maps

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unifi-network-maps"
-version = "1.4.9"
+version = "1.4.11"
 description = "Dynamic UniFi -> network maps in mermaid or svg"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -44,7 +44,7 @@ dev = [
   "pytest==9.0.2",
   "pytest-cov==7.0.0",
   "pyright==1.1.408",
-  "ruff==0.14.11"
+  "ruff==0.14.13"
 ]
 
 [project.scripts]

unifi_network_maps-1.4.11/src/unifi_network_maps/__init__.py

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

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/src/unifi_network_maps/model/topology.py

@@ -37,6 +37,8 @@ class Edge:
     label: str | None = None
     poe: bool = False
     wireless: bool = False
+    speed: int | None = None
+    channel: int | None = None
 
 
 type DeviceSource = object
@@ -64,6 +66,7 @@ class PortInfo:
 
 type PortMap = dict[tuple[str, str], str]
 type PoeMap = dict[tuple[str, str], bool]
+type SpeedMap = dict[tuple[str, str], int]
 type ClientPortMap = dict[str, list[tuple[int, str]]]
 
 
@@ -421,7 +424,15 @@ def _tree_edges_from_parent(
             tree_edges.append(Edge(left=parent_name, right=child))
         else:
             tree_edges.append(
-                Edge(left=parent_name, right=child, label=original.label, poe=original.poe)
+                Edge(
+                    left=parent_name,
+                    right=child,
+                    label=original.label,
+                    poe=original.poe,
+                    wireless=original.wireless,
+                    speed=original.speed,
+                    channel=original.channel,
+                )
             )
     return tree_edges
 
@@ -471,20 +482,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
 
 
@@ -492,6 +514,16 @@ def _client_is_wired(client: object) -> bool:
     return bool(_client_field(client, "is_wired"))
 
 
+def _client_channel(client: object) -> int | None:
+    for key in ("channel", "radio_channel", "wifi_channel"):
+        value = _client_field(client, key)
+        if isinstance(value, int):
+            return value
+        if isinstance(value, str) and value.isdigit():
+            return int(value)
+    return None
+
+
 def _client_matches_mode(client: object, mode: str) -> bool:
     wired = _client_is_wired(client)
     if mode == "all":
@@ -528,12 +560,15 @@ def build_client_edges(
         key = (device_name, name)
         if key in seen:
             continue
+        is_wireless = not _client_is_wired(client)
+        channel = _client_channel(client) if is_wireless else None
         edges.append(
             Edge(
                 left=device_name,
                 right=name,
                 label=label,
-                wireless=not _client_is_wired(client),
+                wireless=is_wireless,
+                channel=channel,
             )
         )
         seen.add(key)
@@ -572,12 +607,14 @@ def build_edges(
     seen: set[frozenset[str]] = set()
     port_map: PortMap = {}
     poe_map: PoeMap = {}
+    speed_map: SpeedMap = {}
 
     devices_with_lldp_edges = _collect_lldp_links(
         ordered_devices,
         index,
         port_map,
         poe_map,
+        speed_map,
         raw_links,
         seen,
         only_unifi=only_unifi,
@@ -597,6 +634,7 @@ def build_edges(
         raw_links,
         port_map,
         poe_map,
+        speed_map,
         device_by_name,
         include_ports=include_ports,
     )
@@ -614,12 +652,14 @@ def build_port_map(devices: Iterable[Device], *, only_unifi: bool = True) -> Por
     seen: set[frozenset[str]] = set()
     port_map: PortMap = {}
     poe_map: PoeMap = {}
+    speed_map: SpeedMap = {}
 
     devices_with_lldp_edges = _collect_lldp_links(
         ordered_devices,
         index,
         port_map,
         poe_map,
+        speed_map,
         raw_links,
         seen,
         only_unifi=only_unifi,
@@ -661,11 +701,19 @@ def build_client_port_map(
     return port_map
 
 
+def _port_speed_by_idx(port_table: list[PortInfo], port_idx: int) -> int | None:
+    for port in port_table:
+        if port.port_idx == port_idx:
+            return port.speed
+    return None
+
+
 def _collect_lldp_links(
     devices: list[Device],
     index: dict[str, str],
     port_map: PortMap,
     poe_map: PoeMap,
+    speed_map: SpeedMap,
     raw_links: list[tuple[str, str]],
     seen: set[frozenset[str]],
     *,
@@ -704,8 +752,12 @@ def _collect_lldp_links(
             label = local_port_label(entry_for_label)
             if label:
                 port_map[(device.name, peer_name)] = label
-            if resolved_port_idx is not None and resolved_port_idx in poe_ports:
-                poe_map[(device.name, peer_name)] = poe_ports[resolved_port_idx]
+            if resolved_port_idx is not None:
+                if resolved_port_idx in poe_ports:
+                    poe_map[(device.name, peer_name)] = poe_ports[resolved_port_idx]
+                port_speed = _port_speed_by_idx(device.port_table, resolved_port_idx)
+                if port_speed is not None:
+                    speed_map[(device.name, peer_name)] = port_speed
 
             key = frozenset({device.name, peer_name})
             if key in seen:
@@ -794,6 +846,7 @@ def _build_ordered_edges(
     raw_links: list[tuple[str, str]],
     port_map: PortMap,
     poe_map: PoeMap,
+    speed_map: SpeedMap,
     device_by_name: dict[str, Device],
     *,
     include_ports: bool,
@@ -820,8 +873,9 @@ def _build_ordered_edges(
         poe = poe_map.get((left_name, right_name), False) or poe_map.get(
             (right_name, left_name), False
         )
+        speed = speed_map.get((left_name, right_name)) or speed_map.get((right_name, left_name))
         label = compose_port_label(left_name, right_name, port_map) if include_ports else None
-        edges.append(Edge(left=left_name, right=right_name, label=label, poe=poe))
+        edges.append(Edge(left=left_name, right=right_name, label=label, poe=poe, speed=speed))
     return edges
 
 

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/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
@@ -44,20 +45,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
 
 

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/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.9 → unifi_network_maps-1.4.11}/src/unifi_network_maps.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.9
+Version: 1.4.11
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -32,7 +32,7 @@ Requires-Dist: pre-commit==4.5.1; extra == "dev"
 Requires-Dist: pytest==9.0.2; extra == "dev"
 Requires-Dist: pytest-cov==7.0.0; extra == "dev"
 Requires-Dist: pyright==1.1.408; extra == "dev"
-Requires-Dist: ruff==0.14.11; extra == "dev"
+Requires-Dist: ruff==0.14.13; extra == "dev"
 Dynamic: license-file
 
 # unifi-network-maps

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/src/unifi_network_maps.egg-info/requires.txt

@@ -10,4 +10,4 @@ pre-commit==4.5.1
 pytest==9.0.2
 pytest-cov==7.0.0
 pyright==1.1.408
-ruff==0.14.11
+ruff==0.14.13

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/tests/test_clients.py

@@ -36,6 +36,13 @@ def test_build_client_edges_includes_wireless_when_requested():
     assert edges[0].wireless is True
 
 
+def test_build_client_edges_includes_channel_for_wireless():
+    device_index = {"aa:bb:cc:dd:ee:ff": "AP One"}
+    clients = [{"name": "Phone", "ap_mac": "aa:bb:cc:dd:ee:ff", "is_wired": False, "channel": 36}]
+    edges = build_client_edges(clients, device_index, client_mode="wireless")
+    assert edges[0].channel == 36
+
+
 def test_build_client_edges_includes_uplink_port_label():
     device_index = {"aa:bb:cc:dd:ee:ff": "Switch A"}
     clients = [

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/tests/test_svg.py

@@ -263,3 +263,30 @@ def test_render_svg_isometric_nodes_reference_iso_node_prefix():
         [Edge("A", "B")], node_types={"A": "switch", "B": "switch"}
     )
     assert 'fill="url(#iso-node-switch)"' in output
+
+
+def test_render_svg_adds_edge_data_attributes():
+    output = svg_module.render_svg(
+        [Edge("Gateway", "Switch")],
+        node_types={"Gateway": "gateway", "Switch": "switch"},
+    )
+    assert 'data-edge-left="Gateway"' in output
+    assert 'data-edge-right="Switch"' in output
+
+
+def test_render_svg_escapes_edge_data_attributes():
+    output = svg_module.render_svg(
+        [Edge('Node "A"', "Node <B>")],
+        node_types={'Node "A"': "gateway", "Node <B>": "switch"},
+    )
+    assert 'data-edge-left="Node &quot;A&quot;"' in output
+    assert 'data-edge-right="Node &lt;B&gt;"' in output
+
+
+def test_render_svg_isometric_adds_edge_data_attributes():
+    output = svg_module.render_svg_isometric(
+        [Edge("Gateway", "Switch")],
+        node_types={"Gateway": "gateway", "Switch": "switch"},
+    )
+    assert 'data-edge-left="Gateway"' in output
+    assert 'data-edge-right="Switch"' in output

{unifi_network_maps-1.4.9 → unifi_network_maps-1.4.11}/tests/test_topology.py

@@ -181,6 +181,22 @@ def test_build_edges_sets_poe_with_port_poe():
     assert edges[0].poe is True
 
 
+def test_build_edges_sets_speed_from_port():
+    dev_switch = DummyDevice(
+        "Switch A",
+        "aa:bb:cc:dd:ee:01",
+        [LLDPEntry("aa:bb:cc:dd:ee:02", "eth1", local_port_idx=1)],
+        port_table=[{"port_idx": 1, "speed": 1000}],
+    )
+    dev_ap = DummyDevice(
+        "AP One",
+        "aa:bb:cc:dd:ee:02",
+        [LLDPEntry("aa:bb:cc:dd:ee:01", "eth0")],
+    )
+    edges = build_edges(normalize_devices([dev_switch, dev_ap]))
+    assert edges[0].speed == 1000
+
+
 def test_coerce_device_uses_lldp_fallback():
     class DeviceWithLldp:
         name = "Device"
@@ -486,6 +502,11 @@ def test_client_uplink_port_direct_str_digit():
     assert _client_uplink_port(client) == 7
 
 
+def test_client_uplink_port_parses_port_label():
+    client = {"uplink_remote_port": "Port 9"}
+    assert _client_uplink_port(client) == 9
+
+
 def test_client_uplink_port_nested_int():
     client = {"uplink": {"uplink_remote_port": 8}}
     assert _client_uplink_port(client) == 8

unifi_network_maps-1.4.9/src/unifi_network_maps/__init__.py

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