From e33f7fdb88c05762a1b94bd37a56a8398ef6dcd9 Mon Sep 17 00:00:00 2001 From: Yujong Lee Date: Wed, 9 Sep 2026 15:47:56 -0700 Subject: [PATCH] refactor(ocr): move Vertex implementation to stacked branch --- litellm-rust/crates/core/src/constants.rs | 2 - litellm-rust/crates/core/src/ocr/handler.rs | 8 - litellm-rust/crates/core/src/ocr/prepare.rs | 13 - litellm-rust/crates/core/src/ocr/types.rs | 8 - litellm-rust/crates/core/src/ocr/wire.rs | 69 +-- litellm-rust/crates/core/src/providers/mod.rs | 1 - .../providers/vertex_ai/ocr/deepseek/mod.rs | 5 - .../vertex_ai/ocr/deepseek/transformation.rs | 142 ----- .../providers/vertex_ai/ocr/deepseek/types.rs | 88 --- .../core/src/providers/vertex_ai/ocr/mod.rs | 4 - .../providers/vertex_ai/ocr/transformation.rs | 515 +++++++++++++++--- litellm-rust/crates/core/tests/ocr_prepare.rs | 6 - .../core/tests/vertex_ai_deepseek_ocr.rs | 57 -- .../crates/core/tests/vertex_ai_ocr.rs | 45 -- 14 files changed, 433 insertions(+), 530 deletions(-) delete mode 100644 litellm-rust/crates/core/src/providers/vertex_ai/ocr/deepseek/mod.rs delete mode 100644 litellm-rust/crates/core/src/providers/vertex_ai/ocr/deepseek/transformation.rs delete mode 100644 litellm-rust/crates/core/src/providers/vertex_ai/ocr/deepseek/types.rs delete mode 100644 litellm-rust/crates/core/tests/vertex_ai_deepseek_ocr.rs delete mode 100644 litellm-rust/crates/core/tests/vertex_ai_ocr.rs diff --git a/litellm-rust/crates/core/src/constants.rs b/litellm-rust/crates/core/src/constants.rs index a396a2b875d..dc651594831 100644 --- a/litellm-rust/crates/core/src/constants.rs +++ b/litellm-rust/crates/core/src/constants.rs @@ -60,5 +60,3 @@ pub(crate) const AZURE_AI_OCR_PATH: &str = "/providers/mistral/azure/ocr"; pub(crate) const MISTRAL_OCR_API_BASE: &str = "https://api.mistral.ai/v1"; pub(crate) const REDUCTO_OCR_API_BASE: &str = "https://platform.reducto.ai"; pub(crate) const REDUCTO_ID_PREFIX: &str = "reducto://"; -pub(crate) const VERTEX_OCR_DEFAULT_LOCATION: &str = "us-central1"; -pub(crate) const VERTEX_DEEPSEEK_API_BASE: &str = "https://aiplatform.googleapis.com"; diff --git a/litellm-rust/crates/core/src/ocr/handler.rs b/litellm-rust/crates/core/src/ocr/handler.rs index 97d5ad14e7d..f8e2d354ae1 100644 --- a/litellm-rust/crates/core/src/ocr/handler.rs +++ b/litellm-rust/crates/core/src/ocr/handler.rs @@ -12,8 +12,6 @@ use crate::providers::mistral::ocr::transformation::MistralOcrConfig; use crate::providers::reducto::ocr::transformation::{ ReductoParseLegacyConfig, ReductoParseV3Config, }; -use crate::providers::vertex_ai::ocr::deepseek::transformation::VertexAiDeepSeekOcrConfig; -use crate::providers::vertex_ai::ocr::transformation::VertexAiOcrConfig; struct OcrExecution<'a> { http_client: &'a reqwest::Client, @@ -60,12 +58,6 @@ pub(crate) async fn perform_ocr_request( OcrProviderRequest::AzureDocumentIntelligence(params) => { dispatch!(AzureDocumentIntelligenceOcrConfig, params) } - OcrProviderRequest::VertexAi(params) => { - dispatch!(VertexAiOcrConfig, params) - } - OcrProviderRequest::VertexAiDeepSeek(params) => { - dispatch!(VertexAiDeepSeekOcrConfig, params) - } OcrProviderRequest::ReductoV3(params) => { dispatch!(ReductoParseV3Config, params) } diff --git a/litellm-rust/crates/core/src/ocr/prepare.rs b/litellm-rust/crates/core/src/ocr/prepare.rs index 6a68a7dfa97..be7337b237d 100644 --- a/litellm-rust/crates/core/src/ocr/prepare.rs +++ b/litellm-rust/crates/core/src/ocr/prepare.rs @@ -4,7 +4,6 @@ use crate::Error; use crate::providers::azure_ai::ocr::document_intelligence::types::DocumentIntelligenceInputParams; use crate::providers::mistral::ocr::types::MistralOcrParams; use crate::providers::reducto::ocr::types::{ReductoLegacyParams, ReductoV3Params}; -use crate::providers::vertex_ai::ocr::deepseek::types::DeepSeekOcrParams; use serde::Serialize; use strum::EnumString; @@ -14,8 +13,6 @@ pub enum OcrProviderRequest { Mistral(MistralOcrParams), AzureAi(MistralOcrParams), AzureDocumentIntelligence(DocumentIntelligenceInputParams), - VertexAi(MistralOcrParams), - VertexAiDeepSeek(DeepSeekOcrParams), ReductoV3(ReductoV3Params), ReductoLegacy(ReductoLegacyParams), } @@ -25,8 +22,6 @@ pub enum OcrProviderKind { Mistral, AzureAi, AzureDocumentIntelligence, - VertexAi, - VertexAiDeepSeek, ReductoV3, ReductoLegacy, } @@ -36,7 +31,6 @@ pub enum OcrProviderKind { pub enum OcrProvider { Mistral, AzureAi, - VertexAi, Reducto, } @@ -65,7 +59,6 @@ impl OcrProviderKind { match self { Self::Mistral => "mistral", Self::AzureAi | Self::AzureDocumentIntelligence => "azure_ai", - Self::VertexAi | Self::VertexAiDeepSeek => "vertex_ai", Self::ReductoV3 | Self::ReductoLegacy => "reducto", } } @@ -76,8 +69,6 @@ impl OcrProviderRequest { Self::Mistral(_) => OcrProviderKind::Mistral, Self::AzureAi(_) => OcrProviderKind::AzureAi, Self::AzureDocumentIntelligence(_) => OcrProviderKind::AzureDocumentIntelligence, - Self::VertexAi(_) => OcrProviderKind::VertexAi, - Self::VertexAiDeepSeek(_) => OcrProviderKind::VertexAiDeepSeek, Self::ReductoV3(_) => OcrProviderKind::ReductoV3, Self::ReductoLegacy(_) => OcrProviderKind::ReductoLegacy, } @@ -95,10 +86,6 @@ pub fn ocr_provider_config(provider: OcrProvider, model: &OcrModel) -> OcrProvid OcrProviderKind::AzureDocumentIntelligence } (OcrProvider::AzureAi, _) => OcrProviderKind::AzureAi, - (OcrProvider::VertexAi, _) if lower.contains("deepseek") => { - OcrProviderKind::VertexAiDeepSeek - } - (OcrProvider::VertexAi, _) => OcrProviderKind::VertexAi, (OcrProvider::Reducto, OcrModel::ReductoLegacy) => OcrProviderKind::ReductoLegacy, (OcrProvider::Reducto, _) => OcrProviderKind::ReductoV3, } diff --git a/litellm-rust/crates/core/src/ocr/types.rs b/litellm-rust/crates/core/src/ocr/types.rs index 1493c78e397..5cbad261e7d 100644 --- a/litellm-rust/crates/core/src/ocr/types.rs +++ b/litellm-rust/crates/core/src/ocr/types.rs @@ -143,19 +143,12 @@ impl OcrResponseData { } } -#[derive(Clone, Default)] -pub struct VertexOcrSettings { - pub project: Option, - pub location: Option, -} - #[derive(Clone)] pub struct OcrConnection { pub api_key: Option, pub api_base: Option, pub extra_headers: Vec<(String, String)>, pub azure_auth: Option, - pub vertex: VertexOcrSettings, pub timeout: Duration, pub poll_timeout: Duration, pub max_download_bytes: u64, @@ -168,7 +161,6 @@ impl Default for OcrConnection { api_base: None, extra_headers: Vec::new(), azure_auth: None, - vertex: VertexOcrSettings::default(), timeout: Duration::from_secs(OCR_HTTP_TIMEOUT_SECS), poll_timeout: Duration::from_secs(crate::constants::OCR_POLL_TIMEOUT_SECS), max_download_bytes: OCR_DOWNLOAD_MAX_BYTES, diff --git a/litellm-rust/crates/core/src/ocr/wire.rs b/litellm-rust/crates/core/src/ocr/wire.rs index be762264e8a..6baa6d39350 100644 --- a/litellm-rust/crates/core/src/ocr/wire.rs +++ b/litellm-rust/crates/core/src/ocr/wire.rs @@ -8,7 +8,7 @@ use super::hooks::{OcrDuringCallRequest, OcrPreCallRequest}; use super::prepare::{ OcrModel, OcrProvider, OcrProviderKind, OcrProviderRequest, ocr_provider_config, }; -use super::types::{OcrConnection, OcrDocument, OcrRequest, OcrRequestFormat, VertexOcrSettings}; +use super::types::{OcrConnection, OcrDocument, OcrRequest, OcrRequestFormat}; use crate::Error; use crate::auth::azure::AzureAuthInputs; use crate::routing_utils::provider::{CustomLlmProvider, get_custom_llm_provider}; @@ -64,7 +64,6 @@ pub fn decode_request_with_env( OcrProviderKind::Mistral => "MISTRAL_API_KEY", OcrProviderKind::AzureAi => "AZURE_AI_API_KEY", OcrProviderKind::AzureDocumentIntelligence => "AZURE_DOCUMENT_INTELLIGENCE_API_KEY", - OcrProviderKind::VertexAi | OcrProviderKind::VertexAiDeepSeek => "VERTEX_AI_API_KEY", OcrProviderKind::ReductoV3 | OcrProviderKind::ReductoLegacy => "REDUCTO_API_KEY", }; let base_env = match kind { @@ -103,19 +102,6 @@ pub fn decode_request_with_env( }) }) .transpose()?; - let vertex = VertexOcrSettings { - project: string_setting( - &wire.optional_params, - &["vertex_project", "vertex_ai_project"], - )? - .or_else(|| nonblank(env("VERTEXAI_PROJECT"))), - location: string_setting( - &wire.optional_params, - &["vertex_location", "vertex_ai_location"], - )? - .or_else(|| nonblank(env("VERTEXAI_LOCATION"))) - .or_else(|| nonblank(env("VERTEX_LOCATION"))), - }; let defaults = OcrConnection::default(); let max_download_bytes = env("MAX_IMAGE_URL_DOWNLOAD_SIZE_MB") .and_then(|value| value.parse::().ok()) @@ -123,20 +109,10 @@ pub fn decode_request_with_env( .unwrap_or(defaults.max_download_bytes); let mut request = OcrRequest::new(model.as_str().to_string(), document, params); request.connection = OcrConnection { - api_key: nonblank(wire.api_key) - .or_else(|| nonblank(env(key_env))) - .or_else(|| { - matches!( - kind, - OcrProviderKind::VertexAi | OcrProviderKind::VertexAiDeepSeek - ) - .then(|| nonblank(env("VERTEXAI_API_KEY"))) - .flatten() - }), + api_key: nonblank(wire.api_key).or_else(|| nonblank(env(key_env))), api_base: nonblank(wire.api_base).or_else(|| base_env.and_then(|name| nonblank(env(name)))), extra_headers: headers, azure_auth, - vertex, timeout: timeout.unwrap_or(defaults.timeout), poll_timeout: timeout.unwrap_or(defaults.poll_timeout), max_download_bytes, @@ -149,25 +125,6 @@ fn nonblank(value: Option) -> Option { .map(|s| s.trim().to_string()) .filter(|s| !s.is_empty()) } -fn string_setting( - params: &Map, - keys: &[&str], -) -> Result, OcrRequestError> { - for key in keys { - if let Some(value) = params.get(*key).filter(|value| !value.is_null()) { - let value = value - .as_str() - .ok_or_else(|| OcrRequestError::RequestField { - path: (*key).into(), - })?; - if let Some(value) = nonblank(Some(value.into())) { - return Ok(Some(value)); - } - } - } - Ok(None) -} - pub fn decode_params( kind: OcrProviderKind, params: Map, @@ -207,12 +164,6 @@ pub fn decode_params( "optional_params", )?) } - OcrProviderKind::VertexAi => { - OcrProviderRequest::VertexAi(decode_request_value(value, "optional_params")?) - } - OcrProviderKind::VertexAiDeepSeek => { - OcrProviderRequest::VertexAiDeepSeek(decode_request_value(value, "optional_params")?) - } OcrProviderKind::ReductoV3 => { OcrProviderRequest::ReductoV3(decode_request_value(value, "optional_params")?) } @@ -396,19 +347,3 @@ pub fn reducto_page<'de, D: Deserializer<'de>>(deserializer: D) -> Result