Im not familiar right now with this assignment but you have a shape mismatch of x and y inside the combine_vectors function. You have to trace back where those or one of them is calculated to fix the issue.
in line 38, you should have passed in
one_hot_labels instead of
image_one_hot_labels, as it is the input to generator.