Update app.py

app.py

@@ -34,36 +34,39 @@ def classify_image(img):
     }
 
 def respond(
-    message,
-    history: list[tuple[str, str]],
+    messages,
     system_message,
     max_tokens,
     temperature,
-    top_p,
+    top_p
 ):
-    messages = [{"role": "system", "content": system_message}]
-
-    for val in history:
-        if val[0]:
-            messages.append({"role": "user", "content": val[0]})
-        if val[1]:
-            messages.append({"role": "assistant", "content": val[1]})
-
-    messages.append({"role": "user", "content": message})
-
-    response = ""
-
-    for message in client.chat_completion(
-        messages,
-        max_tokens=max_tokens,
-        stream=True,
-        temperature=temperature,
-        top_p=top_p,
-    ):
-        token = message.choices[0].delta.content
-
-        response += token
-        yield response
+    # Ensure messages are correctly formatted
+    formatted_messages = []
+    for message in messages:
+        if message['content'] is None:
+            message['content'] = ''  # Set to empty string if None
+        formatted_messages.append(message)
+
+    # Add system message at the beginning
+    formatted_messages.insert(0, {"role": "system", "content": system_message})
+
+    # Proceed with chat completion
+    try:
+        response = ""
+        for message in client.chat_completion(
+            model_id='HuggingFaceH4/zephyr-7b-beta',
+            messages=formatted_messages,
+            max_tokens=max_tokens,
+            temperature=temperature,
+            top_p=top_p,
+            stream=True
+        ):
+            token = message.choices[0].delta.content
+            response += token
+        return response
+    except Exception as e:
+        print(f"Error: {e}")
+        return "Sorry, there was an error processing your request."
 
 def emotion_and_chat(img, system_message, max_tokens, temperature, top_p):
     # Classify the image to detect emotion
@@ -72,8 +75,10 @@ def emotion_and_chat(img, system_message, max_tokens, temperature, top_p):
 
     # Start chatbot conversation based on the detected emotion
     initial_message = f"I detected that you're feeling {detected_emotion}. Let's talk about it."
-    chat_history = [(initial_message, None)]  # Start conversation with detected emotion
-    return respond(initial_message, chat_history, system_message, max_tokens, temperature, top_p)
+    chat_history = [{"role": "user", "content": initial_message}]
+    chat_response = respond(chat_history, system_message, max_tokens, temperature, top_p)
+
+    return chat_response
 
 # Define custom CSS for styling
 custom_css = """
@@ -136,9 +141,9 @@ body {
 
 # Define example images from URLs
 examples = [
-    ["https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/a-captivating-ukiyo-e-inspired-poster-featuring-a--wTg7L-f2Tfiy6K8w6aWnKA-KbGU9GSKSDGBbbxrCO65Mg.jpeg?alt=media&token=64590de9-e265-44ac-a766-aeecd455ed5d"],
-    ["https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/poster-ai-themed-kenyan-female-silhoutte-written-l-PMIXpNWGQ8KaNNetQRVJuQ-B1TteyL-S5OTPZFXvfGybg.jpeg?alt=media&token=fc10f96d-403e-4f75-bd9c-810e0da36867"],
-    ["https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/poster-ai-themed-kenyan-male-silhoutte-written-log-z3fqBD5bQOOj6uqGd_iXLQ-4aBfNy0ZTgmLlTsZh1dzIA.jpeg?alt=media&token=f218f160-d38e-482f-97a9-5442c2f251a7"]
+    "https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/a-captivating-ukiyo-e-inspired-poster-featuring-a--wTg7L-f2Tfiy6K8w6aWnKA-KbGU9GSKSDGBbbxrCO65Mg.jpeg?alt=media&token=64590de9-e265-44ac-a766-aeecd455ed5d",
+    "https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/poster-ai-themed-kenyan-female-silhoutte-written-l-PMIXpNWGQ8KaNNetQRVJuQ-B1TteyL-S5OTPZFXvfGybg.jpeg?alt=media&token=fc10f96d-403e-4f75-bd9c-810e0da36867",
+    "https://firebasestorage.googleapis.com/v0/b/hisia-4b65b.appspot.com/o/poster-ai-themed-kenyan-male-silhoutte-written-log-z3fqBD5bQOOj6uqGd_iXLQ-4aBfNy0ZTgmLlTsZh1dzIA.jpeg?alt=media&token=f218f160-d38e-482f-97a9-5442c2f251a7"
 ]
 
 # Gradio Interface
@@ -160,4 +165,5 @@ interface = gr.Interface(
 )
 
 # Launch the Gradio interface
-interface.launch()
+if __name__ == "__main__":
+    interface.launch()