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

unifi_network_maps/assets/themes/dark.yaml

@@ -25,6 +25,17 @@ mermaid:
   standard_link_width: 2
   standard_link_arrow: "none"
 svg:
+  icon_set: modern
+  background: "#1a1a1a"
+  wan_background: "#1e3a5f"
+  text:
+    primary: "#f5f5f5"
+    secondary: "#a0a0a0"
+  status:
+    online: "#66bb6a"
+    offline: "#ef5350"
+  node_side_left: "#5a5a5a"
+  node_side_right: "#4a4a4a"
   links:
     standard:
       from: "#66bb6a"
@@ -34,17 +45,49 @@ svg:
       to: "#1e88e5"
   nodes:
     gateway:
-      from: "#5c3b00"
-      to: "#3e2a00"
+      from: "#ffb347"
+      to: "#e69530"
     switch:
-      from: "#0f2b3d"
-      to: "#0a1f2c"
+      from: "#5dade2"
+      to: "#3498db"
     ap:
-      from: "#0f3b2d"
-      to: "#0b2a20"
+      from: "#58d68d"
+      to: "#2ecc71"
     client:
-      from: "#2b1f3b"
-      to: "#20162b"
+      from: "#bb8fce"
+      to: "#9b59b6"
     other:
-      from: "#2a2a2a"
-      to: "#1f1f1f"
+      from: "#7f8c8d"
+      to: "#6a7b7c"
+    # Extended device types - purple tint for consistency
+    camera:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    tv:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    phone:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    printer:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    nas:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    speaker:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    game_console:
+      from: "#bb8fce"
+      to: "#9b59b6"
+    iot:
+      from: "#bb8fce"
+      to: "#9b59b6"
+  # VLAN color overrides (brighter for dark mode)
+  vlan_colors:
+    1: "#95a5a6"      # Default/management - light gray
+    10: "#ff6b6b"     # IoT - bright red
+    20: "#5dade2"     # Guest - bright blue
+    30: "#f7dc6f"     # Trusted - bright yellow
+    100: "#bb8fce"    # Security/cameras - bright purple

unifi_network_maps/assets/themes/default.yaml

@@ -22,6 +22,8 @@ mermaid:
   standard_link_width: 2
   standard_link_arrow: "none"
 svg:
+  icon_set: isometric
+  grid_color: "#b8bcc2"
   links:
     standard:
       from: "#2ecc71"
@@ -45,3 +47,35 @@ svg:
     other:
       from: "#eeeeee"
       to: "#d7d7d7"
+    # Extended device types - use client colors for consistency
+    camera:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    tv:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    phone:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    printer:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    nas:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    speaker:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    game_console:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+    iot:
+      from: "#f2e5ff"
+      to: "#e0c9ff"
+  # VLAN color overrides (auto-generated colors used for unlisted VLANs)
+  vlan_colors:
+    1: "#6c757d"      # Default/management - gray
+    10: "#e74c3c"     # IoT - red
+    20: "#3498db"     # Guest - blue
+    30: "#f1c40f"     # Trusted - yellow
+    100: "#9b59b6"    # Security/cameras - purple

unifi_network_maps/assets/themes/minimal-dark.yaml

@@ -0,0 +1,98 @@
+mermaid:
+  nodes:
+    gateway:
+      fill: "#374151"
+      stroke: "#6b7280"
+    switch:
+      fill: "#374151"
+      stroke: "#6b7280"
+    ap:
+      fill: "#374151"
+      stroke: "#6b7280"
+    client:
+      fill: "#4b5563"
+      stroke: "#6b7280"
+    other:
+      fill: "#4b5563"
+      stroke: "#6b7280"
+  node_text: "#f3f4f6"
+  edge_label_border: "#6b7280"
+  edge_label_border_width: 2
+  poe_link: "#9ca3af"
+  poe_link_width: 2
+  poe_link_arrow: "none"
+  standard_link: "#6b7280"
+  standard_link_width: 2
+  standard_link_arrow: "none"
+svg:
+  font_family: "Space Grotesk"
+  icon_set: isometric
+  icon_decal: "#d1d5db"
+  grid_color: "#3f4550"
+  node_side_left: "#4b5563"
+  node_side_right: "#374151"
+  background: "#18181b"
+  wan_background: "#1f2937"
+  text:
+    primary: "#f3f4f6"
+    secondary: "#9ca3af"
+  status:
+    online: "#9ca3af"
+    offline: "#6b7280"
+  wan_globe:
+    from: "#6b7280"
+    to: "#4b5563"
+  links:
+    standard:
+      from: "#6b7280"
+      to: "#4b5563"
+    poe:
+      from: "#9ca3af"
+      to: "#6b7280"
+  nodes:
+    gateway:
+      from: "#6b7280"
+      to: "#4b5563"
+    switch:
+      from: "#6b7280"
+      to: "#4b5563"
+    ap:
+      from: "#6b7280"
+      to: "#4b5563"
+    client:
+      from: "#9ca3af"
+      to: "#6b7280"
+    other:
+      from: "#9ca3af"
+      to: "#6b7280"
+    # Extended device types - all grayscale for minimal-dark theme
+    camera:
+      from: "#9ca3af"
+      to: "#6b7280"
+    tv:
+      from: "#9ca3af"
+      to: "#6b7280"
+    phone:
+      from: "#9ca3af"
+      to: "#6b7280"
+    printer:
+      from: "#9ca3af"
+      to: "#6b7280"
+    nas:
+      from: "#9ca3af"
+      to: "#6b7280"
+    speaker:
+      from: "#9ca3af"
+      to: "#6b7280"
+    game_console:
+      from: "#9ca3af"
+      to: "#6b7280"
+    iot:
+      from: "#9ca3af"
+      to: "#6b7280"
+  vlan_colors:
+    1: "#6b7280"
+    10: "#6b7280"
+    20: "#6b7280"
+    30: "#6b7280"
+    100: "#6b7280"

unifi_network_maps/assets/themes/minimal.yaml

@@ -0,0 +1,92 @@
+mermaid:
+  nodes:
+    gateway:
+      fill: "#e5e7eb"
+      stroke: "#9ca3af"
+    switch:
+      fill: "#e5e7eb"
+      stroke: "#9ca3af"
+    ap:
+      fill: "#e5e7eb"
+      stroke: "#9ca3af"
+    client:
+      fill: "#f3f4f6"
+      stroke: "#d1d5db"
+    other:
+      fill: "#f3f4f6"
+      stroke: "#d1d5db"
+  poe_link: "#6b7280"
+  poe_link_width: 2
+  poe_link_arrow: "none"
+  standard_link: "#9ca3af"
+  standard_link_width: 2
+  standard_link_arrow: "none"
+svg:
+  font_family: "Space Grotesk"
+  icon_set: isometric
+  icon_decal: "#374151"
+  grid_color: "#b8bcc2"
+  background: "#fafafa"
+  text:
+    primary: "#374151"
+    secondary: "#9ca3af"
+  status:
+    online: "#6b7280"
+    offline: "#9ca3af"
+  wan_globe:
+    from: "#d1d5db"
+    to: "#9ca3af"
+  links:
+    standard:
+      from: "#9ca3af"
+      to: "#6b7280"
+    poe:
+      from: "#6b7280"
+      to: "#4b5563"
+  nodes:
+    gateway:
+      from: "#e5e7eb"
+      to: "#d1d5db"
+    switch:
+      from: "#e5e7eb"
+      to: "#d1d5db"
+    ap:
+      from: "#e5e7eb"
+      to: "#d1d5db"
+    client:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    other:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    # Extended device types - all grayscale for minimal theme
+    camera:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    tv:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    phone:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    printer:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    nas:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    speaker:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    game_console:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+    iot:
+      from: "#f3f4f6"
+      to: "#e5e7eb"
+  vlan_colors:
+    1: "#9ca3af"
+    10: "#9ca3af"
+    20: "#9ca3af"
+    30: "#9ca3af"
+    100: "#9ca3af"

unifi_network_maps/assets/themes/unifi-dark.yaml

@@ -0,0 +1,97 @@
+mermaid:
+  nodes:
+    gateway:
+      fill: "#0a3058"
+      stroke: "#4797ff"
+    switch:
+      fill: "#0f3524"
+      stroke: "#37be5f"
+    ap:
+      fill: "#142952"
+      stroke: "#6baeff"
+    client:
+      fill: "#2a2e33"
+      stroke: "#808893"
+    other:
+      fill: "#32373d"
+      stroke: "#50565e"
+  node_text: "#f9fafa"
+  edge_label_border: "#50565e"
+  edge_label_border_width: 2
+  poe_link: "#37be5f"
+  poe_link_width: 2
+  poe_link_arrow: "none"
+  standard_link: "#4797ff"
+  standard_link_width: 2
+  standard_link_arrow: "none"
+svg:
+  font_family: "Inter"
+  icon_set: modern
+  icon_decal: "#e8e8e8"
+  node_side_left: "#4a5060"
+  node_side_right: "#3a4050"
+  background: "#1c1e21"
+  wan_background: "#1a2a3d"
+  text:
+    primary: "#f9fafa"
+    secondary: "#808893"
+  status:
+    online: "#37be5f"
+    offline: "#ee6368"
+  wan_globe:
+    from: "#4797ff"
+    to: "#2d7ae0"
+  links:
+    standard:
+      from: "#4797ff"
+      to: "#2d7ae0"
+    poe:
+      from: "#37be5f"
+      to: "#2a9e4d"
+  nodes:
+    gateway:
+      from: "#4797ff"
+      to: "#2d7ae0"
+    switch:
+      from: "#4dd88a"
+      to: "#37be5f"
+    ap:
+      from: "#6baeff"
+      to: "#4797ff"
+    client:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    other:
+      from: "#5a6a7a"
+      to: "#4a5a6a"
+    # Extended device types - brighter blue tint
+    camera:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    tv:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    phone:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    printer:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    nas:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    speaker:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    game_console:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+    iot:
+      from: "#6b9fff"
+      to: "#4a7fd9"
+  vlan_colors:
+    1: "#9ca3ab"
+    10: "#ee6368"
+    20: "#4797ff"
+    30: "#e79613"
+    100: "#a78bfa"

unifi_network_maps/assets/themes/unifi.yaml

@@ -0,0 +1,92 @@
+mermaid:
+  nodes:
+    gateway:
+      fill: "#e8f1ff"
+      stroke: "#006fff"
+    switch:
+      fill: "#eaf7f0"
+      stroke: "#38cc65"
+    ap:
+      fill: "#edf3ff"
+      stroke: "#4797ff"
+    client:
+      fill: "#f0f2f4"
+      stroke: "#808893"
+    other:
+      fill: "#f4f5f6"
+      stroke: "#c2c6cb"
+  poe_link: "#38cc65"
+  poe_link_width: 2
+  poe_link_arrow: "none"
+  standard_link: "#006fff"
+  standard_link_width: 2
+  standard_link_arrow: "none"
+svg:
+  font_family: "Inter"
+  icon_set: modern
+  icon_decal: "#212327"
+  grid_color: "#a0bde0"
+  background: "#f9fafa"
+  text:
+    primary: "#212327"
+    secondary: "#808893"
+  status:
+    online: "#38cc65"
+    offline: "#f0383b"
+  wan_globe:
+    from: "#4797ff"
+    to: "#006fff"
+  links:
+    standard:
+      from: "#006fff"
+      to: "#0560d4"
+    poe:
+      from: "#38cc65"
+      to: "#2aaa52"
+  nodes:
+    gateway:
+      from: "#2d8cff"
+      to: "#006fff"
+    switch:
+      from: "#4dd88a"
+      to: "#38cc65"
+    ap:
+      from: "#6baeff"
+      to: "#4797ff"
+    client:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    other:
+      from: "#c8d8f0"
+      to: "#b0c4e8"
+    # Extended device types - subtle blue tint for consistency
+    camera:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    tv:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    phone:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    printer:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    nas:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    speaker:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    game_console:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+    iot:
+      from: "#a8c8ff"
+      to: "#8ab4f8"
+  vlan_colors:
+    1: "#808893"
+    10: "#f0383b"
+    20: "#006fff"
+    30: "#f5a524"
+    100: "#8b5cf6"

unifi_network_maps/cli/args.py

@@ -79,6 +79,11 @@ def add_functional_args(parser: argparse._ArgumentGroup) -> None:
         default="wired",
         help="Client types to include (default: wired)",
     )
+    parser.add_argument(
+        "--collapse-clients",
+        action="store_true",
+        help="Group clients by uplink device into cluster nodes with count badges",
+    )
     parser.add_argument(
         "--only-unifi", action="store_true", help="Only include neighbors that are UniFi devices"
     )
@@ -119,6 +124,55 @@ def add_svg_args(parser: argparse._ArgumentGroup) -> None:
     parser.add_argument("--svg-width", type=int, default=None, help="SVG width override")
     parser.add_argument("--svg-height", type=int, default=None, help="SVG height override")
     parser.add_argument("--theme-file", default=None, help="Path to theme YAML file")
+    parser.add_argument(
+        "--theme",
+        choices=["unifi", "unifi-dark", "minimal", "minimal-dark", "classic", "classic-dark"],
+        default=None,
+        help="Built-in theme name (--theme-file takes priority if both specified)",
+    )
+    parser.add_argument(
+        "--svg-layout-mode",
+        choices=["physical", "grouped"],
+        default="physical",
+        help="SVG layout mode: physical (default) or grouped by network segment",
+    )
+    parser.add_argument(
+        "--max-vlan-colors",
+        type=int,
+        default=None,
+        help="Limit VLAN colors shown on edges (default: no limit)",
+    )
+    parser.add_argument(
+        "--include-vlan-legend",
+        action="store_true",
+        help="Add VLAN color legend to SVG output",
+    )
+    parser.add_argument(
+        "--wan-speed",
+        default=None,
+        help="WAN1 ISP provisioned speed (e.g., '1 Gbps ↓↑')",
+    )
+    parser.add_argument(
+        "--wan-label",
+        default=None,
+        help="WAN1 ISP/connection name (e.g., 'KPN Fiber')",
+    )
+    parser.add_argument(
+        "--wan2-speed",
+        default=None,
+        help="WAN2 ISP provisioned speed (e.g., '500 Mbps ↓↑')",
+    )
+    parser.add_argument(
+        "--wan2-label",
+        default=None,
+        help="WAN2 ISP/connection name (e.g., 'Backup 4G')",
+    )
+    parser.add_argument(
+        "--icon-set",
+        choices=["isometric", "modern"],
+        default=None,
+        help="Icon set to use (default: determined by theme, or 'isometric' if no theme)",
+    )
 
 
 def add_general_render_args(parser: argparse._ArgumentGroup) -> None:

unifi_network_maps/cli/main.py

@@ -106,18 +106,18 @@ def _handle_generate_mock(args: argparse.Namespace) -> int | None:
 
 def _load_runtime_context(
     args: argparse.Namespace,
-) -> tuple[Config | None, str, list[object] | None, list[object] | None]:
+) -> tuple[Config | None, str, list[object] | None, list[object] | None, list[object] | None]:
     if args.mock_data:
         try:
-            mock_devices, mock_clients = load_mock_data(args.mock_data)
+            mock_devices, mock_clients, mock_networks = load_mock_data(args.mock_data)
         except Exception as exc:  # noqa: BLE001
             raise ValueError(f"Failed to load mock data: {exc}") from exc
-        return None, "mock", mock_devices, mock_clients
+        return None, "mock", mock_devices, mock_clients, mock_networks
     config = _load_config(args)
     if config is None:
         raise ValueError("Config required to run")
     site = _resolve_site(args, config)
-    return config, site, None, None
+    return config, site, None, None, None
 
 
 def _handle_json_format(
@@ -163,7 +163,7 @@ def main(argv: list[str] | None = None) -> int:
     if mock_result is not None:
         return mock_result
     try:
-        config, site, mock_devices, mock_clients = _load_runtime_context(args)
+        config, site, mock_devices, mock_clients, mock_networks = _load_runtime_context(args)
     except ValueError as exc:
         logging.error(str(exc))
         return 2
@@ -171,11 +171,20 @@ def main(argv: list[str] | None = None) -> int:
     if payload_result is not None:
         return payload_result
     try:
-        mermaid_theme, svg_theme = resolve_themes(args.theme_file)
+        mermaid_theme, svg_theme = resolve_themes(
+            theme_name=args.theme,
+            theme_file=args.theme_file,
+        )
     except Exception as exc:  # noqa: BLE001
-        logging.error("Failed to load theme file: %s", exc)
+        logging.error("Failed to load theme: %s", exc)
         return 2
 
+    # Apply CLI icon-set override if specified
+    if args.icon_set:
+        from dataclasses import replace
+
+        svg_theme = replace(svg_theme, icon_set=args.icon_set)
+
     if args.legend_only:
         legend_style = resolve_legend_style(
             format_name=args.format,
@@ -198,6 +207,7 @@ def main(argv: list[str] | None = None) -> int:
             site=site,
             mock_devices=mock_devices,
             mock_clients=mock_clients,
+            mock_networks=mock_networks,
         )
 
     return render_standard_format(
@@ -206,6 +216,7 @@ def main(argv: list[str] | None = None) -> int:
         site=site,
         mock_devices=mock_devices,
         mock_clients=mock_clients,
+        mock_networks=mock_networks,
         mermaid_theme=mermaid_theme,
         svg_theme=svg_theme,
     )