From 02b11dc8cc3ecbf4bdaf31998ffe4c8bb8d8cadf Mon Sep 17 00:00:00 2001 From: janiussyafiq Date: Tue, 31 Mar 2026 16:04:17 +0800 Subject: [PATCH] fix: replace unwrap with expect in proxy handlers --- src/proxy/handlers/chat_completions/mod.rs | 3 ++- src/proxy/handlers/embeddings/mod.rs | 9 ++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/proxy/handlers/chat_completions/mod.rs b/src/proxy/handlers/chat_completions/mod.rs index 543efe7..35888cb 100644 --- a/src/proxy/handlers/chat_completions/mod.rs +++ b/src/proxy/handlers/chat_completions/mod.rs @@ -39,7 +39,8 @@ pub async fn chat_completions( .pre_call(&mut hook_ctx, &mut request, HOOK_FILTER_ALL) .await?; - let model = hook_ctx.get::>().cloned().unwrap(); //TODO: safe unwrap + let model = hook_ctx.get::>().cloned() + .expect("ValidateModelHook must insert Model into HookContext before chat_completions handler"); let provider = create_provider(&model.provider_config); let timeout = model.timeout.map(Duration::from_millis); diff --git a/src/proxy/handlers/embeddings/mod.rs b/src/proxy/handlers/embeddings/mod.rs index 0d88355..ab86bb6 100644 --- a/src/proxy/handlers/embeddings/mod.rs +++ b/src/proxy/handlers/embeddings/mod.rs @@ -35,8 +35,8 @@ pub async fn embeddings( .await?; // PRE CALL HOOKS END - //TODO: safe unwrap - let model = hook_ctx.get::>().cloned().unwrap(); + let model = hook_ctx.get::>().cloned() + .expect("ValidateModelHook must insert Model into HookContext before embeddings handler"); let provider = create_provider(&model.provider_config); let timeout = model.timeout.map(Duration::from_millis); @@ -46,7 +46,10 @@ pub async fn embeddings( match maybe_timeout(timeout, provider.embedding(request_data)).await { Ok(Ok(mut response)) => { - response.model = hook_ctx.get::().cloned().unwrap().0; //TODO: safe unwrap + response.model = hook_ctx.get::().cloned() + .expect("RequestModel must be inserted before pre_call hooks") + .0; + // Execute post_call_success hooks let response_data = ResponseData::Embedding(response.clone());