Merge pull request #115 from elventear/fix-pydantic

fix: handle missing pydantic-core corner case
DanCardin · May 10, 2024 · ee024c2 · ee024c2
2 parents 98a933d + 5de6984
commit ee024c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## 0.19
 
+### 0.19.1
+
+- fix: Eagerly attempt pydantic BaseModel import to ensure its skipped if unavailable.
+
 ### 0.19.0
 
 - feat: Add support for `msgspec` based class definitions.

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cappa"
-version = "0.19.0"
+version = "0.19.1"
 description = "Declarative CLI argument parser."
 
 repository = "https://github.com/dancardin/cappa"

diff --git a/src/cappa/class_inspect.py b/src/cappa/class_inspect.py
@@ -187,13 +187,12 @@ def from_cls(cls, obj: type) -> ClassTypes | None:
 
         try:
             import pydantic
+            from pydantic import BaseModel
         except ImportError:  # pragma: no cover
             pass
         else:
             try:
-                is_base_model = isinstance(obj, type) and issubclass(
-                    obj, pydantic.BaseModel
-                )
+                is_base_model = isinstance(obj, type) and issubclass(obj, BaseModel)
             except TypeError:  # pragma: no cover
                 is_base_model = False