Skip to content

refactor: remove dead embedding/classify code from regular PreparationStage #668

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

Merged
CatherineSue merged 2 commits into from
Mar 7, 2026
Merged

refactor: remove dead embedding/classify code from regular PreparationStage #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b02a8e5
refactor: remove unnecessary new() and Default impl from EmbeddingPre…
CatherineSue Mar 7, 2026
585c669
refactor: remove dead embedding/classify delegation from PreparationS…
CatherineSue Mar 7, 2026
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
6 changes: 0 additions & 6 deletions model_gateway/src/routers/grpc/regular/stages/embedding/preparation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,6 @@ impl EmbeddingPreparationStage {
}
}

impl Default for EmbeddingPreparationStage {
fn default() -> Self {
Self::new()
}
}

#[async_trait]
impl PipelineStage for EmbeddingPreparationStage {
async fn execute(&self, ctx: &mut RequestContext) -> Result<Option<Response>, Response> {
Expand Down
24 changes: 11 additions & 13 deletions model_gateway/src/routers/grpc/regular/stages/preparation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ use async_trait::async_trait;
use axum::response::Response;
use tracing::error;

use super::{
chat::ChatPreparationStage, embedding::preparation::EmbeddingPreparationStage,
generate::GeneratePreparationStage,
};
use super::{chat::ChatPreparationStage, generate::GeneratePreparationStage};
use crate::routers::{
error as grpc_error,
grpc::{
Expand All @@ -23,15 +20,13 @@ use crate::routers::{
pub(crate) struct PreparationStage {
chat_stage: ChatPreparationStage,
generate_stage: GeneratePreparationStage,
embedding_stage: EmbeddingPreparationStage,
}

impl PreparationStage {
pub fn new() -> Self {
Self {
chat_stage: ChatPreparationStage,
generate_stage: GeneratePreparationStage,
embedding_stage: EmbeddingPreparationStage::new(),
}
}
}
Expand All @@ -48,17 +43,20 @@ impl PipelineStage for PreparationStage {
match &ctx.input.request_type {
RequestType::Chat(_) => self.chat_stage.execute(ctx).await,
RequestType::Generate(_) => self.generate_stage.execute(ctx).await,
RequestType::Embedding(_) => self.embedding_stage.execute(ctx).await,
// Classify reuses the embedding preparation (tokenization)
RequestType::Classify(_) => self.embedding_stage.execute(ctx).await,
RequestType::Responses(_) => {
other => {
let type_name = match other {
RequestType::Embedding(_) => "Embedding",
RequestType::Classify(_) => "Classify",
RequestType::Responses(_) => "Responses",
_ => "Unknown",
};
error!(
function = "PreparationStage::execute",
"RequestType::Responses reached regular preparation stage"
"RequestType::{type_name} reached regular preparation stage"
);
Err(grpc_error::internal_error(
"responses_in_wrong_pipeline",
"RequestType::Responses reached regular preparation stage",
"wrong_pipeline",
format!("RequestType::{type_name} should use its dedicated pipeline"),
))
}
}
Expand Down
Loading