nomenclature fix

backend/app/main.py

@@ -535,7 +535,12 @@ def list_image_models(_user: dict = Depends(get_current_user)):
 GENERATE_ADS_CONCURRENCY = 3
 
 
-async def _save_creative_to_r2(replicate_url: str, creative_id: int, concept_name: str = "") -> tuple[str | None, str | None]:
+async def _save_creative_to_r2(
+    replicate_url: str,
+    creative_id: int,
+    concept_name: str = "",
+    product_name: str = "",
+) -> tuple[str | None, str | None]:
     """Download image from Replicate URL and upload to R2. Returns (R2 presigned URL or None, R2 key or None)."""
     try:
         async with httpx.AsyncClient(timeout=60.0) as client:
@@ -547,7 +552,7 @@ async def _save_creative_to_r2(replicate_url: str, creative_id: int, concept_nam
         return None, None
     if not image_bytes:
         return None, None
-    key = key_for_creative(creative_id, concept_name)
+    key = key_for_creative(creative_id, concept_name, product_name)
     r2_url = await asyncio.to_thread(
         upload_creative_image,
         image_bytes,
@@ -761,7 +766,12 @@ async def generate_ads(
             )
         if err or not url:
             return {"creative_id": cid, "image_url": None, "error": err}
-        r2_url, r2_key = await _save_creative_to_r2(url, cid, (item.get("concept_name") or "").strip())
+        r2_url, r2_key = await _save_creative_to_r2(
+            url,
+            cid,
+            (item.get("concept_name") or "").strip(),
+            (body.product_name or "").strip(),
+        )
         final_url = r2_url if r2_url else url
         if r2_key and username:
             await asyncio.to_thread(
@@ -856,7 +866,12 @@ async def _stream_generate_ads(
             )
         if err or not url:
             return {"creative_id": cid, "image_url": None, "error": err}
-        r2_url, r2_key = await _save_creative_to_r2(url, cid, (item.get("concept_name") or "").strip())
+        r2_url, r2_key = await _save_creative_to_r2(
+            url,
+            cid,
+            (item.get("concept_name") or "").strip(),
+            (body.product_name or "").strip(),
+        )
         final_url = r2_url if r2_url else url
         if r2_key and username:
             await asyncio.to_thread(
@@ -1062,7 +1077,11 @@ async def correct_image_endpoint(
                     image_bytes = r.content
                 concept = (entry.get("concept_name") or "image").strip()[:64]
                 cid = entry.get("creative_id", 0)
-                key = key_for_creative(cid, f"{concept}-corrected")
+                key = key_for_creative(
+                    cid,
+                    f"{concept}-corrected",
+                    (entry.get("product_name") or "").strip(),
+                )
                 r2_url = await asyncio.to_thread(upload_creative_image, image_bytes, key=key, content_type="image/png")
                 if r2_url:
                     gallery_update_entry(

backend/app/r2.py

@@ -132,10 +132,29 @@ def put_object(
         return False
 
 
-def key_for_creative(creative_id: int, concept_slug: str = "") -> str:
+def _sanitize_segment(value: str, *, sep: str = "-") -> str:
+    cleaned = (value or "").strip()
+    if not cleaned:
+        return ""
+    cleaned = cleaned.replace("/", " ").replace("\\", " ")
+    out_chars: list[str] = []
+    prev_sep = False
+    for ch in cleaned:
+        if ch.isalnum():
+            out_chars.append(ch)
+            prev_sep = False
+        else:
+            if not prev_sep:
+                out_chars.append(sep)
+                prev_sep = True
+    out = "".join(out_chars).strip(sep)
+    return out
+
+
+def key_for_creative(creative_id: int, concept_slug: str = "", product_name: str = "") -> str:
     """Generate a stable R2 key for a creative image."""
-    safe = (concept_slug or "").replace(" ", "-").replace("/", "-")[:64].strip() or "image"
-    # Keep only alphanumeric and hyphen for object key
-    safe = "".join(c for c in safe if c.isalnum() or c == "-") or "image"
+    safe_concept = _sanitize_segment(concept_slug, sep="-")[:64] or "image"
+    # Requested naming style: <product>_AI_creative_...
+    safe_product = _sanitize_segment(product_name, sep="_")[:64] or "product"
     unique = uuid.uuid4().hex[:8]
-    return f"creatives/{creative_id}-{safe}-{unique}.png"
+    return f"creatives/{safe_product}_AI_creative_{creative_id}-{safe_concept}-{unique}.png"

backend/app/variation.py

@@ -159,7 +159,12 @@ Return JSON only:
     return normalized
 
 
-async def _save_variation_to_r2(image_url: str, variation_id: int, concept_name: str) -> tuple[str | None, str | None]:
+async def _save_variation_to_r2(
+    image_url: str,
+    variation_id: int,
+    concept_name: str,
+    product_name: str | None = None,
+) -> tuple[str | None, str | None]:
     try:
         async with httpx.AsyncClient(timeout=60.0) as client:
             resp = await client.get(image_url)
@@ -170,7 +175,7 @@ async def _save_variation_to_r2(image_url: str, variation_id: int, concept_name:
         return None, None
     if not image_bytes:
         return None, None
-    key = key_for_creative(variation_id, concept_name)
+    key = key_for_creative(variation_id, concept_name, product_name or "")
     r2_url = await asyncio.to_thread(upload_creative_image, image_bytes, key=key, content_type=content_type)
     return (r2_url, key if r2_url else None)
 
@@ -223,7 +228,7 @@ async def generate_variations_stream(
                 await asyncio.sleep(2 * attempt)
         if err or not image_out_url:
             return {"variation_id": vid, "concept_name": concept_name, "image_url": None, "error": err or "Generation failed"}
-        r2_url, r2_key = await _save_variation_to_r2(image_out_url, vid, concept_name)
+        r2_url, r2_key = await _save_variation_to_r2(image_out_url, vid, concept_name, product_name)
         final_url = r2_url or image_out_url
         if r2_key and username:
             await asyncio.to_thread(