Update app.py

app.py

@@ -3,6 +3,7 @@ import gradio as gr
 from huggingface_hub import InferenceClient
 from retriever import find_similar_foundations
 from retriever_m3 import find_similar_foundations_api
+from chat import chat_with_model
 
 # -------------------------------------------------------------------
 # 1. Setup client for chatbot
@@ -13,31 +14,9 @@ client_chat = InferenceClient(
     api_key=os.environ["HF_TOKEN_inf"]
 )
 
-# -------------------------------------------------------------------
-# 2. Chatbot function
-# -------------------------------------------------------------------
-def chat_with_model(message, history):
-    messages = []
-    for user_msg, bot_msg in history:
-        messages.append({"role": "user", "content": user_msg})
-        if bot_msg:
-            messages.append({"role": "assistant", "content": bot_msg})
-
-    messages.append({"role": "user", "content": message})
-
-    response = client_chat.chat.completions.create(
-        model="mistralai/Mistral-7B-Instruct-v0.2",
-        messages=messages,
-        max_tokens=512,
-    )
-
-    reply = response.choices[0].message.content
-    history.append((message, reply))
-    return history, history
-
 
 # -------------------------------------------------------------------
-# 3. Setup client for bgem3 similarity search
+# 2. Setup client for bgem3 similarity search
 # -------------------------------------------------------------------
 client_m3 = InferenceClient(
     provider="hf-inference", # for embeddings similarity
@@ -45,7 +24,7 @@ client_m3 = InferenceClient(
 )
 
 # -------------------------------------------------------------------
-# 4. Foundations Retriever bge-m3 function API
+# 3. Foundations Retriever bge-m3 function API
 # -------------------------------------------------------------------
 def retrieve_foundations_m3(perspective, top_k=5):
     results = find_similar_foundations_api(perspective, client=client_m3, top_k=int(top_k))
@@ -53,7 +32,7 @@ def retrieve_foundations_m3(perspective, top_k=5):
 
 
 # -------------------------------------------------------------------
-# 5. Foundations Retriever bge-en-icl function (for UI)
+# 4. Foundations Retriever bge-en-icl function (for UI)
 # -------------------------------------------------------------------
 def retrieve_foundations(perspective, top_k=5):
     """
@@ -66,20 +45,26 @@ def retrieve_foundations(perspective, top_k=5):
     return display_text
 
 # -------------------------------------------------------------------
-# 4. Gradio Interface
+# 5. Gradio Interface
 # -------------------------------------------------------------------
 with gr.Blocks() as demo:
     gr.Markdown("# Mistral Perspective Chatbot & Foundation Finder")
 
     with gr.Tab("💬 Chatbot"):
-        perspective = gr.Textbox(
-            label="Enter your philanthropic perspective",
+        perspective_input = gr.Textbox(
+            label="Enter your philanthropic perspective (optional)",
             placeholder="e.g. Environmental philanthropist emphasizing animal protection while fostering children's education"
         )
         chatbot = gr.Chatbot(type="messages")
         msg = gr.Textbox(placeholder="Ask me anything...", show_label=False)
-        state = gr.State([])  # keeps conversation history
-        msg.submit(chat_with_model, [msg, state], [chatbot, state])
+        state = gr.State([])  # stores conversation in messages format
+
+        # Streaming callback from chat.py
+        msg.submit(
+            chat_with_model,
+            [msg, state, perspective_input],
+            [chatbot, state],
+        )
 
     with gr.Tab("🔎 M3 Aligned Foundations"):
         perspective_api = gr.Textbox(label="Enter your philanthropic perspective")