Fix contact-sheet filename bug; write split + upload core data before contact sheets

render_full.py

@@ -11,7 +11,7 @@ Outputs (uploaded to ysharma/gso-orbit-rgba):
   renders/{object_id}/az{000..315}_el{low|eye|high}.png
   metadata.jsonl          one line per view
   split.json              heldout_40 / rejected_objects / train_objects
-  contact_sheets/*.png    one sheet per sampled category
+  contact_sheets/*.jpg    one sheet per sampled category (uploaded after core data)
 """
 import os
 os.environ['PYOPENGL_PLATFORM'] = 'osmesa'  # must precede pyrender import
@@ -199,7 +199,6 @@ def list_all_objects():
 
 
 def make_split(jobs, all_flags):
-    """40 held-out objects stratified by category; rejected objects excluded from both."""
     cats = {}
     for _, oid, cat in jobs:
         cats.setdefault(cat, []).append(oid)
@@ -225,9 +224,10 @@ def contact_sheets(sheets_ids):
     cell = 256
     for sample_id in sheets_ids:
         sheet = Image.new('RGB', (8 * cell, 3 * cell), (128, 128, 128))
-        for r, (_, el) in enumerate(ELEVS):
+        for r, (el_name, _el_deg) in enumerate(ELEVS):
             for c, az in enumerate(AZS):
-                im = Image.open(os.path.join(OUT, 'renders', sample_id, f'az{az:03d}_el{el[0]}.png'))
+                im = Image.open(os.path.join(OUT, 'renders', sample_id,
+                                             f'az{az:03d}_el{el_name}.png'))
                 im = im.resize((cell, cell), Image.LANCZOS)
                 sheet.paste(im, (c * cell, r * cell), im)
         sheet.save(os.path.join(OUT, 'contact_sheets', f'{sample_id}.jpg'), quality=88)
@@ -240,7 +240,7 @@ def main():
     os.makedirs(OUT, exist_ok=True)
     all_rows, ok_flags, sheets_pool = [], {}, []
     s_per_view = []
-    n_ok = n_fail = n_rej = 0
+    n_ok = n_fail = 0
     with ProcessPoolExecutor(max_workers=WORKERS) as ex:
         for k, res in enumerate(ex.map(render_object, jobs)):
             if not res['ok']:
@@ -266,7 +266,6 @@ def main():
              'n_renders': len(all_rows), 'instructions_version': 'orbit-relative-v1'}
     with open(os.path.join(OUT, 'split.json'), 'w') as f:
         json.dump(split, f, indent=2)
-    contact_sheets(sheets_pool[:6])
     bad = sum(1 for r in all_rows if r['coverage'] < COV_MIN)
     n_rej = sum(1 for r in ok_flags.values() if r)
     print(f'\nDONE {n_ok} ok / {n_fail} failed | rejected {n_rej} objects | '
@@ -275,11 +274,22 @@ def main():
     print(f'split: {len(heldout)} heldout, {len(train)} train', flush=True)
 
     api = HfApi(token=os.environ.get('HF_TOKEN'))
-    print('uploading to Hub (upload_large_folder)...', flush=True)
+    print('uploading core data to Hub (upload_large_folder)...', flush=True)
     t_up = time.time()
     api.upload_large_folder(repo_id=REPO_ID, repo_type='dataset', folder_path=OUT)
     print(f'UPLOAD DONE in {time.time()-t_up:.0f}s', flush=True)
 
+    # contact sheets last, guarded: a bug here must never cost the render sweep
+    try:
+        contact_sheets(sheets_pool[:6])
+        api.upload_folder(repo_id=REPO_ID, repo_type='dataset',
+                          folder_path=os.path.join(OUT, 'contact_sheets'),
+                          path_in_repo='contact_sheets')
+        print('contact sheets uploaded', flush=True)
+    except Exception:
+        print('contact sheets failed (non-fatal):', flush=True)
+        traceback.print_exc()
+
 
 if __name__ == '__main__':
     main()