refactor(openai): aggregate as openai classes first THEN convert

[cabljac]

No description provided.

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
3 out of 4 committers have signed the CLA.

✅ CorieW
✅ kevmoo
✅ cabljac
❌ pavelgj
_{You have signed the CLA already but the status is still pending? Let us recheck it.}