Work with both Pydantic 1 and 2 (#121)

* Work with both Pydantic 1 and 2

Refs #112

Signed-off-by: Simon Willison <[email protected]>

* Ignore type checking on pydantic import statements

---------

Signed-off-by: Simon Willison <[email protected]>
Co-authored-by: Mattt Zmuda <[email protected]>

Author: simonw

pyproject.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 license = { file = "LICENSE" }
 authors = [{ name = "Replicate, Inc." }]
 requires-python = ">=3.8"
-dependencies = ["packaging", "pydantic>1,<2", "requests>2"]
+dependencies = ["packaging", "pydantic>1", "requests>2"]
 optional-dependencies = { dev = [
     "black",
     "mypy",

replicate/base_model.py

@@ -4,7 +4,10 @@
     from replicate.client import Client
     from replicate.collection import Collection
 
-import pydantic
+try:
+    from pydantic import v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
 
 
 class BaseModel(pydantic.BaseModel):

requirements.txt

@@ -12,7 +12,7 @@ idna==3.4
     # via requests
 packaging==23.0
     # via replicate (pyproject.toml)
-pydantic==1.10.7
+pydantic>=1.10.7
     # via replicate (pyproject.toml)
 requests==2.31.0
     # via replicate (pyproject.toml)