Remove stringify from primitive types

.vscode/launch.json

@@ -196,7 +196,10 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["search", "microsoft"],
+ "args": [
+ "search",
+ "microsoft"
+ ],
  "cwd": "${workspaceFolder}/src/kiota",
  "console": "internalConsole",
  "stopAtEntry": false
@@ -207,7 +210,10 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["search", "test"],
+ "args": [
+ "search",
+ "test"
+ ],
  "cwd": "${workspaceFolder}/src/kiota",
  "console": "internalConsole",
  "stopAtEntry": false
@@ -249,7 +255,11 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["info", "-l", "CSharp"],
+ "args": [
+ "info",
+ "-l",
+ "CSharp"
+ ],
  "cwd": "${workspaceFolder}/src/kiota",
  "console": "internalConsole",
  "stopAtEntry": false
@@ -260,7 +270,11 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["update", "-o", "${workspaceFolder}/samples"],
+ "args": [
+ "update",
+ "-o",
+ "${workspaceFolder}/samples"
+ ],
  "cwd": "${workspaceFolder}/src/kiota",
  "console": "internalConsole",
  "stopAtEntry": false
@@ -271,7 +285,10 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["workspace", "migrate"],
+ "args": [
+ "workspace",
+ "migrate"
+ ],
  "cwd": "${workspaceFolder}/samples/msgraph-mail/dotnet",
  "console": "internalConsole",
  "stopAtEntry": false,
@@ -285,7 +302,10 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["client", "generate"],
+ "args": [
+ "client",
+ "generate"
+ ],
  "cwd": "${workspaceFolder}/samples/msgraph-mail/dotnet",
  "console": "internalConsole",
  "stopAtEntry": false,
@@ -349,7 +369,11 @@
  "request": "launch",
  "preLaunchTask": "build",
  "program": "${workspaceFolder}/src/kiota/bin/Debug/net8.0/kiota.dll",
- "args": ["login", "github", "device"],
+ "args": [
+ "login",
+ "github",
+ "device"
+ ],
  "cwd": "${workspaceFolder}/src/kiota",
  "console": "internalConsole",
  "stopAtEntry": false
@@ -361,4 +385,4 @@
  "processId": "${command:pickProcess}"
  }
  ]
-}
+}

CHANGELOG.md

@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 ### Changed
+- Fixed python generation client serailization failure str being quoted as "str"
+- Fixed Issue with primitive values being stringified in python python. [#5417](https://github.com/microsoft/kiota/issues/5417)
 
 - Fixed an issue where multipart request content would be ignored if other unstructured content was present in the description. [#5638](https://github.com/microsoft/kiota/issues/5638)
 - Fixed an issue where when generating Go code the deserializer for unions was using `CodeClass` as a filter and not `CodeInterface`. [#4844](https://github.com/microsoft/kiota/issues/4844)
@@ -32,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed cyclic dependencies in generated Go code. [#2834](https://github.com/microsoft/kiota/issues/2834)
 - Fixed a bug where default output folder is created on plugin edit and generate commands. [#5510](https://github.com/microsoft/kiota/issues/5429)
 - Changed GeneratedCode attribute applied when generating CSharp to only include the major version of Kiota. [#5489](https://github.com/microsoft/kiota/issues/5489)
+
 - Fixed generating CSharp client displays clean hint regardless of whether --clean-output is already passed [#5576](https://github.com/microsoft/kiota/issues/5576)
 
 ## [1.19.0] - 2024-10-03

src/Kiota.Builder/Writers/Python/CodeMethodWriter.cs

@@ -41,7 +41,7 @@
  var requestParams = new RequestParams(requestBodyParam, requestConfigParam, requestContentType);
  if (!codeElement.IsOfKind(CodeMethodKind.Setter) &&
  !(codeElement.IsOfKind(CodeMethodKind.Constructor) && parentClass.IsOfKind(CodeClassKind.RequestBuilder)))
  foreach (var parameter in codeElement.Parameters.Where(static x => !x.Optional).OrderBy(static x => x.Name))
  {
  var parameterName = parameter.Name;
  writer.StartBlock($"if {parameterName} is None:");
@@ -113,7 +113,7 @@
  break;
  }
  }
  private void WriteRawUrlBuilderBody(CodeClass parentClass, CodeMethod codeElement, LanguageWriter writer)
  {
  var rawUrlParameter = codeElement.Parameters.OfKind(CodeParameterKind.RawUrl) ?? throw new InvalidOperationException("RawUrlBuilder method should have a RawUrl parameter");
  var requestAdapterProperty = parentClass.GetPropertyOfKind(CodePropertyKind.RequestAdapter) ?? throw new InvalidOperationException("RawUrlBuilder method should have a RequestAdapter property");
@@ -136,7 +136,7 @@
  writer.WriteLine($"return {parentClass.Name}()");
  }
  private const string ResultVarName = "result";
  private void WriteFactoryMethodBodyForUnionModel(CodeMethod codeElement, CodeClass parentClass, CodeParameter parseNodeParameter, LanguageWriter writer)
  {
  writer.WriteLine($"{ResultVarName} = {parentClass.Name}()");
  var includeElse = false;
@@ -165,7 +165,7 @@
  }
  writer.WriteLine($"return {ResultVarName}");
  }
  private void WriteFactoryMethodBodyForIntersectionModel(CodeMethod codeElement, CodeClass parentClass, CodeParameter parseNodeParameter, LanguageWriter writer)
  {
  writer.WriteLine($"{ResultVarName} = {parentClass.Name}()");
  var includeElse = false;
@@ -326,7 +326,7 @@
  return _SetterAccessProperties;
  }
  }
  private void WriteConstructorBody(CodeClass parentClass, CodeMethod currentMethod, LanguageWriter writer, bool inherits)
  {
  if (inherits && !parentClass.IsOfKind(CodeClassKind.Model))
  {
@@ -375,7 +375,7 @@
  writer.IncreaseIndent();
  }
  }
  private void WriteDirectAccessProperties(CodeClass parentClass, LanguageWriter writer)
  {
  foreach (var propWithDefault in parentClass.GetPropertiesOfKind(DirectAccessProperties)
  .Where(static x => !string.IsNullOrEmpty(x.DefaultValue) && !NoneKeyword.Equals(x.DefaultValue, StringComparison.Ordinal))
@@ -392,7 +392,7 @@
  conventions.WriteInLineDescription(propWithDefault, writer);
  if (parentClass.IsOfKind(CodeClassKind.Model))
  {
  writer.WriteLine($"{propWithDefault.Name}: {(propWithDefault.Type.IsNullable ? "Optional[" : string.Empty)}{returnType}{(propWithDefault.Type.IsNullable ? "]" : string.Empty)} = {defaultValue}");
  writer.WriteLine();
  }
  else
@@ -429,7 +429,7 @@
  }
  }
  private const string NoneKeyword = "None";
  private void WriteSetterAccessPropertiesWithoutDefaults(CodeClass parentClass, LanguageWriter writer)
  {
  foreach (var propWithoutDefault in parentClass.GetPropertiesOfKind(SetterAccessProperties)
  .Where(static x => string.IsNullOrEmpty(x.DefaultValue) || NoneKeyword.Equals(x.DefaultValue, StringComparison.Ordinal))
@@ -501,7 +501,7 @@
  else
  WriteDeserializerBodyForInheritedModel(inherits, codeElement, parentClass, writer);
  }
  private void WriteDeserializerBodyForUnionModel(CodeMethod method, CodeClass parentClass, LanguageWriter writer)
  {
  foreach (var otherPropName in parentClass
  .GetPropertiesOfKind(CodePropertyKind.Custom)
@@ -517,7 +517,7 @@
  }
  writer.WriteLine($"return {DefaultDeserializerValue}");
  }
  private void WriteDeserializerBodyForIntersectionModel(CodeClass parentClass, LanguageWriter writer)
  {
  var complexProperties = parentClass.GetPropertiesOfKind(CodePropertyKind.Custom)
  .Where(static x => x.Type is CodeType propType && propType.TypeDefinition is CodeClass && !x.Type.IsCollection)
@@ -583,7 +583,7 @@
  var isStream = conventions.StreamTypeName.Equals(returnType, StringComparison.OrdinalIgnoreCase);
  var returnTypeWithoutCollectionSymbol = GetReturnTypeWithoutCollectionSymbol(codeElement, returnType);
  var genericTypeForSendMethod = GetSendRequestMethodName(isVoid, isStream, codeElement.ReturnType.IsCollection, returnTypeWithoutCollectionSymbol, isEnum);
- var newFactoryParameter = GetTypeFactory(isVoid, isStream, returnTypeWithoutCollectionSymbol, isEnum);
+ var newFactoryParameter = GetTypeFactory(isVoid, isStream, isEnum, returnTypeWithoutCollectionSymbol);
  var errorMappingVarName = NoneKeyword;
  if (codeElement.ErrorMappings.Any())
  {
@@ -809,10 +809,11 @@
  _ => "write_object_value",
  };
  }
- private string GetTypeFactory(bool isVoid, bool isStream, string returnType, bool isEnum)
+ internal string GetTypeFactory(bool isVoid, bool isStream, bool isEnum, string returnType)
  {
  if (isVoid) return string.Empty;
- if (isStream || conventions.IsPrimitiveType(returnType) || isEnum) return $" \"{returnType}\",";
+ if (isStream || isEnum) return $" \"{returnType}\",";
+ if (conventions.IsPrimitiveType(returnType)) return $" {returnType},";
  return $" {returnType},";
  }
  private string GetSendRequestMethodName(bool isVoid, bool isStream, bool isCollection, string returnType,

tests/Kiota.Builder.Tests/Writers/Python/CodeMethodWriterTests.cs

@@ -1,11 +1,11 @@
 using System;
 using System.IO;
 using System.Linq;
-
 using Kiota.Builder.CodeDOM;
 using Kiota.Builder.Extensions;
 using Kiota.Builder.Writers;
 using Kiota.Builder.Writers.Python;
+using Moq;
 using Xunit;
 
 namespace Kiota.Builder.Tests.Writers.Python;
@@ -25,12 +25,15 @@ public sealed class CodeMethodWriterTests : IDisposable
  private const string MethodDescription = "some description";
  private const string ParamDescription = "some parameter description";
  private const string ParamName = "param_name";
+
+
  public CodeMethodWriterTests()
  {
  writer = LanguageWriter.GetLanguageWriter(GenerationLanguage.Python, DefaultPath, DefaultName);
  tw = new StringWriter();
  writer.SetTextWriter(tw);
  root = CodeNamespace.InitRootNamespace();
+
  }
  private void setup(bool withInheritance = false)
  {
@@ -791,6 +794,7 @@ public void WritesInheritedDeSerializerBody()
  Assert.Contains("return fields", result);
  Assert.DoesNotContain("defined_in_parent", result, StringComparison.OrdinalIgnoreCase);
  }
+
  [Fact]
  public void WritesUnionDeSerializerBody()
  {
@@ -815,6 +819,27 @@ public void WritesUnionDeSerializerBody()
  Assert.Contains("return self.complex_type1_value.get_field_deserializers()", result);
  Assert.Contains("return {}", result);
  }
+ [Theory]
+ [InlineData(true, false, false, "string", "")]
+ [InlineData(false, true, false, "Stream", " \"Stream\",")]
+ [InlineData(false, false, true, "SomeEnum", " \"SomeEnum\",")]
+ [InlineData(false, false, false, "int", " int,")]
+ [InlineData(false, false, false, "CustomType", " CustomType,")]
+ public void GetTypeFactory_ReturnsCorrectString(bool isVoid, bool isStream, bool isEnum, string returnType, string expected)
+ {
+ var mockConventionService = new Mock<PythonConventionService>();
+
+ var codeMethodWriter = new CodeMethodWriter(
+ mockConventionService.Object,
+ "TestNamespace",
+ false // usesBackingStore
+ );
+
+ var result = codeMethodWriter.GetTypeFactory(isVoid, isStream, isEnum, returnType);
+
+
+ Assert.Equal(expected, result);
+ }
  [Fact]
  public void WritesIntersectionDeSerializerBody()
  {