Fix import wrong request builder and request body import paths

CodeSnippetsReflection.OpenAPI.Test/PythonImportGeneratorTests.cs

@@ -6,6 +6,7 @@
 
 namespace CodeSnippetsReflection.OpenAPI.Test;
 
+
 public class PythonImportTests : OpenApiSnippetGeneratorTestBase
 {
     private readonly PythonGenerator _generator = new();
@@ -74,4 +75,43 @@ public async Task GenerateComplexModelImports(){
         Assert.Contains("from msgraph.generated.models.extension import Extension", result);
         Assert.Contains("from msgraph.generated.models.open_type_extension import OpenTypeExtension", result);
     }
+
+    [Fact]
+    public async Task GenerateNestedRequestBuilderImports()
+    {
+        using var requestPayload = new HttpRequestMessage(HttpMethod.Get, $"{ServiceRootUrl}/applications(appId={{application-id}})?$select=id,appId,displayName,requiredResourceAccess");
+        var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
+        var result = _generator.GenerateCodeSnippet(snippetModel);
+        Assert.Contains("from msgraph import GraphServiceClient", result);
+        Assert.Contains("from msgraph.generated.applications_with_app_id.applications_with_app_id_request_builder import ApplicationsWithAppIdRequestBuilder", result);
+    }
+    [Fact]
+    public async Task GenerateRequestBodyImports()
+    {
+        string bodyContent = @"
+        {
+            ""passwordCredential"": {
+                ""displayName"": ""Test-Password friendly name""
+            }
+        }";
+
+        using var requestPayload = new HttpRequestMessage(HttpMethod.Post, $"{ServiceRootUrl}/applications/{{application-id}}/addPassword"){
+            Content = new StringContent(bodyContent, Encoding.UTF8, "application/json")
+        };
+        var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
+        var result = _generator.GenerateCodeSnippet(snippetModel);
+        Assert.Contains("from msgraph import GraphServiceClient", result);
+        Assert.Contains("from msgraph.generated.models.password_credential import PasswordCredential", result);
+        Assert.Contains("from msgraph.generated.applications.item.add_password.add_password_post_request_body import AddPasswordPostRequestBody", result);
+    }
+    [Fact]
+    public async Task GeneratesImportsWithoutFilterAttrbutesInPath()
+    {
+        using var requestPayload = new HttpRequestMessage(HttpMethod.Get, $"{ServiceRootUrl}/servicePrincipals/$count");
+        requestPayload.Headers.Add("ConsistencyLevel", "eventual");
+        var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
+        var result = _generator.GenerateCodeSnippet(snippetModel);
+        Assert.Contains("from msgraph import GraphServiceClient", result);
+        Assert.Contains("from msgraph.generated.service_principals.count.count_request_builder import CountRequestBuilder", result);
+    }
 }

CodeSnippetsReflection.OpenAPI.Test/SnippetImportTests.cs

@@ -41,4 +41,15 @@ public async Task TestGenerateImportTemplatesForRequestBuilderImports()
         Assert.NotNull(result[0].Path);
         Assert.NotNull(result[0].RequestBuilderName);
     }
+    [Fact]
+    public async Task TestGenerateImportTemplatesForNestedRequestBuilderImports()
+    {
+        using var requestPayload = new HttpRequestMessage(HttpMethod.Get, $"{ServiceRootUrl}/applications(appId={{application-id}})?$select=id,appId,displayName,requiredResourceAccess");
+        var snippetModel = new SnippetModel(requestPayload, ServiceRootUrl, await GetV1SnippetMetadata());
+        var result = ImportsGenerator.GenerateImportTemplates(snippetModel);
+        Assert.NotNull(result);
+        Assert.IsType<List<ImportTemplate>>(result);
+        Assert.NotNull(result[0].Path);
+        Assert.NotNull(result[0].RequestBuilderName);
+    }
 }

CodeSnippetsReflection.OpenAPI/LanguageGenerators/PythonGenerator.cs

@@ -5,6 +5,8 @@
 using CodeSnippetsReflection.OpenAPI.ModelGraph;
 using CodeSnippetsReflection.StringExtensions;
 using Microsoft.OpenApi.Services;
+using System.Text.RegularExpressions;
+
 
 namespace CodeSnippetsReflection.OpenAPI.LanguageGenerators
 {
@@ -73,7 +75,7 @@
             snippetBuilder.Insert(0, string.Join(Environment.NewLine, importStatements));
             return snippetBuilder.ToString();
         }
         private static HashSet<string> GetImportStatements(SnippetModel snippetModel)
         {
             const string modelImportPrefix = "from msgraph.generated.models";
             const string requestBuilderImportPrefix = "from msgraph.generated";
@@ -89,10 +91,18 @@
                 {
                     case ImportKind.Model:
                         var typeDefinition = import.ModelProperty.TypeDefinition;
-                        if (typeDefinition != null)
-                        {
-                            snippetImports.Add($"{modelImportPrefix}.{typeDefinition.ToSnakeCase()} import {typeDefinition}");
+                        if (typeDefinition != null){
+                            if(typeDefinition.EndsWith("RequestBody")){
+                                 var namespaceParts = import.ModelProperty.NamespaceName.Split('.').Select((s, i) => i == import.ModelProperty.NamespaceName.Split('.').Length - 1 ? s.ToSnakeCase() : s.ToLowerInvariant());
+                                var importString = $"{requestBuilderImportPrefix}.{string.Join(".", namespaceParts)}.{typeDefinition.ToSnakeCase()} import {typeDefinition}";
+                                snippetImports.Add($"{importString.Replace(".me.", ".users.item.")}");
+                            }
+                            else{
+                                snippetImports.Add($"{modelImportPrefix}.{typeDefinition.ToSnakeCase()} import {typeDefinition}");
+                            }
                         }
+
+
                         break;
                     case ImportKind.RequestBuilder:
                         if (!string.IsNullOrEmpty(import.ModelProperty.Name))
@@ -102,11 +112,13 @@
                             snippetImports.Add(importString.Replace(".me.", ".users.item."));
                         }
                         break;
+
+
                     case ImportKind.Path:
                         if (import.Path != null && import.RequestBuilderName != null)
                         {
                             //construct path to request builder
-                            snippetImports.Add($"{requestBuilderImportPrefix}{import.Path.Replace(".me.", ".users.item.")}.{import.RequestBuilderName.ToSnakeCase()} import {import.RequestBuilderName}");
+                            snippetImports.Add($"{requestBuilderImportPrefix}{Regex.Replace(import.Path.Replace(".me.", ".users.item."), @"(\B[A-Z])", "_$1", RegexOptions.Compiled, TimeSpan.FromSeconds(60)).ToLower()}.{import.RequestBuilderName.ToSnakeCase()} import {import.RequestBuilderName}");
                         }
                         break;
                 }
@@ -303,9 +315,9 @@
                     var enumValues = codeProperty.Value.Split(new[] { '|', ',' }, StringSplitOptions.RemoveEmptyEntries)
                         .Select(x =>
                         {
                             var enumHint = x.Split('.').Last().Trim();
                             // the enum member may be invalid so default to generating the first value in case a look up fails.
                             var enumMember = codeProperty.Children.FirstOrDefault(member => member.Value.Equals(enumHint, StringComparison.OrdinalIgnoreCase)).Value ?? codeProperty.Children.FirstOrDefault().Value ?? enumHint;
                             return $"{enumTypeString.TrimEnd('?')}.{enumMember.ToFirstCharacterUpperCase()}";
                         })
                         .Aggregate(static (x, y) => $"{x} | {y}");
@@ -350,7 +362,7 @@
                 case PropertyType.Map:
                     return "{";
                 case PropertyType.Enum:
                     return $"{ReplaceIfReservedTypeName(typeString.Split('.').First())}?";
                 default:
                     return string.Empty;
             }
@@ -358,7 +370,7 @@
         private static string ReplaceIfReservedTypeName(string originalString, string suffix = "_")
             => ReservedTypeNames.Contains(originalString) ? $"{originalString}{suffix}" : originalString;
 
         private static string GetFluentApiPath(IEnumerable<OpenApiUrlTreeNode> nodes, SnippetCodeGraph snippetCodeGraph, bool useIndexerNamespaces = false)
         {
             if (!(nodes?.Any() ?? false))
                 return string.Empty;
@@ -404,7 +416,7 @@
             })
                                 .Aggregate(static (x, y) =>
                                 {
                                     var dot = y.StartsWith("[") ? string.Empty : ".";
                                     return $"{x}{dot}{y}";
                                 });
         }

CodeSnippetsReflection.OpenAPI/LanguageGenerators/SnippetImports.cs

@@ -13,6 +13,8 @@
     {
         Path,
         RequestBuilder,
+
+        RequestBody,
         Model
     }
 
@@ -34,6 +36,11 @@
         {
             get; set;
         }
+        public string RequestBodyName
+        {
+            get; set;
+        }
+
         public string HttpMethod
         {
             get; set;
@@ -42,28 +49,29 @@
 
     public static class ImportsGenerator
     {
         public static List<ImportTemplate> imports = new();
 
         public static List<ImportTemplate>  GenerateImportTemplates(SnippetModel snippetModel)
         {
             var codeGraph = new SnippetCodeGraph(snippetModel);
             var imports = new List<ImportTemplate>();
             if (codeGraph.HasHeaders() || codeGraph.HasParameters() || codeGraph.HasOptions())
             {
                 var className = codeGraph.Nodes.Last().GetClassName().ToFirstCharacterUpperCase();
                 var itemSuffix = codeGraph.Nodes.Last().Segment.IsCollectionIndex() ? "Item" : string.Empty;
-                var requestBuilderName = $"{className}{itemSuffix}RequestBuilder";
+                var requestBuilderName = $"{className}{itemSuffix}RequestBuilder";                
                 if (codeGraph.Nodes.Last().Path != null)
                 {
                     var path = codeGraph.Nodes.Last().Path;
                     imports.Add(new ImportTemplate
                     {
                         Kind = ImportKind.Path,
-                        Path = Regex.Replace(path.Replace("\\", ".").Replace("()", ""), @"\{[^}]*-id\}", "item", RegexOptions.Compiled, TimeSpan.FromSeconds(60)),
+                        Path = Regex.Replace(path.Replace("\\", ".").Replace("()", ""), @"\{[^}]*-id\}", "item", RegexOptions.Compiled, TimeSpan.FromSeconds(60)).CleanUpImportPath().Replace("__", "_"),
                         RequestBuilderName = requestBuilderName,
                         HttpMethod = codeGraph.HttpMethod.ToString()
                     });
                 }
+
             }
             AddModelImportTemplates(codeGraph.Body, imports);
             return imports;

CodeSnippetsReflection/StringExtensions/StringExtensions.cs

@@ -1,6 +1,8 @@
 using System.Text;
 using System.Linq;
 using System;
+using System.Text.RegularExpressions;
+
 
 namespace CodeSnippetsReflection.StringExtensions
 {
@@ -87,6 +89,27 @@ public static string ToSnakeCase(this string str)
             return snakeCaseBuilder.ToString();
         }
 
+    public static string  CleanUpImportPath(this string input)
+    {
+        string pattern = @"(\w+)[A-Z]?(\w*)\((\w+Id)='(\{[^{}]+\})'\)";
+
+        string result = Regex.Replace(input, pattern, m =>
+        {
+            string firstPart = m.Groups[1].Value;
+            string secondPart = m.Groups[2].Value;
+            string idPart = m.Groups[3].Value;
+
+            // Given Id e.g appIdd, groupID - convert to snake case
+            secondPart = Regex.Replace(secondPart, @"(\B[A-Z])", x => "_" + x.Value.ToLower(), RegexOptions.Compiled, TimeSpan.FromSeconds(60));
+            idPart = Regex.Replace(idPart, @"(\B[A-Z])", x => "_" + x.Value.ToLower(), RegexOptions.Compiled, TimeSpan.FromSeconds(60));
+
+            return $"{firstPart}_{secondPart}_with_{idPart}";
+        }, RegexOptions.Compiled, TimeSpan.FromSeconds(60));
+        result = result.Replace("$", "");
+
+        return result;
+    }
+
 
         public static string EscapeQuotes(this string stringValue)
         {