unifi-network-maps 1.4.2__py3-none-any.whl → 1.4.4__py3-none-any.whl

unifi_network_maps/__init__.py

@@ -1 +1 @@
-__version__ = "1.4.2"
+__version__ = "1.4.4"

unifi_network_maps/assets/themes/dark.yaml

@@ -15,6 +15,9 @@ mermaid:
     other:
       fill: "#2a2a2a"
       stroke: "#9e9e9e"
+  node_text: "#f5f5f5"
+  edge_label_border: "#e6e6e6"
+  edge_label_border_width: 2
   poe_link: "#64b5f6"
   poe_link_width: 2
   poe_link_arrow: "none"

unifi_network_maps/cli/main.py

@@ -507,9 +507,9 @@ def _write_mkdocs_sidebar_assets(output_path: str) -> None:
     (assets_dir / "legend.js").write_text(
         (
             'document.addEventListener("DOMContentLoaded", () => {\n'
-            '  const legend = document.querySelector("[data-unifi-legend]");\n'
+            '  const legends = document.querySelectorAll("[data-unifi-legend]");\n'
             '  const sidebar = document.querySelector(".md-sidebar--secondary .md-sidebar__scrollwrap");\n'
-            "  if (!legend || !sidebar) {\n"
+            "  if (!legends.length || !sidebar) {\n"
             "    return;\n"
             "  }\n"
             '  const wrapper = document.createElement("div");\n'
@@ -518,17 +518,22 @@ def _write_mkdocs_sidebar_assets(output_path: str) -> None:
             '  title.className = "unifi-legend-title";\n'
             '  title.textContent = "Legend";\n'
             "  wrapper.appendChild(title);\n"
-            "  wrapper.appendChild(legend.cloneNode(true));\n"
+            "  legends.forEach((legend) => {\n"
+            "    wrapper.appendChild(legend.cloneNode(true));\n"
+            '    legend.classList.add("unifi-legend-hidden");\n'
+            "  });\n"
             "  sidebar.appendChild(wrapper);\n"
-            '  legend.classList.add("unifi-legend-hidden");\n'
             "});\n"
         ),
         encoding="utf-8",
     )
     (assets_dir / "legend.css").write_text(
         (
-            ".unifi-legend-hidden {\n"
-            "  display: none;\n"
+            ".unifi-legend-hidden,\n"
+            ".unifi-legend-hidden.unifi-legend,\n"
+            ".unifi-legend-hidden.unifi-legend--light,\n"
+            ".unifi-legend-hidden.unifi-legend--dark {\n"
+            "  display: none !important;\n"
             "}\n\n"
             ".unifi-legend-sidebar {\n"
             "  margin-top: 1rem;\n"

unifi_network_maps/render/mermaid.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import json
 from collections.abc import Iterable
 
 from ..model.topology import Edge
@@ -163,7 +164,15 @@ def render_mermaid(
 ) -> str:
     edge_list = list(edges)
     id_map = _build_id_map(edge_list, _group_nodes(groups))
-    lines = [f"graph {direction}"]
+    theme_vars: dict[str, object] = {}
+    if theme.edge_label_border:
+        theme_vars["edgeLabelBorderColor"] = theme.edge_label_border
+    if theme.edge_label_border_width:
+        theme_vars["edgeLabelBorderWidth"] = theme.edge_label_border_width
+    lines = []
+    if theme_vars:
+        lines.append(f'%%{{init: {{"themeVariables": {json.dumps(theme_vars)}}}}}%%')
+    lines.append(f"graph {direction}")
     if groups:
         _render_group_sections(lines, groups, group_order=group_order, id_map=id_map)
     use_node_labels = not groups

unifi_network_maps/render/mermaid_theme.py

@@ -18,6 +18,9 @@ class MermaidTheme:
     standard_link: str
     standard_link_width: int
     standard_link_arrow: str
+    node_text: str | None = None
+    edge_label_border: str | None = None
+    edge_label_border_width: int | None = None
 
 
 DEFAULT_THEME = MermaidTheme(
@@ -32,15 +35,22 @@ DEFAULT_THEME = MermaidTheme(
     standard_link="#2ecc71",
     standard_link_width=2,
     standard_link_arrow="none",
+    node_text=None,
+    edge_label_border=None,
+    edge_label_border_width=None,
 )
 
 
 def class_defs(theme: MermaidTheme = DEFAULT_THEME) -> list[str]:
+    def node_def(name: str, fill: str, stroke: str) -> str:
+        color = f",color:{theme.node_text}" if theme.node_text else ""
+        return f"  classDef {name} fill:{fill},stroke:{stroke},stroke-width:1px{color};"
+
     return [
-        f"  classDef node_gateway fill:{theme.node_gateway[0]},stroke:{theme.node_gateway[1]},stroke-width:1px;",
-        f"  classDef node_switch fill:{theme.node_switch[0]},stroke:{theme.node_switch[1]},stroke-width:1px;",
-        f"  classDef node_ap fill:{theme.node_ap[0]},stroke:{theme.node_ap[1]},stroke-width:1px;",
-        f"  classDef node_client fill:{theme.node_client[0]},stroke:{theme.node_client[1]},stroke-width:1px;",
-        f"  classDef node_other fill:{theme.node_other[0]},stroke:{theme.node_other[1]},stroke-width:1px;",
+        node_def("node_gateway", theme.node_gateway[0], theme.node_gateway[1]),
+        node_def("node_switch", theme.node_switch[0], theme.node_switch[1]),
+        node_def("node_ap", theme.node_ap[0], theme.node_ap[1]),
+        node_def("node_client", theme.node_client[0], theme.node_client[1]),
+        node_def("node_other", theme.node_other[0], theme.node_other[1]),
         "  classDef node_legend font-size:10px;",
     ]

unifi_network_maps/render/theme.py

@@ -29,6 +29,18 @@ def _coerce_color(value: object, default: str) -> str:
     return value if isinstance(value, str) else default
 
 
+def _coerce_optional_color(value: object, default: str | None) -> str | None:
+    return value if isinstance(value, str) else default
+
+
+def _coerce_optional_int(value: object, default: int | None) -> int | None:
+    if isinstance(value, int):
+        return value
+    if isinstance(value, float):
+        return int(value)
+    return default
+
+
 def _mermaid_theme_from_dict(data: dict, base: MermaidTheme) -> MermaidTheme:
     nodes = data.get("nodes", {}) if isinstance(data.get("nodes"), dict) else {}
 
@@ -52,6 +64,13 @@ def _mermaid_theme_from_dict(data: dict, base: MermaidTheme) -> MermaidTheme:
         standard_link_arrow=_coerce_color(
             data.get("standard_link_arrow"), base.standard_link_arrow
         ),
+        node_text=_coerce_optional_color(data.get("node_text"), base.node_text),
+        edge_label_border=_coerce_optional_color(
+            data.get("edge_label_border"), base.edge_label_border
+        ),
+        edge_label_border_width=_coerce_optional_int(
+            data.get("edge_label_border_width"), base.edge_label_border_width
+        ),
     )
 
 

{unifi_network_maps-1.4.2.dist-info → unifi_network_maps-1.4.4.dist-info}/METADATA

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

{unifi_network_maps-1.4.2.dist-info → unifi_network_maps-1.4.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-unifi_network_maps/__init__.py,sha256=qjngKmjcwKn1c_BwAouVdai-TbnuKZo56EbqRdILxaI,22
+unifi_network_maps/__init__.py,sha256=6stz_YFBRP_lguydVylsTgSmj3VTb6WFq8Sp45WYQyY,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
@@ -48,11 +48,11 @@ unifi_network_maps/assets/icons/isometric/truck-2.svg,sha256=I7MFGbXW2fmr9WdD29N
 unifi_network_maps/assets/icons/isometric/truck.svg,sha256=BrpBr9Qf8hplQIrBpfhN2USxUlPvGCKahlV5e-G13r0,7195
 unifi_network_maps/assets/icons/isometric/user.svg,sha256=bYpr0t8rETJ1M7RDTWaNkK-nfF3kq9eMxmxYCthNmE0,23026
 unifi_network_maps/assets/icons/isometric/vm.svg,sha256=in6x9cdS6JgQVJl0KAbA79rap4X140dfIBCuxmgQI7s,3694
-unifi_network_maps/assets/themes/dark.yaml,sha256=F86A25kd0VSCCpN4jcMZxPWWtqNC5ftJHUEvUvESTQQ,849
+unifi_network_maps/assets/themes/dark.yaml,sha256=6n4_H6MZbA6DKLdF2eaNcCXYLKNJjVjNN9gmwZX97sA,932
 unifi_network_maps/assets/themes/default.yaml,sha256=F2Jj18NmdaJ_zyERvGAn8NEWBwapjtozrtZUxayd5AU,849
 unifi_network_maps/cli/__init__.py,sha256=2FdmLMpYFh_7P0ew2LnieLANf6ni43Ht9FKzYUDiNis,770
 unifi_network_maps/cli/__main__.py,sha256=nK_jh78VW3h3DRvSpjzpcf64zkCqniP2k82xUR9Hw2I,147
-unifi_network_maps/cli/main.py,sha256=y053K-EbnAvxZ073-AEHhAGYWSvc4-UcoDTKpaBsvZY,27319
+unifi_network_maps/cli/main.py,sha256=klDyfD-wPr3vTRulNzfOcslERcONMpxf4iTtrCJpyMQ,27582
 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
@@ -66,14 +66,14 @@ unifi_network_maps/model/topology.py,sha256=JfpY6Pam_pgqnnmsBmzy3oDv4OCi4Ezc8msx
 unifi_network_maps/render/__init__.py,sha256=nzx1KsiYalL_YuXKE6acW8Dj5flmMg0-i4gyYO0gV54,22
 unifi_network_maps/render/device_ports_md.py,sha256=QoRiuP9l2CH8BYRHXRaWM5wyucAURz-zByzwMetnND4,15473
 unifi_network_maps/render/lldp_md.py,sha256=Eg5c5SWEwTfEn6AN0fOfD3f41GlsqwZQRO8AzIXFQf4,10753
-unifi_network_maps/render/mermaid.py,sha256=IqHgTqXVzHzcWwypwBfPqKx1L5QxLrjEgDiooAvE6HU,9286
-unifi_network_maps/render/mermaid_theme.py,sha256=QReSBFoYSIz7vgAwyHx-9f4ucbSgMTGvo1Ffa2ZfzDQ,1527
+unifi_network_maps/render/mermaid.py,sha256=GVn7VN0xdmweDnjk-0Q8nuivqOZ3YFBQ_iTonNydy28,9675
+unifi_network_maps/render/mermaid_theme.py,sha256=7nqLlvhaUA4z0YOs0ByEx_yHWcQD_hJJjhDtRcbSpg4,1781
 unifi_network_maps/render/svg.py,sha256=RHmSmlKxrS8m3-zYsTJu-GZugsZt8X8TDsPpK7DA6tg,38807
 unifi_network_maps/render/svg_theme.py,sha256=Si1ArM3v_-wAvHZyLFPiOZ0ohQRd6ezIckwC3_b-WIw,2684
-unifi_network_maps/render/theme.py,sha256=-cPvj9dfmOpBD3Ohpye_yTBWxXtsE0-g73mekqoh5kA,3606
-unifi_network_maps-1.4.2.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
-unifi_network_maps-1.4.2.dist-info/METADATA,sha256=GcoBldeKBD7f9fRhpf7RZYpvTFY7MU7Fvi3uCSmai9U,9529
-unifi_network_maps-1.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-unifi_network_maps-1.4.2.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
-unifi_network_maps-1.4.2.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
-unifi_network_maps-1.4.2.dist-info/RECORD,,
+unifi_network_maps/render/theme.py,sha256=vKYdPhcGEOV1o_irwqzJlIXPgRvZqQEzYYV2_TxZn4E,4301
+unifi_network_maps-1.4.4.dist-info/licenses/LICENSE,sha256=mYo1siIIfIwyfdOuK2-Zt0ij2xBTii2hnpeTu79nD80,1074
+unifi_network_maps-1.4.4.dist-info/METADATA,sha256=HqLRtIKBUEZDxWvBZxO6DdcnLroyEasUG5O7CwKKIOc,9529
+unifi_network_maps-1.4.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+unifi_network_maps-1.4.4.dist-info/entry_points.txt,sha256=cdJ7jsBgNgHxSflYUOqgz5BbvuM0Nnh-x8_Hbyh_LFg,67
+unifi_network_maps-1.4.4.dist-info/top_level.txt,sha256=G0rUX1PNfVCn1u-KtB6QjFQHopCOVLnPMczvPOoraHg,19
+unifi_network_maps-1.4.4.dist-info/RECORD,,