Fix merge conflict

Author: thekaranacharya

guardrails/datatypes.py

@@ -382,6 +382,50 @@ class Percentage(ScalarType):
     tag = "percentage"
 
 
+@register_type("enum")
+class Enum(ScalarType):
+    """Element tag: `<enum>`"""
+
+    tag = "enum"
+
+    def __init__(
+        self,
+        children: Dict[str, Any],
+        validators_attr: ValidatorsAttr,
+        optional: bool,
+        name: Optional[str],
+        description: Optional[str],
+        enum_values: TypedList[str],
+    ) -> None:
+        super().__init__(children, validators_attr, optional, name, description)
+        self.enum_values = enum_values
+
+    def from_str(self, s: str) -> Optional[str]:
+        """Create an Enum from a string."""
+        if s is None:
+            return None
+        if s not in self.enum_values:
+            raise ValueError(f"Invalid enum value: {s}")
+        return s
+
+    @classmethod
+    def from_xml(
+        cls,
+        enum_values: TypedList[str],
+        validators: Sequence[ValidatorSpec],
+        description: Optional[str] = None,
+        strict: bool = False,
+    ) -> "Enum":
+        return cls(
+            children={},
+            validators_attr=ValidatorsAttr.from_validators(validators, cls.tag, strict),
+            optional=False,
+            name=None,
+            description=description,
+            enum_values=enum_values,
+        )
+
+
 @register_type("list")
 class List(NonScalarType):
     """Element tag: `<list>`"""

guardrails/utils/json_utils.py

@@ -11,6 +11,7 @@
     DataType,
     Date,
     Email,
+    Enum,
     Float,
     Integer,
 )
@@ -50,6 +51,7 @@ def verify(
     ListDataType: list,
     Date: str,
     Time: str,
+    Enum: str,
 }
 
 ignore_types = [

guardrails/utils/pydantic_utils/v1.py

@@ -3,6 +3,7 @@
 import warnings
 from copy import deepcopy
 from datetime import date, time
+from enum import Enum
 from typing import Any, Callable, Dict, Optional, Type, Union, get_args, get_origin
 
 from pydantic import BaseModel, validator
@@ -14,6 +15,7 @@
 from guardrails.datatypes import Choice as ChoiceDataType
 from guardrails.datatypes import DataType
 from guardrails.datatypes import Date as DateDataType
+from guardrails.datatypes import Enum as EnumDataType
 from guardrails.datatypes import Float as FloatDataType
 from guardrails.datatypes import Integer as IntegerDataType
 from guardrails.datatypes import List as ListDataType
@@ -67,6 +69,19 @@ def is_dict(type_annotation: Any) -> bool:
     return False
 
 
+def is_enum(type_annotation: Any) -> bool:
+    """Check if a type_annotation is an enum."""
+
+    type_annotation = prepare_type_annotation(type_annotation)
+
+    try:
+        if issubclass(type_annotation, Enum):
+            return True
+    except TypeError:
+        pass
+    return False
+
+
 def prepare_type_annotation(type_annotation: Union[ModelField, Type]) -> Type:
     """Get the raw type annotation that can be used for downstream processing.
 
@@ -262,6 +277,8 @@ def field_to_datatype(field: Union[ModelField, Type]) -> Type[DataType]:
         return ListDataType
     elif is_dict(type_annotation):
         return ObjectDataType
+    elif is_enum(type_annotation):
+        return EnumDataType
     elif type_annotation == bool:
         return BooleanDataType
     elif type_annotation == date:
@@ -356,6 +373,12 @@ def convert_pydantic_model_to_datatype(
                 strict=strict,
                 discriminator_key=discriminator,
             )
+        elif target_datatype == EnumDataType:
+            assert issubclass(type_annotation, Enum)
+            valid_choices = [choice.value for choice in type_annotation]
+            children[field_name] = pydantic_field_to_datatype(
+                EnumDataType, field, strict=strict, enum_values=valid_choices
+            )
         elif isinstance(field.type_, type) and issubclass(field.type_, BaseModel):
             children[field_name] = convert_pydantic_model_to_datatype(
                 field, datatype=target_datatype, strict=strict

guardrails/utils/pydantic_utils/v2.py

@@ -2,6 +2,7 @@
 import warnings
 from copy import deepcopy
 from datetime import date, time
+from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Type, TypeVar, Union, get_args
 
 from pydantic import BaseModel, ConfigDict, HttpUrl, field_validator
@@ -14,6 +15,7 @@
 from guardrails.datatypes import Choice as ChoiceDataType
 from guardrails.datatypes import DataType
 from guardrails.datatypes import Date as DateDataType
+from guardrails.datatypes import Enum as EnumDataType
 from guardrails.datatypes import Float as FloatDataType
 from guardrails.datatypes import Integer as IntegerDataType
 from guardrails.datatypes import List as ListDataType
@@ -88,6 +90,19 @@ def is_dict(type_annotation: Any) -> bool:
     return False
 
 
+def is_enum(type_annotation: Any) -> bool:
+    """Check if a type_annotation is an enum."""
+
+    type_annotation = prepare_type_annotation(type_annotation)
+
+    try:
+        if issubclass(type_annotation, Enum):
+            return True
+    except TypeError:
+        pass
+    return False
+
+
 def _create_bare_model(model: Type[BaseModel]) -> Type[BaseModel]:
     class BareModel(BaseModel):
         __annotations__ = getattr(model, "__annotations__", {})
@@ -277,6 +292,8 @@ def field_to_datatype(field: Union[FieldInfo, Type]) -> Type[DataType]:
         return ListDataType
     elif is_dict(type_annotation):
         return ObjectDataType
+    elif is_enum(type_annotation):
+        return EnumDataType
     elif type_annotation == bool:
         return BooleanDataType
     elif type_annotation == date:
@@ -382,6 +399,16 @@ def convert_pydantic_model_to_datatype(
                 discriminator_key=discriminator,
                 name=field_name,
             )
+        elif target_datatype == EnumDataType:
+            assert issubclass(type_annotation, Enum)
+            valid_choices = [choice.value for choice in type_annotation]
+            children[field_name] = pydantic_field_to_datatype(
+                EnumDataType,
+                field,
+                strict=strict,
+                enum_values=valid_choices,
+                name=field_name,
+            )
         elif is_pydantic_base_model(field.annotation):
             children[field_name] = convert_pydantic_model_to_datatype(
                 field,