unifi-network-maps 1.4.14__py3-none-any.whl → 1.4.15__py3-none-any.whl

unifi_network_maps/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.14"
+__version__ = "1.4.15"

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/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.dist-info → unifi_network_maps-1.4.15.dist-info}/METADATA

@@ -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.dist-info → unifi_network_maps-1.4.15.dist-info}/RECORD

@@ -1,8 +1,8 @@
-unifi_network_maps/__init__.py,sha256=NZioYPEcnxQYvCUVptOXRB6uodGfQ2LLvoB6xgFKjps,23
+unifi_network_maps/__init__.py,sha256=hbkjjRMZQ6Z1DxtYr5zQQkJBgg7BX1jvecmMzfI1XL8,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=gnvgAj9wPmYGGQfhcZSHRkcVGojODUYIINU_ztTcuUc,1671
-unifi_network_maps/adapters/unifi.py,sha256=GIPeGVKPR53-Gj0xWYXNCwk1_FUFgQkyY5hDjS-RpAY,19429
+unifi_network_maps/adapters/unifi.py,sha256=1a7NBLszpBhLnepp9WhQ5cF-HRToIG0foOA-H5xUiDI,19328
 unifi_network_maps/assets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unifi_network_maps/assets/icons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unifi_network_maps/assets/icons/access-point.svg,sha256=RJOgO2s9Ino5lWRrh4V7q8Jdwffros5bQq3UeDuQYF4,742
@@ -68,7 +68,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=kkzt7BWt5Q8dZ2wgfgK3HLmVdHHmOjAgS_snJsWawAo,9172
 unifi_network_maps/model/ports.py,sha256=o3NBlXcC5VV5iPWJsO4Ll1mRKJZC0f8zTHdlkkE34GU,609
-unifi_network_maps/model/topology.py,sha256=rC1J1h70JIpkm6eIuFz7AjoNtKobPpVfAbiWgMyow2w,31475
+unifi_network_maps/model/topology.py,sha256=bkKSy1WlZMMkzya3bTbpYLrseXpwjhOPPoGOf4FHInM,32114
 unifi_network_maps/model/vlans.py,sha256=EeRKvIuUs0FgEzrqbo2xi8Xlm5n5V_Z6b7jpXLiNUaY,3788
 unifi_network_maps/render/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
 unifi_network_maps/render/device_ports_md.py,sha256=PLbP4_EDwLNkUACVJB_uM0ywaQTbEc6OWMv4QBcoJbU,16425
@@ -93,9 +93,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.14.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
-unifi_network_maps-1.4.14.dist-info/METADATA,sha256=-c54OG728Xu3nWYCNYG9XlFm4kmi_gbI7Hhh6DIzm8s,10079
-unifi_network_maps-1.4.14.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-unifi_network_maps-1.4.14.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
-unifi_network_maps-1.4.14.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
-unifi_network_maps-1.4.14.dist-info/RECORD,,
+unifi_network_maps-1.4.15.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
+unifi_network_maps-1.4.15.dist-info/METADATA,sha256=Mc5M1u-ACVLVZm6xX-Giv4KhP7r7wZ5V1jfvBoKriYY,10079
+unifi_network_maps-1.4.15.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+unifi_network_maps-1.4.15.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
+unifi_network_maps-1.4.15.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
+unifi_network_maps-1.4.15.dist-info/RECORD,,