fix

app.py

@@ -141,13 +141,64 @@ def _prepare_workspace(logs):
 # ---------------------
 # Helpers for new features (post-processing)
 # ---------------------
-def _parse_rgb(hex):
-    try:
-        hex = hex.lstrip('#')
-        return tuple(int(hex[i:i+2], 16) for i in (0, 2, 4))
-    except Exception:
+def _parse_rgb(val):
+    """Return (R, G, B) as ints in [0,255] from '#RRGGBB', 'rgb(...)', 'rgba(...)', 'r,g,b', [r,g,b], or (r,g,b)."""
+    if val is None:
         return None
 
+    import re
+
+    def clamp255(x):
+        try:
+            return max(0, min(255, int(round(float(x)))))
+        except Exception:
+            return None
+
+    s = str(val).strip()
+
+    # list/tuple
+    if isinstance(val, (list, tuple)) and len(val) >= 3:
+        r, g, b = [clamp255(val[0]), clamp255(val[1]), clamp255(val[2])]
+        if None not in (r, g, b):
+            return (r, g, b)
+
+    # hex: #RGB or #RRGGBB
+    if s.startswith("#"):
+        hx = s[1:].strip()
+        if len(hx) == 3:
+            hx = "".join(c*2 for c in hx)
+        if len(hx) == 6 and re.fullmatch(r"[0-9A-Fa-f]{6}", hx):
+            return tuple(int(hx[i:i+2], 16) for i in (0, 2, 4))
+
+    # rgb/rgba(...)
+    m = re.match(r"rgba?\(\s*([^)]+)\)", s, flags=re.IGNORECASE)
+    if m:
+        parts = [p.strip() for p in m.group(1).split(",")]
+        if len(parts) >= 3:
+            def to_int(p):
+                if p.endswith("%"):
+                    # percentage to 0-255
+                    return clamp255(float(p[:-1]) * 255.0 / 100.0)
+                return clamp255(p)
+            r, g, b = to_int(parts[0]), to_int(parts[1]), to_int(parts[2])
+            if None not in (r, g, b):
+                return (r, g, b)
+
+    # 'r,g,b'
+    if "," in s:
+        parts = [p.strip() for p in s.split(",")]
+        if len(parts) >= 3:
+            def to_int(p):
+                if p.endswith("%"):
+                    return clamp255(float(p[:-1]) * 255.0 / 100.0)
+                return clamp255(p)
+            r, g, b = to_int(parts[0]), to_int(parts[1]), to_int(parts[2])
+            if None not in (r, g, b):
+                return (r, g, b)
+
+    return None
+
+
 def _apply_meeting_logo(OUTPUT_DIR: Path, meeting_logo_file, logs):
     """Replace output/poster_latex_proj/logos/right_logo.png if meeting_logo_file provided."""
     if not meeting_logo_file:
@@ -176,7 +227,7 @@ def _apply_meeting_logo(OUTPUT_DIR: Path, meeting_logo_file, logs):
         return False
 
 def _apply_theme_rgb(OUTPUT_DIR: Path, rgb_tuple, logs):
-    """Replace \\definecolor{nipspurple}{RGB}{r,g,b} in poster_output.tex if rgb_tuple provided."""
+    """Update \\definecolor{<name>}{RGB}{r,g,b} or {HTML}{RRGGBB} in poster_output.tex."""
     if not rgb_tuple:
         return False
 
@@ -187,20 +238,33 @@ def _apply_theme_rgb(OUTPUT_DIR: Path, rgb_tuple, logs):
 
     try:
         content = tex_path.read_text(encoding="utf-8")
-        pattern = r"(\\definecolor\{nipspurple\}\{RGB\}\{)\s*\d+\s*,\s*\d+\s*,\s*\d+\s*(\})"
-        new_vals = f"{rgb_tuple[0]},{rgb_tuple[1]},{rgb_tuple[2]}"
-        new_content, n = re.subn(pattern, r"\1" + new_vals + r"\2", content, flags=re.MULTILINE)
+        r, g, b = rgb_tuple
+        # names we might use in template
+        name_pattern = r"(?:nipspurple|neuripspurple|themecolor)"
+
+        # 1) Try RGB form
+        rgb_pat = rf"(\\definecolor\{{{name_pattern}\}}\{{RGB\}}\{{)\s*\d+\s*,\s*\d+\s*,\s*\d+\s*(\}})"
+        new_content, n = re.subn(rgb_pat, rf"\1{r},{g},{b}\2", content, flags=re.MULTILINE)
+
+        if n == 0:
+            # 2) Try HTML form: \definecolor{name}{HTML}{5E2E91}
+            from_str = f"{r:02X}{g:02X}{b:02X}"
+            html_pat = rf"(\\definecolor\{{{name_pattern}\}}\{{HTML\}}\{{)[0-9A-Fa-f]{{6}}(\}})"
+            new_content, n = re.subn(html_pat, rf"\1{from_str}\2", content, flags=re.MULTILINE)
+
         if n > 0:
             tex_path.write_text(new_content, encoding="utf-8")
-            logs.append(f"🎨 Theme color updated: themecolor = {{{new_vals}}} in {tex_path.relative_to(OUTPUT_DIR)}")
+            logs.append(f"🎨 Theme color updated to RGB {{{r},{g},{b}}} in {tex_path.relative_to(OUTPUT_DIR)}")
             return True
         else:
-            logs.append("⚠️ Theme RGB not applied: definecolor for 'themecolor' not found.")
+            logs.append("ℹ️ No \\definecolor target found.")
             return False
+
     except Exception as e:
         logs.append(f"⚠️ Failed to update theme RGB: {e}")
         return False
 
+
 def _apply_left_logo(OUTPUT_DIR: Path, logo_files, logs):
     """
     Use the first institutional logo uploaded by the user:
@@ -477,16 +541,23 @@ def run_pipeline(arxiv_url, pdf_file, openai_key, logo_files, meeting_logo_file,
 
     # ====== Zip output (run-local) ======
     try:
-        with zipfile.ZipFile(ZIP_PATH, 'w', zipfile.ZIP_DEFLATED) as zipf:
-            for root, dirs, files in os.walk(OUTPUT_DIR):
-                for file in files:
-                    file_path = Path(root) / file
-                    arcname = file_path.relative_to(OUTPUT_DIR)
-                    zipf.write(file_path, arcname=arcname)
-        logs.append(f"✅ Zipped output → {ZIP_PATH.relative_to(WORK_DIR)}")
+        target_dir = OUTPUT_DIR / "poster_latex_proj"
+
+        if not target_dir.exists():
+            logs.append("❌ poster_latex_proj folder not found")
+        else:
+            with zipfile.ZipFile(ZIP_PATH, 'w', zipfile.ZIP_DEFLATED) as zipf:
+                for root, dirs, files in os.walk(target_dir):
+                    for file in files:
+                        file_path = Path(root) / file
+                        arcname = file_path.relative_to(target_dir)  # only relative to subfolder
+                        zipf.write(file_path, arcname=arcname)
+
+            logs.append(f"✅ Zipped poster_latex_proj → {ZIP_PATH.relative_to(WORK_DIR)}")
+
     except Exception as e:
         logs.append(f"❌ Failed to create zip: {e}")
-
+        
     # ====== Prepare Overleaf base64 payload (optional) ======
     overleaf_zip_b64 = ""
     try: