From 558022c3dd0bba00c7b88dd30ae748c8836251ca Mon Sep 17 00:00:00 2001 From: Yujong Lee Date: Thu, 17 Sep 2026 22:46:02 +0000 Subject: [PATCH 1/2] refactor(rust): extract provider translations Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- litellm-rust/Cargo.lock | 13 +++++++ litellm-rust/Cargo.toml | 1 + litellm-rust/crates/core/Cargo.toml | 1 + .../core/src/audio_transcription/error.rs | 20 ++++++++++ .../core/src/audio_transcription/mod.rs | 2 +- .../crates/core/src/chat_completions/error.rs | 16 ++++++++ .../core/src/chat_completions/handler.rs | 1 + .../crates/core/src/chat_completions/mod.rs | 5 +-- .../get_llm_provider_logic.rs | 34 +---------------- .../core/src/llms/anthropic/chat/mod.rs | 2 +- .../experimental_pass_through/messages/mod.rs | 2 +- .../core/src/llms/azure_ai/anthropic/mod.rs | 2 +- .../crates/core/src/llms/base_llm/mod.rs | 4 +- .../crates/core/src/llms/bedrock/chat/mod.rs | 2 +- .../crates/core/src/llms/bedrock/mod.rs | 2 +- .../crates/core/src/messages/error.rs | 16 ++++++++ .../crates/core/src/messages/handler.rs | 1 + litellm-rust/crates/core/src/messages/mod.rs | 2 +- litellm-rust/crates/providers/Cargo.toml | 16 ++++++++ .../providers/src/anthropic/chat/mod.rs | 1 + .../src}/anthropic/chat/tests.rs | 2 +- .../src}/anthropic/chat/transformation.rs | 20 +++++----- .../experimental_pass_through/messages/mod.rs | 1 + .../messages/transformation.rs | 2 +- .../experimental_pass_through/mod.rs | 1 + .../crates/providers/src/anthropic/mod.rs | 4 ++ .../providers/src/audio_transcription/mod.rs | 31 +++++++++++++++ .../src/audio_transcription/types.rs | 20 +++++----- .../anthropic/messages_transformation.rs | 4 +- .../providers/src/azure_ai/anthropic/mod.rs | 1 + .../crates/providers/src/azure_ai/mod.rs | 1 + .../src/base_llm/anthropic_messages/mod.rs | 1 + .../anthropic_messages/transformation.rs | 0 .../src/base_llm/audio_transcription/mod.rs | 1 + .../audio_transcription/transformation.rs | 0 .../crates/providers/src/base_llm/chat/mod.rs | 1 + .../src}/base_llm/chat/transformation.rs | 4 +- .../crates/providers/src/base_llm/mod.rs | 3 ++ .../src}/bedrock/audio_transcription/mod.rs | 4 +- .../bedrock/chat/converse_transformation.rs | 14 +++---- .../crates/providers/src/bedrock/chat/mod.rs | 1 + .../src}/bedrock/chat/tests.rs | 2 +- .../crates/providers/src/bedrock/mod.rs | 2 + .../src/chat}/conversation.rs | 2 +- litellm-rust/crates/providers/src/chat/mod.rs | 21 ++++++++++ .../src/chat}/response_utils.rs | 0 .../src/chat}/types.rs | 38 +++++++++---------- litellm-rust/crates/providers/src/lib.rs | 8 ++++ .../crates/providers/src/messages/mod.rs | 17 +++++++++ .../{core => providers}/src/messages/types.rs | 18 ++++----- .../providers/src/provider_resolution.rs | 33 ++++++++++++++++ 51 files changed, 289 insertions(+), 111 deletions(-) create mode 100644 litellm-rust/crates/providers/Cargo.toml create mode 100644 litellm-rust/crates/providers/src/anthropic/chat/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/anthropic/chat/tests.rs (99%) rename litellm-rust/crates/{core/src/llms => providers/src}/anthropic/chat/transformation.rs (94%) create mode 100644 litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/anthropic/experimental_pass_through/messages/transformation.rs (97%) create mode 100644 litellm-rust/crates/providers/src/anthropic/experimental_pass_through/mod.rs create mode 100644 litellm-rust/crates/providers/src/anthropic/mod.rs create mode 100644 litellm-rust/crates/providers/src/audio_transcription/mod.rs rename litellm-rust/crates/{core => providers}/src/audio_transcription/types.rs (74%) rename litellm-rust/crates/{core/src/llms => providers/src}/azure_ai/anthropic/messages_transformation.rs (99%) create mode 100644 litellm-rust/crates/providers/src/azure_ai/anthropic/mod.rs create mode 100644 litellm-rust/crates/providers/src/azure_ai/mod.rs create mode 100644 litellm-rust/crates/providers/src/base_llm/anthropic_messages/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/base_llm/anthropic_messages/transformation.rs (100%) create mode 100644 litellm-rust/crates/providers/src/base_llm/audio_transcription/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/base_llm/audio_transcription/transformation.rs (100%) create mode 100644 litellm-rust/crates/providers/src/base_llm/chat/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/base_llm/chat/transformation.rs (98%) create mode 100644 litellm-rust/crates/providers/src/base_llm/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/bedrock/audio_transcription/mod.rs (98%) rename litellm-rust/crates/{core/src/llms => providers/src}/bedrock/chat/converse_transformation.rs (97%) create mode 100644 litellm-rust/crates/providers/src/bedrock/chat/mod.rs rename litellm-rust/crates/{core/src/llms => providers/src}/bedrock/chat/tests.rs (99%) create mode 100644 litellm-rust/crates/providers/src/bedrock/mod.rs rename litellm-rust/crates/{core/src/chat_completions => providers/src/chat}/conversation.rs (99%) create mode 100644 litellm-rust/crates/providers/src/chat/mod.rs rename litellm-rust/crates/{core/src/chat_completions => providers/src/chat}/response_utils.rs (100%) rename litellm-rust/crates/{core/src/chat_completions => providers/src/chat}/types.rs (88%) create mode 100644 litellm-rust/crates/providers/src/lib.rs create mode 100644 litellm-rust/crates/providers/src/messages/mod.rs rename litellm-rust/crates/{core => providers}/src/messages/types.rs (90%) create mode 100644 litellm-rust/crates/providers/src/provider_resolution.rs diff --git a/litellm-rust/Cargo.lock b/litellm-rust/Cargo.lock index cf8a2442397..88dc837dd95 100644 --- a/litellm-rust/Cargo.lock +++ b/litellm-rust/Cargo.lock @@ -2016,6 +2016,7 @@ dependencies = [ "litellm-auth-azure", "litellm-auth-gcp", "litellm-framing", + "litellm-providers", "mime_guess", "moka", "rand 0.8.7", @@ -2052,6 +2053,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "litellm-providers" +version = "0.1.0" +dependencies = [ + "litellm-auth", + "litellm-auth-aws", + "rstest", + "serde", + "serde_json", + "thiserror 2.0.19", +] + [[package]] name = "litellm-python-bridge" version = "0.1.0" diff --git a/litellm-rust/Cargo.toml b/litellm-rust/Cargo.toml index a63277d2e23..33cbd4f8b12 100644 --- a/litellm-rust/Cargo.toml +++ b/litellm-rust/Cargo.toml @@ -16,6 +16,7 @@ litellm-auth = { path = "crates/auth" } litellm-auth-aws = { path = "crates/auth-aws" } litellm-auth-azure = { path = "crates/auth-azure" } litellm-auth-gcp = { path = "crates/auth-gcp" } +litellm-providers = { path = "crates/providers" } litellm-cache = { path = "crates/cache" } litellm-cache-memory = { path = "crates/cache-memory" } litellm-token-counter = { path = "crates/token-counter" } diff --git a/litellm-rust/crates/core/Cargo.toml b/litellm-rust/crates/core/Cargo.toml index 6eacfad9fe7..7a836b4c95a 100644 --- a/litellm-rust/crates/core/Cargo.toml +++ b/litellm-rust/crates/core/Cargo.toml @@ -15,6 +15,7 @@ litellm-auth.workspace = true litellm-auth-aws.workspace = true litellm-auth-azure.workspace = true litellm-auth-gcp.workspace = true +litellm-providers.workspace = true litellm-framing.workspace = true moka.workspace = true mime_guess = "2.0.5" diff --git a/litellm-rust/crates/core/src/audio_transcription/error.rs b/litellm-rust/crates/core/src/audio_transcription/error.rs index f9ffb12d349..ab194173b67 100644 --- a/litellm-rust/crates/core/src/audio_transcription/error.rs +++ b/litellm-rust/crates/core/src/audio_transcription/error.rs @@ -24,3 +24,23 @@ pub enum Error { #[error(transparent)] Aws(#[from] litellm_auth_aws::Error), } + +impl From for Error { + fn from(error: litellm_providers::audio_transcription::Error) -> Self { + match error { + litellm_providers::audio_transcription::Error::InvalidType { expected, actual } => { + Self::InvalidType { expected, actual } + } + litellm_providers::audio_transcription::Error::MissingField(field) => { + Self::MissingField(field) + } + litellm_providers::audio_transcription::Error::InvalidRequest(message) => { + Self::InvalidRequest(message) + } + litellm_providers::audio_transcription::Error::InvalidResponse(message) => { + Self::InvalidResponse(message) + } + litellm_providers::audio_transcription::Error::Auth(error) => Self::Auth(error), + } + } +} diff --git a/litellm-rust/crates/core/src/audio_transcription/mod.rs b/litellm-rust/crates/core/src/audio_transcription/mod.rs index fafc29a2d2a..b71e8d38b8a 100644 --- a/litellm-rust/crates/core/src/audio_transcription/mod.rs +++ b/litellm-rust/crates/core/src/audio_transcription/mod.rs @@ -3,7 +3,7 @@ pub use error::Error; mod client; mod handler; mod prepare; -pub mod types; +pub use litellm_providers::audio_transcription::types; pub use handler::execute_audio_transcription_provider_call; pub use prepare::prepare_audio_transcription_provider_call; diff --git a/litellm-rust/crates/core/src/chat_completions/error.rs b/litellm-rust/crates/core/src/chat_completions/error.rs index f9ffb12d349..95da97125d7 100644 --- a/litellm-rust/crates/core/src/chat_completions/error.rs +++ b/litellm-rust/crates/core/src/chat_completions/error.rs @@ -24,3 +24,19 @@ pub enum Error { #[error(transparent)] Aws(#[from] litellm_auth_aws::Error), } + +impl From for Error { + fn from(error: litellm_providers::chat::Error) -> Self { + match error { + litellm_providers::chat::Error::MissingField(field) => Self::MissingField(field), + litellm_providers::chat::Error::InvalidRequest(message) => { + Self::InvalidRequest(message) + } + litellm_providers::chat::Error::InvalidResponse(message) => { + Self::InvalidResponse(message) + } + litellm_providers::chat::Error::Unsupported(reason) => Self::Unsupported(reason), + litellm_providers::chat::Error::Auth(error) => Self::Auth(error), + } + } +} diff --git a/litellm-rust/crates/core/src/chat_completions/handler.rs b/litellm-rust/crates/core/src/chat_completions/handler.rs index 5090d481f6f..2dc44e3bb26 100644 --- a/litellm-rust/crates/core/src/chat_completions/handler.rs +++ b/litellm-rust/crates/core/src/chat_completions/handler.rs @@ -59,6 +59,7 @@ pub(super) async fn execute_chat_completions_provider_call( request .config .transform_response(&request.model, ProviderChatResponseData { body }) + .map_err(Error::from) .map_err(as_response_error) } diff --git a/litellm-rust/crates/core/src/chat_completions/mod.rs b/litellm-rust/crates/core/src/chat_completions/mod.rs index 5f7448bf73a..2215e1d9c5b 100644 --- a/litellm-rust/crates/core/src/chat_completions/mod.rs +++ b/litellm-rust/crates/core/src/chat_completions/mod.rs @@ -10,12 +10,11 @@ mod error; pub use error::Error; mod client; mod common_utils; -pub mod conversation; +pub use litellm_providers::chat::{conversation, response_utils}; pub(crate) mod handler; mod prepare; -pub mod response_utils; pub mod streaming; -pub mod types; +pub use litellm_providers::chat::types; use handler::execute_chat_completions_provider_call; use prepare::{parse_messages, resolve_provider_config, resolve_request}; diff --git a/litellm-rust/crates/core/src/litellm_core_utils/get_llm_provider_logic.rs b/litellm-rust/crates/core/src/litellm_core_utils/get_llm_provider_logic.rs index 6333eedebfc..5958e8ac613 100644 --- a/litellm-rust/crates/core/src/litellm_core_utils/get_llm_provider_logic.rs +++ b/litellm-rust/crates/core/src/litellm_core_utils/get_llm_provider_logic.rs @@ -1,36 +1,4 @@ -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -pub struct CustomLlmProvider<'a> { - pub model: &'a str, - pub custom_llm_provider: &'a str, -} - -pub fn get_custom_llm_provider<'a>( - model: &'a str, - custom_llm_provider: Option<&'a str>, -) -> Option> { - if let Some(custom_llm_provider) = custom_llm_provider.filter(|provider| !provider.is_empty()) { - return Some(CustomLlmProvider { - model: strip_custom_llm_provider_prefix(model, custom_llm_provider), - custom_llm_provider, - }); - } - - let (custom_llm_provider, model) = model.split_once('/')?; - if custom_llm_provider.is_empty() || model.is_empty() { - return None; - } - Some(CustomLlmProvider { - model, - custom_llm_provider, - }) -} - -fn strip_custom_llm_provider_prefix<'a>(model: &'a str, custom_llm_provider: &str) -> &'a str { - model - .strip_prefix(custom_llm_provider) - .and_then(|model| model.strip_prefix('/')) - .unwrap_or(model) -} +pub use litellm_providers::provider_resolution::{CustomLlmProvider, get_custom_llm_provider}; #[cfg(test)] mod tests { diff --git a/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs b/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs index fa7df180f50..d80931444d9 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs @@ -1,2 +1,2 @@ pub mod streaming; -pub mod transformation; +pub use litellm_providers::anthropic::chat::transformation; diff --git a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs index 3b1da7dc069..3029d60823e 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs @@ -1,4 +1,4 @@ pub mod batches; pub mod count_tokens; pub mod streaming; -pub mod transformation; +pub use litellm_providers::anthropic::experimental_pass_through::messages::transformation; diff --git a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs b/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs index eb8d16a4616..9c380f98f9f 100644 --- a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs +++ b/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs @@ -1 +1 @@ -pub mod messages_transformation; +pub use litellm_providers::azure_ai::anthropic::messages_transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/mod.rs b/litellm-rust/crates/core/src/llms/base_llm/mod.rs index 5cd48a21fb6..5fa2ab21564 100644 --- a/litellm-rust/crates/core/src/llms/base_llm/mod.rs +++ b/litellm-rust/crates/core/src/llms/base_llm/mod.rs @@ -1,4 +1,2 @@ -pub mod anthropic_messages; -pub mod audio_transcription; -pub mod chat; +pub use litellm_providers::base_llm::{anthropic_messages, audio_transcription, chat}; pub(crate) mod ocr; diff --git a/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs b/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs index a41ad86ef49..d5668e0d03b 100644 --- a/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs +++ b/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs @@ -1 +1 @@ -pub mod converse_transformation; +pub use litellm_providers::bedrock::chat::converse_transformation; diff --git a/litellm-rust/crates/core/src/llms/bedrock/mod.rs b/litellm-rust/crates/core/src/llms/bedrock/mod.rs index 695aeb8af5e..fa281e5c50d 100644 --- a/litellm-rust/crates/core/src/llms/bedrock/mod.rs +++ b/litellm-rust/crates/core/src/llms/bedrock/mod.rs @@ -1,2 +1,2 @@ -pub mod audio_transcription; +pub use litellm_providers::bedrock::audio_transcription; pub mod chat; diff --git a/litellm-rust/crates/core/src/messages/error.rs b/litellm-rust/crates/core/src/messages/error.rs index f5e86c4850e..cdb4de4645f 100644 --- a/litellm-rust/crates/core/src/messages/error.rs +++ b/litellm-rust/crates/core/src/messages/error.rs @@ -28,6 +28,22 @@ pub enum Error { InvalidBedrockBase64(String), } +impl From for Error { + fn from(error: litellm_providers::messages::Error) -> Self { + match error { + litellm_providers::messages::Error::MissingField(field) => Self::MissingField(field), + litellm_providers::messages::Error::InvalidRequest(message) => { + Self::InvalidRequest(message) + } + litellm_providers::messages::Error::InvalidResponse(message) => { + Self::InvalidResponse(message) + } + litellm_providers::messages::Error::Unsupported(reason) => Self::Unsupported(reason), + litellm_providers::messages::Error::Auth(error) => Self::Auth(error), + } + } +} + impl Error { pub fn is_request(&self) -> bool { match self { diff --git a/litellm-rust/crates/core/src/messages/handler.rs b/litellm-rust/crates/core/src/messages/handler.rs index 36d8d2f0157..e241bc56c1e 100644 --- a/litellm-rust/crates/core/src/messages/handler.rs +++ b/litellm-rust/crates/core/src/messages/handler.rs @@ -40,6 +40,7 @@ pub(super) async fn execute_messages_provider_call( request .config .transform_anthropic_messages_response(&request.model, response) + .map_err(Error::from) } pub(super) async fn execute_messages_provider_stream( diff --git a/litellm-rust/crates/core/src/messages/mod.rs b/litellm-rust/crates/core/src/messages/mod.rs index 8f6fffcaf7f..5149c52478d 100644 --- a/litellm-rust/crates/core/src/messages/mod.rs +++ b/litellm-rust/crates/core/src/messages/mod.rs @@ -13,7 +13,7 @@ mod client; mod common_utils; mod handler; mod prepare; -pub mod types; +pub use litellm_providers::messages::types; use handler::{execute_messages_provider_call, execute_messages_provider_stream}; use types::{AnthropicMessagesResponse, MessagesRequest}; diff --git a/litellm-rust/crates/providers/Cargo.toml b/litellm-rust/crates/providers/Cargo.toml new file mode 100644 index 00000000000..e1c8f2c50d4 --- /dev/null +++ b/litellm-rust/crates/providers/Cargo.toml @@ -0,0 +1,16 @@ +[package] +name = "litellm-providers" +version = "0.1.0" +edition.workspace = true +license.workspace = true +repository.workspace = true + +[dependencies] +litellm-auth.workspace = true +litellm-auth-aws.workspace = true +serde.workspace = true +serde_json.workspace = true +thiserror.workspace = true + +[dev-dependencies] +rstest.workspace = true diff --git a/litellm-rust/crates/providers/src/anthropic/chat/mod.rs b/litellm-rust/crates/providers/src/anthropic/chat/mod.rs new file mode 100644 index 00000000000..f239b6921fa --- /dev/null +++ b/litellm-rust/crates/providers/src/anthropic/chat/mod.rs @@ -0,0 +1 @@ +pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/anthropic/chat/tests.rs b/litellm-rust/crates/providers/src/anthropic/chat/tests.rs similarity index 99% rename from litellm-rust/crates/core/src/llms/anthropic/chat/tests.rs rename to litellm-rust/crates/providers/src/anthropic/chat/tests.rs index 25c2f5e49f4..18b6efb13fd 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/chat/tests.rs +++ b/litellm-rust/crates/providers/src/anthropic/chat/tests.rs @@ -1,7 +1,7 @@ use serde_json::json; use super::*; -use crate::chat_completions::Error; +use crate::chat::Error; fn messages(value: Value) -> Vec { serde_json::from_value(value).expect("valid messages") diff --git a/litellm-rust/crates/core/src/llms/anthropic/chat/transformation.rs b/litellm-rust/crates/providers/src/anthropic/chat/transformation.rs similarity index 94% rename from litellm-rust/crates/core/src/llms/anthropic/chat/transformation.rs rename to litellm-rust/crates/providers/src/anthropic/chat/transformation.rs index fc48ef6d74f..5288eebbb2f 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/chat/transformation.rs +++ b/litellm-rust/crates/providers/src/anthropic/chat/transformation.rs @@ -1,19 +1,19 @@ use serde_json::{Map, Value, json}; -use crate::chat_completions::Error; -use crate::chat_completions::conversation::{Conversation, build_conversation}; -use crate::chat_completions::response_utils::{finish_reason_for, unix_now, usage_from_parts}; -use crate::chat_completions::types::{ - ChatCompletionsChoice, ChatCompletionsChoiceMessage, ChatCompletionsResponse, ChatMessage, - ProviderChatRequestData, ProviderChatResponseData, -}; -use crate::constants::ANTHROPIC_OAUTH_TOKEN_PREFIX; -use crate::llms::anthropic::experimental_pass_through::messages::transformation::{ +use crate::anthropic::ANTHROPIC_OAUTH_TOKEN_PREFIX; +use crate::anthropic::experimental_pass_through::messages::transformation::{ complete_anthropic_url, resolve_anthropic_api_key, }; -use crate::llms::base_llm::chat::transformation::{ +use crate::base_llm::chat::transformation::{ BaseConfig, ChatCompletionsAuth, Unsupported, unsupported_message, unsupported_param, }; +use crate::chat::Error; +use crate::chat::conversation::{Conversation, build_conversation}; +use crate::chat::response_utils::{finish_reason_for, unix_now, usage_from_parts}; +use crate::chat::types::{ + ChatCompletionsChoice, ChatCompletionsChoiceMessage, ChatCompletionsResponse, ChatMessage, + ProviderChatRequestData, ProviderChatResponseData, +}; /// Anthropic parameter names, post `map_openai_params`, that the Rust path can /// place verbatim in the Messages body. diff --git a/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/mod.rs b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/mod.rs new file mode 100644 index 00000000000..f239b6921fa --- /dev/null +++ b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/mod.rs @@ -0,0 +1 @@ +pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/transformation.rs b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/transformation.rs similarity index 97% rename from litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/transformation.rs rename to litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/transformation.rs index 6a1a1613ffc..beabe440269 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/transformation.rs +++ b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/messages/transformation.rs @@ -1,4 +1,4 @@ -use crate::llms::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; +use crate::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; use crate::messages::Error; const ANTHROPIC_API_KEY_ENV: &str = "ANTHROPIC_API_KEY"; diff --git a/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/mod.rs b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/mod.rs new file mode 100644 index 00000000000..ba63992f3cb --- /dev/null +++ b/litellm-rust/crates/providers/src/anthropic/experimental_pass_through/mod.rs @@ -0,0 +1 @@ +pub mod messages; diff --git a/litellm-rust/crates/providers/src/anthropic/mod.rs b/litellm-rust/crates/providers/src/anthropic/mod.rs new file mode 100644 index 00000000000..38a59aa6e0d --- /dev/null +++ b/litellm-rust/crates/providers/src/anthropic/mod.rs @@ -0,0 +1,4 @@ +pub mod chat; +pub mod experimental_pass_through; + +pub const ANTHROPIC_OAUTH_TOKEN_PREFIX: &str = "sk-ant-oat"; diff --git a/litellm-rust/crates/providers/src/audio_transcription/mod.rs b/litellm-rust/crates/providers/src/audio_transcription/mod.rs new file mode 100644 index 00000000000..278b049e8f9 --- /dev/null +++ b/litellm-rust/crates/providers/src/audio_transcription/mod.rs @@ -0,0 +1,31 @@ +use thiserror::Error; + +#[derive(Clone, Debug, PartialEq, Eq, Error)] +pub enum Error { + #[error("expected {expected}, got {actual}")] + InvalidType { + expected: &'static str, + actual: &'static str, + }, + #[error("missing required field: {0}")] + MissingField(&'static str), + #[error("invalid request: {0}")] + InvalidRequest(String), + #[error("invalid response: {0}")] + InvalidResponse(String), + #[error(transparent)] + Auth(#[from] litellm_auth::Error), +} + +pub fn json_type_name(value: &serde_json::Value) -> &'static str { + match value { + serde_json::Value::Null => "null", + serde_json::Value::Bool(_) => "boolean", + serde_json::Value::Number(_) => "number", + serde_json::Value::String(_) => "string", + serde_json::Value::Array(_) => "array", + serde_json::Value::Object(_) => "object", + } +} + +pub mod types; diff --git a/litellm-rust/crates/core/src/audio_transcription/types.rs b/litellm-rust/crates/providers/src/audio_transcription/types.rs similarity index 74% rename from litellm-rust/crates/core/src/audio_transcription/types.rs rename to litellm-rust/crates/providers/src/audio_transcription/types.rs index 1ec1f224f6b..d17d5067de5 100644 --- a/litellm-rust/crates/core/src/audio_transcription/types.rs +++ b/litellm-rust/crates/providers/src/audio_transcription/types.rs @@ -3,7 +3,7 @@ use std::time::Duration; use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; -use crate::llms::base_llm::audio_transcription::transformation::{ +use crate::base_llm::audio_transcription::transformation::{ AudioTranscriptionAuth, BaseAudioTranscriptionConfig, }; @@ -20,15 +20,15 @@ pub struct AudioTranscriptionRequest<'a> { #[derive(Clone)] pub struct ProviderAudioTranscriptionRequest { - pub(super) model: String, - pub(super) custom_llm_provider: String, - pub(super) config: &'static dyn BaseAudioTranscriptionConfig, - pub(super) url: String, - pub(super) body: Value, - pub(super) upstream_headers: Vec<(String, String)>, - pub(super) auth: AudioTranscriptionAuth, - pub(super) optional_params: Map, - pub(super) timeout: Option, + pub model: String, + pub custom_llm_provider: String, + pub config: &'static dyn BaseAudioTranscriptionConfig, + pub url: String, + pub body: Value, + pub upstream_headers: Vec<(String, String)>, + pub auth: AudioTranscriptionAuth, + pub optional_params: Map, + pub timeout: Option, } impl ProviderAudioTranscriptionRequest { diff --git a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/messages_transformation.rs b/litellm-rust/crates/providers/src/azure_ai/anthropic/messages_transformation.rs similarity index 99% rename from litellm-rust/crates/core/src/llms/azure_ai/anthropic/messages_transformation.rs rename to litellm-rust/crates/providers/src/azure_ai/anthropic/messages_transformation.rs index feaee0375c4..a79b9038144 100644 --- a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/messages_transformation.rs +++ b/litellm-rust/crates/providers/src/azure_ai/anthropic/messages_transformation.rs @@ -1,9 +1,9 @@ use serde_json::{Map, Value}; -use crate::llms::anthropic::experimental_pass_through::messages::transformation::{ +use crate::anthropic::experimental_pass_through::messages::transformation::{ ANTHROPIC_MESSAGES_CONFIG, AnthropicMessagesConfig, non_empty, }; -use crate::llms::base_llm::anthropic_messages::transformation::{ +use crate::base_llm::anthropic_messages::transformation::{ BaseAnthropicMessagesConfig, MessagesAuthStrategy, }; use crate::messages::Error; diff --git a/litellm-rust/crates/providers/src/azure_ai/anthropic/mod.rs b/litellm-rust/crates/providers/src/azure_ai/anthropic/mod.rs new file mode 100644 index 00000000000..eb8d16a4616 --- /dev/null +++ b/litellm-rust/crates/providers/src/azure_ai/anthropic/mod.rs @@ -0,0 +1 @@ +pub mod messages_transformation; diff --git a/litellm-rust/crates/providers/src/azure_ai/mod.rs b/litellm-rust/crates/providers/src/azure_ai/mod.rs new file mode 100644 index 00000000000..e529997219e --- /dev/null +++ b/litellm-rust/crates/providers/src/azure_ai/mod.rs @@ -0,0 +1 @@ +pub mod anthropic; diff --git a/litellm-rust/crates/providers/src/base_llm/anthropic_messages/mod.rs b/litellm-rust/crates/providers/src/base_llm/anthropic_messages/mod.rs new file mode 100644 index 00000000000..f239b6921fa --- /dev/null +++ b/litellm-rust/crates/providers/src/base_llm/anthropic_messages/mod.rs @@ -0,0 +1 @@ +pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/transformation.rs b/litellm-rust/crates/providers/src/base_llm/anthropic_messages/transformation.rs similarity index 100% rename from litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/transformation.rs rename to litellm-rust/crates/providers/src/base_llm/anthropic_messages/transformation.rs diff --git a/litellm-rust/crates/providers/src/base_llm/audio_transcription/mod.rs b/litellm-rust/crates/providers/src/base_llm/audio_transcription/mod.rs new file mode 100644 index 00000000000..f239b6921fa --- /dev/null +++ b/litellm-rust/crates/providers/src/base_llm/audio_transcription/mod.rs @@ -0,0 +1 @@ +pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/audio_transcription/transformation.rs b/litellm-rust/crates/providers/src/base_llm/audio_transcription/transformation.rs similarity index 100% rename from litellm-rust/crates/core/src/llms/base_llm/audio_transcription/transformation.rs rename to litellm-rust/crates/providers/src/base_llm/audio_transcription/transformation.rs diff --git a/litellm-rust/crates/providers/src/base_llm/chat/mod.rs b/litellm-rust/crates/providers/src/base_llm/chat/mod.rs new file mode 100644 index 00000000000..f239b6921fa --- /dev/null +++ b/litellm-rust/crates/providers/src/base_llm/chat/mod.rs @@ -0,0 +1 @@ +pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/chat/transformation.rs b/litellm-rust/crates/providers/src/base_llm/chat/transformation.rs similarity index 98% rename from litellm-rust/crates/core/src/llms/base_llm/chat/transformation.rs rename to litellm-rust/crates/providers/src/base_llm/chat/transformation.rs index cb340db7326..5d81dc1a85e 100644 --- a/litellm-rust/crates/core/src/llms/base_llm/chat/transformation.rs +++ b/litellm-rust/crates/providers/src/base_llm/chat/transformation.rs @@ -1,7 +1,7 @@ use serde_json::{Map, Value}; -use crate::chat_completions::Error; -use crate::chat_completions::types::{ +use crate::chat::Error; +use crate::chat::types::{ ChatCompletionsResponse, ChatMessage, ChatMessageContent, ProviderChatRequestData, ProviderChatResponseData, }; diff --git a/litellm-rust/crates/providers/src/base_llm/mod.rs b/litellm-rust/crates/providers/src/base_llm/mod.rs new file mode 100644 index 00000000000..b7a1f696440 --- /dev/null +++ b/litellm-rust/crates/providers/src/base_llm/mod.rs @@ -0,0 +1,3 @@ +pub mod anthropic_messages; +pub mod audio_transcription; +pub mod chat; diff --git a/litellm-rust/crates/core/src/llms/bedrock/audio_transcription/mod.rs b/litellm-rust/crates/providers/src/bedrock/audio_transcription/mod.rs similarity index 98% rename from litellm-rust/crates/core/src/llms/bedrock/audio_transcription/mod.rs rename to litellm-rust/crates/providers/src/bedrock/audio_transcription/mod.rs index 49397e00901..7da2aa42a51 100644 --- a/litellm-rust/crates/core/src/llms/bedrock/audio_transcription/mod.rs +++ b/litellm-rust/crates/providers/src/bedrock/audio_transcription/mod.rs @@ -1,11 +1,11 @@ use serde_json::{Map, Value, json}; use crate::audio_transcription::Error; +use crate::audio_transcription::json_type_name; use crate::audio_transcription::types::{ AudioTranscriptionRequestData, AudioTranscriptionResponseData, }; -use crate::http_utils::json_type_name; -use crate::llms::base_llm::audio_transcription::transformation::{ +use crate::base_llm::audio_transcription::transformation::{ AudioTranscriptionAuth, BaseAudioTranscriptionConfig, }; use litellm_auth_aws::constants::{BEDROCK_RUNTIME_ENDPOINT_TEMPLATE, BEDROCK_SERVICE}; diff --git a/litellm-rust/crates/core/src/llms/bedrock/chat/converse_transformation.rs b/litellm-rust/crates/providers/src/bedrock/chat/converse_transformation.rs similarity index 97% rename from litellm-rust/crates/core/src/llms/bedrock/chat/converse_transformation.rs rename to litellm-rust/crates/providers/src/bedrock/chat/converse_transformation.rs index 525bb6d7abc..85ba3be9b07 100644 --- a/litellm-rust/crates/core/src/llms/bedrock/chat/converse_transformation.rs +++ b/litellm-rust/crates/providers/src/bedrock/chat/converse_transformation.rs @@ -1,16 +1,16 @@ use serde_json::{Map, Value, json}; -use crate::chat_completions::Error; -use crate::chat_completions::conversation::{Conversation, TurnRole, build_conversation}; -use crate::chat_completions::response_utils::{finish_reason_for, unix_now, usage_from_parts}; -use crate::chat_completions::types::{ +use crate::base_llm::chat::transformation::{ + BaseConfig, ChatCompletionsAuth, Unsupported, unsupported_message, unsupported_param, +}; +use crate::chat::Error; +use crate::chat::conversation::{Conversation, TurnRole, build_conversation}; +use crate::chat::response_utils::{finish_reason_for, unix_now, usage_from_parts}; +use crate::chat::types::{ ChatCompletionsChoice, ChatCompletionsChoiceMessage, ChatCompletionsResponse, ChatCompletionsUsage, ChatMessage, ChatMessageContent, ProviderChatRequestData, ProviderChatResponseData, }; -use crate::llms::base_llm::chat::transformation::{ - BaseConfig, ChatCompletionsAuth, Unsupported, unsupported_message, unsupported_param, -}; use litellm_auth_aws::constants::{AWS_BEARER_TOKEN_BEDROCK, BEDROCK_RUNTIME_ENDPOINT_TEMPLATE}; use litellm_auth_aws::{bedrock_model_id_and_region, resolve_bedrock_region}; diff --git a/litellm-rust/crates/providers/src/bedrock/chat/mod.rs b/litellm-rust/crates/providers/src/bedrock/chat/mod.rs new file mode 100644 index 00000000000..a41ad86ef49 --- /dev/null +++ b/litellm-rust/crates/providers/src/bedrock/chat/mod.rs @@ -0,0 +1 @@ +pub mod converse_transformation; diff --git a/litellm-rust/crates/core/src/llms/bedrock/chat/tests.rs b/litellm-rust/crates/providers/src/bedrock/chat/tests.rs similarity index 99% rename from litellm-rust/crates/core/src/llms/bedrock/chat/tests.rs rename to litellm-rust/crates/providers/src/bedrock/chat/tests.rs index ed34a46c431..cfa0c902096 100644 --- a/litellm-rust/crates/core/src/llms/bedrock/chat/tests.rs +++ b/litellm-rust/crates/providers/src/bedrock/chat/tests.rs @@ -1,7 +1,7 @@ use serde_json::json; use super::*; -use crate::chat_completions::Error; +use crate::chat::Error; fn messages(value: Value) -> Vec { serde_json::from_value(value).expect("valid messages") diff --git a/litellm-rust/crates/providers/src/bedrock/mod.rs b/litellm-rust/crates/providers/src/bedrock/mod.rs new file mode 100644 index 00000000000..695aeb8af5e --- /dev/null +++ b/litellm-rust/crates/providers/src/bedrock/mod.rs @@ -0,0 +1,2 @@ +pub mod audio_transcription; +pub mod chat; diff --git a/litellm-rust/crates/core/src/chat_completions/conversation.rs b/litellm-rust/crates/providers/src/chat/conversation.rs similarity index 99% rename from litellm-rust/crates/core/src/chat_completions/conversation.rs rename to litellm-rust/crates/providers/src/chat/conversation.rs index 1f1984ed8be..587b7ea2a16 100644 --- a/litellm-rust/crates/core/src/chat_completions/conversation.rs +++ b/litellm-rust/crates/providers/src/chat/conversation.rs @@ -11,7 +11,7 @@ //! accepts; anything richer is declined upstream by the capability gate. use super::types::{ChatMessage, ChatMessageContent}; -use crate::constants::EMPTY_TEXT_PLACEHOLDER; +use crate::chat::EMPTY_TEXT_PLACEHOLDER; #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum TurnRole { diff --git a/litellm-rust/crates/providers/src/chat/mod.rs b/litellm-rust/crates/providers/src/chat/mod.rs new file mode 100644 index 00000000000..93892657c75 --- /dev/null +++ b/litellm-rust/crates/providers/src/chat/mod.rs @@ -0,0 +1,21 @@ +use thiserror::Error; + +pub const EMPTY_TEXT_PLACEHOLDER: &str = " "; + +#[derive(Clone, Debug, PartialEq, Eq, Error)] +pub enum Error { + #[error("missing required field: {0}")] + MissingField(&'static str), + #[error("invalid request: {0}")] + InvalidRequest(String), + #[error("invalid response: {0}")] + InvalidResponse(String), + #[error("unsupported: {0}")] + Unsupported(&'static str), + #[error(transparent)] + Auth(#[from] litellm_auth::Error), +} + +pub mod conversation; +pub mod response_utils; +pub mod types; diff --git a/litellm-rust/crates/core/src/chat_completions/response_utils.rs b/litellm-rust/crates/providers/src/chat/response_utils.rs similarity index 100% rename from litellm-rust/crates/core/src/chat_completions/response_utils.rs rename to litellm-rust/crates/providers/src/chat/response_utils.rs diff --git a/litellm-rust/crates/core/src/chat_completions/types.rs b/litellm-rust/crates/providers/src/chat/types.rs similarity index 88% rename from litellm-rust/crates/core/src/chat_completions/types.rs rename to litellm-rust/crates/providers/src/chat/types.rs index 48bb0b12966..d61892624cf 100644 --- a/litellm-rust/crates/core/src/chat_completions/types.rs +++ b/litellm-rust/crates/providers/src/chat/types.rs @@ -3,7 +3,7 @@ use std::time::Duration; use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; -use crate::llms::base_llm::chat::transformation::{BaseConfig, ChatCompletionsAuth}; +use crate::base_llm::chat::transformation::{BaseConfig, ChatCompletionsAuth}; /// A `/chat/completions` call as it crosses into the core. /// @@ -22,26 +22,26 @@ pub struct ChatCompletionsRequest<'a> { pub timeout: Option, } -pub(super) struct ResolvedChatCompletionsRequest<'a> { - pub(super) model: String, - pub(super) config: &'static dyn BaseConfig, - pub(super) messages: Vec, - pub(super) optional_params: Map, - pub(super) api_key: Option<&'a str>, - pub(super) api_base: Option<&'a str>, - pub(super) extra_headers: Option>, - pub(super) timeout: Option, +pub struct ResolvedChatCompletionsRequest<'a> { + pub model: String, + pub config: &'static dyn BaseConfig, + pub messages: Vec, + pub optional_params: Map, + pub api_key: Option<&'a str>, + pub api_base: Option<&'a str>, + pub extra_headers: Option>, + pub timeout: Option, } -pub(super) struct ProviderChatCompletionsRequest { - pub(super) model: String, - pub(super) config: &'static dyn BaseConfig, - pub(super) url: String, - pub(super) body: Value, - pub(super) upstream_headers: Vec<(String, String)>, - pub(super) auth: ChatCompletionsAuth, - pub(super) optional_params: Map, - pub(super) timeout: Option, +pub struct ProviderChatCompletionsRequest { + pub model: String, + pub config: &'static dyn BaseConfig, + pub url: String, + pub body: Value, + pub upstream_headers: Vec<(String, String)>, + pub auth: ChatCompletionsAuth, + pub optional_params: Map, + pub timeout: Option, } /// The provider-shaped request body a config produces. Named rather than a bare diff --git a/litellm-rust/crates/providers/src/lib.rs b/litellm-rust/crates/providers/src/lib.rs new file mode 100644 index 00000000000..5d72ffffb2b --- /dev/null +++ b/litellm-rust/crates/providers/src/lib.rs @@ -0,0 +1,8 @@ +pub mod anthropic; +pub mod audio_transcription; +pub mod azure_ai; +pub mod base_llm; +pub mod bedrock; +pub mod chat; +pub mod messages; +pub mod provider_resolution; diff --git a/litellm-rust/crates/providers/src/messages/mod.rs b/litellm-rust/crates/providers/src/messages/mod.rs new file mode 100644 index 00000000000..07232b36b51 --- /dev/null +++ b/litellm-rust/crates/providers/src/messages/mod.rs @@ -0,0 +1,17 @@ +use thiserror::Error; + +#[derive(Clone, Debug, PartialEq, Eq, Error)] +pub enum Error { + #[error("missing required field: {0}")] + MissingField(&'static str), + #[error("invalid request: {0}")] + InvalidRequest(String), + #[error("invalid response: {0}")] + InvalidResponse(String), + #[error("unsupported: {0}")] + Unsupported(&'static str), + #[error(transparent)] + Auth(#[from] litellm_auth::Error), +} + +pub mod types; diff --git a/litellm-rust/crates/core/src/messages/types.rs b/litellm-rust/crates/providers/src/messages/types.rs similarity index 90% rename from litellm-rust/crates/core/src/messages/types.rs rename to litellm-rust/crates/providers/src/messages/types.rs index 32cf4b29faf..ba274ab9651 100644 --- a/litellm-rust/crates/core/src/messages/types.rs +++ b/litellm-rust/crates/providers/src/messages/types.rs @@ -3,7 +3,7 @@ use std::time::Duration; use serde::{Deserialize, Serialize}; use serde_json::{Map, Value}; -use crate::llms::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; +use crate::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; pub struct MessagesRequest<'a> { pub model: &'a str, @@ -15,14 +15,14 @@ pub struct MessagesRequest<'a> { pub timeout: Option, } -pub(super) struct ProviderMessagesRequest { - pub(super) provider: String, - pub(super) model: String, - pub(super) config: &'static dyn BaseAnthropicMessagesConfig, - pub(super) url: String, - pub(super) body: Value, - pub(super) upstream_headers: Vec<(String, String)>, - pub(super) timeout: Option, +pub struct ProviderMessagesRequest { + pub provider: String, + pub model: String, + pub config: &'static dyn BaseAnthropicMessagesConfig, + pub url: String, + pub body: Value, + pub upstream_headers: Vec<(String, String)>, + pub timeout: Option, } #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/litellm-rust/crates/providers/src/provider_resolution.rs b/litellm-rust/crates/providers/src/provider_resolution.rs new file mode 100644 index 00000000000..d1ada2472e9 --- /dev/null +++ b/litellm-rust/crates/providers/src/provider_resolution.rs @@ -0,0 +1,33 @@ +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct CustomLlmProvider<'a> { + pub model: &'a str, + pub custom_llm_provider: &'a str, +} + +pub fn get_custom_llm_provider<'a>( + model: &'a str, + custom_llm_provider: Option<&'a str>, +) -> Option> { + if let Some(custom_llm_provider) = custom_llm_provider.filter(|provider| !provider.is_empty()) { + return Some(CustomLlmProvider { + model: strip_custom_llm_provider_prefix(model, custom_llm_provider), + custom_llm_provider, + }); + } + + let (custom_llm_provider, model) = model.split_once('/')?; + if custom_llm_provider.is_empty() || model.is_empty() { + return None; + } + Some(CustomLlmProvider { + model, + custom_llm_provider, + }) +} + +fn strip_custom_llm_provider_prefix<'a>(model: &'a str, custom_llm_provider: &str) -> &'a str { + model + .strip_prefix(custom_llm_provider) + .and_then(|model| model.strip_prefix('/')) + .unwrap_or(model) +} From 6ce78b85a5326f5ace2d0e8bf27d521736fd64ec Mon Sep 17 00:00:00 2001 From: Yujong Lee Date: Thu, 17 Sep 2026 22:55:15 +0000 Subject: [PATCH 2/2] refactor(rust): remove core provider reexports Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- .../crates/core/src/audio_transcription/handler.rs | 2 +- .../crates/core/src/audio_transcription/prepare.rs | 4 ++-- .../crates/core/src/chat_completions/common_utils.rs | 6 +++--- litellm-rust/crates/core/src/chat_completions/handler.rs | 2 +- litellm-rust/crates/core/src/chat_completions/prepare.rs | 2 +- litellm-rust/crates/core/src/chat_completions/tests.rs | 2 +- litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs | 1 - .../crates/core/src/llms/anthropic/chat/streaming.rs | 8 ++++---- .../experimental_pass_through/messages/batches.rs | 2 +- .../anthropic/experimental_pass_through/messages/mod.rs | 1 - .../crates/core/src/llms/azure_ai/anthropic/mod.rs | 1 - litellm-rust/crates/core/src/llms/azure_ai/mod.rs | 1 - .../core/src/llms/base_llm/anthropic_messages/mod.rs | 1 - .../core/src/llms/base_llm/audio_transcription/mod.rs | 1 - litellm-rust/crates/core/src/llms/base_llm/chat/mod.rs | 1 - litellm-rust/crates/core/src/llms/base_llm/mod.rs | 1 - litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs | 1 - litellm-rust/crates/core/src/llms/bedrock/mod.rs | 2 -- litellm-rust/crates/core/src/llms/mod.rs | 1 - litellm-rust/crates/core/src/messages/common_utils.rs | 6 +++--- litellm-rust/crates/core/src/messages/prepare.rs | 2 +- 21 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs delete mode 100644 litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/mod.rs delete mode 100644 litellm-rust/crates/core/src/llms/base_llm/audio_transcription/mod.rs delete mode 100644 litellm-rust/crates/core/src/llms/base_llm/chat/mod.rs delete mode 100644 litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs delete mode 100644 litellm-rust/crates/core/src/llms/bedrock/mod.rs diff --git a/litellm-rust/crates/core/src/audio_transcription/handler.rs b/litellm-rust/crates/core/src/audio_transcription/handler.rs index 4c48b6b5ede..ae547f10f15 100644 --- a/litellm-rust/crates/core/src/audio_transcription/handler.rs +++ b/litellm-rust/crates/core/src/audio_transcription/handler.rs @@ -47,8 +47,8 @@ async fn signed_headers( use std::collections::BTreeMap; use std::time::SystemTime; - use crate::llms::base_llm::audio_transcription::transformation::AudioTranscriptionAuth; use litellm_auth_aws::{aws_auth_config, resolve_credentials, sign_bedrock_post}; + use litellm_providers::base_llm::audio_transcription::transformation::AudioTranscriptionAuth; let AudioTranscriptionAuth::AwsSigV4 { region, .. } = &request.auth else { return Ok(request.upstream_headers.clone()); diff --git a/litellm-rust/crates/core/src/audio_transcription/prepare.rs b/litellm-rust/crates/core/src/audio_transcription/prepare.rs index 26e705408e0..4dc3ffae191 100644 --- a/litellm-rust/crates/core/src/audio_transcription/prepare.rs +++ b/litellm-rust/crates/core/src/audio_transcription/prepare.rs @@ -4,10 +4,10 @@ use crate::http_utils::{has_header, string_headers}; use crate::litellm_core_utils::get_llm_provider_logic::{ CustomLlmProvider, get_custom_llm_provider, }; -use crate::llms::base_llm::audio_transcription::transformation::{ +use litellm_providers::base_llm::audio_transcription::transformation::{ AudioTranscriptionAuth, BaseAudioTranscriptionConfig, }; -use crate::llms::bedrock::audio_transcription::BEDROCK_AUDIO_TRANSCRIPTION_CONFIG; +use litellm_providers::bedrock::audio_transcription::BEDROCK_AUDIO_TRANSCRIPTION_CONFIG; fn provider_config(provider: &str) -> Option<&'static dyn BaseAudioTranscriptionConfig> { if provider == "bedrock" { diff --git a/litellm-rust/crates/core/src/chat_completions/common_utils.rs b/litellm-rust/crates/core/src/chat_completions/common_utils.rs index 8b966c7a173..63fc899e6f4 100644 --- a/litellm-rust/crates/core/src/chat_completions/common_utils.rs +++ b/litellm-rust/crates/core/src/chat_completions/common_utils.rs @@ -2,8 +2,8 @@ use serde_json::{Map, Value}; use super::Error; use crate::http_utils::string_headers as shared_string_headers; -use crate::llms::anthropic::chat::transformation::ANTHROPIC_CHAT_COMPLETIONS_CONFIG; -use crate::llms::base_llm::chat::transformation::BaseConfig; +use litellm_providers::anthropic::chat::transformation::ANTHROPIC_CHAT_COMPLETIONS_CONFIG; +use litellm_providers::base_llm::chat::transformation::BaseConfig; const HEADER_CONTEXT: &str = "chat completions"; @@ -11,7 +11,7 @@ pub(super) fn chat_completions_provider_config(provider: &str) -> Option<&'stati match provider { "anthropic" => Some(&ANTHROPIC_CHAT_COMPLETIONS_CONFIG), "bedrock" => Some( - &crate::llms::bedrock::chat::converse_transformation::BEDROCK_CHAT_COMPLETIONS_CONFIG, + &litellm_providers::bedrock::chat::converse_transformation::BEDROCK_CHAT_COMPLETIONS_CONFIG, ), _ => None, } diff --git a/litellm-rust/crates/core/src/chat_completions/handler.rs b/litellm-rust/crates/core/src/chat_completions/handler.rs index 2dc44e3bb26..ac9f58cda22 100644 --- a/litellm-rust/crates/core/src/chat_completions/handler.rs +++ b/litellm-rust/crates/core/src/chat_completions/handler.rs @@ -8,7 +8,7 @@ use super::types::{ ResolvedChatCompletionsRequest, }; use crate::http_utils::{http_request, truncate_error_body}; -use crate::llms::base_llm::chat::transformation::ChatCompletionsAuth; +use litellm_providers::base_llm::chat::transformation::ChatCompletionsAuth; pub(super) async fn execute_chat_completions_provider_call( request: ResolvedChatCompletionsRequest<'_>, diff --git a/litellm-rust/crates/core/src/chat_completions/prepare.rs b/litellm-rust/crates/core/src/chat_completions/prepare.rs index 983fbdf4f1d..3f3f97d6191 100644 --- a/litellm-rust/crates/core/src/chat_completions/prepare.rs +++ b/litellm-rust/crates/core/src/chat_completions/prepare.rs @@ -10,7 +10,7 @@ use crate::http_utils::has_header; use crate::litellm_core_utils::get_llm_provider_logic::{ CustomLlmProvider, get_custom_llm_provider, }; -use crate::llms::base_llm::chat::transformation::{BaseConfig, ChatCompletionsAuth}; +use litellm_providers::base_llm::chat::transformation::{BaseConfig, ChatCompletionsAuth}; pub(super) fn resolve_provider_config<'a>( model: &'a str, diff --git a/litellm-rust/crates/core/src/chat_completions/tests.rs b/litellm-rust/crates/core/src/chat_completions/tests.rs index 86ac6c6ca35..40298cf5c2e 100644 --- a/litellm-rust/crates/core/src/chat_completions/tests.rs +++ b/litellm-rust/crates/core/src/chat_completions/tests.rs @@ -3,7 +3,7 @@ use serde_json::{Map, Value, json}; use super::Error; use super::prepare::{prepare_provider_request, resolve_request}; use super::types::{ChatCompletionsRequest, ProviderChatCompletionsRequest}; -use crate::llms::base_llm::chat::transformation::ChatCompletionsAuth; +use litellm_providers::base_llm::chat::transformation::ChatCompletionsAuth; fn prepare_chat_completions_call( request: ChatCompletionsRequest<'_>, diff --git a/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs b/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs index d80931444d9..7bf4fc46291 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/chat/mod.rs @@ -1,2 +1 @@ pub mod streaming; -pub use litellm_providers::anthropic::chat::transformation; diff --git a/litellm-rust/crates/core/src/llms/anthropic/chat/streaming.rs b/litellm-rust/crates/core/src/llms/anthropic/chat/streaming.rs index ec44f2c5808..427c57633d3 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/chat/streaming.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/chat/streaming.rs @@ -2,16 +2,16 @@ use std::collections::HashMap; use serde_json::Value; +use super::super::experimental_pass_through::messages::streaming::{ + AnthropicContentBlock, AnthropicContentBlockDelta, AnthropicMessagesStreamEvent, + AnthropicStreamUsage, +}; use crate::chat_completions::Error; use crate::chat_completions::streaming::StreamTransformer; use crate::chat_completions::types::{ ChatCompletionChunk, ChatCompletionThinkingBlock, ChatCompletionToolCallChunk, ChatCompletionsUsage, }; -use crate::llms::anthropic::experimental_pass_through::messages::streaming::{ - AnthropicContentBlock, AnthropicContentBlockDelta, AnthropicMessagesStreamEvent, - AnthropicStreamUsage, -}; #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub enum AnthropicJsonChunkType { diff --git a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/batches.rs b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/batches.rs index 762e699acba..16b4e2a59ad 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/batches.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/batches.rs @@ -3,9 +3,9 @@ use serde_json::Value; use time::OffsetDateTime; use url::Url; -use crate::llms::anthropic::experimental_pass_through::messages::transformation::resolve_anthropic_api_base; use crate::messages::Error; use crate::messages::types::AnthropicMessagesResponse; +use litellm_providers::anthropic::experimental_pass_through::messages::transformation::resolve_anthropic_api_base; const BATCHES_PATH_SUFFIX: &str = "/v1/messages/batches"; diff --git a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs index 3029d60823e..42d4fcdde0f 100644 --- a/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs +++ b/litellm-rust/crates/core/src/llms/anthropic/experimental_pass_through/messages/mod.rs @@ -1,4 +1,3 @@ pub mod batches; pub mod count_tokens; pub mod streaming; -pub use litellm_providers::anthropic::experimental_pass_through::messages::transformation; diff --git a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs b/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs deleted file mode 100644 index 9c380f98f9f..00000000000 --- a/litellm-rust/crates/core/src/llms/azure_ai/anthropic/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub use litellm_providers::azure_ai::anthropic::messages_transformation; diff --git a/litellm-rust/crates/core/src/llms/azure_ai/mod.rs b/litellm-rust/crates/core/src/llms/azure_ai/mod.rs index 8a52bda45be..079e0c41eae 100644 --- a/litellm-rust/crates/core/src/llms/azure_ai/mod.rs +++ b/litellm-rust/crates/core/src/llms/azure_ai/mod.rs @@ -1,2 +1 @@ -pub mod anthropic; pub(crate) mod ocr; diff --git a/litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/mod.rs b/litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/mod.rs deleted file mode 100644 index f239b6921fa..00000000000 --- a/litellm-rust/crates/core/src/llms/base_llm/anthropic_messages/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/audio_transcription/mod.rs b/litellm-rust/crates/core/src/llms/base_llm/audio_transcription/mod.rs deleted file mode 100644 index f239b6921fa..00000000000 --- a/litellm-rust/crates/core/src/llms/base_llm/audio_transcription/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/chat/mod.rs b/litellm-rust/crates/core/src/llms/base_llm/chat/mod.rs deleted file mode 100644 index f239b6921fa..00000000000 --- a/litellm-rust/crates/core/src/llms/base_llm/chat/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod transformation; diff --git a/litellm-rust/crates/core/src/llms/base_llm/mod.rs b/litellm-rust/crates/core/src/llms/base_llm/mod.rs index 5fa2ab21564..079e0c41eae 100644 --- a/litellm-rust/crates/core/src/llms/base_llm/mod.rs +++ b/litellm-rust/crates/core/src/llms/base_llm/mod.rs @@ -1,2 +1 @@ -pub use litellm_providers::base_llm::{anthropic_messages, audio_transcription, chat}; pub(crate) mod ocr; diff --git a/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs b/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs deleted file mode 100644 index d5668e0d03b..00000000000 --- a/litellm-rust/crates/core/src/llms/bedrock/chat/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub use litellm_providers::bedrock::chat::converse_transformation; diff --git a/litellm-rust/crates/core/src/llms/bedrock/mod.rs b/litellm-rust/crates/core/src/llms/bedrock/mod.rs deleted file mode 100644 index fa281e5c50d..00000000000 --- a/litellm-rust/crates/core/src/llms/bedrock/mod.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub use litellm_providers::bedrock::audio_transcription; -pub mod chat; diff --git a/litellm-rust/crates/core/src/llms/mod.rs b/litellm-rust/crates/core/src/llms/mod.rs index 635d381561c..4b93a5f971c 100644 --- a/litellm-rust/crates/core/src/llms/mod.rs +++ b/litellm-rust/crates/core/src/llms/mod.rs @@ -1,7 +1,6 @@ pub mod anthropic; pub mod azure_ai; pub mod base_llm; -pub mod bedrock; pub(crate) mod cohere; pub(crate) mod mistral; pub mod openai; diff --git a/litellm-rust/crates/core/src/messages/common_utils.rs b/litellm-rust/crates/core/src/messages/common_utils.rs index a0a120c34a9..c58e9122cad 100644 --- a/litellm-rust/crates/core/src/messages/common_utils.rs +++ b/litellm-rust/crates/core/src/messages/common_utils.rs @@ -3,9 +3,9 @@ use serde_json::{Map, Value}; use super::Error; use crate::http_utils::string_headers as shared_string_headers; pub(super) use crate::http_utils::{has_bearer_auth, has_header, truncate_error_body}; -use crate::llms::anthropic::experimental_pass_through::messages::transformation::ANTHROPIC_MESSAGES_CONFIG; -use crate::llms::azure_ai::anthropic::messages_transformation::AZURE_ANTHROPIC_MESSAGES_CONFIG; -use crate::llms::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; +use litellm_providers::anthropic::experimental_pass_through::messages::transformation::ANTHROPIC_MESSAGES_CONFIG; +use litellm_providers::azure_ai::anthropic::messages_transformation::AZURE_ANTHROPIC_MESSAGES_CONFIG; +use litellm_providers::base_llm::anthropic_messages::transformation::BaseAnthropicMessagesConfig; const HEADER_CONTEXT: &str = "messages"; diff --git a/litellm-rust/crates/core/src/messages/prepare.rs b/litellm-rust/crates/core/src/messages/prepare.rs index a3c93746d3e..f3735ff1700 100644 --- a/litellm-rust/crates/core/src/messages/prepare.rs +++ b/litellm-rust/crates/core/src/messages/prepare.rs @@ -6,7 +6,7 @@ use super::types::{MessagesRequest, ProviderMessagesRequest}; use crate::litellm_core_utils::get_llm_provider_logic::{ CustomLlmProvider, get_custom_llm_provider, }; -use crate::llms::base_llm::anthropic_messages::transformation::{ +use litellm_providers::base_llm::anthropic_messages::transformation::{ BaseAnthropicMessagesConfig, MessagesAuthStrategy, };