Skip to content

Commit cabaf24

Browse files
committed
rename
Signed-off-by: kerthcet <kerthcet@gmail.com>
1 parent 74f7c9d commit cabaf24

8 files changed

Lines changed: 23 additions & 23 deletions

File tree

src/client/client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ impl Client {
2828

2929
pub async fn create_response(
3030
&mut self,
31-
request: provider::CreateResponseInput,
32-
) -> Result<provider::CreateResponseOutput, provider::APIError> {
31+
request: provider::CreateResponseReq,
32+
) -> Result<provider::CreateResponseRes, provider::APIError> {
3333
let model_id = self.router.sample(&request);
3434
let provider = self.providers.get(&model_id).unwrap();
3535
provider.create_response(request).await

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ mod provider {
1717
pub use crate::client::client::Client;
1818
pub use crate::config::{Config, ModelConfig, RoutingMode};
1919
pub use crate::provider::provider::{
20-
APIError, CreateResponseArgs, CreateResponseInput, CreateResponseOutput,
20+
APIError, CreateResponseArgs, CreateResponseReq, CreateResponseRes,
2121
};

src/provider/fake.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use reqwest::header::HeaderName;
1010

1111
use crate::config::{ModelConfig, ModelId};
1212
use crate::provider::provider::{
13-
APIError, CreateResponseInput, CreateResponseOutput, Provider, validate_request,
13+
APIError, CreateResponseReq, CreateResponseRes, Provider, validate_request,
1414
};
1515

1616
pub struct FakeProvider {
@@ -33,11 +33,11 @@ impl Provider for FakeProvider {
3333

3434
async fn create_response(
3535
&self,
36-
request: CreateResponseInput,
37-
) -> Result<CreateResponseOutput, APIError> {
36+
request: CreateResponseReq,
37+
) -> Result<CreateResponseRes, APIError> {
3838
validate_request(&request)?;
3939

40-
Ok(CreateResponseOutput {
40+
Ok(CreateResponseRes {
4141
id: "fake-response-id".to_string(),
4242
object: "text_completion".to_string(),
4343
model: self.model.clone(),

src/provider/openai.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use derive_builder::Builder;
44

55
use crate::config::{ModelConfig, ModelId};
66
use crate::provider::provider::{
7-
APIError, CreateResponseInput, CreateResponseOutput, Provider, validate_request,
7+
APIError, CreateResponseReq, CreateResponseRes, Provider, validate_request,
88
};
99

1010
#[derive(Debug, Clone, Builder)]
@@ -53,8 +53,8 @@ impl Provider for OpenAIProvider {
5353

5454
async fn create_response(
5555
&self,
56-
request: CreateResponseInput,
57-
) -> Result<CreateResponseOutput, APIError> {
56+
request: CreateResponseReq,
57+
) -> Result<CreateResponseRes, APIError> {
5858
validate_request(&request)?;
5959
self.client.responses().create(request).await
6060
}

src/provider/provider.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ use crate::config::ModelConfig;
88
use crate::provider::fake::FakeProvider;
99
use crate::provider::openai::OpenAIProvider;
1010

11-
pub type CreateResponseInput = CreateResponse;
11+
pub type CreateResponseReq = CreateResponse;
1212
pub type CreateResponseArgs = OpenAICreateResponseArgs;
13-
pub type CreateResponseOutput = Response;
13+
pub type CreateResponseRes = Response;
1414
pub type APIError = OpenAI_Error;
1515

1616
pub fn construct_provider(config: ModelConfig) -> Box<dyn Provider> {
@@ -27,11 +27,11 @@ pub trait Provider: Send + Sync {
2727
fn name(&self) -> &'static str;
2828
async fn create_response(
2929
&self,
30-
request: CreateResponseInput,
31-
) -> Result<CreateResponseOutput, APIError>;
30+
request: CreateResponseReq,
31+
) -> Result<CreateResponseRes, APIError>;
3232
}
3333

34-
pub fn validate_request(request: &CreateResponseInput) -> Result<(), APIError> {
34+
pub fn validate_request(request: &CreateResponseReq) -> Result<(), APIError> {
3535
if request.model.is_some() {
3636
return Err(APIError::InvalidArgument(
3737
"Model ID must be specified in the config".to_string(),

src/router/random.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rand::Rng;
22

33
use crate::config::ModelId;
4-
use crate::provider::provider::CreateResponseInput;
4+
use crate::provider::provider::CreateResponseReq;
55
use crate::router::router::{ModelInfo, Router};
66

77
pub struct RandomRouter {
@@ -19,7 +19,7 @@ impl Router for RandomRouter {
1919
"RandomRouter"
2020
}
2121

22-
fn sample(&mut self, _input: &CreateResponseInput) -> ModelId {
22+
fn sample(&mut self, _input: &CreateResponseReq) -> ModelId {
2323
let mut rng = rand::rng();
2424
let idx = rng.random_range(0..self.model_infos.len());
2525
self.model_infos[idx].id.clone()
@@ -50,7 +50,7 @@ mod tests {
5050
let mut counts = std::collections::HashMap::new();
5151

5252
for _ in 0..1000 {
53-
let sampled_id = router.sample(&CreateResponseInput::default());
53+
let sampled_id = router.sample(&CreateResponseReq::default());
5454
*counts.entry(sampled_id.clone()).or_insert(0) += 1;
5555
}
5656
assert!(counts.len() == model_infos.len());

src/router/router.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::HashMap;
22
use std::sync::atomic::AtomicUsize;
33

44
use crate::config::{ModelConfig, ModelId, RoutingMode};
5-
use crate::provider::provider::CreateResponseInput;
5+
use crate::provider::provider::CreateResponseReq;
66
use crate::router::random::RandomRouter;
77
use crate::router::wrr::WeightedRoundRobinRouter;
88

@@ -28,7 +28,7 @@ pub fn construct_router(mode: RoutingMode, models: Vec<ModelConfig>) -> Box<dyn
2828

2929
pub trait Router {
3030
fn name(&self) -> &'static str;
31-
fn sample(&mut self, input: &CreateResponseInput) -> ModelId;
31+
fn sample(&mut self, input: &CreateResponseReq) -> ModelId;
3232
}
3333

3434
#[cfg(test)]

src/router/wrr.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::router::router::{ModelInfo, Router};
2-
use crate::{config::ModelId, provider::provider::CreateResponseInput};
2+
use crate::{config::ModelId, provider::provider::CreateResponseReq};
33

44
pub struct WeightedRoundRobinRouter {
55
total_weight: i32,
@@ -27,7 +27,7 @@ impl Router for WeightedRoundRobinRouter {
2727
}
2828

2929
// Use Smooth Weighted Round Robin Algorithm.
30-
fn sample(&mut self, _input: &CreateResponseInput) -> ModelId {
30+
fn sample(&mut self, _input: &CreateResponseReq) -> ModelId {
3131
// return early if only one model.
3232
if self.model_infos.len() == 1 {
3333
return self.model_infos[0].id.clone();
@@ -76,7 +76,7 @@ mod tests {
7676
let mut wrr = WeightedRoundRobinRouter::new(model_infos.clone());
7777
let mut counts = HashMap::new();
7878
for _ in 0..1000 {
79-
let sampled_id = wrr.sample(&CreateResponseInput::default());
79+
let sampled_id = wrr.sample(&CreateResponseReq::default());
8080
*counts.entry(sampled_id.clone()).or_insert(0) += 1;
8181
}
8282
assert!(counts.len() == model_infos.len());

0 commit comments

Comments
 (0)