Update app.py

app.py

@@ -165,45 +165,39 @@ SVG_FLUENT = {
 # -----------------------
 # Dynamic Top Bar Generator
 # -----------------------
-def generate_topbar(screen_name, user_name="Mauricio Moutinho"):
-    """Generate top bar based on screen type."""
+def generate_topbar(screen_name, role="default", user_name="John Joe"):
+    """Generate dynamic PowerApps-style top bar with role-based icons and user avatar."""
     initials = "".join([x[0] for x in user_name.split()[:2]]).upper()
 
     ICONS = {
-        "back": """<svg viewBox="0 0 24 24"><path d="M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"/></svg>""",
-        "menu": """<svg viewBox="0 0 24 24"><path d="M3 6h18v2H3zM3 12h18v2H3zM3 18h18v2H3z"/></svg>""",
-        "share": """<svg viewBox="0 0 24 24"><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7a2.5 2.5 0 000-1.4l7.02-4.11A2.5 2.5 0 0018 7.91a2.5 2.5 0 10-2.5-2.5 2.5 2.5 0 00-.1.71L8.59 10.3a2.5 2.5 0 100 3.4l7.02 4.11a2.5 2.5 0 00-.1.71 2.5 2.5 0 102.5-2.44z"/></svg>""",
-        "add": """<svg viewBox="0 0 24 24"><path d="M19 11h-6V5h-2v6H5v2h6v6h2v-6h6z"/></svg>""",
-        "check": """<svg viewBox="0 0 24 24"><path d="M9 16.17 4.83 12l-1.42 1.41L9 19l12-12-1.41-1.41z"/></svg>""",
-        "info": """<svg viewBox="0 0 24 24"><path d="M11 9h2V7h-2v2zm1-7C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6z"/></svg>""",
-        "filter": """<svg viewBox="0 0 24 24"><path d="M10 18h4v-2h-4v2zm-7-7v2h18v-2H3zm3-5v2h12V6H6z"/></svg>"""
+        "menu": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M3 6h18v2H3zM3 12h18v2H3zM3 18h18v2H3z"/></svg>""",
+        "back": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M15.41 7.41 14 6l-6 6 6 6 1.41-1.41L10.83 12z"/></svg>""",
+        "share": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7a2.5 2.5 0 000-1.4l7.02-4.11A2.5 2.5 0 0018 7.91a2.5 2.5 0 10-2.5-2.5 2.5 2.5 0 00-.1.71L8.59 10.3a2.5 2.5 0 100 3.4l7.02 4.11a2.5 2.5 0 00-.1.71 2.5 2.5 0 102.5-2.44z"/></svg>""",
+        "add": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M19 11h-6V5h-2v6H5v2h6v6h2v-6h6z"/></svg>""",
+        "check": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M9 16.17 4.83 12l-1.42 1.41L9 19l12-12-1.41-1.41z"/></svg>""",
+        "info": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M11 9h2V7h-2v2zm1-7C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6z"/></svg>""",
+        "filter": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M10 18h4v-2h-4v2zm-7-7v2h18v-2H3zm3-5v2h12V6H6z"/></svg>""",
+        "user_icon": """<svg viewBox="0 0 24 24"><path fill="#fff" d="M12 12c2.67 0 8 1.34 8 4v2H4v-2c0-2.66 5.33-4 8-4zm0-2a4 4 0 110-8 4 4 0 010 8z"/></svg>"""
     }
 
-    name_lower = screen_name.lower()
-    left_icon, right_icons = ICONS["menu"], ICONS["share"] + ICONS["info"]
+    # Default icons
+    left_icon = ICONS["menu"]
+    right_icons = ICONS["user_icon"]
 
-    if "dashboard" in name_lower:
-        left_icon = ICONS["menu"]
-        right_icons = ICONS["share"] + ICONS["info"]
-    elif "repository" in name_lower or "library" in name_lower:
-        left_icon = ICONS["menu"]
-        right_icons = ICONS["filter"] + ICONS["add"]
-    elif "task" in name_lower:
-        left_icon = ICONS["menu"]
-        right_icons = ICONS["filter"]
-    elif "form" in name_lower or "edit" in name_lower or "add" in name_lower:
+    if role == "dashboard":
+        right_icons = ICONS["share"] + ICONS["info"] + ICONS["user_icon"]
+    elif role == "list":
+        right_icons = ICONS["add"] + ICONS["filter"] + ICONS["user_icon"]
+    elif role == "form":
         left_icon = ICONS["back"]
-        right_icons = ICONS["check"]
-    else:
-        left_icon = ICONS["menu"]
-        right_icons = ICONS["share"]
+        right_icons = ICONS["check"] + ICONS["user_icon"]
+    elif role == "settings":
+        left_icon = ICONS["back"]
+        right_icons = ICONS["info"] + ICONS["user_icon"]
 
     return f"""
     <div class="topbar">
-      <div class="topbar-left">
-        {left_icon}
-        <span>{screen_name}</span>
-      </div>
+      <div class="topbar-left">{left_icon}<span>{screen_name}</span></div>
       <div class="topbar-right">
         {right_icons}
         <div class="topbar-user">
@@ -274,6 +268,25 @@ def analyze_business_pdf(pdf_file):
             if (t := page.extract_text()):
                 text += t + "\n"
 
+    # Try extracting user name from the PDF text
+    user_name = None
+    possible_name_patterns = [
+        r"Prepared by[:\-]\s*([A-Z][a-z]+(?:\s[A-Z][a-z]+)+)",
+        r"Author[:\-]\s*([A-Z][a-z]+(?:\s[A-Z][a-z]+)+)",
+        r"Created by[:\-]\s*([A-Z][a-z]+(?:\s[A-Z][a-z]+)+)",
+        r"Owner[:\-]\s*([A-Z][a-z]+(?:\s[A-Z][a-z]+)+)"
+    ]
+
+    for pattern in possible_name_patterns:
+        match = re.search(pattern, text)
+        if match:
+            user_name = match.group(1).strip()
+            break
+
+    if not user_name:
+        user_name = "John Joe"  # Default fallback name
+
+    # Generate concise app title
     try:
         app_title = model.generate_content(
             "From the following business requirements, infer a concise PowerApp title. Return only the title.\n\n" + text
@@ -281,50 +294,49 @@ def analyze_business_pdf(pdf_file):
     except Exception:
         app_title = "PowerApp Solution"
 
-    # Ask Gemini to infer logical app structure (grouped screens)
+    # Ask Gemini for structural, grouped analysis
     try:
         prompt = (
-            "You are a PowerApps UI designer. Analyze the following business requirements and detect the app's structure. "
-            "Return JSON in this format:\n"
+            "You are a senior PowerApps architect. Analyze the business requirements and return JSON structure like:\n"
             "["
             "  {\"group\": \"Metadata\", \"screens\": ["
-            "    {\"screen_name\": \"Metadata Dashboard\", \"html\": \"<div>...</div>\"},"
-            "    {\"screen_name\": \"Document Metadata\", \"html\": \"<div>...</div>\"}"
-            "  ]},"
-            "  {\"group\": \"Settings\", \"screens\": ["
-            "    {\"screen_name\": \"User Preferences\", \"html\": \"<div>...</div>\"}"
+            "    {\"screen_name\": \"Metadata Dashboard\", \"role\": \"dashboard\", \"html\": \"<div>...</div>\"}"
             "  ]}"
-            "]\n\n"
-            "If the app does not have clear groupings, return a single group called 'My Work'."
-            "\n\n" + text
+            "]\n"
+            "- Identify user roles (dashboard, list, form, settings, etc.)\n"
+            "- Group screens into modules (Metadata, Templates, Settings...)\n"
+            "- Return valid JSON only.\n\n"
+            f"Document:\n{text}"
         )
+
         response = model.generate_content(prompt)
         cleaned = re.sub(r"```(?:json)?|```", "", response.text.strip())
         groups = eval(cleaned) if cleaned.strip().startswith("[") else []
+
     except Exception as e:
         print("⚠️ Gemini failed:", e)
         groups = [{
             "group": "My Work",
-            "screens": [{"screen_name": "Dashboard", "html": "<h2>Error</h2>"}]
+            "screens": [{"screen_name": "Dashboard", "role": "dashboard", "html": "<h2>Error</h2>"}]
         }]
 
-    return app_title, groups
+    return app_title, groups, user_name
 
 # -----------------------
 # Generate Mockups
 # -----------------------
-def generate_mockups(app_title, groups):
+def generate_mockups(app_title, groups, user_name):
     image_paths = []
     for group in groups:
         for screen in group.get("screens", []):
             label = screen.get("screen_name", "Screen")
             html_content = screen.get("html", "<h2>Empty Screen</h2>")
             sidebar_html = generate_sidebar(app_title, groups, active_label=label)
-            topbar_html = generate_topbar(label)
+            topbar_html = generate_topbar(label, role=screen.get("role", "default"), user_name=user_name)
+
             full_html = BASE_TEMPLATE.replace("{user_sidebar}", sidebar_html)\
                                      .replace("{user_content}", html_content)\
                                      .replace("{user_topbar}", topbar_html)
-
             uid = str(uuid.uuid4())[:8]
             html_path = f"mockup_{label.replace(' ', '_')}_{uid}.html"
             img_path = f"mockup_{label.replace(' ', '_')}_{uid}.png"
@@ -340,15 +352,15 @@ def generate_mockups(app_title, groups):
 def generate_from_pdf(pdf_file):
     for attempt in range(3):
         try:
-            app_title, screens = analyze_business_pdf(pdf_file)
-            return generate_mockups(app_title, screens)
+            app_title, groups, user_name = analyze_business_pdf(pdf_file)
+            return generate_mockups(app_title, groups, user_name)
         except Exception as e:
             if "429" in str(e) or "quota" in str(e).lower():
-                print("⏳ Waiting for Gemini quota reset...")
+                print("⏳ Waiting for Gemini quota reset... retrying in 10 seconds")
                 time.sleep(10)
             else:
                 raise e
-    raise Exception("❌ Failed after retries.")
+    raise Exception("❌ Failed after 3 retries due to Gemini API quota limits.")
 
 # -----------------------
 # Gradio UI