Upload app.py

app.py

@@ -102,26 +102,32 @@ def user_inference(img1, img2):
     
 def build_textured_cube(textures, out_dir=None):
     """
+    Écrit les fichiers dans ./models/<uuid>/ pour être visibles dans le Space.
     textures: list de 4 PIL.Image (RGB) -> mapping:
       textures[0] -> right
       textures[1] -> left
       textures[2] -> front
       textures[3] -> back
-    out_dir: dossier de sortie optionnel
     Retourne: (chemin_absolu_obj, out_dir)
     """
-    import os, tempfile
+    import os, uuid
+    from pathlib import Path
+    import tempfile
 
+    # dossier racine "models" dans le repo (sera visible dans Files)
+    repo_models_dir = os.path.join(os.path.dirname(__file__), "models")
+    os.makedirs(repo_models_dir, exist_ok=True)
+
+    # crée un sous-dossier unique
     if out_dir is None:
-        out_dir = tempfile.mkdtemp(prefix="cube_")
-    else:
-        os.makedirs(out_dir, exist_ok=True)
+        out_dir = os.path.join(repo_models_dir, f"cube_{uuid.uuid4().hex}")
+    os.makedirs(out_dir, exist_ok=True)
 
-    # Ensure we have 4 PIL images
+    # vérifications
     if len(textures) < 4:
         raise ValueError("Il faut fournir 4 images dans `textures`.")
 
-    # Normalize size for textures (choose la taille de la première image)
+    # normaliser taille (utilise la taille de la première texture)
     base_w, base_h = textures[0].size
     norm_texts = []
     for im in textures[:4]:
@@ -129,21 +135,22 @@ def build_textured_cube(textures, out_dir=None):
             im = im.resize((base_w, base_h))
         norm_texts.append(im.convert("RGB"))
 
-    # Create top & bottom black textures (mêmes dimensions)
+    # top & bottom : textures noires
+    from PIL import Image
     black_top = Image.new("RGB", (base_w, base_h), (0,0,0))
     black_bottom = Image.new("RGB", (base_w, base_h), (0,0,0))
 
-    all_texts = norm_texts + [black_top, black_bottom]  # order: 0..5
+    all_texts = norm_texts + [black_top, black_bottom]  # order: right,left,front,back,top,bottom
 
-    # Save textures as tex_0.png ... tex_5.png
+    # Sauvegarde textures dans out_dir
     tex_filenames = []
     for i, im in enumerate(all_texts):
         fn = f"tex_{i}.png"
         path = os.path.join(out_dir, fn)
         im.save(path, format="PNG")
-        tex_filenames.append(fn)
+        tex_filenames.append(fn)  # NOTE: on garde juste le basename pour le .mtl
 
-    # Write MTL file
+    # Écrire le .mtl (utilise seulement les basenames car .mtl est dans le même dossier)
     mtl_name = "cube.mtl"
     mtl_path = os.path.join(out_dir, mtl_name)
     with open(mtl_path, "w") as f:
@@ -154,9 +161,10 @@ def build_textured_cube(textures, out_dir=None):
             f.write("  Ns 10\n")
             f.write("  Ka 1.000 1.000 1.000\n")
             f.write("  Kd 1.000 1.000 1.000\n")
+            # map_Kd doit référencer le fichier image *tel quel* (basename)
             f.write(f"  map_Kd {tex}\n\n")
 
-    # Write OBJ file (triangulated faces, with per-face UVs)
+    # Écrire l'OBJ triangulé (vt par face)
     obj_name = "cube.obj"
     obj_path = os.path.join(out_dir, obj_name)
     with open(obj_path, "w") as f:
@@ -177,14 +185,13 @@ def build_textured_cube(textures, out_dir=None):
         for v in verts:
             f.write(f"v {v[0]} {v[1]} {v[2]}\n")
 
-        # For each face we emit 4 uv coords (vt). Order per face: (0,0),(1,0),(1,1),(0,1)
+        # vt : 4 par face (0,0),(1,0),(1,1),(0,1)
         uv_coords = [(0.0,0.0),(1.0,0.0),(1.0,1.0),(0.0,1.0)]
-        for face_i in range(6):
+        for _ in range(6):
             for uv in uv_coords:
                 f.write(f"vt {uv[0]} {uv[1]}\n")
 
-        # Faces definitions (using triangles). Faces in the order of materials:
-        # right, left, front, back, top, bottom
+        # faces (triangle pairs) ; ordre des matériaux = right,left,front,back,top,bottom
         faces = {
             "mat_right": [2,6,7,3],   # x = +1
             "mat_left":  [5,1,4,8],   # x = -1
@@ -194,28 +201,22 @@ def build_textured_cube(textures, out_dir=None):
             "mat_bottom":[1,5,6,2],   # y = -1
         }
 
-        # Since we wrote vt in face order, vt indices for face i start at (i*4)+1
-        face_order = ["mat_right","mat_left","mat_top","mat_bottom","mat_front","mat_back"]
-        # Note: keep mapping consistent with how mtl was written above (names list)
-        # but ensure ordering for vt indices is synchronized:
-        # We'll iterate in the exact same order as vt emission (0..5)
-        # vt indices start at 1
-        for i, mat in enumerate(["mat_right","mat_left","mat_front","mat_back","mat_top","mat_bottom"]):
-            verts_idx = faces[mat]  # list of 4 vertex indices
+        # écriture en même ordre que les vt (i.e. 0..5)
+        mats_order = ["mat_right","mat_left","mat_front","mat_back","mat_top","mat_bottom"]
+        for i, mat in enumerate(mats_order):
+            verts_idx = faces[mat]
             vt_base = i*4 + 1
-            # triangles: (a,b,c) and (a,c,d)
             a, b, c, d = verts_idx
             v1 = f"{a}/{vt_base}"
             v2 = f"{b}/{vt_base+1}"
             v3 = f"{c}/{vt_base+2}"
             v4 = f"{d}/{vt_base+3}"
             f.write(f"usemtl {mat}\n")
-            # first triangle
             f.write(f"f {v1} {v2} {v3}\n")
-            # second triangle
             f.write(f"f {v1} {v3} {v4}\n")
 
-    return obj_path, out_dir
+    # Retourne le chemin absolu vers .obj (Gradio accepte ça)
+    return os.path.abspath(obj_path), out_dir
 
 # -------------------------
 # Fonction appelée par Gradio