Fix bugs that are not compatible with pydantic2.x : Fix missing import + refactoring

Fix bugs that are not compatible with pydantic2.x : Fix missing import + refactoring #288