Merge pull request #603 from PrefectHQ/fix-imports

fix imports
PrefectHQ · Sep 28, 2023 · e15186a · e15186a
2 parents f37ad5b + 19fd898
commit e15186a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -18,7 +18,6 @@ dependencies = [
   "jsonpatch>=1.33",
   "openai>=0.27.8",
   "pydantic[dotenv]>=1.10.7",
-  "pydantic-settings>=2.0.0",
   "rich>=12",
   "tiktoken>=0.4.0",
   "typer>=0.9.0",
@@ -49,6 +48,7 @@ tests = [
     "pytest-rerunfailures>=10,<13",
     "pytest-sugar~=0.9",
     "pytest~=7.3.1",
+    "pydantic-settings>=2.0.0",
 ]
 framework = [
     "aiosqlite>=0.19.0",

diff --git a/src/marvin/_compat.py b/src/marvin/_compat.py
@@ -19,8 +19,12 @@
 
 if PYDANTIC_V2:
     from pydantic.v1 import validate_arguments  # noqa # type: ignore
-    from pydantic_settings import BaseSettings  # noqa # type: ignore
-    from pydantic_settings import SettingsConfigDict  # noqa # type: ignore
+
+    try:
+        from pydantic_settings import BaseSettings  # noqa # type: ignore
+        from pydantic_settings import SettingsConfigDict  # noqa # type: ignore
+    except Exception as e:
+        print('Please install "pydantic-settings" to marvin with Pydantic v2.', e)
     from pydantic import field_validator  # noqa # type: ignore
 
 else: