Fix pydantic generics and add ability to directive json schema

Fix pydantic generics and add ability to directive json schema #3050