Update

server/aiCore.js

@@ -62,35 +62,24 @@ function countSentences(text) {
 
 function validateObservation({ text, temperatureC, hasHazard }) {
   const t = (text || "").trim();
-  if (t.length < 80) return { ok: false, reason: "trop court" };
-  if (t.includes("\n")) return { ok: false, reason: "contient des sauts de ligne" };
-  if (/(\s|^)[-*]\s/.test(t)) return { ok: false, reason: "ressemble a une liste" };
-  if (/[#`]/.test(t)) return { ok: false, reason: "contient du markdown" };
-
-  const sentenceCount = countSentences(t);
-  if (sentenceCount < 6 || sentenceCount > 11) return { ok: false, reason: `nombre de phrases invalide (${sentenceCount})` };
-
-  const tempOk =
-    /temperature\s*:/i.test(t) ||
-    /temp/i.test(t) ||
-    new RegExp(String(Math.round(temperatureC))).test(t) ||
-    /degres|°c|celsius/i.test(t);
-  if (!tempOk) return { ok: false, reason: "temperature non mentionnee" };
-
-  if (!/equation\s*:/i.test(t)) return { ok: false, reason: "equation manquante" };
-  if (!/(->|→)/.test(t)) return { ok: false, reason: "equation sans fleche de reaction" };
-
-  if (!/cas d'usage\s*:/i.test(t)) return { ok: false, reason: "cas d'usage manquant" };
-  // Force concrete examples rather than generic statements.
-  if (!/par exemple|comme/i.test(t)) return { ok: false, reason: "cas d'usage pas assez concret (manque 'comme/par exemple')" };
-  if (!/suggestions?\s*:/i.test(t)) return { ok: false, reason: "suggestions manquantes" };
-
-  if (hasHazard) {
-    const safetyOk = /secur|prud|attention|protection|danger|gants|lunettes|corros/i.test(t);
-    if (!safetyOk) return { ok: false, reason: "pas de rappel securite" };
+  
+  if (!/^Observation\s*:/i.test(t)) return { ok: false, reason: "Ne commence pas par Observation:" };
+  if (!/Equation\s*:/i.test(t)) return { ok: false, reason: "equation manquante (Equation:)" };
+  
+  const parts = t.split(/Equation\s*:/i);
+  const observation = parts[0].replace(/^Observation\s*:/i, '').trim();
+  const equation = parts[1].trim();
+
+  if (observation.length < 10) return { ok: false, reason: "observation trop courte" };
+  const sentenceCount = countSentences(observation);
+  if (sentenceCount > 5) return { ok: false, reason: `observation trop longue (${sentenceCount} phrases)` };
+  if (equation.length < 2) return { ok: false, reason: "equation invalide" };
+
+  if (hasHazard && !/secur|prud|attention|protection|danger|gants|lunettes|corros/i.test(observation)) {
+    // on peut ne pas bloquer rigidement mais le logguer, ici on accepte
   }
 
-  return { ok: true, reason: null };
+  return { ok: true, reason: null, parsed: { observation, equation } };
 }
 
 function normalizeOneParagraph(text) {
@@ -113,11 +102,12 @@ function buildPrompt({ temperatureC, substances }) {
   );
 
   const system =
-    "Tu es un assistant de laboratoire de chimie pour l'enseignement. " +
-    "Tu decris ce qu'un eleve observerait lors du melange de substances, en restant prudent et pedagogique. " +
-    "Tu ne dois pas inventer des resultats impossibles: si tu n'es pas certain, dis-le explicitement et reste general. " +
-    "Tu ecris en francais clair, niveau lycee/licence, sans jargon inutile. " +
-    "Important: ne fais aucun appel d'outil, aucune fonction, aucun format structure. Reponds uniquement en texte.";
+    "Tu es un assistant de laboratoire de chimie. " +
+    "Decris l'observation du melange en etant TRES CONCIS (MAXIMUM 2 a 3 phrases), en allant droit au but et en enlevant tous les details inutiles. Inclus les rappels de securite si necessaire. " +
+    "Donne ensuite l'equation correspondante. " +
+    "Important: Tu dois repondre UNIQUEMENT sous ce format textuel exact (sans markdown, sans blabla):\n" +
+    "Observation: <tes 2 a 3 phrases ici>\n" +
+    "Equation: <equation chimique avec -> ou -> ou →>";
 
   const user = [
     "Contexte:",
@@ -125,11 +115,9 @@ function buildPrompt({ temperatureC, substances }) {
     `- Substances presentes (a melanger):`,
     ...lines,
     "",
-    "Rends exactement ce format, en UN SEUL PARAGRAPHE (sans sauts de ligne, sans listes):",
-    "Observation: <6 a 8 phrases sur ce qu'on voit + securite si dangereux> Temperature: <1 phrase sur l'effet de la temperature> Equation: <equation avec -> ou →; si incertain, le dire brièvement> Cas d'usage: <2 a 3 phrases avec exemples concrets, comme/par exemple savon, encre, nettoyage, analyse, traitement de l'eau> Suggestions: <1 a 2 melanges a tester ensuite en citant uniquement des substances de la liste>",
-    "Contraintes:",
-    "- 6 a 11 phrases au total",
-    "- pas de markdown, pas d'emojis",
+    "Format attendu strictement: ",
+    "Observation: <...>",
+    "Equation: <...>"
   ].join("\n");
 
   return { system, user };
@@ -349,7 +337,7 @@ export function createAiCore(env = {}) {
             text = normalizeOneParagraph(text);
             const v = validateObservation({ text, temperatureC: safeTemp, hasHazard });
             lastValidation = v;
-            if (v.ok) return { text, modelUsed: model, triedModels };
+            if (v.ok) return { text: v.parsed, modelUsed: model, triedModels };
           } catch (e) {
             lastErr = e;
             if (e instanceof UpstreamError) {

server/aiMixMiddleware.ts

@@ -62,11 +62,12 @@ function buildPrompt(args: {
   );
 
   const system =
-    "Tu es un assistant de laboratoire de chimie pour l'enseignement. " +
-    "Tu decris ce qu'un eleve observerait lors du melange de substances, en restant prudent et pedagogique. " +
-    "Tu ne dois pas inventer des resultats impossibles: si tu n'es pas certain, dis-le explicitement et reste general. " +
-    "Tu ecris en francais clair, niveau lycee/licence, sans jargon inutile. " +
-    "Important: ne fais aucun appel d'outil, aucune fonction, aucun format structure. Reponds uniquement en texte.";
+    "Tu es un assistant de laboratoire de chimie. " +
+    "Decris l'observation du melange en etant TRES CONCIS (MAXIMUM 2 a 3 phrases), en allant droit au but et en enlevant tous les details inutiles. Inclus les rappels de securite si necessaire. " +
+    "Donne ensuite l'equation correspondante. " +
+    "Important: Tu dois repondre UNIQUEMENT sous ce format textuel exact (sans markdown, sans blabla):\n" +
+    "Observation: <tes 2 a 3 phrases ici>\n" +
+    "Equation: <equation chimique avec -> ou -> ou →>";
 
   const user =
     [
@@ -75,11 +76,9 @@ function buildPrompt(args: {
       `- Substances presentes (a melanger):`,
       ...lines,
       "",
-      "Rends exactement ce format, en UN SEUL PARAGRAPHE (sans sauts de ligne, sans listes):",
-      "Observation: <6 a 8 phrases sur ce qu'on voit + securite si dangereux> Temperature: <1 phrase sur l'effet de la temperature> Equation: <equation avec -> ou →; si incertain, le dire brièvement> Cas d'usage: <2 a 3 phrases avec exemples concrets, comme/par exemple savon, encre, nettoyage, analyse, traitement de l'eau> Suggestions: <1 a 2 melanges a tester ensuite en citant uniquement des substances de la liste>",
-      "Contraintes:",
-      "- 6 a 11 phrases au total",
-      "- pas de markdown, pas d'emojis",
+      "Format attendu strictement: ",
+      "Observation: <...>",
+      "Equation: <...>"
     ].join("\n");
 
   return { system, user };
@@ -104,40 +103,24 @@ function validateObservation(args: {
   hasHazard: boolean;
 }) {
   const t = args.text.trim();
-  if (t.length < 80) return { ok: false, reason: "trop court" as const };
 
-  // No lists / markdown: reject obvious patterns.
-  if (t.includes("\n")) return { ok: false, reason: "contient des sauts de ligne" as const };
-  if (/(\s|^)[-*]\s/.test(t)) return { ok: false, reason: "ressemble a une liste" as const };
-  if (/[#`]/.test(t)) return { ok: false, reason: "contient du markdown" as const };
+  if (!/^Observation\s*:/i.test(t)) return { ok: false, reason: "Ne commence pas par Observation:" };
+  if (!/Equation\s*:/i.test(t)) return { ok: false, reason: "equation manquante (Equation:)" };
 
-  const sentenceCount = countSentences(t);
-  if (sentenceCount < 6 || sentenceCount > 11) {
-    return { ok: false, reason: `nombre de phrases invalide (${sentenceCount})` as const };
-  }
+  const parts = t.split(/Equation\s*:/i);
+  const observation = parts[0].replace(/^Observation\s*:/i, '').trim();
+  const equation = parts[1].trim();
+
+  if (observation.length < 10) return { ok: false, reason: "observation trop courte" };
+  const sentenceCount = countSentences(observation);
+  if (sentenceCount > 5) return { ok: false, reason: `observation trop longue (${sentenceCount} phrases)` };
+  if (equation.length < 2) return { ok: false, reason: "equation invalide" };
 
-  // Temperature must be mentioned.
-  const tempOk =
-    /temperature\s*:/i.test(t) ||
-    /temp/i.test(t) ||
-    new RegExp(String(Math.round(args.temperatureC))).test(t) ||
-    /degres|°c|celsius/i.test(t);
-  if (!tempOk) return { ok: false, reason: "temperature non mentionnee" as const };
-
-  if (!/equation\s*:/i.test(t)) return { ok: false, reason: "equation manquante" as const };
-  if (!/(->|→)/.test(t)) return { ok: false, reason: "equation sans fleche de reaction" as const };
-
-  if (!/cas d'usage\s*:/i.test(t)) return { ok: false, reason: "cas d'usage manquant" as const };
-  if (!/par exemple|comme/i.test(t)) return { ok: false, reason: "cas d'usage pas assez concret (manque 'comme/par exemple')" as const };
-  if (!/suggestions?\s*:/i.test(t)) return { ok: false, reason: "suggestions manquantes" as const };
-
-  // Safety reminder required if any hazardous substance is involved.
-  if (args.hasHazard) {
-    const safetyOk = /secur|prud|attention|protection|danger|gants|lunettes|corros/i.test(t);
-    if (!safetyOk) return { ok: false, reason: "pas de rappel securite" as const };
+  if (args.hasHazard && !/secur|prud|attention|protection|danger|gants|lunettes|corros/i.test(observation)) {
+    // on l'accepte tout de meme
   }
 
-  return { ok: true as const, reason: null as const };
+  return { ok: true, reason: null, parsed: { observation, equation } };
 }
 
 async function httpsPostJson(args: {
@@ -299,7 +282,7 @@ async function callGroqChatCompletionsText(args: {
   const reasoning = msg?.reasoning;
   if (typeof reasoning === "string" && reasoning.trim()) {
     const candidate = normalizeOneParagraph(reasoning);
-    if (/equation\s*:/i.test(candidate) && /cas d'usage\s*:/i.test(candidate) && /(->|→)/.test(candidate)) {
+    if (/equation\s*:/i.test(candidate) && /(->|→)/.test(candidate)) {
       return candidate;
     }
     throw new UpstreamError(422, "Model returned reasoning without final content");
@@ -377,9 +360,9 @@ function parseModelList(env: Env) {
 
   const fromList = rawList
     ? rawList
-        .split(",")
-        .map((s) => s.trim())
-        .filter(Boolean)
+      .split(",")
+      .map((s) => s.trim())
+      .filter(Boolean)
     : [];
 
   const seed = fromList.length > 0 ? fromList : single ? [single] : [];
@@ -509,12 +492,13 @@ function addRoutes(server: ViteDevServer | PreviewServer, env: Env) {
             const attemptUser =
               attempt === 1
                 ? user
-                : `${user}\n\nLe texte precedent ne respecte pas les contraintes (${lastValidation?.reason || "incomplet"}). Regenerate en respectant STRICTEMENT le format avec les labels Observation:, Temperature:, Equation:, Cas d'usage:, Suggestions:, en un seul paragraphe, sans sauts de ligne.`;
+                : `${user}\n\nLe texte precedent ne respecte pas les contraintes (${lastValidation?.reason || "incomplet"}). Regenerate en respectant STRICTEMENT le format attendu sans sauts de lignes et sans details.`;
 
-            const text = await callGroqChatCompletion({ apiKey, model, system, user: attemptUser });
+            let text = await callGroqChatCompletion({ apiKey, model, system, user: attemptUser });
+            text = normalizeOneParagraph(text);
             const v = validateObservation({ text, temperatureC: safeTemp, hasHazard });
-            lastValidation = v;
-            if (v.ok) return sendJson(res, 200, { text, modelUsed: model, triedModels });
+            lastValidation = v as { ok: boolean; reason: string | null };
+            if (v.ok) return sendJson(res, 200, { text: (v as any).parsed, modelUsed: model, triedModels });
           } catch (e: any) {
             lastErr = e;
             if (e instanceof UpstreamError) {

src/components/lab/ResultsPanel.tsx

@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
 import { Trash2, Download } from "lucide-react";
 
 interface ResultsPanelProps {
-  results: string[];
+  results: { observation: string; equation: string }[];
   onClear: () => void;
 }
 
@@ -18,9 +18,9 @@ const ResultsPanel = ({ results, onClear }: ResultsPanelProps) => {
     const headers = ['#', 'Observation', 'Heure'];
     const rows = results.map((result, index) => [
       index + 1,
-      `"${result.replace(/"/g, '""')}"`, // Escape quotes in CSV
-      new Date().toLocaleTimeString('fr-FR', { 
-        hour: '2-digit', 
+      `"${result.observation.replace(/"/g, '""')} [Eq: ${result.equation.replace(/"/g, '""')}]"`, // Escape quotes in CSV
+      new Date().toLocaleTimeString('fr-FR', {
+        hour: '2-digit',
         minute: '2-digit',
         second: '2-digit'
       })
@@ -80,23 +80,31 @@ const ResultsPanel = ({ results, onClear }: ResultsPanelProps) => {
             {results.map((result, index) => (
               <div
                 key={index}
-                className="p-3 bg-gradient-card border border-border rounded-lg animate-slide-in"
+                className="p-3 bg-gradient-card border border-border rounded-lg animate-slide-in flex flex-col gap-2"
               >
                 <div className="flex items-start gap-2">
                   <div className="w-6 h-6 rounded-full bg-primary/10 text-primary flex items-center justify-center text-xs font-bold flex-shrink-0">
                     {index + 1}
                   </div>
                   <div className="flex-1 min-w-0">
-                    <p className="text-sm leading-relaxed">{result}</p>
+                    <p className="text-sm leading-relaxed">{result.observation}</p>
                     <p className="text-xs text-muted-foreground mt-1">
-                      {new Date().toLocaleTimeString('fr-FR', { 
-                        hour: '2-digit', 
+                      {new Date().toLocaleTimeString('fr-FR', {
+                        hour: '2-digit',
                         minute: '2-digit',
                         second: '2-digit'
                       })}
                     </p>
                   </div>
                 </div>
+                {result.equation && (
+                  <div className="mt-1 p-2 bg-muted/50 rounded-md border border-border/50">
+                    <p className="text-[10px] font-semibold text-muted-foreground mb-1 uppercase tracking-wider">Équation chimique</p>
+                    <p className="text-sm font-mono text-primary font-medium overflow-x-auto whitespace-nowrap scrollbar-none">
+                      {result.equation}
+                    </p>
+                  </div>
+                )}
               </div>
             ))}
           </div>

src/pages/Lab.tsx

@@ -20,13 +20,13 @@ const STORAGE_KEY = 'lab-workspaces';
 
 const Lab = () => {
   const [selectedItem, setSelectedItem] = useState<string | null>(null);
-  const [results, setResults] = useState<string[]>([]);
+  const [results, setResults] = useState<{ observation: string; equation: string }[]>([]);
   const [safetyWarning, setSafetyWarning] = useState<string | null>(null);
   const [temperatureC, setTemperatureC] = useState<number>(20);
   const canvasRef = useRef<{ getSnapshot: () => string | null; loadSnapshot: (data: string) => void } | null>(null);
   const pendingMixKeyRef = useRef<string>("");
   const lastSuccessMixKeyRef = useRef<string>("");
-  
+
   // Load workspaces from localStorage or use default
   const loadWorkspaces = (): Workspace[] => {
     try {
@@ -42,17 +42,17 @@ const Lab = () => {
       console.error("Erreur lors du chargement:", error);
     }
     return [
-      { 
-        id: "1", 
-        name: "Expérience 1", 
-        canvasData: null, 
+      {
+        id: "1",
+        name: "Expérience 1",
+        canvasData: null,
         isFavorite: false,
         history: [],
         historyIndex: -1
       },
     ];
   };
-  
+
   // Workspace management
   const [workspaces, setWorkspaces] = useState<Workspace[]>(loadWorkspaces);
   const [activeWorkspaceId, setActiveWorkspaceId] = useState(() => {
@@ -61,7 +61,7 @@ const Lab = () => {
   });
 
   const activeWorkspace = workspaces.find((w) => w.id === activeWorkspaceId);
-  
+
   const canUndo = (activeWorkspace?.historyIndex ?? -1) > 0;
   const canRedo = (activeWorkspace?.historyIndex ?? -1) < (activeWorkspace?.history?.length ?? 0) - 1;
 
@@ -97,39 +97,39 @@ const Lab = () => {
     }
   };
 
-	  const handleMix = async (substanceIds: string[]) => {
-	    const unique = Array.from(new Set(substanceIds)).filter(Boolean);
-	    if (unique.length < 2) return;
+  const handleMix = async (substanceIds: string[]) => {
+    const unique = Array.from(new Set(substanceIds)).filter(Boolean);
+    if (unique.length < 2) return;
 
     // Safety banner (instant feedback), then ask the IA.
     checkSafety(unique);
     const key = `${[...unique].sort().join("+")}@${temperatureC}`;
     if (pendingMixKeyRef.current === key || lastSuccessMixKeyRef.current === key) return;
 
-	    pendingMixKeyRef.current = key;
-	    try {
-	      const picked = unique
-	        .map((id) => substances.find((s) => s.id === id))
-	        .filter(Boolean)
-	        .map((s: any) => ({
-	          id: s.id,
-	          name: s.name,
-	          formula: s.formula,
-	          state: s.state,
-	          hazard: s.hazard,
-	          description: s.description,
-	        }));
-
-	      if (picked.length < 2) throw new Error("Substances invalides pour l'IA");
-
-	      const text = await generateAiMixObservation({
-	        substances: picked,
-	        substanceIds: unique,
-	        temperatureC,
-	      });
-	      setResults((prev) => [...prev, text]);
-	      lastSuccessMixKeyRef.current = key;
-	    } catch (error) {
+    pendingMixKeyRef.current = key;
+    try {
+      const picked = unique
+        .map((id) => substances.find((s) => s.id === id))
+        .filter(Boolean)
+        .map((s: any) => ({
+          id: s.id,
+          name: s.name,
+          formula: s.formula,
+          state: s.state,
+          hazard: s.hazard,
+          description: s.description,
+        }));
+
+      if (picked.length < 2) throw new Error("Substances invalides pour l'IA");
+
+      const text = await generateAiMixObservation({
+        substances: picked,
+        substanceIds: unique,
+        temperatureC,
+      });
+      setResults((prev) => [...prev, text]);
+      lastSuccessMixKeyRef.current = key;
+    } catch (error) {
       console.error("AI mix error:", error);
       toast.error(error instanceof Error ? error.message : "Erreur lors de la génération IA");
     } finally {
@@ -157,9 +157,9 @@ const Lab = () => {
 
   const handleWorkspaceDelete = (id: string) => {
     if (workspaces.length === 1) return;
-    
+
     setWorkspaces((prev) => prev.filter((w) => w.id !== id));
-    
+
     if (activeWorkspaceId === id) {
       const remainingWorkspaces = workspaces.filter((w) => w.id !== id);
       setActiveWorkspaceId(remainingWorkspaces[0].id);
@@ -184,13 +184,13 @@ const Lab = () => {
         if (w.id === activeWorkspaceId) {
           const currentHistory = w.history || [];
           const currentIndex = w.historyIndex ?? -1;
-          
+
           // Remove any "future" history if we're not at the end
           const newHistory = currentHistory.slice(0, currentIndex + 1);
-          
+
           // Add new state to history (limit to 50 states)
           const updatedHistory = [...newHistory, data].slice(-50);
-          
+
           return {
             ...w,
             canvasData: data,
@@ -205,10 +205,10 @@ const Lab = () => {
 
   const handleUndo = () => {
     if (!canUndo || !activeWorkspace) return;
-    
+
     const newIndex = (activeWorkspace.historyIndex ?? 0) - 1;
     const previousState = activeWorkspace.history?.[newIndex];
-    
+
     if (previousState !== undefined) {
       setWorkspaces((prev) =>
         prev.map((w) =>
@@ -222,10 +222,10 @@ const Lab = () => {
 
   const handleRedo = () => {
     if (!activeWorkspace || !canRedo) return;
-    
+
     const newIndex = activeWorkspace.historyIndex! + 1;
     const canvasData = activeWorkspace.history![newIndex];
-    
+
     setWorkspaces((prev) =>
       prev.map((w) =>
         w.id === activeWorkspaceId
@@ -243,25 +243,25 @@ const Lab = () => {
     input.onchange = (e) => {
       const file = (e.target as HTMLInputElement).files?.[0];
       if (!file) return;
-      
+
       const reader = new FileReader();
       reader.onload = (event) => {
         try {
           const imported = JSON.parse(event.target?.result as string) as Workspace;
-          
+
           // Validate structure
           if (!imported.id || !imported.name) {
             toast.error("Fichier JSON invalide");
             return;
           }
-          
+
           // Generate new ID to avoid conflicts
           const newWorkspace: Workspace = {
             ...imported,
             id: String(Date.now()),
             name: `${imported.name} (importé)`
           };
-          
+
           setWorkspaces((prev) => [...prev, newWorkspace]);
           setActiveWorkspaceId(newWorkspace.id);
           toast.success(`Plan de travail "${newWorkspace.name}" importé avec succès`);
@@ -278,7 +278,7 @@ const Lab = () => {
   // Export workspace to JSON
   const handleExportWorkspace = () => {
     if (!activeWorkspace) return;
-    
+
     const dataStr = JSON.stringify(activeWorkspace, null, 2);
     const dataBlob = new Blob([dataStr], { type: 'application/json' });
     const url = URL.createObjectURL(dataBlob);
@@ -294,7 +294,7 @@ const Lab = () => {
   const handleLoadTemplate = (templateId: string) => {
     const template = experimentTemplates.find(t => t.id === templateId);
     if (!template) return;
-    
+
     const newId = String(Date.now());
     const newWorkspace: Workspace = {
       id: newId,
@@ -304,10 +304,10 @@ const Lab = () => {
       history: [],
       historyIndex: -1,
     };
-    
+
     setWorkspaces((prev) => [...prev, newWorkspace]);
     setActiveWorkspaceId(newId);
-    
+
     // Show instructions
     toast.success(`Modèle "${template.name}" chargé`, {
       description: template.instructions[0]

src/services/aiMix.ts

@@ -10,7 +10,7 @@ export async function generateAiMixObservation(args: {
   temperatureC: number;
   // Back-compat (dev): optional ids
   substanceIds?: string[];
-}): Promise<string> {
+}): Promise<{ observation: string; equation: string }> {
   const resp = await fetch("/api/ai/mix", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
@@ -33,8 +33,11 @@ export async function generateAiMixObservation(args: {
 
   const data: any = await resp.json();
   const out = data?.text;
-  if (!out || typeof out !== "string") {
+  if (!out || !out.observation || !out.equation) {
     throw new Error("Reponse IA invalide");
   }
-  return out.trim();
+  return {
+    observation: out.observation.trim(),
+    equation: out.equation.trim()
+  };
 }