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

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

@@ -5,6 +5,13 @@ 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
@@ -169,7 +176,8 @@ 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.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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.10
+Version: 1.4.11
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT

{unifi_network_maps-1.4.10 → 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.10"
+version = "1.4.11"
 description = "Dynamic UniFi -> network maps in mermaid or svg"
 readme = "README.md"
 requires-python = ">=3.12"

unifi_network_maps-1.4.11/src/unifi_network_maps/__init__.py

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

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

@@ -482,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
 
 

{unifi_network_maps-1.4.10 → 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.10 → 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.10 → 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.10
+Version: 1.4.11
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT

{unifi_network_maps-1.4.10 → 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.10 → unifi_network_maps-1.4.11}/tests/test_topology.py

@@ -502,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.10/src/unifi_network_maps/__init__.py

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