scripts and scenarios

networmix · networmix · commit c83d27976d63 · 2025-08-13T21:37:04.000+01:00
diff --git a/examples/backbone_baseline.yml b/examples/backbone_baseline.yml
@@ -85,6 +85,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/backbone_clos.yml b/examples/backbone_clos.yml
@@ -85,6 +85,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/backbone_slimfly.yml b/examples/backbone_slimfly.yml
@@ -85,6 +85,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/backbone_slimfly_spine.yml b/examples/backbone_slimfly_spine.yml
@@ -85,6 +85,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/small_test_baseline.yml b/examples/small_test_baseline.yml
@@ -73,6 +73,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/small_test_clos.yml b/examples/small_test_clos.yml
@@ -73,6 +73,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/small_test_slimfly.yml b/examples/small_test_slimfly.yml
@@ -73,6 +73,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/examples/small_test_slimfly_spine.yml b/examples/small_test_slimfly_spine.yml
@@ -73,6 +73,8 @@ visualization:
     use_real_geometry: true
   site_graph:
     export: true
+  blueprints:
+    export: true
 
 traffic:
   enabled: true
diff --git a/run.sh b/run.sh
@@ -15,9 +15,9 @@
 # Behavior:
 # - Recursively finds *_scenario.yml / *_scenario.yaml files under <root_dir>.
 # - For each scenario, runs in its directory:
-#     ngraph inspect <file>   → writes notebook/artifacts (tool-defined)
-#     ngraph run <file>       → writes results JSON (tool-defined)
-#     ngraph report --html <file> → writes HTML report (tool-defined)
+#     ngraph inspect -o <dir> <file>
+#     ngraph run -o <dir> <file>
+#     ngraph report -o <dir> <results.json> --html --notebook <path>
 # - Logs for each step are saved next to the scenario file:
 #     <stem>.inspect.log, <stem>.run.log, <stem>.report.log
 # - If --force is not set and cached artifacts are found (results JSON + HTML),
@@ -63,7 +63,7 @@ EOF
 }
 
 ARGS=()
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
   case "$1" in
     --include)
       shift || true
@@ -146,8 +146,8 @@ passes_filters() {
 
 has_cached() {
   # Cached if expected results and HTML report exist
-  local dir="$1"; local stem="$2"
-  if [[ -f "$dir/$stem.json" && -f "$dir/$stem.html" ]]; then
+  local dir="$1"; local results_prefix="$2"
+  if [[ -f "$dir/$results_prefix.json" && -f "$dir/$results_prefix.html" ]]; then
     return 0
   fi
   return 1
@@ -176,6 +176,10 @@ while IFS= read -r -d '' scn; do
   scn_dir=$(cd "$(dirname -- "$scn")" && pwd)
   scn_base_noext=${scn_name%.*}
   scn_stem=${scn_base_noext}
+  results_prefix="$scn_stem.results"
+  results_json="$scn_dir/$results_prefix.json"
+  html_path="$scn_dir/$results_prefix.html"
+  ipynb_path="$scn_dir/$results_prefix.ipynb"
 
   echo "➡️  Scenario: $scn_name"
   echo "   📁 Dir:   $scn_dir"
@@ -184,31 +188,26 @@ while IFS= read -r -d '' scn; do
   log_run="$scn_dir/$scn_stem.run.log"
   log_rep="$scn_dir/$scn_stem.report.log"
 
-  if [[ "$FORCE" == "false" ]] && has_cached "$scn_dir" "$scn_stem"; then
+  if [[ "$FORCE" == "false" ]] && has_cached "$scn_dir" "$results_prefix"; then
     echo "⏭️  Cached: results + report found, skipping"
     ins_status="⏭️ cached"; run_status="⏭️ cached"; rep_status="⏭️ cached"
     ins_cached=$((ins_cached + 1))
     run_cached=$((run_cached + 1))
     rep_cached=$((rep_cached + 1))
   else
     # Inspect
-    (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" inspect "$scn_abs") 2>&1 | tee "$log_ins"
+    (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" inspect -o "$scn_dir" "$scn_abs") 2>&1 | tee "$log_ins"
     ins_ec=${PIPESTATUS[0]}
     if [[ $ins_ec -eq 0 ]]; then
       ins_status="✅"; ins_ok=$((ins_ok + 1))
       # Run
-      (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" run "$scn_abs") 2>&1 | tee "$log_run"
+      (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" run -o "$scn_dir" -r "$results_json" "$scn_abs") 2>&1 | tee "$log_run"
       run_ec=${PIPESTATUS[0]}
       if [[ $run_ec -eq 0 ]]; then
         run_status="✅"; run_ok=$((run_ok + 1))
         # Report
-        results_json="$scn_dir/$scn_stem.json"
-        # If the default name was not used, fallback to results.json
-        if [[ ! -f "$results_json" && -f "$scn_dir/results.json" ]]; then
-          results_json="$scn_dir/results.json"
-        fi
-        # Generate both HTML and Notebook deterministically named after the scenario stem
-        (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" report "$results_json" --html "$scn_dir/$scn_stem.html" --notebook "$scn_dir/$scn_stem.ipynb") 2>&1 | tee "$log_rep"
+        # Generate both HTML and Notebook under the scenario directory using the results-derived prefix
+        (cd "$scn_dir" && "${NGRAPH_INVOKE[@]}" report -o "$scn_dir" "$results_json" --html "$html_path" --notebook "$ipynb_path") 2>&1 | tee "$log_rep"
         rep_ec=${PIPESTATUS[0]}
         if [[ $rep_ec -eq 0 ]]; then
           rep_status="✅"; rep_ok=$((rep_ok + 1))
diff --git a/topogen/config.py b/topogen/config.py
@@ -492,6 +492,8 @@ class TopologyConfig:
     _export_site_graph: bool = False
     _visualization_dpi: int = 300
     _source_path: Path | None = None
+    # Export per-blueprint abstract+concrete diagrams
+    _export_blueprint_diagrams: bool = False
     # Optional instrumentation fields for debugging/export
     _debug_dir: Path | None = None
     _source_stem: str | None = None
@@ -1007,6 +1009,13 @@ def _from_dict(cls, config_dict: dict[str, Any]) -> TopologyConfig:
                 "'visualization.site_graph' must be a dictionary if provided"
             )
         export_site_graph = bool(vis_site.get("export", False))
+        # Optional per-blueprint diagram export
+        vis_blueprints = vis.get("blueprints", {}) or {}
+        if not isinstance(vis_blueprints, dict):
+            raise ValueError(
+                "'visualization.blueprints' must be a dictionary if provided"
+            )
+        export_blueprints = bool(vis_blueprints.get("export", False))
         # Optional global visualization DPI
         dpi_val = vis.get("dpi", 300)
         try:
@@ -1035,6 +1044,7 @@ def _from_dict(cls, config_dict: dict[str, Any]) -> TopologyConfig:
         cfg._use_real_corridor_geometry = use_real_geometry
         cfg._export_site_graph = export_site_graph
         cfg._visualization_dpi = visualization_dpi
+        cfg._export_blueprint_diagrams = export_blueprints
         return cfg
 
     def validate(self) -> None:
diff --git a/topogen/scenario/assembly.py b/topogen/scenario/assembly.py
@@ -345,6 +345,106 @@ def _count_for_optic(name: str, capacity: float) -> float:
 
     _fmt = getattr(getattr(config, "output", None), "formatting", None)
     _anchors = bool(getattr(_fmt, "yaml_anchors", True)) if _fmt is not None else True
+    # Optional: export per-blueprint diagrams (abstract + concrete)
+    try:
+        if bool(getattr(config, "_export_blueprint_diagrams", False)):
+            from topogen.visualization import export_blueprint_diagram
+
+            # Determine used blueprints again (same as before)
+            used_blueprints = set(scenario.get("blueprints", {}).keys())
+            # Select a representative site with maximum attached capacity per blueprint
+            # Build lookup: site node name -> total incident link capacity from expanded net
+            attached: dict[str, float] = {}
+            for link in net.links.values():
+                cap = float(getattr(link, "capacity", 0.0) or 0.0)
+                s = str(getattr(link, "source", ""))
+                t = str(getattr(link, "target", ""))
+                if s:
+                    attached[s] = attached.get(s, 0.0) + cap
+                if t:
+                    attached[t] = attached.get(t, 0.0) + cap
+
+            # Build mapping: site path -> blueprint used (from groups section attrs)
+            # We use the authoritative groups section emitted earlier
+            site_to_bp: dict[str, str] = {}
+            for gpath, gdef in scenario.get("network", {}).get("groups", {}).items():
+                bp = str(gdef.get("use_blueprint", ""))
+                if not bp:
+                    continue
+                # Expand ranges like pop[1-4] into concrete prefixes
+                import re as _re
+
+                m = _re.match(r"^(?P<prefix>.+?)\[(?P<a>\d+)-(?:\d+)\]$", gpath)
+                if m:
+                    prefix = m.group("prefix")
+                    # Find any nodes whose path starts with this prefix in expanded net
+                    for node in net.nodes.values():
+                        nname = str(node.name)
+                        if nname.startswith(prefix.rstrip("/")):
+                            head = nname.split("/", 2)[0:2]
+                            site_path = "/".join(head)
+                            site_to_bp[site_path] = bp
+                else:
+                    # Non-ranged path; take as-is
+                    # Normalize to the first two components (site scope)
+                    head = gpath.split("/", 2)[0:2]
+                    site_path = "/".join(head)
+                    site_to_bp[site_path] = bp
+
+            # For each used blueprint, pick site with max attached capacity
+            bp_to_best_site: dict[str, str] = {}
+            for site_path, bp in site_to_bp.items():
+                # Aggregate attached over concrete nodes under the site
+                prefix = f"{site_path}/"
+                tot = 0.0
+                for node_name, val in attached.items():
+                    if str(node_name).startswith(prefix):
+                        tot += float(val)
+                prev_site = bp_to_best_site.get(bp)
+                if prev_site is None:
+                    bp_to_best_site[bp] = site_path
+                else:
+                    # Compare totals
+                    prev_tot = 0.0
+                    for node_name, val in attached.items():
+                        if str(node_name).startswith(f"{prev_site}/"):
+                            prev_tot += float(val)
+                    if tot > prev_tot:
+                        bp_to_best_site[bp] = site_path
+
+            # Export one diagram per blueprint actually used
+            cfg_out = getattr(config, "_output_dir", None)
+            output_dir = (
+                Path(cfg_out) if isinstance(cfg_out, (str, Path)) else Path.cwd()
+            )
+            try:
+                output_dir.mkdir(parents=True, exist_ok=True)
+            except Exception:
+                pass
+            src_path = getattr(config, "_source_path", None)
+            stem = (
+                Path(src_path).stem if isinstance(src_path, (str, Path)) else "scenario"
+            )
+            dpi = int(getattr(config, "_visualization_dpi", 300))
+            blueprints_defs = scenario.get("blueprints", {})
+            for bp in sorted(used_blueprints):
+                if bp not in blueprints_defs:
+                    continue
+                site = bp_to_best_site.get(bp)
+                if not site:
+                    continue
+                out_path = output_dir / f"{stem}_blueprint_{bp}.jpg"
+                export_blueprint_diagram(
+                    bp,
+                    blueprints_defs[bp],
+                    net,
+                    site,
+                    out_path,
+                    dpi=dpi,
+                )
+    except Exception as e:  # pragma: no cover - non-fatal visualization optional
+        logger.warning("Failed to export blueprint diagrams: %s", e)
+
     return _emit_yaml(scenario, yaml_anchors=_anchors)
 
 
diff --git a/topogen/visualization.py b/topogen/visualization.py
diff --git a/topogen/workflows_lib.py b/topogen/workflows_lib.py
