Remove support for Pydantic < 2

.github/workflows/ci.yml

@@ -86,7 +86,7 @@ jobs:
         # TODO: fix errors so that we can run both `make dev` and `make full`
         # dependencies: ['dev', 'full']
         dependencies: ["full"]
-        pydantic-version: ["1.10.9", "2.4.2"]
+        pydantic-version: ["2.4.2"]
         openai-version: ["1.30.1"]
     steps:
       - uses: actions/checkout@v4

guardrails/guard.py

@@ -34,7 +34,6 @@
 from langchain_core.messages import BaseMessage
 from langchain_core.runnables import Runnable, RunnableConfig
 from pydantic import BaseModel
-from pydantic.version import VERSION as PYDANTIC_VERSION
 from typing_extensions import deprecated  # type: ignore
 
 from guardrails.api_client import GuardrailsApiClient
@@ -420,13 +419,6 @@ def from_pydantic(
         description: Optional[str] = None,
     ):
         """Create a Guard instance from a Pydantic model and prompt."""
-        if PYDANTIC_VERSION.startswith("1"):
-            warnings.warn(
-                """Support for Pydantic v1.x is deprecated and will be removed in
-                Guardrails 0.5.x. Please upgrade to the latest Pydantic v2.x to
-                continue receiving future updates and support.""",
-                FutureWarning,
-            )
         # We have to set the tracer in the ContextStore before the Rail,
         #   and therefore the Validators, are initialized
         cls._set_tracer(cls, tracer)  # type: ignore

guardrails/utils/dataclass.py

@@ -2,10 +2,4 @@
 
 PYDANTIC_VERSION = pydantic.version.VERSION
 
-if PYDANTIC_VERSION.startswith("1"):
-
-    def dataclass(cls):  # type: ignore
-        return cls
-
-else:
-    from dataclasses import dataclass  # type: ignore  # noqa
+from dataclasses import dataclass  # type: ignore  # noqa

guardrails/utils/pydantic_utils/__init__.py

@@ -1,25 +1,14 @@
 import pydantic.version
+from .v2 import (
+    ArbitraryModel,
+    add_pydantic_validators_as_guardrails_validators,
+    add_validator,
+    convert_pydantic_model_to_datatype,
+    convert_pydantic_model_to_openai_fn,
+)
 
 PYDANTIC_VERSION = pydantic.version.VERSION
 
-if PYDANTIC_VERSION.startswith("1"):
-    from .v1 import (
-        ArbitraryModel,
-        add_pydantic_validators_as_guardrails_validators,
-        add_validator,
-        convert_pydantic_model_to_datatype,
-        convert_pydantic_model_to_openai_fn,
-    )
-else:
-    from .v2 import (
-        ArbitraryModel,
-        add_pydantic_validators_as_guardrails_validators,
-        add_validator,
-        convert_pydantic_model_to_datatype,
-        convert_pydantic_model_to_openai_fn,
-    )
-
-
 __all__ = [
     "add_validator",
     "add_pydantic_validators_as_guardrails_validators",

pyproject.toml

@@ -17,7 +17,7 @@ python = "^3.8.1"
 lxml = "^4.9.3"
 openai = "^1.30.1"
 rich = "^13.6.0"
-pydantic = ">=1.10.9, <3.0"
+pydantic = ">=2.0.0, <3.0"
 typer = {extras = ["all"], version = "^0.9.0"}
 griffe = "^0.36.9"
 tenacity = ">=8.1.0"

tests/integration_tests/test_assets/pydantic/validated_response_reask.py

@@ -3,7 +3,6 @@
 
 from pydantic import BaseModel, Field
 
-from guardrails.utils.pydantic_utils import PYDANTIC_VERSION
 from guardrails.utils.reask_utils import FieldReAsk
 from guardrails.validator_base import OnFailAction
 from guardrails.validators import (
@@ -61,33 +60,22 @@ class Person(BaseModel):
     """
 
     name: str
-    if PYDANTIC_VERSION.startswith("1"):
-        age: int = Field(
-            ..., validators=[AgeMustBeBetween0And150(on_fail=OnFailAction.REASK)]
-        )
-        zip_code: str = Field(
-            ...,
-            validators=[
+
+    age: int = Field(
+        ...,
+        json_schema_extra={
+            "validators": [AgeMustBeBetween0And150(on_fail=OnFailAction.REASK)]
+        },
+    )
+    zip_code: str = Field(
+        ...,
+        json_schema_extra={
+            "validators": [
                 ZipCodeMustBeNumeric(on_fail=OnFailAction.REASK),
                 ZipCodeInCalifornia(on_fail=OnFailAction.REASK),
             ],
-        )
-    else:
-        age: int = Field(
-            ...,
-            json_schema_extra={
-                "validators": [AgeMustBeBetween0And150(on_fail=OnFailAction.REASK)]
-            },
-        )
-        zip_code: str = Field(
-            ...,
-            json_schema_extra={
-                "validators": [
-                    ZipCodeMustBeNumeric(on_fail=OnFailAction.REASK),
-                    ZipCodeInCalifornia(on_fail=OnFailAction.REASK),
-                ],
-            },
-        )
+        },
+    )
 
 
 class ListOfPeople(BaseModel):