[bugfix] Fix pydantic v1/v2 compatible model_dump method (backport #5388

) (#5396) [bugfix] Fix pydantic v1/v2 compatible model_dump method (#5388) (cherry picked from commit 67b2977) Co-authored-by: Hailin Wang <[email protected]>
haiiliin · Nov 23, 2023 · c4ceba6 · c4ceba6
1 parent 437d6a0
commit c4ceba6
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/abqpy/config.py b/src/abqpy/config.py
@@ -2,12 +2,20 @@
 
 import ast
 import os
-from typing import Optional
+from typing import Any, Optional
 
 from pydantic import BaseModel
 
 
-class AbaqusCAEConfig(BaseModel):
+class CompatibleBaseModel(BaseModel):
+    def model_dump(self, **kwargs) -> dict[str, Any]:
+        try:
+            return super().model_dump(**kwargs)
+        except AttributeError:
+            return super().dict(**kwargs)
+
+
+class AbaqusCAEConfig(CompatibleBaseModel):
     database: Optional[str] = None
     replay: Optional[str] = None
     recover: Optional[str] = None
@@ -21,12 +29,12 @@ class AbaqusCAEConfig(BaseModel):
     guiRecord: Optional[bool] = None
 
 
-class AbaqusPythonConfig(BaseModel):
+class AbaqusPythonConfig(CompatibleBaseModel):
     sim: Optional[str] = None
     log: Optional[str] = None
 
 
-class AbaqusConfig(BaseModel):
+class AbaqusConfig(CompatibleBaseModel):
     cae: AbaqusCAEConfig
     python: AbaqusPythonConfig