The oil market is re-balancing but output from non-OPEC producers will continue to expand over the coming years, the latest report from the International Energy Agency said Friday.