unifi-network-maps 1.4.9__py3-none-any.whl → 1.4.10__py3-none-any.whl

unifi_network_maps/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.9"
+__version__ = "1.4.10"

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
 
@@ -492,6 +503,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 +549,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 +596,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 +623,7 @@ def build_edges(
         raw_links,
         port_map,
         poe_map,
+        speed_map,
         device_by_name,
         include_ports=include_ports,
     )
@@ -614,12 +641,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 +690,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 +741,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 +835,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 +862,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.dist-info → unifi_network_maps-1.4.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.9
+Version: 1.4.10
 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.dist-info → unifi_network_maps-1.4.10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-unifi_network_maps/__init__.py,sha256=A4qmsE8vvj9H09qZTlxxGLwgABGRSkAJASAcIbNUgt4,22
+unifi_network_maps/__init__.py,sha256=WCR-6aXXvi4kHlaMAYnHT-VzLSifo-1Btos9idb9SM8,23
 unifi_network_maps/__main__.py,sha256=XsOjaqslAVgyVlOTokjVddZ2iT8apZXpJ_OB-9WEEe4,179
 unifi_network_maps/adapters/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
 unifi_network_maps/adapters/config.py,sha256=Bx9JDZxxY7Gjxyb8FDT0dxiKfgXt_TmzTDbgvpwB53s,1548
@@ -67,7 +67,7 @@ unifi_network_maps/model/labels.py,sha256=m_k8mbzWtOSDOjjHhLUqwIw93pg98HAtGtHkiE
 unifi_network_maps/model/lldp.py,sha256=SrPW5XC2lfJgaGeVx-KnSFNltyok7gIWWQNg1SkOaj4,3300
 unifi_network_maps/model/mock.py,sha256=kd1MSiIn-7KKu_nMVmheYPfTyAN5DHt4dzRrBifF_lI,8706
 unifi_network_maps/model/ports.py,sha256=o3NBlXcC5VV5iPWJsO4Ll1mRKJZC0f8zTHdlkkE34GU,609
-unifi_network_maps/model/topology.py,sha256=JfpY6Pam_pgqnnmsBmzy3oDv4OCi4Ezc8msxvp5Z5NQ,26784
+unifi_network_maps/model/topology.py,sha256=Rq69wcJ5toXz4ZZPHahc2Jiuw-3CXiOiIrZp1fupaUU,28262
 unifi_network_maps/render/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
 unifi_network_maps/render/device_ports_md.py,sha256=vt5kGFSIAabMbcSxIuVVLSzdb_i58NHGi4hJM2ZLZR4,15975
 unifi_network_maps/render/legend.py,sha256=TmZsxgCVOM2CZImI9zgRVyzrcg01HZFDj9F715d4CGo,772
@@ -91,9 +91,9 @@ unifi_network_maps/render/templates/mkdocs_html_block.html.j2,sha256=5l5-BbNujOc
 unifi_network_maps/render/templates/mkdocs_legend.css.j2,sha256=tkTI-RagBSgdjUygVenlTsQFenU09ePbXOfDt_Q7YRM,612
 unifi_network_maps/render/templates/mkdocs_legend.js.j2,sha256=qMYyCKsJ84uXf1wGgzbc7Bc49RU4oyuaGK9KrgQDQEI,685
 unifi_network_maps/render/templates/mkdocs_mermaid_block.md.j2,sha256=9IncllWQpoI8BN3A7b2zOQ5cksj97ddsjHJ-aBhpw7o,66
-unifi_network_maps-1.4.9.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
-unifi_network_maps-1.4.9.dist-info/METADATA,sha256=8-wqtJhL46qhE6O56rNBkKpBJ_lAOqvwki6zxJSlRnY,9850
-unifi_network_maps-1.4.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unifi_network_maps-1.4.9.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
-unifi_network_maps-1.4.9.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
-unifi_network_maps-1.4.9.dist-info/RECORD,,
+unifi_network_maps-1.4.10.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
+unifi_network_maps-1.4.10.dist-info/METADATA,sha256=hLv77auAYEJIxkk_vslu8qvQnI975Oud_AqsC3THRoE,9851
+unifi_network_maps-1.4.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unifi_network_maps-1.4.10.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
+unifi_network_maps-1.4.10.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
+unifi_network_maps-1.4.10.dist-info/RECORD,,