Chentony/mermaid response refactor (Azure#21)

* Fix diagram prompting

* Small change

* Reminder

* Fix

* Remove Mermaid Encode/Decode

---------

Co-authored-by: Tony Chen (DevDiv) <[email protected]>

Author: Tonychen0227

areas/deploy/src/AzureMcp.Deploy/Commands/Architecture/DiagramGenerateCommand.cs

@@ -81,10 +81,6 @@ public override Task<CommandResponse> ExecuteAsync(CommandContext context, Parse
             {
                 throw new InvalidOperationException("Failed to generate architecture diagram. The chart content is empty.");
             }
-            var encodedDiagram = EncodeMermaid.GetEncodedMermaidChart(chart).Replace("+", "-").Replace("/", "_"); // replace '+' with '-' and "/" with "_" for URL safety and consistency with mermaid.live URL encoding
-
-            var mermaidUrl = $"https://mermaid.live/view#pako:{encodedDiagram}";
-            _logger.LogInformation("Generated architecture diagram successfully. Mermaid URL: {MermaidUrl}", mermaidUrl);
 
             var usedServiceTypes = appTopology.Services
                 .SelectMany(service => service.Dependencies)
@@ -99,8 +95,8 @@ public override Task<CommandResponse> ExecuteAsync(CommandContext context, Parse
                 ? string.Join(", ", usedServiceTypes)
                 : null;
 
-            context.Response.Message = $"Help the user open up this URI to preview their app topology using tool open_simple_browser: {mermaidUrl} \n"
-                + "Ask user if the topology is expected, if not, you should call this tool with the user's updated instructions. "
+            context.Response.Message = $"Here is the user's mermaid diagram. Please write this into .azure/architecture.copilot.md. Make changes if these do not fulfill requirements:\n ```mermaid\n{chart}\n``` \n"
+                + "Ask user if the topology is expected, if not, you should directly update the generated diagram with the user's updated instructions. Remind the user to install a Mermaid preview extension to be able to render the diagram. "
                 + "Please inform the user that here are the supported hosting technologies: "
                 + $"{string.Join(", ", Enum.GetNames<AzureServiceConstants.AzureComputeServiceType>())}. ";
             if (!string.IsNullOrWhiteSpace(usedServiceTypesString))

areas/deploy/src/AzureMcp.Deploy/Commands/GenerateMermaidChart.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Immutable;
 using System.Text;
+using Azure.ResourceManager.Network.Models;
 using AzureMcp.Deploy.Options;
 using Microsoft.Extensions.ObjectPool;
 
@@ -14,6 +15,9 @@ public static class GenerateMermaidChart
     private const string aksClusterInternalName = "akscluster";
     private const string aksClusterName = "Azure Kubernetes Service (AKS) Cluster";
 
+    private const string acaEnvInternalName = "acaenvironment";
+    private const string acaEnvName = "Azure Container Apps Environment";
+
     public static string GenerateChart(string workspaceFolder, AppTopology appTopology)
     {
         var chartComponents = new List<string>();
@@ -32,7 +36,8 @@ public static string GenerateChart(string workspaceFolder, AppTopology appTopolo
         }
 
         var services = new List<string> { "%% Services" };
-        var resources = new List<string> { "%% Resources" };
+        var resources = new List<string> { "%% Compute Resources" };
+        var dependencyResources = new List<string> { "%% Binding Resources" };
         var relationships = new List<string> { "%% Relationships" };
 
         foreach (var service in appTopology.Services)
@@ -56,12 +61,14 @@ public static string GenerateChart(string workspaceFolder, AppTopology appTopolo
 
             var serviceInternalName = $"svc-{service.Name}";
 
-            services.Add(CreateComponentName(serviceInternalName, string.Join("\n", serviceName), "service", NodeShape.Rectangle));
+            services.Add(CreateComponentName(serviceInternalName, string.Join("\n", serviceName), NodeShape.Rectangle));
 
             relationships.Add(CreateRelationshipString(serviceInternalName, $"{FlattenServiceType(service.AzureComputeHost)}_{service.Name}", "hosted on", ArrowType.Solid));
         }
 
         var aksClusterExists = false;
+        var containerAppEnvExists = false;
+
         foreach (var service in appTopology.Services)
         {
             string serviceResourceInternalName = $"{FlattenServiceType(service.AzureComputeHost)}_{service.Name}";
@@ -74,18 +81,34 @@ public static string GenerateChart(string workspaceFolder, AppTopology appTopolo
                     // containerized services share the same AKS cluster
                     foreach (var aksservice in appTopology.Services.Where(s => s.AzureComputeHost == "aks"))
                     {
-                        resources.Add(CreateComponentName($"{aksservice.AzureComputeHost}_{aksservice.Name}", $"{aksservice.Name} (Containerized Service)", "compute", NodeShape.RoundedRectangle));
+                        resources.Add(CreateComponentName($"{aksservice.AzureComputeHost}_{aksservice.Name}", $"{aksservice.Name} (Containerized Service)", NodeShape.RoundedRectangle));
                     }
                     resources.Add("end");
                     resources.Add($"{aksClusterInternalName}:::cluster");
                     aksClusterExists = true;
                 }
             }
+            else if (service.AzureComputeHost == "containerapp")
+            {
+                if (!containerAppEnvExists)
+                {
+                    // Add Container App Environment as a subgraph
+                    resources.Add($"subgraph {acaEnvInternalName} [\"{acaEnvName}\"]");
+                    // containerized services share the same Container App Environment
+                    foreach (var containerAppService in appTopology.Services.Where(s => s.AzureComputeHost == "containerapp"))
+                    {
+                        resources.Add(CreateComponentName($"{containerAppService.AzureComputeHost}_{containerAppService.Name}", $"{containerAppService.Name} (Container App)", NodeShape.RoundedRectangle));
+                    }
+                    resources.Add("end");
+                    containerAppEnvExists = true;
+                }
+            }
             // each service should have a compute resource type
             else if (!resources.Any(r => r.Contains(serviceResourceInternalName)))
             {
-                resources.Add(CreateComponentName(serviceResourceInternalName, $"{service.Name} ({GetFormalName(service.AzureComputeHost)})", "compute", NodeShape.RoundedRectangle));
+                resources.Add(CreateComponentName(serviceResourceInternalName, $"{service.Name} ({GetFormalName(service.AzureComputeHost)})", NodeShape.RoundedRectangle));
             }
+
             foreach (var dependency in service.Dependencies)
             {
                 var instanceInternalName = $"{FlattenServiceType(dependency.ServiceType)}.{dependency.Name}";
@@ -95,12 +118,12 @@ public static string GenerateChart(string workspaceFolder, AppTopology appTopolo
                 {
                     if (!resources.Any(r => r.Contains(EnsureUrlFriendlyName(instanceInternalName))))
                     {
-                        resources.Add(CreateComponentName(instanceInternalName, instanceName, "compute", NodeShape.RoundedRectangle));
+                        resources.Add(CreateComponentName(instanceInternalName, instanceName, NodeShape.RoundedRectangle));
                     }
                 }
                 else
                 {
-                    resources.Add(CreateComponentName(instanceInternalName, instanceName, "binding", NodeShape.Circle));
+                    dependencyResources.Add(CreateComponentName(instanceInternalName, instanceName, NodeShape.Rectangle));
                 }
 
                 relationships.Add(CreateRelationshipString(serviceResourceInternalName, instanceInternalName, dependency.ConnectionType, ArrowType.Dotted));
@@ -109,15 +132,25 @@ public static string GenerateChart(string workspaceFolder, AppTopology appTopolo
 
         chartComponents.AddRange(services);
         chartComponents.AddRange(resources);
+
+
+        chartComponents.Add("subgraph \"Compute Resources\"");
+        chartComponents.AddRange(resources);
+        chartComponents.Add("end");
+
+        chartComponents.Add("subgraph \"Dependency Resources\"");
+        chartComponents.AddRange(dependencyResources);
+        chartComponents.Add("end");
+
         chartComponents.AddRange(relationships);
 
         return string.Join("\n", chartComponents);
     }
 
-    private static string CreateComponentName(string internalName, string name, string type, NodeShape nodeShape)
+    private static string CreateComponentName(string internalName, string name, NodeShape nodeShape)
     {
         var nodeShapeBrackets = GetNodeShapeBrackets(nodeShape);
-        return $"{EnsureUrlFriendlyName(internalName)}{nodeShapeBrackets[0]}\"`{name}`\"{nodeShapeBrackets[1]}:::{type}";
+        return $"{EnsureUrlFriendlyName(internalName)}{nodeShapeBrackets[0]}\"`{name}`\"{nodeShapeBrackets[1]}";
     }
 
     private static string CreateRelationshipString(string sourceName, string targetName, string connectionDescription, ArrowType arrowType)
@@ -200,7 +233,6 @@ private static bool IsComputeResourceType(string serviceType)
         { "azureservicebus", "Azure Service Bus" },
         { "azurewebpubsub", "Azure Web PubSub"}
     };
-
 }
 
 public enum NodeShape

areas/deploy/src/AzureMcp.Deploy/Models/EncodeMermaid.cs

@@ -134,22 +134,21 @@ public async Task GenerateArchitectureDiagram_ShouldReturnEncryptedDiagramUrl()
         Assert.NotNull(response);
         Assert.Equal(200, response.Status);
         // Extract the URL from the response message
-        var urlPattern = "https://mermaid.live/view#pako:";
-        var urlStartIndex = response.Message.IndexOf(urlPattern);
-        Assert.True(urlStartIndex >= 0, "URL starting with 'https://mermaid.live/view#pako:' should be present in the response");
+        var graphStartPattern = "```mermaid";
+        var graphStartIndex = response.Message.IndexOf(graphStartPattern);
+        Assert.True(graphStartIndex >= 0, "Graph data starting with '```mermaid' should be present in the response");
 
-        // Extract the full URL (assuming it ends at whitespace or end of string)
-        var urlStartPosition = urlStartIndex;
-        var urlEndPosition = response.Message.IndexOfAny([' ', '\n', '\r', '\t'], urlStartPosition);
-        if (urlEndPosition == -1)
-            urlEndPosition = response.Message.Length;
+        // Extract the full graph (assuming it ends at whitespace or end of string)
+        var graphStartPosition = graphStartIndex;
+        var graphEndPosition = response.Message.IndexOf("```", graphStartIndex + 1);
 
-        var extractedUrl = response.Message.Substring(urlStartPosition, urlEndPosition - urlStartPosition);
-        Assert.StartsWith(urlPattern, extractedUrl);
-        var encodedDiagram = extractedUrl.Substring(urlPattern.Length).Replace("_", "/").Replace("-", "+"); // Replace back for decoding
-        var decodedDiagram = EncodeMermaid.GetDecodedMermaidChart(encodedDiagram);
-        Assert.NotEmpty(decodedDiagram);
-        Assert.Contains("website", decodedDiagram);
-        Assert.Contains("store", decodedDiagram);
+        if (graphEndPosition == -1)
+            graphEndPosition = response.Message.Length;
+
+        var extractedGraph = response.Message.Substring(graphStartPosition, graphEndPosition - graphStartPosition);
+        Assert.StartsWith(graphStartPattern, extractedGraph);
+        Assert.NotEmpty(extractedGraph);
+        Assert.Contains("website", extractedGraph);
+        Assert.Contains("store", extractedGraph);
     }
 }