Update app.py

app.py

@@ -7,7 +7,7 @@ from llama_cpp import Llama
 
 # -------------------------
 # TÉLÉCHARGEMENT DU MODÈLE HUGGING FACE
-# ------------------------
+# -------------------------
 MODEL_REPO = "mradermacher/Alisia-7B-it-GGUF"
 MODEL_NAME = "Alisia-7B-it.Q4_K_M.gguf"
 MODEL_PATH = f"/tmp/{MODEL_NAME}"
@@ -41,7 +41,7 @@ print("⚡ Chargement du modèle Alisia-7B-it depuis Hugging Face...")
 llm = Llama(
     model_path=MODEL_PATH,
     n_ctx=2048,
-    n_gpu_layers=0,       # Désactivé pour CPU
+    n_gpu_layers=0,
     n_threads=8,
     verbose=False
 )
@@ -66,13 +66,8 @@ def get_conv_names():
         return list(conversations.keys())
 
 def build_conversation_prompt(history, new_message):
-    """
-    Construit le prompt complet avec l'historique de conversation
-    System prompt UNIQUEMENT au début, ensuite seulement les Q/R
-    """
     prompt = ""
 
-    # System prompt UNIQUEMENT si c'est le tout premier message de toute conversation
     if not any(any(conv) for conv in conversations.values()):
         prompt += """Your name is Alisia, you are created by the Alisia research team.
 Below is an instruction that describes a task, paired with an input that provides further context.
@@ -80,11 +75,9 @@ Write a response that appropriately completes the request.
 
 """
 
-    # Ajouter tout l'historique de conversation (seulement les Q/R)
     for user_msg, assistant_msg in history:
         prompt += f"### Instruction:\n{user_msg}\n\n### Response:\n{assistant_msg}\n\n"
 
-    # Ajouter le nouveau message
     prompt += f"### Instruction:\n{new_message}\n\n### Response:\n"
 
     return prompt
@@ -106,7 +99,6 @@ def send_message_stream(user_message, displayed_history, current_chat_name):
     local_hist.append((str(user_message), ""))
     yield local_hist, ""
 
-    # Utiliser le format CORRECT Alpaca
     formatted_prompt = build_conversation_prompt(local_hist[:-1], str(user_message))
 
     partial = ""
@@ -127,7 +119,6 @@ def send_message_stream(user_message, displayed_history, current_chat_name):
                 token = chunk["choices"][0].get("text", "")
                 if token:
                     partial += token
-                    # Nettoyer et mettre à jour l'affichage
                     cleaned = clean_output(partial)
                     local_hist[-1] = (str(user_message), cleaned)
                     yield local_hist, ""
@@ -138,7 +129,6 @@ def send_message_stream(user_message, displayed_history, current_chat_name):
         yield local_hist, ""
 
     finally:
-        # Sauvegarder l'historique après la génération
         with lock:
             conversations[current_chat_name] = local_hist.copy()
         yield local_hist, ""
@@ -146,10 +136,6 @@ def send_message_stream(user_message, displayed_history, current_chat_name):
 # -------------------------
 # Fonctions pour l'interface
 # -------------------------
-def toggle_history(visible_state):
-    new_state = not bool(visible_state)
-    return new_state, gr.update(visible=new_state)
-
 def new_conversation():
     with lock:
         name = f"Conversation {len(conversations) + 1}"
@@ -174,267 +160,41 @@ def clear_chat():
 # -------------------------
 # Interface Gradio
 # -------------------------
-css = """
-:root {
-    --primary-color: #4f46e5;
-    --primary-hover: #4338ca;
-    --chat-bg: #0f172a;
-    --input-bg: #1e293b;
-}
-
-#topbar {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-    padding: 10px;
-    background: var(--chat-bg);
-    color: #fff;
-    border-bottom: 1px solid #334155;
-}
-
-#leftcol {
-    background: #111218;
-    color: #fff;
-    padding: 12px;
-    min-height: 520px;
-    border-right: 1px solid #334155;
-    transition: all 0.3s ease;
-}
-
-#chatcol {
-    padding: 12px;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.hamburger {
-    font-size: 20px;
-    background: transparent;
-    color: #fff;
-    border: none;
-    cursor: pointer;
-    padding: 8px;
-    border-radius: 50%;
-    transition: background 0.2s;
-}
-
-.hamburger:hover {
-    background: #334155;
-}
-
-#chat-container {
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-}
-
-#chatbot {
-    flex-grow: 1;
-    height: calc(100vh - 200px) !important;
-    min-height: 500px;
-    background: var(--chat-bg);
-    border-radius: 16px;
-    padding: 20px;
-    overflow-y: auto;
-    border: 1px solid #334155;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
-}
-
-#input-container {
-    display: flex;
-    gap: 8px;
-    padding: 16px 0;
-    align-items: center;
-}
-
-#msg_input {
-    flex-grow: 1;
-    background: var(--input-bg);
-    color: #fff;
-    border: 1px solid #334155;
-    border-radius: 24px;
-    padding: 16px 20px;
-    font-size: 16px;
-    box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.1);
-    transition: all 0.3s ease;
-}
-
-#msg_input:focus {
-    outline: none;
-    border-color: var(--primary-color);
-    box-shadow: 0 0 0 3px rgba(79, 70, 229, 0.2);
-}
-
-#send_btn {
-    background: var(--primary-color);
-    color: white;
-    border: none;
-    border-radius: 24px;
-    padding: 14px 20px;
-    height: 50px;
-    min-width: 80px;
-    font-weight: 600;
-    cursor: pointer;
-    transition: background 0.2s;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-#send_btn:hover {
-    background: var(--primary-hover);
-}
-
-#stop_btn {
-    background: #ef4444;
-    color: white;
-    border: none;
-    border-radius: 24px;
-    padding: 14px 20px;
-    height: 50px;
-    min-width: 80px;
-    font-weight: 600;
-    cursor: pointer;
-    transition: background 0.2s;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-}
-
-#stop_btn:hover {
-    background: #dc2626;
-}
-
-.conversation-list {
-    margin-top: 20px;
-    max-height: calc(100vh - 200px);
-    overflow-y: auto;
-}
-
-.conversation-item {
-    padding: 12px 16px;
-    border-radius: 12px;
-    margin-bottom: 8px;
-    cursor: pointer;
-    transition: background 0.2s;
-}
-
-.conversation-item:hover {
-    background: #1e293b;
-}
-
-.conversation-item.active {
-    background: var(--primary-color);
-    color: white;
-}
-
-.alisia-badge {
-    background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-    color: white;
-    padding: 4px 8px;
-    border-radius: 12px;
-    font-size: 12px;
-    font-weight: bold;
-    margin-left: 8px;
-}
-
-.clear-btn {
-    background: #94a3b8 !important;
-    color: white !important;
-    border: none;
-    border-radius: 12px;
-    padding: 10px 16px;
-    margin-top: 10px;
-    cursor: pointer;
-}
-
-.clear-btn:hover {
-    background: #64748b !important;
-}
-"""
-
-with gr.Blocks(css=css, title="Alisia Chat", theme=gr.themes.Soft()) as demo:
-    history_visible = gr.State(True)
+with gr.Blocks(title="Alisia Chat", theme=gr.themes.Soft()) as demo:
     current_chat = gr.State("Conversation 1")
 
-    with gr.Row(elem_id="topbar"):
-        menu_btn = gr.Button("☰", elem_classes="hamburger")
-        gr.Markdown("### 💬 Alisia <span class='alisia-badge'>AI Assistant</span>", elem_id="title")
-        gr.HTML("<div style='flex:1'></div>")
-        gr.Markdown("<small style='color:#94a3b8'>Hugging Face • Alisia-7B-it</small>")
-
     with gr.Row():
-        with gr.Column(scale=1, visible=True, elem_id="leftcol") as left_column:
-            with gr.Column(elem_classes="conversation-list"):
+        with gr.Column(scale=1):
+            with gr.Accordion("Conversations", open=True):
                 conv_dropdown = gr.Dropdown(
                     choices=get_conv_names(),
                     value="Conversation 1",
                     label="Conversations",
-                    interactive=True,
-                    elem_classes="conversation-item"
+                    interactive=True
                 )
-                new_conv_btn = gr.Button(
-                    "➕ Nouvelle conversation",
-                    variant="primary",
-                    elem_classes="conversation-item"
+                with gr.Row():
+                    new_conv_btn = gr.Button("➕ Nouvelle conversation")
+                    clear_btn = gr.Button("🗑️ Effacer chat")
+
+        with gr.Column(scale=3):
+            chatbot = gr.Chatbot(label="Alisia")
+            with gr.Row():
+                msg_input = gr.Textbox(
+                    placeholder="Posez votre question à Alisia…",
+                    lines=3,
+                    scale=4,
                 )
-                clear_btn = gr.Button(
-                    "🗑️ Effacer chat",
-                    elem_classes="clear-btn"
-                )
-                gr.Markdown("## Format Alpaca", elem_classes="conversation-header")
-                gr.Markdown("""
-                <div style="color: #94a3b8; font-size: 14px;">
-                ✅ Historique Q/R pur<br>
-                ✅ System prompt unique<br>
-                ✅ Multiples conversations
-                </div>
-                """, elem_classes="conversation-subheader")
-
-        with gr.Column(scale=3, elem_id="chatcol"):
-            with gr.Column(elem_id="chat-container"):
-                chatbot = gr.Chatbot(
-                    label="Alisia",
-                    elem_id="chatbot",
-                    show_label=False
-                )
-                with gr.Row(elem_id="input-container"):
-                    msg_input = gr.Textbox(
-                        placeholder="Posez votre question à Alisia…",
-                        lines=3,
-                        show_label=False,
-                        elem_id="msg_input"
-                    )
-                    send_btn = gr.Button(
-                        "Envoyer",
-                        variant="primary",
-                        elem_id="send_btn"
-                    )
-                    stop_btn = gr.Button(
-                        "Arrêter",
-                        variant="stop",
-                        elem_id="stop_btn",
-                        visible=False
-                    )
+                send_btn = gr.Button("Envoyer", scale=1)
+                stop_btn = gr.Button("Arrêter", visible=False)
 
     # Événements
-    menu_btn.click(
-        fn=toggle_history,
-        inputs=[history_visible],
-        outputs=[history_visible, left_column]
-    )
-
     new_conv_btn.click(
         fn=new_conversation,
-        inputs=None,
         outputs=[conv_dropdown, chatbot, current_chat]
     )
 
     clear_btn.click(
         fn=clear_chat,
-        inputs=None,
         outputs=[chatbot, current_chat]
     )
 
@@ -446,41 +206,34 @@ with gr.Blocks(css=css, title="Alisia Chat", theme=gr.themes.Soft()) as demo:
 
     send_btn.click(
         fn=lambda: (gr.update(visible=False), gr.update(visible=True)),
-        inputs=None,
         outputs=[send_btn, stop_btn],
         queue=False
     ).then(
         fn=send_message_stream,
         inputs=[msg_input, chatbot, current_chat],
         outputs=[chatbot, msg_input],
-        queue=True
     ).then(
         fn=lambda: (gr.update(visible=True), gr.update(visible=False)),
-        inputs=None,
         outputs=[send_btn, stop_btn],
         queue=False
     )
 
     msg_input.submit(
         fn=lambda: (gr.update(visible=False), gr.update(visible=True)),
-        inputs=None,
         outputs=[send_btn, stop_btn],
         queue=False
     ).then(
         fn=send_message_stream,
         inputs=[msg_input, chatbot, current_chat],
         outputs=[chatbot, msg_input],
-        queue=True
     ).then(
         fn=lambda: (gr.update(visible=True), gr.update(visible=False)),
-        inputs=None,
         outputs=[send_btn, stop_btn],
         queue=False
     )
 
     stop_btn.click(
         fn=request_stop,
-        inputs=None,
         outputs=None
     )
 
@@ -491,11 +244,10 @@ if __name__ == "__main__":
     print("🚀 Démarrage du serveur Alisia...")
     print("📱 Préparation du lien de partage...")
 
-    # Lancement avec partage activé
     demo.launch(
-        share=True,               # Crée un lien public
-        server_name="0.0.0.0",    # Accepte les connexions externes
-        server_port=7860,         # Port standard
-        debug=False,              # Mode non-verbose pour performance
-        show_error=True           # Affiche les erreurs
-    )
+        share=True,
+        server_name="0.0.0.0",
+        server_port=7860,
+        debug=False,
+        show_error=True
+    )