unifi-network-maps 1.4.5__py3-none-any.whl → 1.4.7__py3-none-any.whl

unifi_network_maps/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.5"
+__version__ = "1.4.7"

unifi_network_maps/cli/main.py

@@ -90,7 +90,11 @@ def main(argv: list[str] | None = None) -> int:
     except ValueError as exc:
         logging.error(str(exc))
         return 2
-    mermaid_theme, svg_theme = resolve_themes(args.theme_file)
+    try:
+        mermaid_theme, svg_theme = resolve_themes(args.theme_file)
+    except Exception as exc:  # noqa: BLE001
+        logging.error("Failed to load theme file: %s", exc)
+        return 2
 
     if args.legend_only:
         legend_style = resolve_legend_style(

unifi_network_maps/render/svg.py

@@ -6,6 +6,7 @@ import base64
 import math
 from collections.abc import Callable
 from dataclasses import dataclass
+from html import escape as _escape_attr
 from pathlib import Path
 
 from ..model.topology import Edge
@@ -472,6 +473,7 @@ def render_svg(
     edges: list[Edge],
     *,
     node_types: dict[str, str],
+    node_data: dict[str, dict[str, str]] | None = None,
     options: SvgOptions | None = None,
     theme: SvgTheme = DEFAULT_THEME,
 ) -> str:
@@ -503,6 +505,7 @@ def render_svg(
         node_port_prefix,
         icons,
         options,
+        node_data,
     )
 
     lines.append("</svg>")
@@ -519,6 +522,8 @@ def _render_svg_edges(
     node_port_labels: dict[str, str] = {}
     node_port_prefix: dict[str, str] = {}
     for edge in edges:
+        _record_edge_labels(edge, node_types, node_port_labels, node_port_prefix)
+    for edge in sorted(edges, key=lambda item: item.poe):
         if edge.left not in positions or edge.right not in positions:
             continue
         src_x, src_y = positions[edge.left]
@@ -530,7 +535,17 @@ def _render_svg_edges(
         mid_y = (src_bottom + dst_top) / 2
         color = "url(#link-poe)" if edge.poe else "url(#link-standard)"
         width_px = 2 if edge.poe else 1
-        path = f"M {src_cx} {src_bottom} L {src_cx} {mid_y} L {dst_cx} {mid_y} L {dst_cx} {dst_top}"
+        if math.isclose(src_cx, dst_cx, abs_tol=0.01):
+            elbow_x = src_cx + 0.5
+            path = (
+                f"M {src_cx} {src_bottom} L {src_cx} {mid_y} "
+                f"L {elbow_x} {mid_y} L {dst_cx} {mid_y} L {dst_cx} {dst_top}"
+            )
+        else:
+            path = (
+                f"M {src_cx} {src_bottom} L {src_cx} {mid_y} "
+                f"L {dst_cx} {mid_y} L {dst_cx} {dst_top}"
+            )
         dash = ' stroke-dasharray="6 4"' if edge.wireless else ""
         lines.append(
             f'<path d="{path}" stroke="{color}" stroke-width="{width_px}" fill="none"{dash}/>'
@@ -542,7 +557,6 @@ def _render_svg_edges(
                 f'<text x="{icon_x}" y="{icon_y}" text-anchor="middle" fill="#1e88e5" '
                 f'font-size="{max(options.font_size, 10)}">⚡</text>'
             )
-        _record_edge_labels(edge, node_types, node_port_labels, node_port_prefix)
     return node_port_labels, node_port_prefix
 
 
@@ -589,11 +603,19 @@ def _render_svg_nodes(
     node_port_prefix: dict[str, str],
     icons: dict[str, str],
     options: SvgOptions,
+    node_data: dict[str, dict[str, str]] | None,
 ) -> None:
     for name, (x, y) in positions.items():
         node_type = node_types.get(name, "other")
         fill, stroke = _TYPE_COLORS.get(node_type, _TYPE_COLORS["other"])
         fill = f"url(#node-{node_type})"
+        group_attrs = _svg_node_group_attrs(node_data, name, node_type)
+        lines.append(f"<g{group_attrs}>")
+        lines.append(f"<title>{_escape_text(name)}</title>")
+        lines.append(
+            f'<rect x="{x}" y="{y}" width="{options.node_width}" height="{options.node_height}" '
+            'fill="transparent" pointer-events="all" class="node-hitbox"/>'
+        )
         lines.append(
             f'<rect x="{x}" y="{y}" width="{options.node_width}" height="{options.node_height}" '
             f'rx="6" ry="6" fill="{fill}" stroke="{stroke}" stroke-width="1"/>'
@@ -631,6 +653,27 @@ def _render_svg_nodes(
         lines.append(
             f'<text x="{text_x}" y="{text_y}" fill="#1f1f1f" text-anchor="start">{safe_name}</text>'
         )
+        lines.append("</g>")
+
+
+def _svg_node_group_attrs(
+    node_data: dict[str, dict[str, str]] | None,
+    name: str,
+    node_type: str,
+) -> str:
+    attrs: dict[str, str] = {
+        "class": "unm-node",
+        "data-node-id": name,
+        "data-node-type": node_type,
+    }
+    if node_data and (extra := node_data.get(name)):
+        for key, value in extra.items():
+            if key == "class":
+                attrs["class"] = f"{attrs['class']} {value}".strip()
+            else:
+                attrs[key] = value
+    rendered = [f' {key}="{_escape_attr(value, quote=True)}"' for key, value in attrs.items()]
+    return "".join(rendered)
 
 
 def _iso_project(layout: IsoLayout, gx: float, gy: float) -> tuple[float, float]:
@@ -759,6 +802,8 @@ def _render_iso_edges(
     node_port_prefix: dict[str, str],
 ) -> None:
     for edge in edges:
+        _record_iso_edge_label(edge, node_types, node_port_labels, node_port_prefix)
+    for edge in sorted(edges, key=lambda item: item.poe):
         if edge.left not in positions or edge.right not in positions:
             continue
         src_grid = grid_positions.get(edge.left)
@@ -800,7 +845,6 @@ def _render_iso_edges(
                 f'<text x="{icon_x}" y="{icon_y}" text-anchor="middle" fill="#1e88e5" '
                 f'font-size="{max(options.font_size, 10)}">⚡</text>'
             )
-        _record_iso_edge_label(edge, node_types, node_port_labels, node_port_prefix)
 
 
 def _iso_edge_path(
@@ -1019,7 +1063,14 @@ def _render_iso_node(
     node_depth = 0.0
     tile_w = layout.tile_width
     tile_h = layout.tile_height
+    group_attrs = _svg_node_group_attrs(None, name, node_type)
+    lines.append(f"<g{group_attrs}>")
+    lines.append(f"<title>{_escape_text(name)}</title>")
     top, left, right = _iso_node_polygons(x, y, tile_w, tile_h, node_depth)
+    lines.append(
+        f'<polygon points="{_points_to_svg(top)}" fill="transparent" '
+        'pointer-events="all" class="node-hitbox"/>'
+    )
     left_fill = "#d0d0d0" if node_type == "other" else "#dcdcdc"
     right_fill = "#c2c2c2" if node_type == "other" else "#c8c8c8"
     _iso_render_faces(
@@ -1085,6 +1136,7 @@ def _render_iso_node(
         f'<text x="{name_x}" y="{name_y}" text-anchor="middle" fill="#1f1f1f" '
         f'font-size="{name_font_size}" transform="{name_transform}">{_escape_text(name)}</text>'
     )
+    lines.append("</g>")
 
 
 def _render_iso_nodes(

{unifi_network_maps-1.4.5.dist-info → unifi_network_maps-1.4.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unifi-network-maps
-Version: 1.4.5
+Version: 1.4.7
 Summary: Dynamic UniFi -> network maps in mermaid or svg
 Author: Merlijn
 License-Expression: MIT
@@ -25,7 +25,7 @@ Requires-Dist: python-dotenv==1.2.1
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: Jinja2==3.1.6
 Provides-Extra: dev
-Requires-Dist: Faker==40.1.0; extra == "dev"
+Requires-Dist: Faker==40.1.2; extra == "dev"
 Requires-Dist: behave==1.3.3; extra == "dev"
 Requires-Dist: pre-commit==4.5.1; extra == "dev"
 Requires-Dist: pytest==9.0.2; extra == "dev"
@@ -144,6 +144,11 @@ Legend only:
 unifi-network-maps --legend-only --stdout
 ```
 
+## Home Assistant integration
+
+The live Home Assistant integration (Config Flow + coordinator + custom card) lives in a separate repo:
+- https://github.com/merlijntishauser/unifi-network-maps-ha
+
 ## Examples (mock data)
 
 These examples are generated from `examples/mock_data.json` (safe, anonymized fixture).

{unifi_network_maps-1.4.5.dist-info → unifi_network_maps-1.4.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-unifi_network_maps/__init__.py,sha256=Fv2JHnR-ADpzdVitwHAsUrkhe-BpoDkmx7MxtXxlm1k,22
+unifi_network_maps/__init__.py,sha256=pHClr_RD94RdAO4nIJOBug2vXKKjcRzEGxsyrQcqnHY,22
 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
@@ -53,7 +53,7 @@ unifi_network_maps/assets/themes/default.yaml,sha256=F2Jj18NmdaJ_zyERvGAn8NEWBwa
 unifi_network_maps/cli/__init__.py,sha256=cds9GvFNZmYAR22Ab3TSzfriSAW--kf9jvC5U-21AoA,70
 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=8r4zxhDYzDNJ-JMzX3HjPD1QTIUIyrrQeCGxcqe2vqc,4015
+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/io/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
@@ -76,7 +76,7 @@ unifi_network_maps/render/markdown_tables.py,sha256=VvM0fSnSmpeeDPcD5pXaL_j_PTF0
 unifi_network_maps/render/mermaid.py,sha256=xsC57Xg-nKhmlVATzEbwLkMM2BOeDYlBjZuxBIPhHeI,8324
 unifi_network_maps/render/mermaid_theme.py,sha256=7nqLlvhaUA4z0YOs0ByEx_yHWcQD_hJJjhDtRcbSpg4,1781
 unifi_network_maps/render/mkdocs.py,sha256=EOST9_eP1ZoZQax-p-2fjlelrl3AKEJ9Gn-KXW8TI-o,5389
-unifi_network_maps/render/svg.py,sha256=RHmSmlKxrS8m3-zYsTJu-GZugsZt8X8TDsPpK7DA6tg,38807
+unifi_network_maps/render/svg.py,sha256=W0tiuCkicTxbHTJbeRbnWzFfaO9yawL7e6EJiP7TLnU,40791
 unifi_network_maps/render/svg_theme.py,sha256=Si1ArM3v_-wAvHZyLFPiOZ0ohQRd6ezIckwC3_b-WIw,2684
 unifi_network_maps/render/templating.py,sha256=VJbXzZFBPjL8LFFPcLf_EU5Eu53GN9_vpten2Mf9A-k,576
 unifi_network_maps/render/theme.py,sha256=vKYdPhcGEOV1o_irwqzJlIXPgRvZqQEzYYV2_TxZn4E,4301
@@ -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.5.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
-unifi_network_maps-1.4.5.dist-info/METADATA,sha256=AVMHFRRAIPqB5nH1lObiLgXDGnwx_Ia38TkZaUzi60k,9558
-unifi_network_maps-1.4.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unifi_network_maps-1.4.5.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
-unifi_network_maps-1.4.5.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
-unifi_network_maps-1.4.5.dist-info/RECORD,,
+unifi_network_maps-1.4.7.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
+unifi_network_maps-1.4.7.dist-info/METADATA,sha256=kHKNrAptcX2vYnP1c4-0sxA9l6bmTBXSHLLOCskIlm0,9754
+unifi_network_maps-1.4.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unifi_network_maps-1.4.7.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
+unifi_network_maps-1.4.7.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
+unifi_network_maps-1.4.7.dist-info/RECORD,,