unifi-network-maps 1.4.14__tar.gz → 1.4.15__tar.gz

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/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.15] - 2026-02-01
+### Changed
+- Displaying of friendly device/model names
+
+### Fixed
+- Handle disabled WAN interfaces gracefully (avoid unifi-controller-api model parse errors)
+
 ## [1.4.14] - 2026-02-01
 ### Added
 - JSON output with VLAN inventory

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/PKG-INFO

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

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/pyproject.toml

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

unifi_network_maps-1.4.15/src/unifi_network_maps/__init__.py

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

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/src/unifi_network_maps/adapters/unifi.py

@@ -513,11 +513,9 @@ def fetch_networks(
         controller = _init_controller(config, is_udm_pro=False)
 
     def _fetch() -> Sequence[object]:
-        try:
-            return controller.get_unifi_site_networkconf(site_name=site_name, raw=False)
-        except Exception as exc:  # noqa: BLE001 - fallback to raw network data
-            logger.warning("Networkconf model parse failed; retrying raw fetch: %s", exc)
-            return controller.get_unifi_site_networkconf(site_name=site_name, raw=True)
+        # Always use raw=True to avoid model parsing issues with disabled WAN interfaces
+        # (the UnifiNetworkConf model requires an 'enabled' field that may be absent)
+        return controller.get_unifi_site_networkconf(site_name=site_name, raw=True)
 
     try:
         networks = _call_with_retries("network fetch", _fetch)

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/src/unifi_network_maps/model/topology.py

@@ -302,9 +302,29 @@ def _uplink_info(device: DeviceSource) -> tuple[UplinkInfo | None, UplinkInfo |
     return uplink, last_uplink
 
 
+def _get_model_display_name(device: DeviceSource) -> str | None:
+    """Extract the human-readable model name from device data.
+
+    UniFi stores the friendly model name (e.g., 'USW Flex 2.5G 8 PoE') in various
+    fields depending on controller version. This function checks multiple candidates
+    and returns the first non-empty value found.
+    """
+    candidates = (
+        "model_in_lts",
+        "model_in_eol",
+        "shortname",
+        "model_name",
+    )
+    for key in candidates:
+        value = _get_attr(device, key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
 def coerce_device(device: DeviceSource) -> Device:
     name = _get_attr(device, "name")
-    model_name = _get_attr(device, "model_name") or _get_attr(device, "model")
+    model_name = _get_model_display_name(device) or _get_attr(device, "model")
     model = _get_attr(device, "model")
     mac = _get_attr(device, "mac")
     ip = _get_attr(device, "ip") or _get_attr(device, "ip_address")

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/src/unifi_network_maps.egg-info/PKG-INFO

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

{unifi_network_maps-1.4.14 → unifi_network_maps-1.4.15}/tests/test_topology.py

@@ -20,6 +20,7 @@ from unifi_network_maps.model.topology import (
     _client_unifi_flag,
     _client_uplink_mac,
     _client_uplink_port,
+    _get_model_display_name,
     _parse_uplink,
     _poe_ports_from_device,
     _port_speed_by_idx,
@@ -735,3 +736,48 @@ def test_port_speed_by_idx_reads_speed():
 def test_classify_device_type_from_name():
     device = SimpleNamespace(type="", name="Gateway Main")
     assert classify_device_type(device) == "gateway"
+
+
+def test_get_model_display_name_prefers_model_in_lts():
+    device = SimpleNamespace(
+        model_in_lts="USW Flex 2.5G 8 PoE",
+        model_name="USW-Flex-2.5G-8-PoE",
+        model="USWFLEXPOE8",
+    )
+    assert _get_model_display_name(device) == "USW Flex 2.5G 8 PoE"
+
+
+def test_get_model_display_name_uses_model_in_eol():
+    device = SimpleNamespace(model_in_eol="USW Pro 24", model="USWPRO24")
+    assert _get_model_display_name(device) == "USW Pro 24"
+
+
+def test_get_model_display_name_uses_shortname():
+    device = SimpleNamespace(shortname="USW Mini", model="USWMINI")
+    assert _get_model_display_name(device) == "USW Mini"
+
+
+def test_get_model_display_name_falls_back_to_model_name():
+    device = SimpleNamespace(model_name="Dream Machine", model="UDM")
+    assert _get_model_display_name(device) == "Dream Machine"
+
+
+def test_get_model_display_name_returns_none_without_candidates():
+    device = SimpleNamespace(model="USWFLEX")
+    assert _get_model_display_name(device) is None
+
+
+def test_coerce_device_uses_model_in_lts_for_model_name():
+    device = SimpleNamespace(
+        name="Switch",
+        mac="aa:bb:cc:dd:ee:ff",
+        model_in_lts="USW Flex 2.5G 8 PoE",
+        model="USWFLEXPOE8",
+        ip="",
+        type="usw",
+        lldp_info=[],
+        port_table=[],
+    )
+    result = coerce_device(device)
+    assert result.model_name == "USW Flex 2.5G 8 PoE"
+    assert result.model == "USWFLEXPOE8"

unifi_network_maps-1.4.14/src/unifi_network_maps/__init__.py

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