diff --git a/litellm-rust/crates/core/src/llms/vertex_ai/ocr/deepseek_transformation.rs b/litellm-rust/crates/core/src/llms/vertex_ai/ocr/deepseek_transformation.rs index 335d6e49dd3..43bee24b860 100644 --- a/litellm-rust/crates/core/src/llms/vertex_ai/ocr/deepseek_transformation.rs +++ b/litellm-rust/crates/core/src/llms/vertex_ai/ocr/deepseek_transformation.rs @@ -12,11 +12,10 @@ use crate::ocr::types::{ PreparedOcrRequest, }; use crate::params::OpaqueParams; -use crate::providers::model::{ModelNamespace, ProviderModel, RoutedModel}; use crate::url_utils::ApiUrl; const DEFAULT_API_BASE: &str = "https://aiplatform.googleapis.com"; -const MODEL_NAMESPACE: &str = "deepseek-ai"; +const MODEL_PREFIX: &str = "deepseek-ai/"; const DEFAULT_LOCATION: &str = "us-central1"; const DEEPSEEK_OCR_PARAMS: &[&str] = &["stream", "temperature", "max_tokens", "top_p", "n", "stop"]; @@ -24,7 +23,7 @@ pub(crate) type DeepSeekOcrParams = OpaqueParams; #[derive(Clone, Debug, Serialize, Deserialize)] pub(crate) struct DeepSeekOcrRequest { - pub model: ProviderModel, + pub model: String, pub messages: Vec, #[serde(flatten)] pub params: OpaqueParams, @@ -87,13 +86,6 @@ struct DeepSeekPage { dimensions: Option, } -#[derive(Clone, Debug)] -pub(crate) struct DeepSeekAi; - -impl ModelNamespace for DeepSeekAi { - const NAME: &'static str = MODEL_NAMESPACE; -} - #[derive(Clone, Debug)] pub(crate) struct VertexAIDeepSeekOCRConfig; @@ -367,12 +359,14 @@ fn response_field(field: &str) -> crate::ocr::Error { } } -pub(crate) fn provider_model(model: &str) -> Result, crate::ocr::Error> { - RoutedModel::new(model) - .and_then(RoutedModel::into_provider::) - .map_err(|_| crate::ocr::Error::RequestField { +pub(crate) fn provider_model(model: &str) -> Result { + let local_model = model.trim_start_matches(MODEL_PREFIX); + if local_model.is_empty() { + return Err(crate::ocr::Error::RequestField { path: "model".into(), - }) + }); + } + Ok(format!("{MODEL_PREFIX}{local_model}")) } impl VertexAIDeepSeekOCRConfig { @@ -443,13 +437,11 @@ mod tests { #[test] fn config_owns_model_namespace_and_endpoint() { assert_eq!( - provider_model("deepseek-ocr-maas").unwrap().as_str(), + provider_model("deepseek-ocr-maas").unwrap(), "deepseek-ai/deepseek-ocr-maas" ); assert_eq!( - provider_model("deepseek-ai/deepseek-ocr-maas") - .unwrap() - .as_str(), + provider_model("deepseek-ai/deepseek-ocr-maas").unwrap(), "deepseek-ai/deepseek-ocr-maas" ); assert_eq!( diff --git a/litellm-rust/crates/core/src/providers/mod.rs b/litellm-rust/crates/core/src/providers/mod.rs index 79eb3404ece..70ca4386fff 100644 --- a/litellm-rust/crates/core/src/providers/mod.rs +++ b/litellm-rust/crates/core/src/providers/mod.rs @@ -2,5 +2,4 @@ pub mod anthropic; pub mod azure_ai; pub mod bedrock; pub mod custom_llm_provider; -pub(crate) mod model; pub mod openai; diff --git a/litellm-rust/crates/core/src/providers/model.rs b/litellm-rust/crates/core/src/providers/model.rs deleted file mode 100644 index fcedc4b023a..00000000000 --- a/litellm-rust/crates/core/src/providers/model.rs +++ /dev/null @@ -1,219 +0,0 @@ -use std::marker::PhantomData; - -use serde::{Deserialize, Deserializer, Serialize, Serializer}; - -#[derive(Clone, Copy, Debug, Eq, PartialEq, thiserror::Error)] -pub(crate) enum ModelNameError { - #[error("model name cannot be empty")] - EmptyModel, - #[error("model namespace must be one non-empty path segment: {0}")] - InvalidNamespace(&'static str), -} - -pub(crate) trait ModelNamespace { - const NAME: &'static str; -} - -#[derive(Clone, Copy, Debug, Eq, PartialEq)] -pub(crate) struct RoutedModel<'a>(&'a str); - -impl<'a> RoutedModel<'a> { - pub(crate) fn new(value: &'a str) -> Result { - if value.is_empty() { - return Err(ModelNameError::EmptyModel); - } - Ok(Self(value)) - } - - pub(crate) fn into_provider( - self, - ) -> Result, ModelNameError> { - let namespace = N::NAME; - if namespace.is_empty() || namespace.contains('/') { - return Err(ModelNameError::InvalidNamespace(namespace)); - } - let prefix = format!("{namespace}/"); - let local_model = self.0.trim_start_matches(prefix.as_str()); - if local_model.is_empty() { - return Err(ModelNameError::EmptyModel); - } - Ok(ProviderModel { - value: format!("{prefix}{local_model}"), - namespace: PhantomData, - }) - } -} - -#[derive(Clone, Debug, Eq, PartialEq)] -pub(crate) struct ProviderModel { - value: String, - namespace: PhantomData, -} - -impl ProviderModel { - #[cfg(test)] - pub(crate) fn as_str(&self) -> &str { - &self.value - } -} - -impl Serialize for ProviderModel { - fn serialize(&self, serializer: S) -> Result - where - S: Serializer, - { - self.value.serialize(serializer) - } -} - -impl<'de, N: ModelNamespace> Deserialize<'de> for ProviderModel { - fn deserialize(deserializer: D) -> Result - where - D: Deserializer<'de>, - { - let value = String::deserialize(deserializer)?; - RoutedModel::new(&value) - .and_then(RoutedModel::into_provider::) - .map_err(::custom) - } -} - -#[cfg(test)] -mod tests { - use serde_json::json; - - use super::*; - - #[derive(Clone, Debug, Eq, PartialEq)] - struct DeepSeekAi; - - impl ModelNamespace for DeepSeekAi { - const NAME: &'static str = "deepseek-ai"; - } - - #[derive(Clone, Debug, Eq, PartialEq)] - struct FalAi; - - impl ModelNamespace for FalAi { - const NAME: &'static str = "fal-ai"; - } - - #[test] - fn qualifies_a_bare_model() { - let model = RoutedModel::new("deepseek-ocr-maas") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!(model.as_str(), "deepseek-ai/deepseek-ocr-maas"); - } - - #[test] - fn preserves_an_already_qualified_model() { - let model = RoutedModel::new("deepseek-ai/deepseek-ocr-maas") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!(model.as_str(), "deepseek-ai/deepseek-ocr-maas"); - } - - #[test] - fn collapses_repeated_owned_namespaces() { - let model = RoutedModel::new("deepseek-ai/deepseek-ai/deepseek-ai/deepseek-ocr-maas") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!(model.as_str(), "deepseek-ai/deepseek-ocr-maas"); - } - - #[test] - fn matches_the_namespace_as_a_complete_segment() { - let model = RoutedModel::new("deepseek-ai-v2/model") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!(model.as_str(), "deepseek-ai/deepseek-ai-v2/model"); - } - - #[test] - fn preserves_nested_provider_model_paths() { - let model = RoutedModel::new("publishers/vendor/models/model-v1") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!( - model.as_str(), - "deepseek-ai/publishers/vendor/models/model-v1" - ); - } - - #[test] - fn namespace_markers_select_different_wire_names() { - let routed = RoutedModel::new("model-v1").unwrap(); - let deepseek = routed.into_provider::().unwrap(); - let fal = routed.into_provider::().unwrap(); - - assert_eq!(deepseek.as_str(), "deepseek-ai/model-v1"); - assert_eq!(fal.as_str(), "fal-ai/model-v1"); - } - - #[test] - fn rejects_empty_routed_models() { - assert_eq!(RoutedModel::new(""), Err(ModelNameError::EmptyModel)); - } - - #[test] - fn rejects_a_namespace_without_a_model() { - let result = - RoutedModel::new("deepseek-ai/").and_then(RoutedModel::into_provider::); - - assert_eq!(result, Err(ModelNameError::EmptyModel)); - } - - #[test] - fn rejects_invalid_namespace_markers() { - struct Empty; - impl ModelNamespace for Empty { - const NAME: &'static str = ""; - } - struct MultipleSegments; - impl ModelNamespace for MultipleSegments { - const NAME: &'static str = "one/two"; - } - - assert!(matches!( - RoutedModel::new("model").and_then(RoutedModel::into_provider::), - Err(ModelNameError::InvalidNamespace("")) - )); - assert!(matches!( - RoutedModel::new("model").and_then(RoutedModel::into_provider::), - Err(ModelNameError::InvalidNamespace("one/two")) - )); - } - - #[test] - fn provider_models_serialize_as_plain_strings() { - let model = RoutedModel::new("deepseek-ocr-maas") - .and_then(RoutedModel::into_provider::) - .unwrap(); - - assert_eq!( - serde_json::to_value(model).unwrap(), - json!("deepseek-ai/deepseek-ocr-maas") - ); - } - - #[test] - fn deserialization_reestablishes_the_namespace_invariant() { - let model: ProviderModel = - serde_json::from_value(json!("deepseek-ai/deepseek-ai/model-v1")).unwrap(); - - assert_eq!(model.as_str(), "deepseek-ai/model-v1"); - } - - #[test] - fn deserialization_rejects_missing_model_names() { - let result = serde_json::from_value::>(json!("deepseek-ai/")); - - assert!(result.is_err()); - } -}