From 896d30e563a2962f006f9d7ef52b5fada237d42c Mon Sep 17 00:00:00 2001 From: kerthcet Date: Tue, 30 Dec 2025 20:34:25 +0800 Subject: [PATCH] rename routingMode to routerMode Signed-off-by: kerthcet --- README.md | 2 +- bindings/python/amrs/__init__.py | 4 ++-- bindings/python/amrs/config.py | 6 +++--- bindings/python/amrs/router/router.py | 4 ++-- examples/wrr.rs | 2 +- src/client/client.rs | 4 ++-- src/client/config.rs | 10 +++++----- src/client/mod.rs | 2 +- src/router/router.rs | 12 ++++++------ tests/client.rs | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 740ca2f..1e2a6f9 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ use tokio::runtime::Runtime; fn main() { let config = client::Config::builder() .provider("deepinfra") - .routing_mode(client::RoutingMode::WRR) + .routing_mode(client::RouterMode::WRR) .model( client::ModelConfig::builder() .name("deepseek-ai/DeepSeek-V3.2") diff --git a/bindings/python/amrs/__init__.py b/bindings/python/amrs/__init__.py index 804a827..c466d93 100644 --- a/bindings/python/amrs/__init__.py +++ b/bindings/python/amrs/__init__.py @@ -1,7 +1,7 @@ -from amrs.config import ModelConfig, Config, RoutingMode +from amrs.config import ModelConfig, Config, RouterMode __all__ = [ "ModelConfig", "Config", - "RoutingMode", + "RouterMode", ] diff --git a/bindings/python/amrs/config.py b/bindings/python/amrs/config.py index 955e58e..9ad1967 100644 --- a/bindings/python/amrs/config.py +++ b/bindings/python/amrs/config.py @@ -72,15 +72,15 @@ class Message(BaseModel): content: str = Field(description="Content of the message.") -class RoutingMode(str, Enum): +class RouterMode(str, Enum): RANDOM = "random" WEIGHTED = "weighted" class Config(BasicModelConfig): models: List[ModelConfig] = Field(description="List of model configurations") - routing_mode: RoutingMode = Field( - default=RoutingMode.RANDOM, + routing_mode: RouterMode = Field( + default=RouterMode.RANDOM, description="Routing mode for the model, default is random.", ) callback_funcs: Optional[List[Callable]] = Field( diff --git a/bindings/python/amrs/router/router.py b/bindings/python/amrs/router/router.py index c8bceba..5fbbee0 100644 --- a/bindings/python/amrs/router/router.py +++ b/bindings/python/amrs/router/router.py @@ -14,10 +14,10 @@ def __init__(self, model_list: list[config.ModelName]): def sample(self, content: str) -> config.ModelName: pass -def new_router(model_cfgs: list[config.ModelConfig], mode: config.RoutingMode) -> Router: +def new_router(model_cfgs: list[config.ModelConfig], mode: config.RouterMode) -> Router: model_list = [f"{model_cfg.provider}/{model_cfg.id}" for model_cfg in model_cfgs] - if mode == config.RoutingMode.RANDOM: + if mode == config.RouterMode.RANDOM: from amrs.router.random import RandomRouter return RandomRouter(model_list) else: diff --git a/examples/wrr.rs b/examples/wrr.rs index 6050b8f..b72cf4f 100644 --- a/examples/wrr.rs +++ b/examples/wrr.rs @@ -5,7 +5,7 @@ use tokio::runtime::Runtime; fn main() { let config = client::Config::builder() .provider("deepinfra") - .routing_mode(client::RoutingMode::WRR) + .routing_mode(client::RouterMode::WRR) .model( client::ModelConfig::builder() .name("deepseek-ai/DeepSeek-V3.2") diff --git a/src/client/client.rs b/src/client/client.rs index d5762c7..a156e0d 100644 --- a/src/client/client.rs +++ b/src/client/client.rs @@ -51,7 +51,7 @@ impl Client { #[cfg(test)] mod tests { use super::*; - use crate::client::config::{Config, ModelConfig, RoutingMode}; + use crate::client::config::{Config, ModelConfig, RouterMode}; use dotenvy::from_filename; #[test] @@ -81,7 +81,7 @@ mod tests { TestCase { name: "weighted round-robin router", config: Config::builder() - .routing_mode(RoutingMode::WRR) + .routing_mode(RouterMode::WRR) .models(vec![ crate::client::config::ModelConfig::builder() .name("model_a".to_string()) diff --git a/src/client/config.rs b/src/client/config.rs index f50de68..68329f1 100644 --- a/src/client/config.rs +++ b/src/client/config.rs @@ -22,7 +22,7 @@ lazy_static! { // ------------------ Routing Mode ------------------ #[derive(Debug, Clone, PartialEq)] -pub enum RoutingMode { +pub enum RouterMode { Random, WRR, // WeightedRoundRobin, } @@ -83,8 +83,8 @@ pub struct Config { #[builder(default = "DEFAULT_PROVIDER.to_string()", setter(custom))] pub(crate) provider: String, - #[builder(default = "RoutingMode::Random")] - pub(crate) routing_mode: RoutingMode, + #[builder(default = "RouterMode::Random")] + pub(crate) routing_mode: RouterMode, #[builder(default = "vec![]")] pub(crate) models: Vec, } @@ -152,7 +152,7 @@ impl ConfigBuilder { for model in self.models.as_ref().unwrap() { if self.routing_mode.is_some() - && self.routing_mode.as_ref().unwrap() == &RoutingMode::WRR + && self.routing_mode.as_ref().unwrap() == &RouterMode::WRR && model.weight <= 0 { return Err(format!( @@ -218,7 +218,7 @@ mod tests { assert!(valid_simplest_models_cfg.is_ok()); assert!(valid_simplest_models_cfg.as_ref().unwrap().provider == DEFAULT_PROVIDER); assert!(valid_simplest_models_cfg.as_ref().unwrap().base_url == None); - assert!(valid_simplest_models_cfg.as_ref().unwrap().routing_mode == RoutingMode::Random); + assert!(valid_simplest_models_cfg.as_ref().unwrap().routing_mode == RouterMode::Random); assert!(valid_simplest_models_cfg.as_ref().unwrap().models.len() == 1); assert!(valid_simplest_models_cfg.as_ref().unwrap().models[0].base_url == None); assert!(valid_simplest_models_cfg.as_ref().unwrap().models[0].provider == None); diff --git a/src/client/mod.rs b/src/client/mod.rs index 96f5bea..a77d512 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -2,4 +2,4 @@ pub mod client; pub mod config; pub use client::Client; -pub use config::{Config, ModelConfig, ModelName, RoutingMode}; +pub use config::{Config, ModelConfig, ModelName, RouterMode}; diff --git a/src/router/router.rs b/src/router/router.rs index 6532a07..783db42 100644 --- a/src/router/router.rs +++ b/src/router/router.rs @@ -1,4 +1,4 @@ -use crate::client::config::{ModelConfig, ModelName, RoutingMode}; +use crate::client::config::{ModelConfig, ModelName, RouterMode}; use crate::router::random::RandomRouter; use crate::router::wrr::WeightedRoundRobinRouter; @@ -8,7 +8,7 @@ pub struct ModelInfo { pub weight: i32, } -pub fn construct_router(mode: RoutingMode, models: Vec) -> Box { +pub fn construct_router(mode: RouterMode, models: Vec) -> Box { let model_infos: Vec = models .iter() .map(|m| ModelInfo { @@ -17,8 +17,8 @@ pub fn construct_router(mode: RoutingMode, models: Vec) -> Box Box::new(RandomRouter::new(model_infos)), - RoutingMode::WRR => Box::new(WeightedRoundRobinRouter::new(model_infos)), + RouterMode::Random => Box::new(RandomRouter::new(model_infos)), + RouterMode::WRR => Box::new(WeightedRoundRobinRouter::new(model_infos)), } } @@ -47,10 +47,10 @@ mod tests { .unwrap(), ]; - let random_router = construct_router(RoutingMode::Random, model_configs.clone()); + let random_router = construct_router(RouterMode::Random, model_configs.clone()); assert_eq!(random_router.name(), "RandomRouter"); - let weighted_router = construct_router(RoutingMode::WRR, model_configs.clone()); + let weighted_router = construct_router(RouterMode::WRR, model_configs.clone()); assert_eq!(weighted_router.name(), "WeightedRoundRobinRouter"); } } diff --git a/tests/client.rs b/tests/client.rs index bf9a41d..68fe94f 100644 --- a/tests/client.rs +++ b/tests/client.rs @@ -57,7 +57,7 @@ mod tests { // case 3: multiple models with router. let config = client::Config::builder() .provider("faker") - .routing_mode(client::RoutingMode::WRR) + .routing_mode(client::RouterMode::WRR) .model( client::ModelConfig::builder() .name("gpt-3.5-turbo")