FIX

agent.py

@@ -1,22 +1,14 @@
-import os
 from huggingface_hub import InferenceClient
+import os
 
-def generate_email(model_id: str, to: str, context: str, tone: str) -> tuple[str, str]:
-    """
-    Génère un email en deux parties : sujet et corps du message.
-
-    Args:
-        model_id (str): ID du modèle HF.
-        to (str): Adresse email cible.
-        context (str): Contexte du message.
-        tone (str): Ton souhaité (formel, amical, chaleureux...).
+# Utilise le token depuis les secrets HF
+HF_TOKEN = os.getenv("HUGGINGFACEHUB_API_TOKEN")
 
-    Returns:
-        tuple[str, str]: sujet, corps
-    """
-    client = InferenceClient(model=model_id, token=os.getenv("HF_TOKEN"))
+def generate_email(model_id, to_email, context, tone):
+    client = InferenceClient(token=HF_TOKEN)
 
-    prompt = f"""Tu es un assistant virtuel. Rédige un email destiné à {to}.
+    prompt = f"""
+Tu es un assistant virtuel. Rédige un email destiné à {to_email}.
 
 Contexte : {context}
 Ton : {tone}
@@ -25,21 +17,22 @@ Réponds en deux parties :
 1. Objet : ligne d'objet de l'email
 2. Corps : contenu de l'email bien rédigé, en respectant le ton demandé.
 Commence chaque partie par son étiquette.
-"""
-
-    response = client.text_generation(
-        prompt,
-        max_new_tokens=500,
-        temperature=0.7,
-        top_p=0.95,
-        stop_sequences=["\n\n"]
-    )
-
-    if "Objet" in response and "Corps" in response:
-        subject = response.split("Objet", 1)[-1].split("Corps")[0].strip(": \n")
-        body = response.split("Corps", 1)[-1].strip()
-    else:
-        subject = "Sujet non généré"
-        body = response.strip()
-
+""".strip()
+
+    try:
+        response = client.text_generation(
+            model=model_id,
+            prompt=prompt,
+            max_new_tokens=512,
+            temperature=0.7,
+        )
+        return parse_email(response)
+    except Exception as e:
+        return "Erreur", f"❌ Erreur de génération : {e}"
+
+def parse_email(text):
+    lines = text.strip().split("\n")
+    subject = next((line for line in lines if line.lower().startswith("objet")), "Objet : (non trouvé)")
+    body_lines = [line for line in lines if not line.lower().startswith("objet")]
+    body = "\n".join(body_lines).strip()
     return subject, body

app.py

@@ -6,31 +6,30 @@ def on_generate(to_email, context, tone):
     subject, body = generate_email("mistralai/Mistral-7B-Instruct-v0.1", to_email, context, tone)
     return subject, body
 
-def on_send(to_email, subject, body, sender_email, refresh_token):
-    success, msg = send_email(sender_email, to_email, subject, body, refresh_token)
-    return msg
+def on_send(sender_email, to_email, subject, body, refresh_token):
+    return send_email(sender_email, to_email, subject, body, refresh_token)
 
-with gr.Blocks(theme="soft", css="body { background-color: #111; color: #eee; }") as demo:
-    gr.Markdown("## ✉️ Assistant de Rédaction & Envoi d’Emails", elem_id="title")
+with gr.Blocks(theme=gr.themes.Base(), css="body { background-color: #111; color: white; }") as app:
+    gr.Markdown("## ✉️ Agent d'envoi de mails", elem_id="title")
 
     with gr.Row():
-        to_email = gr.Textbox(label="📨 Destinataire")
-        sender_email = gr.Textbox(label="📤 Votre email Gmail")
-        refresh_token = gr.Textbox(label="🔐 Refresh token (coller ici)", type="password")
+        with gr.Column():
+            to_email = gr.Text(label="Destinataire")
+            context = gr.Text(label="Contexte de l'email")
+            tone = gr.Dropdown(["Chaleureux", "Formel", "Amical"], value="Chaleureux", label="Ton")
+            generate_btn = gr.Button("✏️ Générer l'email")
 
-    context = gr.Textbox(lines=3, label="📝 Contexte")
-    tone = gr.Dropdown(["Formel", "Amical", "Chaleureux", "Professionnel"], label="🎭 Ton", value="Formel")
+        with gr.Column():
+            subject_output = gr.Text(label="Objet")
+            body_output = gr.TextArea(label="Corps de l'email", lines=15)
 
     with gr.Row():
-        generate_btn = gr.Button("💡 Générer l'email")
-        send_btn = gr.Button("📤 Envoyer l'email")
+        sender_email = gr.Text(label="Adresse d'envoi (Gmail)")
+        refresh_token = gr.Text(label="Refresh Token Gmail", type="password")
+        send_btn = gr.Button("📤 Envoyer le mail")
+        status = gr.Textbox(label="Statut")
 
-    subject = gr.Textbox(label="✏️ Objet de l'email")
-    body = gr.Textbox(lines=10, label="📄 Contenu de l'email")
+    generate_btn.click(on_generate, inputs=[to_email, context, tone], outputs=[subject_output, body_output])
+    send_btn.click(on_send, inputs=[sender_email, to_email, subject_output, body_output, refresh_token], outputs=status)
 
-    status = gr.Markdown("")
-
-    generate_btn.click(fn=on_generate, inputs=[to_email, context, tone], outputs=[subject, body])
-    send_btn.click(fn=on_send, inputs=[to_email, subject, body, sender_email, refresh_token], outputs=status)
-
-demo.launch()
+app.launch()

email_sender.py

@@ -1,31 +1,37 @@
-import os
 import base64
+import os
 from email.mime.text import MIMEText
+from google.auth.transport.requests import Request
 from google.oauth2.credentials import Credentials
 from googleapiclient.discovery import build
 
-# Ces variables doivent être fournies via les secrets HF
-GMAIL_CLIENT_ID = os.getenv("GMAIL_CLIENT_ID")
-GMAIL_CLIENT_SECRET = os.getenv("GMAIL_CLIENT_SECRET")
+# Client ID / secret à stocker dans les secrets HF (cf. variables d’environnement du Space)
+CLIENT_ID = os.getenv("GMAIL_CLIENT_ID")
+CLIENT_SECRET = os.getenv("GMAIL_CLIENT_SECRET")
+
+def authenticate_gmail(sender_email, refresh_token):
+    creds_data = {
+        "token": "",
+        "refresh_token": refresh_token,
+        "token_uri": "https://oauth2.googleapis.com/token",
+        "client_id": CLIENT_ID,
+        "client_secret": CLIENT_SECRET,
+        "scopes": ["https://www.googleapis.com/auth/gmail.send"]
+    }
 
-def send_email(from_email, to_email, subject, body, refresh_token):
-    if not (GMAIL_CLIENT_ID and GMAIL_CLIENT_SECRET and refresh_token):
-        return False, "❌ Paramètres Gmail manquants (client ID, secret ou refresh token)"
+    creds = Credentials.from_authorized_user_info(info=creds_data)
+    if not creds.valid and creds.expired and creds.refresh_token:
+        creds.refresh(Request())
 
-    creds = Credentials(
-        token=None,
-        refresh_token=refresh_token,
-        token_uri="https://oauth2.googleapis.com/token",
-        client_id=GMAIL_CLIENT_ID,
-        client_secret=GMAIL_CLIENT_SECRET,
-        scopes=["https://www.googleapis.com/auth/gmail.send"]
-    )
+    service = build("gmail", "v1", credentials=creds)
+    return service
 
+def send_email(sender_email, to_email, subject, body, refresh_token):
     try:
-        service = build("gmail", "v1", credentials=creds)
+        service = authenticate_gmail(sender_email, refresh_token)
         message = MIMEText(body)
         message["to"] = to_email
-        message["from"] = from_email
+        message["from"] = sender_email
         message["subject"] = subject
 
         raw_message = base64.urlsafe_b64encode(message.as_bytes()).decode()
@@ -34,4 +40,4 @@ def send_email(from_email, to_email, subject, body, refresh_token):
         sent = service.users().messages().send(userId="me", body=send_body).execute()
         return True, f"✅ Email envoyé à {to_email} (ID: {sent['id']})"
     except Exception as e:
-        return False, f"❌ Erreur lors de l'envoi : {e}"
+        return False, f"❌ Erreur d'envoi : {e}"