unifi-network-maps 1.4.11__py3-none-any.whl → 1.4.12__py3-none-any.whl

unifi_network_maps/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.11"
+__version__ = "1.4.12"

unifi_network_maps/cli/render.py

@@ -62,7 +62,12 @@ def render_mermaid_output(
         direction=args.direction,
         groups=groups,
         group_order=group_order,
-        node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+        node_types=build_node_type_map(
+            devices,
+            clients,
+            client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
+        ),
         theme=mermaid_theme,
     )
     if args.markdown:
@@ -97,13 +102,23 @@ def render_svg_output(
 
         return render_svg_isometric(
             edges,
-            node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+            node_types=build_node_type_map(
+                devices,
+                clients,
+                client_mode=args.client_scope,
+                only_unifi=args.only_unifi,
+            ),
             options=options,
             theme=svg_theme,
         )
     return render_svg(
         edges,
-        node_types=build_node_type_map(devices, clients, client_mode=args.client_scope),
+        node_types=build_node_type_map(
+            devices,
+            clients,
+            client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
+        ),
         options=options,
         theme=svg_theme,
     )
@@ -190,6 +205,7 @@ def render_lldp_format(
         include_ports=args.include_ports,
         show_clients=args.include_clients,
         client_mode=args.client_scope,
+        only_unifi=args.only_unifi,
     )
     write_output(content, output_path=args.output, stdout=args.stdout)
     return 0

unifi_network_maps/cli/runtime.py

@@ -95,6 +95,7 @@ def build_edges_with_clients(
             device_index,
             include_ports=args.include_ports,
             client_mode=args.client_scope,
+            only_unifi=args.only_unifi,
         )
     return edges, clients
 
@@ -153,5 +154,10 @@ def resolve_mkdocs_client_ports(
         clients = list(fetch_clients(config, site=site))
     else:
         clients = mock_clients
-    client_ports = build_client_port_map(devices, clients, client_mode=args.client_scope)
+    client_ports = build_client_port_map(
+        devices,
+        clients,
+        client_mode=args.client_scope,
+        only_unifi=args.only_unifi,
+    )
     return client_ports, None

unifi_network_maps/model/topology.py

@@ -460,7 +460,13 @@ def _client_field(client: object, name: str) -> object | None:
 
 
 def _client_display_name(client: object) -> str | None:
-    for key in ("name", "hostname", "mac"):
+    raw_name = _client_field(client, "name")
+    if isinstance(raw_name, str) and raw_name.strip():
+        return raw_name.strip()
+    preferred = _client_ucore_display_name(client)
+    if preferred:
+        return preferred
+    for key in ("hostname", "mac"):
         value = _client_field(client, key)
         if isinstance(value, str) and value.strip():
             return value.strip()
@@ -514,6 +520,73 @@ def _client_is_wired(client: object) -> bool:
     return bool(_client_field(client, "is_wired"))
 
 
+def _client_unifi_flag(client: object) -> bool | None:
+    for key in ("is_unifi", "is_unifi_device", "is_ubnt", "is_uap", "is_managed"):
+        value = _client_field(client, key)
+        if isinstance(value, bool):
+            return value
+        if isinstance(value, int):
+            return value != 0
+    return None
+
+
+def _client_vendor(client: object) -> str | None:
+    for key in ("oui", "vendor", "vendor_name", "manufacturer", "manufacturer_name"):
+        value = _client_field(client, key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_ucore_info(client: object) -> dict[str, object] | None:
+    info = _client_field(client, "unifi_device_info_from_ucore")
+    if isinstance(info, dict):
+        return info
+    return None
+
+
+def _client_ucore_display_name(client: object) -> str | None:
+    ucore = _client_ucore_info(client)
+    if not ucore:
+        return None
+    for key in ("name", "computed_model", "product_model", "product_shortname"):
+        value = ucore.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_hostname_source(client: object) -> str | None:
+    value = _client_field(client, "hostname_source")
+    if isinstance(value, str) and value.strip():
+        return value.strip()
+    return None
+
+
+def _client_is_unifi(client: object) -> bool:
+    flag = _client_unifi_flag(client)
+    if flag is not None:
+        return flag
+    ucore = _client_ucore_info(client)
+    if ucore:
+        managed = ucore.get("managed")
+        if isinstance(managed, bool) and managed:
+            return True
+        if isinstance(ucore.get("product_line"), str) and ucore.get("product_line"):
+            return True
+        if isinstance(ucore.get("product_shortname"), str) and ucore.get("product_shortname"):
+            return True
+        for key in ("name", "computed_model", "product_model"):
+            value = ucore.get(key)
+            if isinstance(value, str) and value.strip():
+                return True
+    vendor = _client_vendor(client)
+    if not vendor:
+        return False
+    normalized = vendor.lower()
+    return "ubiquiti" in normalized or "unifi" in normalized
+
+
 def _client_channel(client: object) -> int | None:
     for key in ("channel", "radio_channel", "wifi_channel"):
         value = _client_field(client, key)
@@ -533,17 +606,26 @@ def _client_matches_mode(client: object, mode: str) -> bool:
     return wired
 
 
+def _client_matches_filters(client: object, *, client_mode: str, only_unifi: bool) -> bool:
+    if not _client_matches_mode(client, client_mode):
+        return False
+    if only_unifi and not _client_is_unifi(client):
+        return False
+    return True
+
+
 def build_client_edges(
     clients: Iterable[object],
     device_index: dict[str, str],
     *,
     include_ports: bool = False,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> list[Edge]:
     edges: list[Edge] = []
     seen: set[tuple[str, str]] = set()
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)
@@ -580,13 +662,14 @@ def build_node_type_map(
     clients: Iterable[object] | None = None,
     *,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> dict[str, str]:
     node_types: dict[str, str] = {}
     for device in devices:
         node_types[device.name] = classify_device_type(device)
     if clients:
         for client in clients:
-            if not _client_matches_mode(client, client_mode):
+            if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
                 continue
             name = _client_display_name(client)
             if name:
@@ -683,11 +766,12 @@ def build_client_port_map(
     clients: Iterable[object],
     *,
     client_mode: str,
+    only_unifi: bool = False,
 ) -> ClientPortMap:
     device_index = build_device_index(devices)
     port_map: ClientPortMap = {}
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)

unifi_network_maps/render/lldp_md.py

@@ -23,7 +23,13 @@ def _client_field(client: object, name: str) -> object | None:
 
 
 def _client_display_name(client: object) -> str | None:
-    for key in ("name", "hostname", "mac"):
+    raw_name = _client_field(client, "name")
+    if isinstance(raw_name, str) and raw_name.strip():
+        return raw_name.strip()
+    preferred = _client_ucore_display_name(client)
+    if preferred:
+        return preferred
+    for key in ("hostname", "mac"):
         value = _client_field(client, key)
         if isinstance(value, str) and value.strip():
             return value.strip()
@@ -77,6 +83,73 @@ def _client_is_wired(client: object) -> bool:
     return bool(_client_field(client, "is_wired"))
 
 
+def _client_unifi_flag(client: object) -> bool | None:
+    for key in ("is_unifi", "is_unifi_device", "is_ubnt", "is_uap", "is_managed"):
+        value = _client_field(client, key)
+        if isinstance(value, bool):
+            return value
+        if isinstance(value, int):
+            return value != 0
+    return None
+
+
+def _client_vendor(client: object) -> str | None:
+    for key in ("oui", "vendor", "vendor_name", "manufacturer", "manufacturer_name"):
+        value = _client_field(client, key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_ucore_info(client: object) -> dict[str, object] | None:
+    info = _client_field(client, "unifi_device_info_from_ucore")
+    if isinstance(info, dict):
+        return info
+    return None
+
+
+def _client_ucore_display_name(client: object) -> str | None:
+    ucore = _client_ucore_info(client)
+    if not ucore:
+        return None
+    for key in ("name", "computed_model", "product_model", "product_shortname"):
+        value = ucore.get(key)
+        if isinstance(value, str) and value.strip():
+            return value.strip()
+    return None
+
+
+def _client_hostname_source(client: object) -> str | None:
+    value = _client_field(client, "hostname_source")
+    if isinstance(value, str) and value.strip():
+        return value.strip()
+    return None
+
+
+def _client_is_unifi(client: object) -> bool:
+    flag = _client_unifi_flag(client)
+    if flag is not None:
+        return flag
+    ucore = _client_ucore_info(client)
+    if ucore:
+        managed = ucore.get("managed")
+        if isinstance(managed, bool) and managed:
+            return True
+        if isinstance(ucore.get("product_line"), str) and ucore.get("product_line"):
+            return True
+        if isinstance(ucore.get("product_shortname"), str) and ucore.get("product_shortname"):
+            return True
+        for key in ("name", "computed_model", "product_model"):
+            value = ucore.get(key)
+            if isinstance(value, str) and value.strip():
+                return True
+    vendor = _client_vendor(client)
+    if not vendor:
+        return False
+    normalized = vendor.lower()
+    return "ubiquiti" in normalized or "unifi" in normalized
+
+
 def _client_matches_mode(client: object, mode: str) -> bool:
     wired = _client_is_wired(client)
     if mode == "all":
@@ -86,6 +159,14 @@ def _client_matches_mode(client: object, mode: str) -> bool:
     return wired
 
 
+def _client_matches_filters(client: object, *, client_mode: str, only_unifi: bool) -> bool:
+    if not _client_matches_mode(client, client_mode):
+        return False
+    if only_unifi and not _client_is_unifi(client):
+        return False
+    return True
+
+
 def _lldp_sort_key(entry: LLDPEntry) -> tuple[int, str, str]:
     port_label = local_port_label(entry) or ""
     port_number = "".join(ch for ch in port_label if ch.isdigit())
@@ -199,10 +280,11 @@ def _client_rows(
     *,
     include_ports: bool,
     client_mode: str,
+    only_unifi: bool,
 ) -> dict[str, list[tuple[str, str | None]]]:
     rows_by_device: dict[str, list[tuple[str, str | None]]] = {}
     for client in clients:
-        if not _client_matches_mode(client, client_mode):
+        if not _client_matches_filters(client, client_mode=client_mode, only_unifi=only_unifi):
             continue
         name = _client_display_name(client)
         uplink_mac = _client_uplink_mac(client)
@@ -227,6 +309,7 @@ def _prepare_lldp_maps(
     include_ports: bool,
     show_clients: bool,
     client_mode: str,
+    only_unifi: bool,
 ) -> tuple[
     dict[tuple[str, str], str],
     dict[str, list[tuple[int, str]]] | None,
@@ -234,7 +317,13 @@ def _prepare_lldp_maps(
 ]:
     device_index = build_device_index(devices)
     client_rows = (
-        _client_rows(clients, device_index, include_ports=include_ports, client_mode=client_mode)
+        _client_rows(
+            clients,
+            device_index,
+            include_ports=include_ports,
+            client_mode=client_mode,
+            only_unifi=only_unifi,
+        )
         if clients
         else {}
     )
@@ -243,7 +332,12 @@ def _prepare_lldp_maps(
     if include_ports:
         port_map = build_port_map(devices, only_unifi=False)
         if clients and show_clients:
-            client_port_map = build_client_port_map(devices, clients, client_mode=client_mode)
+            client_port_map = build_client_port_map(
+                devices,
+                clients,
+                client_mode=client_mode,
+                only_unifi=only_unifi,
+            )
     return port_map, client_port_map, client_rows
 
 
@@ -318,6 +412,7 @@ def render_lldp_md(
     include_ports: bool = False,
     show_clients: bool = False,
     client_mode: str = "wired",
+    only_unifi: bool = False,
 ) -> str:
     device_index = build_device_index(devices)
     port_map, client_port_map, client_rows = _prepare_lldp_maps(
@@ -326,6 +421,7 @@ def render_lldp_md(
         include_ports=include_ports,
         show_clients=show_clients,
         client_mode=client_mode,
+        only_unifi=only_unifi,
     )
     sections: list[str] = []
     for device in sorted(devices, key=lambda item: item.name.lower()):

{unifi_network_maps-1.4.11.dist-info → unifi_network_maps-1.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.11
+Version: 1.4.12
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -223,7 +223,7 @@ Functional:
 - `--include-ports`: show port labels (Mermaid shows both ends; SVG shows compact labels).
 - `--include-clients`: add active wired clients as leaf nodes.
 - `--client-scope wired|wireless|all`: which client types to include (default wired).
-- `--only-unifi`: only include neighbors that are UniFi devices.
+- `--only-unifi`: only include neighbors that are UniFi devices; when clients are included, filters to UniFi-managed clients (by explicit UniFi flags or vendor/OUI).
 - `--no-cache`: disable UniFi API cache reads and writes.
 
 Mermaid:

{unifi_network_maps-1.4.11.dist-info → unifi_network_maps-1.4.12.dist-info}/RECORD

@@ -1,4 +1,4 @@
-unifi_network_maps/__init__.py,sha256=E_3GCl6XTRrqUMJy7bs7bnXqi2aoli2GL8PC4NQJkSE,23
+unifi_network_maps/__init__.py,sha256=nGraM_ujqcNJ-Dyz-qi99_8ynLwzQU2N68yOSnVykOs,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
@@ -54,8 +54,8 @@ unifi_network_maps/cli/__init__.py,sha256=cds9GvFNZmYAR22Ab3TSzfriSAW--kf9jvC5U-
 unifi_network_maps/cli/__main__.py,sha256=nK_jh78VW3h3DRvSpjzpcf64zkCqniP2k82xUR9Hw2I,147
 unifi_network_maps/cli/args.py,sha256=lIgQDeob_SIhjXg76hJsnpgNOKupSjSYum_MqarWOkE,5552
 unifi_network_maps/cli/main.py,sha256=jQXesuHJLTQl4lBk1DD6em67Wj9oEjBmH9X-X1zA6MI,4150
-unifi_network_maps/cli/render.py,sha256=sUyDWm_I_zbEcKuNEpKUXDxhe1XptgOYsmdMP9BJ3Eg,7040
-unifi_network_maps/cli/runtime.py,sha256=Hln4LMpuTrEsy6gIBmqkOrUpMb4nTeZ-AH72KyxpZwA,4723
+unifi_network_maps/cli/render.py,sha256=hT4RS3Y5F2TVDe85xpaOckgz9b5c8igY5Q77Uoh8nmk,7357
+unifi_network_maps/cli/runtime.py,sha256=cMtIShERup2z2_uCcEGcaJFJptvdI0L3FDWqKFwSevY,4830
 unifi_network_maps/io/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
 unifi_network_maps/io/debug.py,sha256=eUVs6GLfs6VqI6ma8ra7NLhC3q4ek2K8OSRLnpQDF9s,1745
 unifi_network_maps/io/export.py,sha256=2vURunQDja-_fKKMb-gQG-n34aeM8GFprNJqcGaP4qg,843
@@ -67,11 +67,11 @@ 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=YOiLGKFEl4AQncaiM0C_uHt85lX1rsNM4n0HEZ5K-ns,28541
+unifi_network_maps/model/topology.py,sha256=l26yHsRGuD-D1x4-qsaMBRTeA8SBU_xhRCi9ZwyG7w8,31472
 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
-unifi_network_maps/render/lldp_md.py,sha256=13g9G_oQ-riTDakt-_qmGX8YtEmL0eikjFMbtiTKKVo,11672
+unifi_network_maps/render/lldp_md.py,sha256=wHMMoxcRicF3NirNh0L62PQFNQYOp6XFxNOTwFm7x0Y,14738
 unifi_network_maps/render/markdown_tables.py,sha256=VvM0fSnSmpeeDPcD5pXaL_j_PTF0STrMCaqnr2BVHn4,547
 unifi_network_maps/render/mermaid.py,sha256=xsC57Xg-nKhmlVATzEbwLkMM2BOeDYlBjZuxBIPhHeI,8324
 unifi_network_maps/render/mermaid_theme.py,sha256=7nqLlvhaUA4z0YOs0ByEx_yHWcQD_hJJjhDtRcbSpg4,1781
@@ -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.11.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
-unifi_network_maps-1.4.11.dist-info/METADATA,sha256=ihN2YNJUN-9W1RR2USmMtMGJq72XSSULMtG8k9qry4g,9851
-unifi_network_maps-1.4.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unifi_network_maps-1.4.11.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
-unifi_network_maps-1.4.11.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
-unifi_network_maps-1.4.11.dist-info/RECORD,,
+unifi_network_maps-1.4.12.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
+unifi_network_maps-1.4.12.dist-info/METADATA,sha256=ob7P4a7jb8JTC_OWLX4Ej0jPf8SrYNXWyhCCodGmyRM,9952
+unifi_network_maps-1.4.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unifi_network_maps-1.4.12.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
+unifi_network_maps-1.4.12.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
+unifi_network_maps-1.4.12.dist-info/RECORD,,