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