Update app.py

app.py

@@ -4,7 +4,6 @@ import os
 from dotenv import load_dotenv
 import http.client
 import json
-from typing import Iterator
 
 load_dotenv()
 
@@ -18,12 +17,11 @@ safety_settings = [
     {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
 ]
 
-model = genai.GenerativeModel('gemini-2.0-flash-exp', 
-                            tools='code_execution',
+model = genai.GenerativeModel('gemini-2.0-flash-exp', tools='code_execution',
                             safety_settings=safety_settings,
                             system_instruction="Tu es un assistant intelligent. ton but est d'assister au mieux que tu peux. tu as été créé par Aenir et tu t'appelles Mariam")
 
-def perform_web_search(query: str) -> dict:
+def perform_web_search(query):
     conn = http.client.HTTPSConnection("google.serper.dev")
     payload = json.dumps({"q": query})
     headers = {
@@ -41,135 +39,109 @@ def perform_web_search(query: str) -> dict:
     finally:
         conn.close()
 
-def format_search_results(data: dict) -> str:
+def format_search_results(data):
     if not data:
         return "Aucun résultat trouvé"
     
     result = ""
     
+    # Knowledge Graph
     if 'knowledgeGraph' in data:
         kg = data['knowledgeGraph']
         result += f"### {kg.get('title', '')}\n"
         result += f"*{kg.get('type', '')}*\n\n"
         result += f"{kg.get('description', '')}\n\n"
     
+    # Organic Results
     if 'organic' in data:
         result += "### Résultats principaux:\n"
-        for item in data['organic'][:3]:
+        for item in data['organic'][:3]:  # Limit to top 3 results
             result += f"- **{item['title']}**\n"
             result += f"  {item['snippet']}\n"
             result += f"  [Lien]({item['link']})\n\n"
     
+    # People Also Ask
     if 'peopleAlsoAsk' in data:
         result += "### Questions fréquentes:\n"
-        for item in data['peopleAlsoAsk'][:2]:
+        for item in data['peopleAlsoAsk'][:2]:  # Limit to top 2 questions
             result += f"- **{item['question']}**\n"
             result += f"  {item['snippet']}\n\n"
     
     return result
 
-def stream_response(prompt: str, uploaded_file=None) -> Iterator[str]:
-    """Stream the response from Gemini"""
-    try:
-        if uploaded_file:
-            response = model.generate_content([uploaded_file, "\n\n", prompt], stream=True)
-        else:
-            response = model.generate_content(prompt, stream=True)
-        
-        for chunk in response:
-            if chunk.text:
-                yield chunk.text
-                
-    except Exception as e:
-        yield f"Erreur lors de la génération de la réponse : {str(e)}"
+def role_to_streamlit(role):
+    if role == "model":
+        return "assistant"
+    else:
+        return role
+
+# Add chat and settings to session state
+if "chat" not in st.session_state:
+    st.session_state.chat = model.start_chat(history=[])
+if "web_search" not in st.session_state:
+    st.session_state.web_search = False
 
-def role_to_streamlit(role: str) -> str:
-    return "assistant" if role == "model" else role
+# Display Form Title
+st.title("Mariam AI!")
 
-def process_uploaded_file(file) -> object:
+# Settings section
+with st.sidebar:
+    st.title("Paramètres")
+    st.session_state.web_search = st.toggle("Activer la recherche web", value=st.session_state.web_search)
+
+# File upload section
+uploaded_file = st.file_uploader("Télécharger un fichier (image/document)", type=['jpg', 'mp4', 'mp3', 'jpeg', 'png', 'pdf', 'txt'])
+
+# Display chat messages
+for message in st.session_state.chat.history:
+    with st.chat_message(role_to_streamlit(message.role)):
+        st.markdown(message.parts[0].text)
+
+# Function to handle file upload with Gemini
+def process_uploaded_file(file):
     if file is not None:
-        file_path = os.path.join("temp", file.name)
-        with open(file_path, "wb") as f:
+        with open(os.path.join("temp", file.name), "wb") as f:
             f.write(file.getbuffer())
         try:
-            return genai.upload_file(file_path)
+            gemini_file = genai.upload_file(os.path.join("temp", file.name))
+            return gemini_file
         except Exception as e:
             st.error(f"Erreur lors du téléchargement du fichier : {e}")
             return None
-        finally:
-            # Clean up the temporary file
-            if os.path.exists(file_path):
-                os.remove(file_path)
-
-def main():
-    # Initialize session state
-    if "chat" not in st.session_state:
-        st.session_state.chat = model.start_chat(history=[])
-    if "messages" not in st.session_state:
-        st.session_state.messages = []
-    if "web_search" not in st.session_state:
-        st.session_state.web_search = False
-
-    st.title("Mariam AI!")
-
-    # Settings sidebar
-    with st.sidebar:
-        st.title("Paramètres")
-        st.session_state.web_search = st.toggle("Activer la recherche web", 
-                                              value=st.session_state.web_search)
-
-    # File upload
-    uploaded_file = st.file_uploader("Télécharger un fichier (image/document)", 
-                                   type=['jpg', 'mp4', 'mp3', 'jpeg', 'png', 'pdf', 'txt'])
-
-    # Display chat history from session state
-    for message in st.session_state.messages:
-        with st.chat_message(message["role"]):
-            st.markdown(message["content"])
-
-    # Chat input
-    if prompt := st.chat_input("Hey?"):
-        # Add user message to chat history
-        st.session_state.messages.append({"role": "user", "content": prompt})
-        
-        # Display user message
-        st.chat_message("user").markdown(prompt)
 
-        # Handle file upload
-        uploaded_gemini_file = None
-        if uploaded_file:
-            uploaded_gemini_file = process_uploaded_file(uploaded_file)
-
-        try:
-            # Perform web search if enabled
-            if st.session_state.web_search:
-                with st.spinner("Recherche web en cours..."):
-                    web_results = perform_web_search(prompt)
-                    if web_results:
-                        formatted_results = format_search_results(web_results)
-                        prompt = f"""Question: {prompt}\n\nRésultats de recherche web:\n{formatted_results}\n\nPourrais-tu analyser ces informations et me donner une réponse complète?"""
-
-            # Display assistant message with streaming
-            with st.chat_message("assistant"):
-                message_placeholder = st.empty()
-                full_response = ""
-                
-                # Stream the response
-                for chunk in stream_response(prompt, uploaded_gemini_file):
-                    full_response += chunk
-                    # Update the message placeholder with the accumulated response
-                    message_placeholder.markdown(full_response + "▌")
-                
-                # Remove the cursor and update with the final response
-                message_placeholder.markdown(full_response)
-            
-            # Add assistant response to chat history
-            st.session_state.messages.append({"role": "assistant", "content": full_response})
+# Chat input and processing
+if prompt := st.chat_input("Hey?"):
+    uploaded_gemini_file = None
+    if uploaded_file:
+        uploaded_gemini_file = process_uploaded_file(uploaded_file)
+    
+    # Display user message
+    st.chat_message("user").markdown(prompt)
+    print(prompt)
+    print("------------")
+    try:
+        # Perform web search if enabled
+        web_results = None
+        if st.session_state.web_search:
+            with st.spinner("Recherche web en cours..."):
+                web_results = perform_web_search(prompt)
+                if web_results:
+                    formatted_results = format_search_results(web_results)
+                    prompt = f"""Question: {prompt}\n\nRésultats de recherche web:\n{formatted_results}\n\nPourrais-tu analyser ces informations et me donner une réponse complète?"""
+        
+        # Send message to Gemini
+        if uploaded_gemini_file:
+            response = st.session_state.chat.send_message([uploaded_gemini_file, "\n\n", prompt])
+        else:
+            response = st.session_state.chat.send_message(prompt)
 
-        except Exception as e:
-            st.error(f"Erreur lors de l'envoi du message : {e}")
+        print(response.text)
+        # Display assistant response
+        with st.chat_message("assistant"):
+            st.markdown(response.text)
+    
+    except Exception as e:
+        st.error(f"Erreur lors de l'envoi du message : {e}")
 
-if __name__ == "__main__":
-    # Create temp directory
-    os.makedirs("temp", exist_ok=True)
-    main()
+# Create temp directory
+os.makedirs("temp", exist_ok=True)