@typespec/http-client-python 0.16.0 → 0.17.0

package/eng/scripts/ci/regenerate.ts

@@ -22,11 +22,7 @@ const argv = parseArgs({
 });
 
 // Add this near the top with other constants
-const SKIP_SPECS = [
-  "type/union/discriminated",
-  "client-operation-group",
-  "azure/client-generator-core/hierarchy-building",
-];
+const SKIP_SPECS = ["type/union/discriminated", "client-operation-group"];
 
 // Get the directory of the current file
 const PLUGIN_DIR = argv.values.pluginDir
@@ -68,6 +64,9 @@ const AZURE_EMITTER_OPTIONS: Record<string, Record<string, string> | Record<stri
   "azure/client-generator-core/override": {
     namespace: "specs.azure.clientgenerator.core.override",
   },
+  "azure/client-generator-core/hierarchy-building": {
+    namespace: "specs.azure.clientgenerator.core.hierarchybuilding",
+  },
   "azure/core/basic": {
     namespace: "specs.azure.core.basic",
   },

package/eng/scripts/setup/install.py

@@ -8,28 +8,33 @@
 import sys
 
 if not sys.version_info >= (3, 9, 0):
-    raise Warning(
-        "Autorest for Python extension requires Python 3.9 at least. We will run your code with Pyodide since your Python version isn't adequate."
+    print(
+        "Warning: Autorest for Python extension requires Python 3.9 at least. We will run your code with Pyodide since your Python version isn't adequate."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 try:
     from package_manager import detect_package_manager, PackageManagerNotFoundError
 
     detect_package_manager()  # Just check if we have a package manager
 except (ImportError, ModuleNotFoundError, PackageManagerNotFoundError):
-    raise Warning(
-        "Your Python installation doesn't have a suitable package manager (pip or uv) available. We will run your code with Pyodide since your Python environment isn't adequate."
+    print(
+        "Warning: Your Python installation doesn't have a suitable package manager (pip or uv) available. We will run your code with Pyodide since your Python environment isn't adequate."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 try:
     import venv
 except (ImportError, ModuleNotFoundError):
-    raise Warning(
-        "Your Python installation doesn't have venv available. We will run your code with Pyodide since your Python version isn't adequate."
+    print(
+        "Warning: Your Python installation doesn't have venv available. We will run your code with Pyodide since your Python version isn't adequate."
     )
+    sys.exit(2)  # Exit code 2 for inadequate environment
 
 
-# Now we have a package manager (uv or pip) and Py >= 3.8, go to work
+# Now we have a package manager (uv or pip) and Py >= 3.9, go to work
+# At this point, both Python and package manager are confirmed to be available
+# Any failures from here should fail the npm install, not fallback to Pyodide
 
 from pathlib import Path
 
@@ -42,11 +47,16 @@ def main():
     # Create virtual environment using package manager abstraction
     from package_manager import create_venv_with_package_manager, install_packages
 
-    venv_context = create_venv_with_package_manager(venv_path)
+    try:
+        venv_context = create_venv_with_package_manager(venv_path)
 
-    # Install required packages - install_packages handles package manager logic
-    install_packages(["-U", "black"], venv_context)
-    install_packages(["-e", f"{_ROOT_DIR}/generator"], venv_context)
+        # Install required packages - install_packages handles package manager logic
+        install_packages(["-U", "black"], venv_context)
+        install_packages([f"{_ROOT_DIR}/generator"], venv_context)
+    except Exception as e:
+        # Since Python and package manager are available, any failure here should fail the npm install
+        print(f"Error: Installation failed despite Python and package manager being available: {e}")
+        sys.exit(1)  # Exit code 1 for installation failure
 
 
 if __name__ == "__main__":

package/eng/scripts/setup/install.ts

@@ -1,11 +1,36 @@
-import { runPython3 } from "./run-python3.js";
+import cp from "child_process";
+import { patchPythonPath } from "./system-requirements.js";
 
 async function main() {
+  let pythonCommand: string[];
+
   try {
-    await runPython3("./eng/scripts/setup/install.py");
-    console.log("Found Python on your local environment and created a venv with all requirements."); // eslint-disable-line no-console
+    // First try to resolve Python path
+    pythonCommand = await patchPythonPath(["python", "./eng/scripts/setup/install.py"], {
+      version: ">=3.9",
+      environmentVariable: "AUTOREST_PYTHON_EXE",
+    });
   } catch (error) {
-    console.log("No Python found on your local environment. We will use Pyodide instead."); // eslint-disable-line no-console
+    console.log(`Ran into the following error when setting up your local environment: ${error}`); // eslint-disable-line no-console
+    return;
+  }
+
+  try {
+    // Python found, now try to run the installation script
+    cp.execSync(pythonCommand.join(" "), {
+      stdio: [0, 1, 2],
+    });
+    console.log("Found Python on your local environment and created a venv with all requirements."); // eslint-disable-line no-console
+  } catch (error: any) {
+    // Check the exit code to determine the type of error
+    if (error.status === 2) {
+      // Exit code 2: Python/pip not adequate - use Pyodide
+      console.log("No Python found on your local environment. We will use Pyodide instead."); // eslint-disable-line no-console
+    } else {
+      // Exit code 1 or other: Python and pip were found but installation failed - fail the npm install
+      console.error("Python and package manager found but installation failed."); // eslint-disable-line no-console
+      process.exit(1);
+    }
   }
 }
 

package/eng/scripts/setup/run-python3.ts

@@ -11,7 +11,7 @@ import { patchPythonPath } from "./system-requirements.js";
 
 export async function runPython3(...args: string[]) {
   const command = await patchPythonPath(["python", ...args], {
-    version: ">=3.8",
+    version: ">=3.9",
     environmentVariable: "AUTOREST_PYTHON_EXE",
   });
   cp.execSync(command.join(" "), {

package/eng/scripts/setup/system-requirements.ts

@@ -1,5 +1,4 @@
 import { ChildProcess, spawn, SpawnOptions } from "child_process";
-import { coerce, satisfies } from "semver";
 
 /*
  * Copied from @autorest/system-requirements
@@ -46,12 +45,21 @@ const execute = (
   });
 };
 
+// Simple version comparison without semver dependency
 const versionIsSatisfied = (version: string, requirement: string): boolean => {
-  const cleanedVersion = coerce(version);
-  if (!cleanedVersion) {
-    throw new Error(`Invalid version ${version}.`);
+  // For now, support only >= requirements since that's what we use
+  if (requirement.startsWith(">=")) {
+    const requiredVersion = requirement.substring(2);
+    return parseVersionNumber(version) >= parseVersionNumber(requiredVersion);
   }
-  return satisfies(cleanedVersion, requirement, true);
+  // Fallback to true for other version requirements
+  return true;
+};
+
+const parseVersionNumber = (version: string): number => {
+  // Parse version like "3.9.0" to a comparable number
+  const parts = version.split(".").map((p) => parseInt(p.replace(/[^0-9]/g, ""), 10) || 0);
+  return parts[0] * 10000 + (parts[1] || 0) * 100 + (parts[2] || 0);
 };
 
 /**

package/generator/build/lib/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

package/generator/build/lib/pygen/codegen/models/code_model.py

@@ -484,3 +484,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
         # No generation-subdir specified, use the namespace path directly
         return Path(*namespace.split("."))
+
+    @property
+    def has_operation_named_list(self) -> bool:
+        return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)

package/generator/build/lib/pygen/codegen/models/list_type.py

@@ -40,13 +40,9 @@ class ListType(BaseType):
         ):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
-        has_operation_named_list = any(
-            o.name.lower() == "list"
-            for c in self.code_model.clients
-            for og in c.operation_groups
-            for o in og.operations
-        )
-        list_type = "List" if has_operation_named_list and kwargs.get("is_operation_file") else "list"
+
+        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

package/generator/build/lib/pygen/codegen/models/operation.py

@@ -404,10 +404,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
-        if self.name == "list":
-            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-            # not doing for dict or set yet, though we might have to later
-            file_import.define_mypy_type("List", "list")
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

package/generator/build/lib/pygen/codegen/serializers/model_serializer.py

@@ -158,6 +158,16 @@ class MsrestModelSerializer(_ModelSerializer):
                         called_by_property=True,
                     )
                 )
+            for prop in model.properties:
+                if prop.readonly:
+                    # it will be defined in the __init__ so we need to import it
+                    file_import.merge(
+                        prop.imports(
+                            serialize_namespace=self.serialize_namespace,
+                            serialize_namespace_type=NamespaceType.MODEL,
+                            called_by_property=True,
+                        )
+                    )
 
         return file_import
 
@@ -224,7 +234,16 @@ class DpgModelSerializer(_ModelSerializer):
                 "for k, v in _flattened_input.items():",
                 "    setattr(self, k, v)",
             ]
-        return [super_call]
+        discriminator_value_setter = []
+        for prop in self.get_properties_to_declare(model):
+            if (
+                prop.is_discriminator
+                and isinstance(prop.type, (ConstantType, EnumValue))
+                and prop.type.value is not None
+            ):
+                discriminator_value_setter.append(f"self.{prop.client_name}={prop.get_declaration()}  # type: ignore")
+
+        return [super_call, *discriminator_value_setter]
 
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
@@ -343,17 +362,7 @@ class DpgModelSerializer(_ModelSerializer):
 
     @staticmethod
     def properties_to_pass_to_super(model: ModelType) -> str:
-        properties_to_pass_to_super = ["*args"]
-        for parent in model.parents:
-            for prop in model.properties:
-                if (
-                    prop.client_name in [prop.client_name for prop in parent.properties if prop.is_base_discriminator]
-                    and prop.is_discriminator
-                    and not prop.constant
-                    and not prop.readonly
-                ):
-                    properties_to_pass_to_super.append(f"{prop.client_name}={prop.get_declaration()}")
-        properties_to_pass_to_super.append("**kwargs")
+        properties_to_pass_to_super = ["*args", "**kwargs"]
         return ", ".join(properties_to_pass_to_super)
 
     def global_pylint_disables(self) -> str:

package/generator/build/lib/pygen/codegen/serializers/operation_groups_serializer.py

@@ -66,6 +66,11 @@ class OperationGroupsSerializer(BaseSerializer):
                     serialize_namespace_type=NamespaceType.OPERATION,
                 )
             )
+        # put here since one operation file only need one self-defined list type
+        if self.code_model.has_operation_named_list:
+            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+            # not doing for dict or set yet, though we might have to later
+            imports.define_mypy_type("List", "list")
 
         template = self.env.get_or_select_template("operation_groups_container.py.jinja2")
 

package/generator/build/lib/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -43,7 +43,7 @@ dependencies = [
     {% else %}
     "isodate>={{ VERSION_MAP['isodate'] }}",
     {% endif %}
-    {% if options.get('azure_arm') %}
+    {% if options.get('azure-arm') %}
     "azure-mgmt-core>={{ VERSION_MAP['azure-mgmt-core'] }}",
     {% elif code_model.is_azure_flavor %}
     "azure-core>={{ VERSION_MAP['azure-core'] }}",

package/generator/pygen/black.py

@@ -69,9 +69,9 @@ class BlackScriptPlugin(Plugin):
                 pylint_disables.append("too-many-lines")
             if pylint_disables:
                 file_content = (
-                    "\n".join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
+                    os.linesep.join([lines[0] + ",".join([""] + pylint_disables)] + lines[1:])
                     if "pylint: disable=" in lines[0]
-                    else f"# pylint: disable={','.join(pylint_disables)}\n" + file_content
+                    else f"# pylint: disable={','.join(pylint_disables)}{os.linesep}" + file_content
                 )
         self.write_file(file, file_content)
 

package/generator/pygen/codegen/models/code_model.py

@@ -484,3 +484,7 @@ class CodeModel:  # pylint: disable=too-many-public-methods, disable=too-many-in
 
         # No generation-subdir specified, use the namespace path directly
         return Path(*namespace.split("."))
+
+    @property
+    def has_operation_named_list(self) -> bool:
+        return any(o.name.lower() == "list" for c in self.clients for og in c.operation_groups for o in og.operations)

package/generator/pygen/codegen/models/list_type.py

@@ -40,13 +40,9 @@ class ListType(BaseType):
         ):
             # this means we're version tolerant XML, we just return the XML element
             return self.element_type.type_annotation(**kwargs)
-        has_operation_named_list = any(
-            o.name.lower() == "list"
-            for c in self.code_model.clients
-            for og in c.operation_groups
-            for o in og.operations
-        )
-        list_type = "List" if has_operation_named_list and kwargs.get("is_operation_file") else "list"
+
+        # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+        list_type = "List" if self.code_model.has_operation_named_list and kwargs.get("is_operation_file") else "list"
         return f"{list_type}[{self.element_type.type_annotation(**kwargs)}]"
 
     def description(self, *, is_operation_file: bool) -> str:

package/generator/pygen/codegen/models/operation.py

@@ -404,10 +404,6 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
         file_import.merge(self.get_request_builder_import(self.request_builder, async_mode, serialize_namespace))
         if self.overloads:
             file_import.add_submodule_import("typing", "overload", ImportType.STDLIB)
-        if self.name == "list":
-            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
-            # not doing for dict or set yet, though we might have to later
-            file_import.define_mypy_type("List", "list")
         if self.code_model.options["models-mode"] == "dpg":
             relative_path = self.code_model.get_relative_import_path(
                 serialize_namespace, module_name="_utils.model_base"

package/generator/pygen/codegen/serializers/model_serializer.py

@@ -158,6 +158,16 @@ class MsrestModelSerializer(_ModelSerializer):
                         called_by_property=True,
                     )
                 )
+            for prop in model.properties:
+                if prop.readonly:
+                    # it will be defined in the __init__ so we need to import it
+                    file_import.merge(
+                        prop.imports(
+                            serialize_namespace=self.serialize_namespace,
+                            serialize_namespace_type=NamespaceType.MODEL,
+                            called_by_property=True,
+                        )
+                    )
 
         return file_import
 
@@ -224,7 +234,16 @@ class DpgModelSerializer(_ModelSerializer):
                 "for k, v in _flattened_input.items():",
                 "    setattr(self, k, v)",
             ]
-        return [super_call]
+        discriminator_value_setter = []
+        for prop in self.get_properties_to_declare(model):
+            if (
+                prop.is_discriminator
+                and isinstance(prop.type, (ConstantType, EnumValue))
+                and prop.type.value is not None
+            ):
+                discriminator_value_setter.append(f"self.{prop.client_name}={prop.get_declaration()}  # type: ignore")
+
+        return [super_call, *discriminator_value_setter]
 
     def imports(self) -> FileImport:
         file_import = FileImport(self.code_model)
@@ -343,17 +362,7 @@ class DpgModelSerializer(_ModelSerializer):
 
     @staticmethod
     def properties_to_pass_to_super(model: ModelType) -> str:
-        properties_to_pass_to_super = ["*args"]
-        for parent in model.parents:
-            for prop in model.properties:
-                if (
-                    prop.client_name in [prop.client_name for prop in parent.properties if prop.is_base_discriminator]
-                    and prop.is_discriminator
-                    and not prop.constant
-                    and not prop.readonly
-                ):
-                    properties_to_pass_to_super.append(f"{prop.client_name}={prop.get_declaration()}")
-        properties_to_pass_to_super.append("**kwargs")
+        properties_to_pass_to_super = ["*args", "**kwargs"]
         return ", ".join(properties_to_pass_to_super)
 
     def global_pylint_disables(self) -> str:

package/generator/pygen/codegen/serializers/operation_groups_serializer.py

@@ -66,6 +66,11 @@ class OperationGroupsSerializer(BaseSerializer):
                     serialize_namespace_type=NamespaceType.OPERATION,
                 )
             )
+        # put here since one operation file only need one self-defined list type
+        if self.code_model.has_operation_named_list:
+            # if there is a function named `list` we have to make sure there's no conflict with the built-in `list`
+            # not doing for dict or set yet, though we might have to later
+            imports.define_mypy_type("List", "list")
 
         template = self.env.get_or_select_template("operation_groups_container.py.jinja2")
 

package/generator/pygen/codegen/templates/packaging_templates/pyproject.toml.jinja2

@@ -43,7 +43,7 @@ dependencies = [
     {% else %}
     "isodate>={{ VERSION_MAP['isodate'] }}",
     {% endif %}
-    {% if options.get('azure_arm') %}
+    {% if options.get('azure-arm') %}
     "azure-mgmt-core>={{ VERSION_MAP['azure-mgmt-core'] }}",
     {% elif code_model.is_azure_flavor %}
     "azure-core>={{ VERSION_MAP['azure-core'] }}",

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_hierrarchy_building_async.py

@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from specs.azure.clientgenerator.core.hierarchybuilding.aio import HierarchyBuildingClient
+from specs.azure.clientgenerator.core.hierarchybuilding.models import (
+    Pet,
+    Dog,
+)
+
+
+@pytest.fixture
+async def client():
+    async with HierarchyBuildingClient() as client:
+        yield client
+
+
+# ========== test for spector ==========
+
+
+@pytest.mark.asyncio
+async def test_update_pet_as_pet(client: HierarchyBuildingClient):
+    resp = Pet(name="Buddy", trained=True)
+    assert await client.pet_operations.update_pet_as_pet(Pet(name="Buddy", trained=True)) == resp
+
+
+@pytest.mark.asyncio
+async def test_update_dog_as_pet(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert await client.pet_operations.update_dog_as_pet(Dog(name="Rex", trained=True, breed="German Shepherd")) == resp
+
+
+@pytest.mark.asyncio
+async def test_update_pet_as_animal(client: HierarchyBuildingClient):
+    resp = Pet(name="Buddy", trained=True)
+    assert await client.animal_operations.update_pet_as_animal(Pet(name="Buddy", trained=True)) == resp
+
+
+@pytest.mark.asyncio
+async def test_update_dog_as_animal(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert (
+        await client.animal_operations.update_dog_as_animal(Dog(name="Rex", trained=True, breed="German Shepherd"))
+        == resp
+    )
+
+
+@pytest.mark.asyncio
+async def test_update_dog_as_dog(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert await client.dog_operations.update_dog_as_dog(Dog(name="Rex", trained=True, breed="German Shepherd")) == resp

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_hierrarchy_building.py

@@ -0,0 +1,45 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+import pytest
+from specs.azure.clientgenerator.core.hierarchybuilding import HierarchyBuildingClient
+from specs.azure.clientgenerator.core.hierarchybuilding.models import (
+    Pet,
+    Dog,
+)
+
+
+@pytest.fixture
+def client():
+    with HierarchyBuildingClient() as client:
+        yield client
+
+
+# ========== test for spector ==========
+
+
+def test_update_pet_as_pet(client: HierarchyBuildingClient):
+    resp = Pet(name="Buddy", trained=True)
+    assert client.pet_operations.update_pet_as_pet(Pet(name="Buddy", trained=True)) == resp
+
+
+def test_update_dog_as_pet(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert client.pet_operations.update_dog_as_pet(Dog(name="Rex", trained=True, breed="German Shepherd")) == resp
+
+
+def test_update_pet_as_animal(client: HierarchyBuildingClient):
+    resp = Pet(name="Buddy", trained=True)
+    assert client.animal_operations.update_pet_as_animal(Pet(name="Buddy", trained=True)) == resp
+
+
+def test_update_dog_as_animal(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert client.animal_operations.update_dog_as_animal(Dog(name="Rex", trained=True, breed="German Shepherd")) == resp
+
+
+def test_update_dog_as_dog(client: HierarchyBuildingClient):
+    resp = Dog(name="Rex", trained=True, breed="German Shepherd")
+    assert client.dog_operations.update_dog_as_dog(Dog(name="Rex", trained=True, breed="German Shepherd")) == resp

package/generator/test/azure/requirements.txt

@@ -10,6 +10,7 @@ azure-mgmt-core==1.6.0
 -e ./generated/azure-client-generator-core-client-initialization
 -e ./generated/azure-client-generator-core-deserialize-empty-string-as-null
 -e ./generated/azure-client-generator-core-flatten-property
+-e ./generated/azure-client-generator-core-hierarchy-building
 -e ./generated/azure-client-generator-core-usage
 -e ./generated/azure-client-generator-core-override
 -e ./generated/azure-client-generator-core-client-location

package/generator/test/unittests/test_model_base_serialization.py

@@ -4061,3 +4061,50 @@ def test_additional_properties_serialization():
     model["durationProp"] = datetime.timedelta(days=1)
 
     assert json.loads(json.dumps(model, cls=SdkJSONEncoder)) == value
+
+
+class Animal(Model):
+    __mapping__: dict[str, Model] = {}
+    kind: str = rest_discriminator(name="kind")
+    name: str = rest_field()
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+
+
+class AnotherPet(Animal, discriminator="pet"):
+    __mapping__: dict[str, Model] = {}
+    kind: Literal["pet"] = rest_discriminator(name="kind")
+    trained: bool = rest_field()
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.kind = "pet"
+
+
+class AnotherDog(AnotherPet, discriminator="dog"):
+    kind: Literal["dog"] = rest_discriminator(name="kind")
+    breed: str = rest_field()
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        super().__init__(*args, **kwargs)
+        self.kind = "dog"
+
+
+def test_multi_layer_discriminator():
+    pet = {"kind": "pet", "name": "Buddy", "trained": True}
+
+    dog = {"kind": "dog", "name": "Rex", "trained": True, "breed": "German Shepherd"}
+
+    model_pet = AnotherPet(pet)
+    assert model_pet == pet
+
+    model_dog = AnotherDog(dog)
+    assert model_dog == dog
+
+    assert _deserialize(Animal, pet) == model_pet
+    assert _deserialize(Animal, dog) == model_dog
+    assert _deserialize(AnotherPet, dog) == model_dog
+
+    assert AnotherPet(name="Buddy", trained=True) == model_pet
+    assert AnotherDog(name="Rex", trained=True, breed="German Shepherd") == model_dog