0.4.1 release

guardrails/guard.py

@@ -99,7 +99,7 @@ def __init__(
         self._set_tracer(tracer)
 
         # Get unique id of user from credentials
-        self._user_id = Credentials.from_rc_file().id
+        self._user_id = Credentials.from_rc_file().id or ""
 
         # Get metrics opt-out from credentials
         self._disable_tracer = Credentials.from_rc_file().no_metrics

guardrails/utils/pydantic_utils/v2.py

@@ -28,6 +28,16 @@
 
 DataTypeT = TypeVar("DataTypeT", bound=DataType)
 
+try:
+    from pydantic import Discriminator  # type: ignore
+
+    if not Discriminator:
+        raise ImportError("pydantic.Discriminator does not exist!")
+except ImportError:
+
+    class Discriminator:
+        pass
+
 
 class ArbitraryModel(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -375,7 +385,17 @@ def convert_pydantic_model_to_datatype(
                 name=field_name,
             )
         elif target_datatype == ChoiceDataType:
-            discriminator = field.discriminator or "discriminator"
+            discriminator = "discriminator"
+            if field.discriminator:
+                if isinstance(field.discriminator, str):
+                    discriminator = field.discriminator
+                elif isinstance(field.discriminator, Discriminator):
+                    discriminator = (
+                        field.discriminator.discriminator
+                        if isinstance(field.discriminator.discriminator, str)
+                        else "discriminator"
+                    )
+
             choice_children = {}
             for case in typing.get_args(field.annotation):
                 case_discriminator_type = case.model_fields[discriminator].annotation
@@ -465,7 +485,7 @@ def pydantic_field_to_datatype(
     return construct_datatype(
         datatype,
         children,
-        validators,
+        validators,  # type: ignore
         is_optional,
         name,
         description,