Update app.py

app.py

@@ -114,13 +114,9 @@ def _strip_code_fences(text: str) -> str:
 
 def _escape_bare_ampersands(text: str) -> str:
     # Replace & that aren't valid entities with &
-    return re.sub(
-        r'&(?!amp;|lt;|gt;|apos;|quot;|#\d+;|#x[0-9a-fA-F]+;)',
-        '&',
-        text
-    )
+    return re.sub(r'&(?!amp;|lt;|gt;|apos;|quot;|#\d+;|#x[0-9a-fA-F]+;)', '&', text)
 
-# ---------- Metadata Validator (updated to handle non-XML gracefully) ----------
+# ---------- Metadata Validator (handles non-XML gracefully) ----------
 def validate_metadata(metadata, admin_id=None):
     if not metadata.strip():
         return "No metadata provided.", "", ""
@@ -129,11 +125,10 @@ def validate_metadata(metadata, admin_id=None):
     issue = "Unknown"
     recommendation = "No recommendation found."
 
-    # Log a short preview to help diagnose pastes
+    # Preview to help diagnose pastes
     preview = metadata[:100].replace("\n", "\\n")
     log_to_console({"preview": preview}, "Metadata Input Preview")
 
-    # Clean typical paste artefacts
     cleaned = _strip_code_fences(metadata).lstrip("\ufeff").strip()
 
     # Only treat as XML if the first non-space character is '<'
@@ -144,16 +139,11 @@ def validate_metadata(metadata, admin_id=None):
             "<CustomField xmlns=\"http://soap.sforce.com/2006/04/metadata\">...</CustomField>"
         )
     else:
-        # Escape stray ampersands (common XML error)
         cleaned = _escape_bare_ampersands(cleaned)
-
         try:
             root = ET.fromstring(cleaned)
             # Detect <description> regardless of namespace
-            has_description = any(
-                elem.tag.split('}')[-1].lower() == "description"
-                for elem in root.iter()
-            )
+            has_description = any(elem.tag.split('}')[-1].lower() == "description" for elem in root.iter())
 
             if not has_description:
                 issue = "Missing description"
@@ -161,7 +151,6 @@ def validate_metadata(metadata, admin_id=None):
             else:
                 issue = "Unused field detected"
                 recommendation = "Remove it to improve performance or document its purpose."
-
         except ET.ParseError as pe:
             issue = "Invalid XML"
             recommendation = f"Could not parse metadata XML. Error: {pe}."
@@ -169,7 +158,7 @@ def validate_metadata(metadata, admin_id=None):
             issue = "Validation Error"
             recommendation = f"Unexpected error while validating metadata: {str(e)}"
 
-    # Log to Salesforce (unchanged)
+    # Log to Salesforce
     log_data = {
         "Name": f"MetadataLog_{mtype}",
         "MetadataType__c": mtype,
@@ -196,34 +185,45 @@ def validate_metadata(metadata, admin_id=None):
 
     return mtype, issue, recommendation
 
-# ---------- Salesforce Chatbot (Updated Prompt) ----------
-conversation_history = []
+# ---------- Salesforce Chatbot (messages format, 2+ line answers) ----------
+conversation_history = []  # optional global memory
 
-def salesforce_chatbot(query, history=[]):
+def salesforce_chatbot(query: str, chat_messages: list):
+    """
+    query: latest user question string
+    chat_messages: list[{"role":"user"|"assistant","content":str}] from the UI state
+    """
     global conversation_history
-    if not query.strip():
+    if not query or not query.strip():
         return "Please provide a valid Salesforce-related question."
 
     salesforce_keywords = [
         "apex", "soql", "trigger", "lwc", "aura", "visualforce", "salesforce", "governor limits",
         "dml", "metadata", "batch apex", "queueable", "future method", "api", "sfdc", "heap", "limits"
     ]
-
-    if not any(keyword.lower() in query.lower() for keyword in salesforce_keywords):
+    if not any(k in query.lower() for k in salesforce_keywords):
         return "Please ask a Salesforce-related question (e.g., Apex, SOQL, LWC, limits, etc)."
 
+    # Build history summary from messages (last few pairs)
+    chat_messages = chat_messages or []
+    history_summary = []
+    for m in chat_messages[-8:]:
+        prefix = "User" if m.get("role") == "user" else "Assistant"
+        history_summary.append(f"{prefix}: {m.get('content','')}")
+    history_summary = "\n".join(history_summary)
+
+    # Quick KB shortcut
     query_key = query.lower().strip()
     for kb_key, kb_answer in salesforce_knowledge_base.items():
         if kb_key in query_key:
             conversation_history.append((query, kb_answer))
-            conversation_history = conversation_history[-6:]
+            conversation_history[:] = conversation_history[-6:]
             log_to_console({"Question": query, "Answer": kb_answer}, "Chatbot Query")
             return kb_answer
 
-    history_summary = "\n".join([f"User: {q}\nAssistant: {a}" for q, a in conversation_history[-4:]])
-
     prompt = f"""
-You are an expert Salesforce developer and certified architect. You provide 100% accurate, clear, and practical answers for topics like Apex, SOQL, LWC, governor limits, triggers, metadata, and more.
+You are an expert Salesforce developer and certified architect. Provide accurate, clear, and practical answers for topics like Apex, SOQL, LWC, governor limits, triggers, metadata, and more.
+
 When answering:
 - ALWAYS give at least 2 lines of explanation.
 - Be clear, concise, and technically correct.
@@ -231,8 +231,10 @@ When answering:
 - Use bullet points or code snippets when helpful.
 - Avoid speculation — if unknown, say so and suggest Trailhead or official docs.
 - Examples must be realistic and follow best practices.
+
 Conversation History:
 {history_summary}
+
 User: {query.strip()}
 Assistant:
 """
@@ -243,11 +245,13 @@ Assistant:
         if output.startswith("Assistant:"):
             output = output.replace("Assistant:", "").strip()
 
-        if len(output) < 20:
-            output = f"I'm sorry, I couldn't generate a detailed answer for '{query}'. You can also check https://developer.salesforce.com/docs."
+        # Enforce 2+ meaningful lines
+        if len(output.split()) < 20:
+            output = (output + "\n\n"
+                      "Tip: You can verify limits and examples in the official docs at https://developer.salesforce.com/docs.")
 
         conversation_history.append((query, output))
-        conversation_history = conversation_history[-6:]
+        conversation_history[:] = conversation_history[-6:]
         log_to_console({"Question": query, "Answer": output}, "Chatbot Query")
         return output
     except Exception as e:
@@ -257,6 +261,7 @@ Assistant:
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🤖 Advanced Salesforce AI Code Review & Chatbot")
 
+    # Code Review
     with gr.Tab("Code Review"):
         code_input = gr.Textbox(label="Apex / LWC Code", lines=8, placeholder="Enter your Apex or LWC code here")
         issue_type = gr.Textbox(label="Issue Type")
@@ -265,6 +270,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         code_button = gr.Button("Analyze Code")
         code_button.click(analyze_code, inputs=code_input, outputs=[issue_type, suggestion, severity])
 
+    # Metadata Validation
     with gr.Tab("Metadata Validation"):
         metadata_input = gr.Textbox(label="Metadata XML", lines=8, placeholder="Enter your metadata XML here")
         mtype = gr.Textbox(label="Type")
@@ -273,24 +279,30 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
         metadata_button = gr.Button("Validate Metadata")
         metadata_button.click(validate_metadata, inputs=metadata_input, outputs=[mtype, issue, recommendation])
 
+    # Salesforce Chatbot (messages format)
     with gr.Tab("Salesforce Chatbot"):
         chatbot_output = gr.Chatbot(label="Conversation History", height=400, type="messages")
         query_input = gr.Textbox(label="Your Question", placeholder="e.g., What is heap size in Apex?")
         with gr.Row():
             chatbot_button = gr.Button("Ask")
             clear_button = gr.Button("Clear Chat")
+
+        # Messages state: list of {"role","content"}
         chat_state = gr.State(value=[])
 
-        def update_chatbot(query, chat_history):
-            if not query.strip():
-                return chat_history, "Please enter a valid question."
-            response = salesforce_chatbot(query, chat_history)
-            chat_history.append((query, response))
-            return chat_history, ""
+        def update_chatbot(query, chat_messages):
+            if not query or not query.strip():
+                return chat_messages, "Please enter a valid question."
+            # Get model answer
+            answer = salesforce_chatbot(query, chat_messages)
+            # Append messages in OpenAI style
+            chat_messages = (chat_messages or []) + [
+                {"role": "user", "content": query},
+                {"role": "assistant", "content": answer},
+            ]
+            return chat_messages, ""
 
         def clear_chat():
-            global conversation_history
-            conversation_history = []
             return [], ""
 
         chatbot_button.click(fn=update_chatbot, inputs=[query_input, chat_state], outputs=[chatbot_output, query_input])