If your client was a resident alien, it'd be a 1040.  Otherwise, it'd be a 1040NR.

It could be that your client is a dual-status resident, in which case, you'd file a 1040 or 1040NR return based on the status as of the end of the year but attach a 1040NR or 1040 statement for income reportable for the earlier period.