Can I get a review on this cherry-pick to 2.15 https://github.com/pantsbuild/pants/pull/18030 ? I am wanting to test pyright on 2.15 and this blocks that.

merged: thanks!