Skip to content

World's first open-source enterprise world model.

Do not report fallback chat completion when saving fails (#852)

Maya Kid7cfeedfeb11c
diff --git a/crates/utopia-server/src/api/chat.rs b/crates/utopia-server/src/api/chat.rs
index d7e7cc0c..3e666462 100644
--- a/crates/utopia-server/src/api/chat.rs
+++ b/crates/utopia-server/src/api/chat.rs
@@ -957,7 +957,7 @@ fn legacy_rag(
Err(e) => { yield error_event(&e.to_string()); return; }
}
}
- let _ = utopia_store::conversations::append_message(
+ if let Err(error) = utopia_store::conversations::append_message(
&state.pool, conversation_id, "assistant", &answer_acc,
&utopia_store::conversations::TurnRecord {
steps: serde_json::Value::Array(Vec::new()),
@@ -965,7 +965,11 @@ fn legacy_rag(
resolved: serde_json::Value::Array(Vec::new()),
tool_exchange: serde_json::Value::Array(Vec::new()),
},
- ).await;
+ ).await {
+ tracing::error!(%error, "fallback answer persistence was not confirmed");
+ yield error_event("Could not confirm that the answer was saved.");
+ return;
+ }
yield done_event();
}
Err(e) => yield error_event(&e.to_string()),
diff --git a/crates/utopia-server/src/api/chat_empty_reply_tests.rs b/crates/utopia-server/src/api/chat_empty_reply_tests.rs
index b53b4945..968a97fc 100644
--- a/crates/utopia-server/src/api/chat_empty_reply_tests.rs
+++ b/crates/utopia-server/src/api/chat_empty_reply_tests.rs
@@ -308,6 +308,8 @@ async fn a_reply_that_stays_empty_is_an_error_after_one_retry() -> anyhow::Resul
#[path = "chat_fallback_tests.rs"]
mod fallback_tests;
+#[path = "chat_persistence_tests.rs"]
+mod persistence_tests;
#[path = "chat_registry_tests.rs"]
mod registry_tests;
#[path = "chat_sources_tests.rs"]
diff --git a/crates/utopia-server/src/api/chat_persistence_tests.rs b/crates/utopia-server/src/api/chat_persistence_tests.rs
new file mode 100644
index 00000000..ca42b7a6
--- /dev/null
+++ b/crates/utopia-server/src/api/chat_persistence_tests.rs
@@ -0,0 +1,113 @@
+//! The fallback answer can be streamed before its save; a failed save must still
+//! terminate as error, including when the initiating browser has disconnected.
+use super::*;
+
+#[derive(Clone, Default)]
+struct LegacyOnly(Arc<Mutex<Vec<serde_json::Value>>>);
+impl Respond for LegacyOnly {
+ fn respond(&self, request: &Request) -> ResponseTemplate {
+ let body: serde_json::Value = request.body_json().unwrap();
+ let tools = body.get("tools").is_some();
+ self.0.lock().unwrap().push(body);
+ if tools {
+ return ResponseTemplate::new(422)
+ .set_body_json(json!({"error":{"message":"tools unsupported"}}));
+ }
+ ResponseTemplate::new(200).insert_header("content-type","text/event-stream")
+ .set_body_string("data: {\"choices\":[{\"delta\":{\"content\":\"Generated answer.\"},\"finish_reason\":\"stop\"}]}\n\ndata: [DONE]\n\n")
+ }
+}
+
+async fn exercise(deny: bool, disconnect: bool) -> anyhow::Result<()> {
+ let Some(f) = fixture(Scripted::new(vec![])).await? else {
+ return Ok(());
+ };
+ f._server.reset().await;
+ let model = LegacyOnly::default();
+ Mock::given(method("POST"))
+ .and(path("/chat/completions"))
+ .respond_with(model.clone())
+ .mount(&f._server)
+ .await;
+ let trigger = format!("reject_chat_{}", f.kb.simple());
+ if deny {
+ sqlx::raw_sql(&format!("CREATE FUNCTION {trigger}() RETURNS trigger LANGUAGE plpgsql AS $$ BEGIN IF NEW.role='assistant' AND EXISTS(SELECT 1 FROM conversations WHERE id=NEW.conversation_id AND kb_id='{}') THEN RAISE EXCEPTION 'private persistence diagnostic'; END IF; RETURN NEW; END $$; CREATE TRIGGER {trigger} BEFORE INSERT ON conversation_messages FOR EACH ROW EXECUTE FUNCTION {trigger}();",f.kb)).execute(&f.pool).await?;
+ }
+ let result = tokio::time::timeout(std::time::Duration::from_secs(20), async {
+ let sse = if disconnect {
+ let id =
+ utopia_store::conversations::create(&f.pool, f.kb, f.user.id, "disconnect").await?;
+ let response = chat(
+ State(f.state.clone()),
+ AuthUser(f.user.clone()),
+ Path(f.kb),
+ Json(ChatReq {
+ conversation_id: Some(id),
+ message: "hello".into(),
+ }),
+ )
+ .await
+ .map_err(|_| anyhow::anyhow!("chat refused"))?;
+ let (_, mut rx) = f
+ .state
+ .live
+ .attach(id)
+ .await
+ .ok_or_else(|| anyhow::anyhow!("producer ended before attachment"))?;
+ drop(response);
+ let mut frames = String::new();
+ loop {
+ match rx.recv().await {
+ Ok(frame) => frames
+ .push_str(&format!("event: {}\ndata: {}\n\n", frame.event, frame.data)),
+ Err(tokio::sync::broadcast::error::RecvError::Closed) => break,
+ Err(e) => return Err(e.into()),
+ }
+ }
+ anyhow::ensure!(f.state.live.attach(id).await.is_none());
+ frames
+ } else {
+ f.ask("hello").await?
+ };
+ if deny {
+ anyhow::ensure!(
+ sse.contains("event: error") && !sse.contains("event: done"),
+ "{sse}"
+ );
+ anyhow::ensure!(sse.contains("Could not confirm that the answer was saved."));
+ anyhow::ensure!(!sse.contains("private persistence diagnostic"));
+ anyhow::ensure!(f.stored_answer().await?.is_none());
+ } else {
+ anyhow::ensure!(sse.contains("event: done") && !sse.contains("event: error"));
+ anyhow::ensure!(f.stored_answer().await?.as_deref() == Some("Generated answer."));
+ }
+ anyhow::ensure!(
+ model.0.lock().unwrap().len() == 3,
+ "compatibility negotiation plus exactly one answer, no save retry"
+ );
+ Ok::<_, anyhow::Error>(())
+ })
+ .await;
+ if deny {
+ sqlx::raw_sql(&format!(
+ "DROP TRIGGER {trigger} ON conversation_messages; DROP FUNCTION {trigger}();"
+ ))
+ .execute(&f.pool)
+ .await?;
+ }
+ f.cleanup().await?;
+ result??;
+ Ok(())
+}
+#[tokio::test]
+async fn failed_fallback_save_never_reports_done() -> anyhow::Result<()> {
+ exercise(true, false).await
+}
+#[tokio::test]
+async fn failed_fallback_save_after_disconnect_cleans_up() -> anyhow::Result<()> {
+ exercise(true, true).await
+}
+#[tokio::test]
+async fn committed_fallback_answer_is_readable_at_done() -> anyhow::Result<()> {
+ exercise(false, false).await
+}