diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs index f96539454..9fb92f041 100644 --- a/crates/index-scheduler/src/lib.rs +++ b/crates/index-scheduler/src/lib.rs @@ -214,7 +214,7 @@ impl IndexScheduler { #[cfg(test)] run_loop_iteration: self.run_loop_iteration.clone(), features: self.features.clone(), - chat_settings: self.chat_settings.clone(), + chat_settings: self.chat_settings, } } @@ -877,12 +877,12 @@ impl IndexScheduler { pub fn chat_settings(&self) -> Result> { let rtxn = self.env.read_txn().map_err(Error::HeedTransaction)?; - self.chat_settings.get(&rtxn, &"main").map_err(Into::into) + self.chat_settings.get(&rtxn, "main").map_err(Into::into) } pub fn put_chat_settings(&self, settings: &serde_json::Value) -> Result<()> { let mut wtxn = self.env.write_txn().map_err(Error::HeedTransaction)?; - self.chat_settings.put(&mut wtxn, &"main", &settings)?; + self.chat_settings.put(&mut wtxn, "main", settings)?; wtxn.commit().map_err(Error::HeedTransaction)?; Ok(()) } diff --git a/crates/meilisearch/src/routes/chat.rs b/crates/meilisearch/src/routes/chat.rs index f8a3e8237..82ee4b435 100644 --- a/crates/meilisearch/src/routes/chat.rs +++ b/crates/meilisearch/src/routes/chat.rs @@ -276,11 +276,11 @@ async fn streamed_chat( match result { Ok(resp) => { let delta = &resp.choices[0].delta; + #[allow(deprecated)] let ChatCompletionStreamResponseDelta { content, // Using deprecated field but keeping for compatibility - #[allow(deprecated)] - function_call: _, + function_call: _, ref tool_calls, role: _, refusal: _, @@ -291,7 +291,7 @@ async fn streamed_chat( break 'main; } - if let Some(_) = content { + if content.is_some() { tx.send(Event::Data(sse::Data::new_json(&resp).unwrap())).await.unwrap() } @@ -321,8 +321,8 @@ async fn streamed_chat( let (meili_calls, _other_calls): (Vec<_>, Vec<_>) = mem::take(&mut global_tool_calls) - .into_iter() - .map(|(_, call)| ChatCompletionMessageToolCall { + .into_values() + .map(|call| ChatCompletionMessageToolCall { id: call.id, r#type: ChatCompletionToolType::Function, function: FunctionCall { @@ -342,7 +342,7 @@ async fn streamed_chat( for call in meili_calls { tx.send(Event::Data( - sse::Data::new_json(&json!({ + sse::Data::new_json(json!({ "object": "chat.completion.tool.call", "tool": call, })) @@ -380,7 +380,7 @@ async fn streamed_chat( ); tx.send(Event::Data( - sse::Data::new_json(&json!({ + sse::Data::new_json(json!({ "object": "chat.completion.tool.output", "tool": ChatCompletionRequestMessage::Tool( ChatCompletionRequestToolMessage {