feat(schema): model generated attribute as a kind-discriminated union

Replace the flat attribute write/read models, which typed parameters as a
plain union of every parameters shape, with a discriminated union on kind.
A shared AttributeSchemaBase carries every field except parameters, and each
variant narrows kind to the kinds sharing one parameters shape and carries
that parameters model, so a Text attribute no longer validates NumberPool
parameters. The public AttributeSchema{Write,Read} name becomes the union
alias.

Route offline validation of a single item through pydantic.TypeAdapter so a
union alias (which has no model_validate) validates like a plain model.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: dgarros

infrahub_sdk/schema/generated/read.py

@@ -121,21 +121,7 @@ class ComputedAttributeTransformPythonRead(BaseModel):
     )
 
 
-AttributeParametersUnionRead = (
-    NumberPoolParametersRead
-    | NumberAttributeParametersRead
-    | TextAttributeParametersRead
-    | ListAttributeParametersRead
-    | AttributeParametersRead
-)
-
-ComputedAttributeRead = Annotated[
-    ComputedAttributeUserRead | ComputedAttributeJinja2Read | ComputedAttributeTransformPythonRead,
-    Field(discriminator="kind"),
-]
-
-
-class AttributeSchemaRead(BaseModel):
+class AttributeSchemaBaseRead(BaseModel):
     model_config = ConfigDict()
     id: str | None = Field(
         default=None,
@@ -245,10 +231,6 @@ class AttributeSchemaRead(BaseModel):
         default="any",
         description="Type of allowed override for the attribute.",
     )
-    parameters: AttributeParametersUnionRead | None = Field(
-        default=None,
-        description="Extra parameters specific to this kind of attribute",
-    )
     deprecation: str | None = Field(
         default=None,
         description="Mark attribute as deprecated and provide a user-friendly message to display",
@@ -260,6 +242,95 @@ class AttributeSchemaRead(BaseModel):
     )
 
 
+class TextAttributeRead(AttributeSchemaBaseRead):
+    model_config = ConfigDict()
+    kind: Literal["Text", "TextArea"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: TextAttributeParametersRead | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class NumberAttributeRead(AttributeSchemaBaseRead):
+    model_config = ConfigDict()
+    kind: Literal["Number"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: NumberAttributeParametersRead | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class ListAttributeRead(AttributeSchemaBaseRead):
+    model_config = ConfigDict()
+    kind: Literal["List"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: ListAttributeParametersRead | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class NumberPoolAttributeRead(AttributeSchemaBaseRead):
+    model_config = ConfigDict()
+    kind: Literal["NumberPool"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: NumberPoolParametersRead | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class GenericAttributeRead(AttributeSchemaBaseRead):
+    model_config = ConfigDict()
+    kind: Literal[
+        "ID",
+        "Dropdown",
+        "DateTime",
+        "Email",
+        "Password",
+        "HashedPassword",
+        "URL",
+        "File",
+        "MacAddress",
+        "Color",
+        "Bandwidth",
+        "IPHost",
+        "IPNetwork",
+        "Boolean",
+        "Checkbox",
+        "JSON",
+        "Any",
+    ] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: AttributeParametersRead | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+ComputedAttributeRead = Annotated[
+    ComputedAttributeUserRead | ComputedAttributeJinja2Read | ComputedAttributeTransformPythonRead,
+    Field(discriminator="kind"),
+]
+
+AttributeSchemaRead = Annotated[
+    TextAttributeRead | NumberAttributeRead | ListAttributeRead | NumberPoolAttributeRead | GenericAttributeRead,
+    Field(discriminator="kind"),
+]
+
+
 class RelationshipSchemaRead(BaseModel):
     model_config = ConfigDict()
     id: str | None = Field(

infrahub_sdk/schema/generated/write.py

@@ -121,21 +121,7 @@ class ComputedAttributeTransformPythonWrite(BaseModel):
     )
 
 
-AttributeParametersUnionWrite = (
-    NumberPoolParametersWrite
-    | NumberAttributeParametersWrite
-    | TextAttributeParametersWrite
-    | ListAttributeParametersWrite
-    | AttributeParametersWrite
-)
-
-ComputedAttributeWrite = Annotated[
-    ComputedAttributeUserWrite | ComputedAttributeJinja2Write | ComputedAttributeTransformPythonWrite,
-    Field(discriminator="kind"),
-]
-
-
-class AttributeSchemaWrite(BaseModel):
+class AttributeSchemaBaseWrite(BaseModel):
     model_config = ConfigDict(extra="forbid")
     id: str | None = Field(
         default=None,
@@ -241,10 +227,6 @@ class AttributeSchemaWrite(BaseModel):
         default="any",
         description="Type of allowed override for the attribute.",
     )
-    parameters: AttributeParametersUnionWrite | None = Field(
-        default=None,
-        description="Extra parameters specific to this kind of attribute",
-    )
     deprecation: str | None = Field(
         default=None,
         description="Mark attribute as deprecated and provide a user-friendly message to display",
@@ -256,6 +238,95 @@ class AttributeSchemaWrite(BaseModel):
     )
 
 
+class TextAttributeWrite(AttributeSchemaBaseWrite):
+    model_config = ConfigDict(extra="forbid")
+    kind: Literal["Text", "TextArea"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: TextAttributeParametersWrite | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class NumberAttributeWrite(AttributeSchemaBaseWrite):
+    model_config = ConfigDict(extra="forbid")
+    kind: Literal["Number"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: NumberAttributeParametersWrite | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class ListAttributeWrite(AttributeSchemaBaseWrite):
+    model_config = ConfigDict(extra="forbid")
+    kind: Literal["List"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: ListAttributeParametersWrite | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class NumberPoolAttributeWrite(AttributeSchemaBaseWrite):
+    model_config = ConfigDict(extra="forbid")
+    kind: Literal["NumberPool"] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: NumberPoolParametersWrite | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+class GenericAttributeWrite(AttributeSchemaBaseWrite):
+    model_config = ConfigDict(extra="forbid")
+    kind: Literal[
+        "ID",
+        "Dropdown",
+        "DateTime",
+        "Email",
+        "Password",
+        "HashedPassword",
+        "URL",
+        "File",
+        "MacAddress",
+        "Color",
+        "Bandwidth",
+        "IPHost",
+        "IPNetwork",
+        "Boolean",
+        "Checkbox",
+        "JSON",
+        "Any",
+    ] = Field(
+        ...,
+        description="Defines the type of the attribute.",
+    )
+    parameters: AttributeParametersWrite | None = Field(
+        default=None,
+        description="Extra parameters specific to this kind of attribute",
+    )
+
+
+ComputedAttributeWrite = Annotated[
+    ComputedAttributeUserWrite | ComputedAttributeJinja2Write | ComputedAttributeTransformPythonWrite,
+    Field(discriminator="kind"),
+]
+
+AttributeSchemaWrite = Annotated[
+    TextAttributeWrite | NumberAttributeWrite | ListAttributeWrite | NumberPoolAttributeWrite | GenericAttributeWrite,
+    Field(discriminator="kind"),
+]
+
+
 class RelationshipSchemaWrite(BaseModel):
     model_config = ConfigDict(extra="forbid")
     id: str | None = Field(

infrahub_sdk/schema/validate.py

@@ -12,7 +12,7 @@
 
 from typing import Any
 
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, TypeAdapter
 from pydantic import ValidationError as PydanticValidationError
 
 from .generated.write import (
@@ -83,12 +83,16 @@ def _collect_validation_errors(
         errors.append(SchemaValidationErrorDetail(field=location, message=message))
 
 
-def _validate_item(model: type[BaseModel], item: Any, prefix: str, errors: list[SchemaValidationErrorDetail]) -> None:
-    """Validate a single mapping against a write model, appending field-level errors under ``prefix``."""
+def _validate_item(model: Any, item: Any, prefix: str, errors: list[SchemaValidationErrorDetail]) -> None:
+    """Validate a single mapping against a write model, appending field-level errors under ``prefix``.
+
+    ``model`` may be a plain model class or a discriminated-union alias (which has no
+    ``model_validate``), so validation goes through a ``TypeAdapter`` that handles both.
+    """
     if not isinstance(item, dict):
         return
     try:
-        model.model_validate(item)
+        TypeAdapter(model).validate_python(item)
     except PydanticValidationError as exc:
         _collect_validation_errors(exc=exc, errors=errors, prefix=prefix)