Skip to content

fix: replace unwrap with expect in proxy handlers #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janiussyafiq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: replace unwrap with expect in proxy handlers #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/proxy/handlers/chat_completions/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<ResourceEntry<Model>>().cloned().unwrap(); //TODO: safe unwrap
let model = hook_ctx.get::<ResourceEntry<Model>>().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);
Expand Down
9 changes: 6 additions & 3 deletions src/proxy/handlers/embeddings/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ pub async fn embeddings(
.await?;
// PRE CALL HOOKS END

//TODO: safe unwrap
let model = hook_ctx.get::<ResourceEntry<Model>>().cloned().unwrap();
let model = hook_ctx.get::<ResourceEntry<Model>>().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);
Expand All @@ -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::<RequestModel>().cloned().unwrap().0; //TODO: safe unwrap
response.model = hook_ctx.get::<RequestModel>().cloned()
.expect("RequestModel must be inserted before pre_call hooks")
.0;


// Execute post_call_success hooks
let response_data = ResponseData::Embedding(response.clone());
Expand Down