[Python] Initial fixes using simple oneOfs with discriminator

.github/workflows/integration-tests.yml

@@ -49,6 +49,7 @@ jobs:
           - "./tests/Kiota.Builder.IntegrationTests/NoUnderscoresInModel.yaml"
           - "./tests/Kiota.Builder.IntegrationTests/ToDoApi.yaml"
           - "./tests/Kiota.Builder.IntegrationTests/GeneratesUritemplateHints.yaml"
+          - "./tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml"
           - "oas::petstore"
           - "apisguru::twitter.com:current"
           - "apisguru::notion.com"

CHANGELOG.md

@@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed Csharp code generation to put braces on new lines (where it makes sense). [#4347](https://github.com/microsoft/kiota/issues/4347)
 - Fixed a bug where some no-content status codes would be considered structured (301, 302, 303, 307) when described. [#4190](https://github.com/microsoft/kiota/issues/4190)
 - TypeScript is now a preview language!
+- Fixed a bug where the code generated for Python in presence of discriminator values was not compiling/working. [#4433](https://github.com/microsoft/kiota/issues/4433)
 
 ## [1.12.0] - 2024-03-06
 

it/config.json

@@ -53,6 +53,19 @@
       }
     ]
   },
+  "./tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml": {
+    "MockServerITFolder": "discriminator",
+    "Suppressions": [
+      {
+        "Language": "ruby",
+        "Rationale": "https://github.com/microsoft/kiota/issues/2484"
+      },
+      {
+        "Language": "typescript",
+        "Rationale": "https://github.com/microsoft/kiota/issues/4434"
+      }
+    ]
+  },
   "./tests/Kiota.Builder.IntegrationTests/InheritingErrors.yaml": {
     "MockServerITFolder": "basic",
     "Suppressions": [
@@ -341,9 +354,7 @@
     ]
   },
   "apisguru::apis.guru": {
-    "Suppressions": [
-    ],
-    "IdempotencySuppressions": [
-    ]
+    "Suppressions": [],
+    "IdempotencySuppressions": []
   }
-}
+}

it/python/discriminator/test_serdeser.py

@@ -0,0 +1,56 @@
+import pytest
+
+from kiota_serialization_json.json_parse_node_factory import JsonParseNodeFactory
+from kiota_serialization_json.json_serialization_writer_factory import JsonSerializationWriterFactory
+
+from client.models.component import Component
+from client.models.component1 import Component1
+from client.models.component2 import Component2
+
+@pytest.mark.asyncio
+async def test_component1_deser():
+    factory = JsonParseNodeFactory()
+    root = factory.get_root_parse_node('application/json', '{"objectType": "obj1", "one": "foo"}'.encode('utf-8'))
+    result = root.get_object_value(Component)
+    assert hasattr(result, "component1")
+    assert not hasattr(result, "component2")
+    assert isinstance(result.component1, Component1)
+    assert result.component1.object_type == "obj1"
+    assert result.component1.one == "foo"
+
+@pytest.mark.asyncio
+async def test_component2_deser():
+    factory = JsonParseNodeFactory()
+    root = factory.get_root_parse_node('application/json', '{"objectType": "obj2", "two": "bar"}'.encode('utf-8'))
+    result = root.get_object_value(Component)
+    assert hasattr(result, "component2")
+    assert not hasattr(result, "component1")
+    assert isinstance(result.component2, Component2)
+    assert result.component2.object_type == "obj2"
+    assert result.component2.two == "bar"
+
+@pytest.mark.asyncio
+async def test_component1_ser():
+    obj = Component()
+    obj1 = Component1()
+    obj1.object_type = "obj1"
+    obj1.one = "foo"
+    obj.component1 = obj1
+    factory = JsonSerializationWriterFactory()
+    writer = factory.get_serialization_writer('application/json')
+    obj.serialize(writer)
+    content = writer.get_serialized_content().decode('utf-8')
+    assert content == '{"objectType": "obj1", "one": "foo"}'
+
+@pytest.mark.asyncio
+async def test_component2_ser():
+    obj = Component()
+    obj2 = Component2()
+    obj2.object_type = "obj2"
+    obj2.two = "bar"
+    obj.component2 = obj2
+    factory = JsonSerializationWriterFactory()
+    writer = factory.get_serialization_writer('application/json')
+    obj.serialize(writer)
+    content = writer.get_serialized_content().decode('utf-8')
+    assert content == '{"objectType": "obj2", "two": "bar"}'

it/python/requirements-dev.txt

@@ -134,7 +134,5 @@ six==1.16.0 ; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'
 
 sniffio==1.3.1 ; python_version >= '3.7'
 
-uritemplate==4.1.1 ; python_version >= '3.6'
-
 yarl==1.9.4 ; python_version >= '3.7'
 

src/Kiota.Builder/CodeDOM/CodeClass.cs

@@ -77,8 +77,14 @@ public override IEnumerable<CodeProperty> AddProperty(params CodeProperty[] prop
         if (properties.Length == 0)
             throw new ArgumentOutOfRangeException(nameof(properties));
 
-        return properties.Select(property =>
+        return properties.GroupBy(static x => x.Name).Select(static x => x.First()).Select(property =>
         {
+            // Prevent duplicates
+            if (FindPropertyByNameInTypeHierarchy(property.Name) != null)
+            {
+                return null; // this property is going to collide, skipping
+            }
+
             if (property.IsOfKind(CodePropertyKind.Custom, CodePropertyKind.QueryParameter))
             {
                 if (GetOriginalPropertyDefinedFromBaseType(property.WireName) is CodeProperty original)
@@ -98,7 +104,7 @@ public override IEnumerable<CodeProperty> AddProperty(params CodeProperty[] prop
             }
             var result = base.AddProperty(property).First();
             return PropertiesByWireName.GetOrAdd(result.WireName, result);
-        }).ToArray();
+        }).OfType<CodeProperty>().ToArray();
     }
     public override void RenameChildElement(string oldName, string newName)
     {

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

@@ -137,7 +137,14 @@ private void WriteFactoryMethodBodyForInheritedModel(CodeClass parentClass, Lang
     private const string ResultVarName = "result";
     private void WriteFactoryMethodBodyForUnionModel(CodeMethod codeElement, CodeClass parentClass, CodeParameter parseNodeParameter, LanguageWriter writer)
     {
-        writer.WriteLine($"{ResultVarName} = {parentClass.Name}()");
+        var className = parentClass.Name;
+        if (parentClass.Parent is CodeClass pc &&
+            !string.IsNullOrEmpty(pc.Name) &&
+            pc.InnerClasses.Any(x => x == parentClass))
+        {
+            className = $"{pc.Name}.{parentClass.Name}";
+        }
+        writer.WriteLine($"{ResultVarName} = {className}()");
         var includeElse = false;
         foreach (var property in parentClass.GetPropertiesOfKind(CodePropertyKind.Custom)
                                             .OrderBy(static x => x, CodePropertyTypeForwardComparer)
@@ -508,7 +515,7 @@ private void WriteDeserializerBodyForUnionModel(CodeMethod method, CodeClass par
                                         .ThenBy(static x => x.Name)
                                         .Select(static x => x.Name))
         {
-            writer.StartBlock($"if self.{otherPropName}:");
+            writer.StartBlock($"if hasattr(self, \"{otherPropName}\"):");
             writer.WriteLine($"return self.{otherPropName}.{method.Name}()");
             writer.DecreaseIndent();
         }
@@ -659,7 +666,7 @@ private void WriteSerializerBodyForUnionModel(CodeClass parentClass, LanguageWri
                                         .OrderBy(static x => x, CodePropertyTypeForwardComparer)
                                         .ThenBy(static x => x.Name))
         {
-            writer.StartBlock($"{(includeElse ? "el" : string.Empty)}if self.{otherProp.Name}:");
+            writer.StartBlock($"{(includeElse ? "el" : string.Empty)}if hasattr(self, \"{otherProp.Name}\"):");
             writer.WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(None, self.{otherProp.Name})");
             writer.DecreaseIndent();
             if (!includeElse)
@@ -676,7 +683,7 @@ private void WriteSerializerBodyForIntersectionModel(CodeClass parentClass, Lang
                                         .OrderBy(static x => x, CodePropertyTypeBackwardComparer)
                                         .ThenBy(static x => x.Name))
         {
-            writer.StartBlock($"{(includeElse ? "el" : string.Empty)}if self.{otherProp.Name}:");
+            writer.StartBlock($"{(includeElse ? "el" : string.Empty)}if hasattr(self, \"{otherProp.Name}\"):");
             writer.WriteLine($"writer.{GetSerializationMethodName(otherProp.Type)}(None, self.{otherProp.Name})");
             writer.DecreaseIndent();
             if (!includeElse)

tests/Kiota.Builder.IntegrationTests/DiscriminatorSample.yaml

@@ -0,0 +1,51 @@
+openapi: 3.0.0
+info:
+  title: "Discriminator API"
+  version: "1.0.0"
+servers:
+  - url: https://mytodos.doesnotexist/
+paths:
+  /discriminateme:
+    post:
+      description: Return something
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Component"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/Component"
+components:
+  schemas:
+    Component:
+      oneOf:
+        - $ref: "#/components/schemas/Component1"
+        - $ref: "#/components/schemas/Component2"
+      discriminator:
+        propertyName: objectType
+        mapping:
+          obj1: "#/components/schemas/Component1"
+          obj2: "#/components/schemas/Component2"
+    Component1:
+      type: object
+      required:
+        - objectType
+      properties:
+        objectType:
+          type: string
+        one:
+          type: string
+    Component2:
+      type: object
+      required:
+        - objectType
+      properties:
+        objectType:
+          type: string
+        two:
+          type: string

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

@@ -811,7 +811,7 @@ public void WritesUnionDeSerializerBody()
         Assert.DoesNotContain("super_fields = super()", result);
         Assert.DoesNotContain("return fields", result);
         Assert.DoesNotContain("elif", result);
-        Assert.Contains("if self.complex_type1_value:", result);
+        Assert.Contains("if hasattr(self, \"complex_type1_value\"):", result);
         Assert.Contains("return self.complex_type1_value.get_field_deserializers()", result);
         Assert.Contains("return {}", result);
     }