fix_bug_adopt_suggest (#3)

- bugfix adopt suggestion bug (2bc2c4da823502330dea5f3a41924435ed503821)

provider.py

@@ -151,7 +151,7 @@ class LLMClient:
                     ann, err = self._parse_and_validate(raw_text, schema)
                 if err:
                     print(
-                        f"[LLM] error provider={self.provider} model={model} latency={time.time() - start:.2f}s error={e}")
+                        f"[LLM] error provider={self.provider} model={model} latency={time.time() - start:.2f}s error={err}")
                     return ModelResult(model=model, ok=False, annotation=None, latency_s=time.time() - start, error=err,
                                        raw=raw_text)
                 print(f"[LLM] done provider={self.provider} model={model} latency={time.time() - start:.2f}s")

static/app.js

@@ -326,6 +326,27 @@ function annotator() {
             }
             this.rev++;
         },
+        isFullStatePayload(data) {
+            return data && Array.isArray(data.sentences) && data.icl_pool !== undefined;
+        },
+
+        applyTokenSavePayload(sidx, data) {
+            if (!data) return;
+
+            // Nouveau backend : payload = _public_state()
+            if (this.isFullStatePayload(data)) {
+                this.applyState(data);
+                return;
+            }
+
+            // Ancien backend : payload = sentence uniquement
+            if (data.tokens && Array.isArray(data.tokens)) {
+                this.replaceSentence(sidx, data);
+                return;
+            }
+
+            console.warn('Unexpected token-save payload:', data);
+        },
         replaceSentence(sidx, sent) {
             const arr = [...this.state.sentences];
             arr[sidx] = {
@@ -877,11 +898,24 @@ function annotator() {
 
         adoptFromModel(model) {
             const sent = this.state.sentences[this.editor.sidx];
-            const t = (sent.per_model[model]?.tokens || [])[this.editor.tidx];
-            if (!t) return;
-            // copy all fields except surface
+            const modelTok = (sent.per_model?.[model]?.tokens || [])[this.editor.tidx];
+
+            if (!modelTok || !this.editor.tok) return;
+
             const surface = this.editor.tok.surface;
-            this.editor.tok = {...t, surface};
+            const adopted = JSON.parse(JSON.stringify(modelTok));
+
+            for (const [k, v] of Object.entries(adopted)) {
+                if (k === 'surface') continue;
+                this.editor.tok[k] = v;
+            }
+
+            this.editor.tok.surface = surface;
+            this.editor.tok._corrected = true;
+
+            // Force Alpine reactivity
+            this.editor.tok = {...this.editor.tok};
+
             this.toast(`Adopted from ${this.modelShort(model)}.`, 'ok');
         },
 
@@ -912,76 +946,87 @@ function annotator() {
         },
 
         async saveToken() {
-    const sidx = this.editor.sidx;
-    const tidx = this.editor.tidx;
-    const surface = this.editor.tok.surface;
-    const changes = this.fieldChanges();
-    const wantPropagate =
-        this.editor.propagateToSimilar &&
-        Object.keys(changes).length > 0 &&
-        this.matchingTokenCount() > 0;
-
-    this.editor.tok._corrected = true;
-
-    const r = await fetch(`/api/sentence/${sidx}/token/${tidx}`, {
-        method: 'POST',
-        headers: {'Content-Type': 'application/json'},
-        body: JSON.stringify({token: this.editor.tok})
-    });
-
-    if (!r.ok) {
-        this.toast('Save failed.', 'error');
-        return;
-    }
-
-    // returns full state to ensure consistency
-    const data = await r.json();
-    this.applyState(data);
-
-    let propagatedCount = 0;
-
-    if (wantPropagate) {
-        try {
-            const r2 = await fetch('/api/bulk_similar', {
+            const sidx = this.editor.sidx;
+            const tidx = this.editor.tidx;
+            const surface = this.editor.tok.surface;
+            const changes = this.fieldChanges();
+            const wantPropagate =
+                this.editor.propagateToSimilar &&
+                Object.keys(changes).length > 0 &&
+                this.matchingTokenCount() > 0;
+
+            this.editor.tok._corrected = true;
+
+            const r = await fetch(`/api/sentence/${sidx}/token/${tidx}`, {
                 method: 'POST',
                 headers: {'Content-Type': 'application/json'},
-                body: JSON.stringify({
-                    surface,
-                    updates: changes,
-                    exclude: [{s: sidx, t: tidx}],
-                }),
+                body: JSON.stringify({token: this.editor.tok})
             });
 
-            if (r2.ok) {
-                const j = await r2.json();
+            if (!r.ok) {
+                this.toast('Save failed.', 'error');
+                return;
+            }
+
+            const data = await r.json();
+            this.applyTokenSavePayload(sidx, data);
+            let propagatedCount = 0;
 
-                for (const item of (j.sentences || [])) {
-                    this.replaceSentence(item.idx, item.sentence);
+            if (wantPropagate) {
+                try {
+                    const r2 = await fetch('/api/bulk_similar', {
+                        method: 'POST',
+                        headers: {'Content-Type': 'application/json'},
+                        body: JSON.stringify({
+                            surface,
+                            updates: changes,
+                            exclude: [{s: sidx, t: tidx}],
+                        }),
+                    });
+
+                    if (r2.ok) {
+                        const j = await r2.json();
+
+                        for (const item of (j.sentences || [])) {
+                            this.replaceSentence(item.idx, item.sentence);
+                        }
+
+                        propagatedCount = (j.affected || []).length;
+                    }
+                } catch (e) {
+                    this.toast('Propagation failed: ' + e.message, 'error');
                 }
+            }
+
+            let iclMsg = '';
 
-                propagatedCount = (j.affected || []).length;
+            if (data.icl_add_result === 'updated') {
+                iclMsg = ` + updated ICL v${this.state.icl_pool.version}`;
+            } else if (data.icl_add_result === 'inserted') {
+                iclMsg = ` + added to ICL v${this.state.icl_pool.version}`;
+            } else if (data.icl_add_result === 'unchanged') {
+                iclMsg = ` + ICL unchanged`;
             }
-        } catch (e) {
-            this.toast('Propagation failed: ' + e.message, 'error');
-        }
-    }
 
-    let iclMsg = '';
+            // auto-advance
+            if (this.editor.autoAdvance) {
+                const next = this.findNextDisagreement(sidx, tidx);
 
-    if (data.icl_add_result === 'updated') {
-        iclMsg = ` + updated ICL v${this.state.icl_pool.version}`;
-    } else if (data.icl_add_result === 'inserted') {
-        iclMsg = ` + added to ICL v${this.state.icl_pool.version}`;
-    } else if (data.icl_add_result === 'unchanged') {
-        iclMsg = ` + ICL unchanged`;
-    }
+                if (next) {
+                    this.openTokenEditor(next.s, next.t);
 
-    // auto-advance
-    if (this.editor.autoAdvance) {
-        const next = this.findNextDisagreement(sidx, tidx);
+                    this.toast(
+                        propagatedCount > 0
+                            ? `✓ Saved + propagated to ${propagatedCount} other "${surface}"${iclMsg}.`
+                            : `✓ Saved${iclMsg}.`,
+                        'ok'
+                    );
 
-        if (next) {
-            this.openTokenEditor(next.s, next.t);
+                    return;
+                }
+            }
+
+            this.closeModal();
 
             this.toast(
                 propagatedCount > 0
@@ -989,20 +1034,7 @@ function annotator() {
                     : `✓ Saved${iclMsg}.`,
                 'ok'
             );
-
-            return;
-        }
-    }
-
-    this.closeModal();
-
-    this.toast(
-        propagatedCount > 0
-            ? `✓ Saved + propagated to ${propagatedCount} other "${surface}"${iclMsg}.`
-            : `✓ Saved${iclMsg}.`,
-        'ok'
-    );
-},
+        },
 
         findNextDisagreement(sidx, tidx) {
             const sents = this.state.sentences;