Fix import errors, shadowing, and openapi serialization issues 6122249 verified teoat commited on Jan 11
