fix optional body type and request configurations

microsoft · May 2, 2024 · ec569b3 · ec569b3
1 parent bc3dbe7
commit ec569b3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/src/Kiota.Builder/Refiners/PythonRefiner.cs b/src/Kiota.Builder/Refiners/PythonRefiner.cs
@@ -56,34 +56,15 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
                         Name = $"{AbstractionsPackageName}.base_request_configuration",
                         IsExternal = true
                     }
-                }, 
+                },
                 new CodeType
                 {
-                    Name = "DefaultQueryParameters",
+                    Name = "QueryParameters",
                     IsExternal = true,
                 },
                 keepRequestConfigurationClass: true,
                 addDeprecation: true
-                );
-
-            // RemoveRequestConfigurationClasses(generatedCode,
-            //     new CodeUsing
-            //     {
-            //         Name = "RequestConfiguration",
-            //         Declaration = new CodeType
-            //         {
-            //             Name = $"{AbstractionsPackageName}.base_request_configuration",
-            //             IsExternal = true
-            //         }
-            //     },
-            //     new CodeType
-            //     {
-            //         Name = "QueryParameters",
-            //         IsExternal = true,
-            //     },
-            //     keepRequestConfigurationClass: true,
-            //     addDeprecation: true
-            //     );
+            );
             AddDefaultImports(generatedCode, defaultUsingEvaluators);
             CorrectCoreType(generatedCode, CorrectMethodType, CorrectPropertyType, CorrectImplements);
             cancellationToken.ThrowIfCancellationRequested();
@@ -192,6 +173,8 @@ public override Task Refine(CodeNamespace generatedCode, CancellationToken cance
             $"{AbstractionsPackageName}.request_information", "RequestInformation"),
         new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator),
             $"{AbstractionsPackageName}.request_option", "RequestOption"),
+        new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.RequestGenerator),
+            $"{AbstractionsPackageName}.default_query_parameters", "QueryParameters"),
         new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Serializer),
             SerializationModuleName, "SerializationWriter"),
         new (static x => x is CodeMethod method && method.IsOfKind(CodeMethodKind.Deserializer),

diff --git a/src/Kiota.Builder/Writers/Python/PythonConventionService.cs b/src/Kiota.Builder/Writers/Python/PythonConventionService.cs
@@ -56,7 +56,7 @@ public override string GetParameterSignature(CodeParameter parameter, CodeElemen
         var defaultValueSuffix = string.IsNullOrEmpty(parameter.DefaultValue) ? string.Empty : $" = {parameter.DefaultValue}";
         var deprecationInfo = GetDeprecationInformation(parameter);
         var deprecationSuffix = string.IsNullOrEmpty(deprecationInfo) ? string.Empty : $"# {deprecationInfo}";
-        return $"{parameter.Name}: {(parameter.Type.IsNullable ? "Optional[" : string.Empty)}{GetTypeString(parameter.Type, targetElement, true, writer)}{(parameter.Type.IsNullable ? "] = None" : string.Empty)}{defaultValueSuffix}{deprecationSuffix}";
+        return $"{parameter.Name}: {(parameter.Optional ? "Optional[" : string.Empty)}{GetTypeString(parameter.Type, targetElement, true, writer)}{(parameter.Optional ? "] = None" : string.Empty)}{defaultValueSuffix}{deprecationSuffix}";
     }
     private static string GetTypeAlias(CodeType targetType, CodeElement targetElement)
     {
@@ -87,7 +87,10 @@ public override string GetTypeString(CodeTypeBase code, CodeElement targetElemen
                 typeName = targetElement.Parent.Name;
             if (code.ActionOf && writer != null)
                 return WriteInlineDeclaration(currentType, targetElement, writer);
-            return $"{collectionPrefix}{typeName}{collectionSuffix}";
+                var genericParameters = currentType.GenericTypeParameterValues.Count != 0 ?
+                $"[{string.Join(", ", currentType.GenericTypeParameterValues.Select(x => GetTypeString(x, targetElement, includeCollectionInformation)))}]" :
+                string.Empty;
+            return $"{collectionPrefix}{typeName}{genericParameters}{collectionSuffix}";
         }
 
         throw new InvalidOperationException($"type of type {code.GetType()} is unknown");