Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 0 additions & 25 deletions tensorzero-core/src/config/provider_types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ pub struct ProviderTypesConfig {
#[serde(default)]
pub hyperbolic: HyperbolicProviderTypeConfig,
#[serde(default)]
pub kie: KIEProviderTypeConfig,
#[serde(default)]
pub mistral: MistralProviderTypeConfig,
#[serde(default)]
pub openai: OpenAIProviderTypeConfig,
Expand Down Expand Up @@ -283,29 +281,6 @@ impl Default for HyperbolicDefaults {
}
}

// KIE

#[derive(Clone, Debug, Default, Deserialize, Serialize)]
pub struct KIEProviderTypeConfig {
#[serde(default)]
pub defaults: KIEDefaults,
}

#[derive(Clone, Debug, Deserialize, Serialize)]
pub struct KIEDefaults {
pub api_key_location: CredentialLocationWithFallback,
}

impl Default for KIEDefaults {
fn default() -> Self {
Self {
api_key_location: CredentialLocationWithFallback::Single(CredentialLocation::Env(
"KIE_API_KEY".to_string(),
)),
}
}
}

// Mistral

#[derive(Clone, Debug, Default, Deserialize, Serialize)]
Expand Down
57 changes: 4 additions & 53 deletions tensorzero-core/src/model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ use crate::inference::types::{
};
use crate::model_table::{
AnthropicKind, AzureKind, BaseModelTable, DeepSeekKind, FireworksKind,
GoogleAIStudioGeminiKind, GroqKind, HyperbolicKind, KIEKind, MistralKind, OpenAIKind,
OpenRouterKind, ProviderTypeDefaultCredentials, SGLangKind, ShorthandModelConfig, TGIKind,
TogetherKind, VLLMKind, XAIKind,
GoogleAIStudioGeminiKind, GroqKind, HyperbolicKind, MistralKind, OpenAIKind, OpenRouterKind,
ProviderTypeDefaultCredentials, SGLangKind, ShorthandModelConfig, TGIKind, TogetherKind,
VLLMKind, XAIKind,
};
use crate::providers::helpers::peek_first_chunk;
use crate::providers::hyperbolic::HyperbolicProvider;
Expand All @@ -74,7 +74,7 @@ use crate::providers::{
anthropic::AnthropicProvider, aws_bedrock::AWSBedrockProvider, azure::AzureProvider,
deepseek::DeepSeekProvider, fireworks::FireworksProvider,
gcp_vertex_anthropic::GCPVertexAnthropicProvider, gcp_vertex_gemini::GCPVertexGeminiProvider,
groq::GroqProvider, kie::KIEProvider, mistral::MistralProvider, openai::OpenAIProvider,
groq::GroqProvider, mistral::MistralProvider, openai::OpenAIProvider,
openrouter::OpenRouterProvider, together::TogetherProvider, vllm::VLLMProvider,
xai::XAIProvider,
};
Expand Down Expand Up @@ -899,7 +899,6 @@ impl ModelProvider {
ProviderConfig::GoogleAIStudioGemini(_) => "google_ai_studio_gemini",
ProviderConfig::Groq(_) => "groq",
ProviderConfig::Hyperbolic(_) => "hyperbolic",
ProviderConfig::KIE(_) => "kie",
ProviderConfig::Mistral(_) => "mistral",
ProviderConfig::OpenAI(_) => "openai",
ProviderConfig::OpenRouter(_) => "openrouter",
Expand Down Expand Up @@ -940,7 +939,6 @@ impl ModelProvider {
ProviderConfig::GoogleAIStudioGemini(provider) => Some(provider.model_name()),
ProviderConfig::Groq(provider) => Some(provider.model_name()),
ProviderConfig::Hyperbolic(provider) => Some(provider.model_name()),
ProviderConfig::KIE(provider) => Some(provider.model_name()),
ProviderConfig::Mistral(provider) => Some(provider.model_name()),
ProviderConfig::OpenAI(provider) => Some(provider.model_name()),
ProviderConfig::OpenRouter(provider) => Some(provider.model_name()),
Expand Down Expand Up @@ -996,7 +994,6 @@ pub enum ProviderConfig {
GoogleAIStudioGemini(GoogleAIStudioGeminiProvider),
Groq(GroqProvider),
Hyperbolic(HyperbolicProvider),
KIE(KIEProvider),
Mistral(MistralProvider),
OpenAI(OpenAIProvider),
OpenRouter(OpenRouterProvider),
Expand Down Expand Up @@ -1049,7 +1046,6 @@ impl ProviderConfig {
ProviderConfig::Hyperbolic(_) => {
Cow::Borrowed(crate::providers::hyperbolic::PROVIDER_TYPE)
}
ProviderConfig::KIE(_) => Cow::Borrowed(crate::providers::kie::PROVIDER_TYPE),
ProviderConfig::Mistral(_) => Cow::Borrowed(crate::providers::mistral::PROVIDER_TYPE),
ProviderConfig::OpenAI(_) => Cow::Borrowed(crate::providers::openai::PROVIDER_TYPE),
ProviderConfig::OpenRouter(_) => {
Expand Down Expand Up @@ -1093,7 +1089,6 @@ impl ProviderConfig {
ProviderConfig::GoogleAIStudioGemini(_) => false,
ProviderConfig::Groq(_) => false,
ProviderConfig::Hyperbolic(_) => false,
ProviderConfig::KIE(_) => false,
ProviderConfig::Mistral(_) => false,
ProviderConfig::OpenRouter(_) => false,
ProviderConfig::SGLang(_) => false,
Expand Down Expand Up @@ -1226,11 +1221,6 @@ pub enum UninitializedProviderConfig {
#[cfg_attr(feature = "ts-bindings", ts(type = "string | null"))]
api_key_location: Option<CredentialLocationWithFallback>,
},
KIE {
model_name: String,
#[cfg_attr(feature = "ts-bindings", ts(type = "string | null"))]
api_key_location: Option<CredentialLocationWithFallback>,
},
#[strum(serialize = "fireworks")]
#[serde(rename = "fireworks")]
Fireworks {
Expand Down Expand Up @@ -1527,18 +1517,6 @@ impl UninitializedProviderConfig {
)
.await?,
)),
UninitializedProviderConfig::KIE {
model_name,
api_key_location,
} => ProviderConfig::KIE(KIEProvider::new(
model_name,
KIEKind
.get_defaulted_credential(
api_key_location.as_ref(),
provider_type_default_credentials,
)
.await?,
)),
UninitializedProviderConfig::Mistral {
model_name,
api_key_location,
Expand Down Expand Up @@ -1864,11 +1842,6 @@ impl ModelProvider {
.infer(request, &clients.http_client, &clients.credentials, self)
.await
}
ProviderConfig::KIE(provider) => {
provider
.infer(request, &clients.http_client, &clients.credentials, self)
.await
}
ProviderConfig::Mistral(provider) => {
provider
.infer(request, &clients.http_client, &clients.credentials, self)
Expand Down Expand Up @@ -2003,11 +1976,6 @@ impl ModelProvider {
.infer_stream(request, &clients.http_client, &clients.credentials, self)
.await
}
ProviderConfig::KIE(provider) => {
provider
.infer_stream(request, &clients.http_client, &clients.credentials, self)
.await
}
ProviderConfig::Mistral(provider) => {
provider
.infer_stream(request, &clients.http_client, &clients.credentials, self)
Expand Down Expand Up @@ -2129,11 +2097,6 @@ impl ModelProvider {
.start_batch_inference(requests, client, api_keys)
.await
}
ProviderConfig::KIE(provider) => {
provider
.start_batch_inference(requests, client, api_keys)
.await
}
ProviderConfig::Mistral(provider) => {
provider
.start_batch_inference(requests, client, api_keys)
Expand Down Expand Up @@ -2245,11 +2208,6 @@ impl ModelProvider {
.poll_batch_inference(batch_request, http_client, dynamic_api_keys)
.await
}
ProviderConfig::KIE(provider) => {
provider
.poll_batch_inference(batch_request, http_client, dynamic_api_keys)
.await
}
ProviderConfig::Mistral(provider) => {
provider
.poll_batch_inference(batch_request, http_client, dynamic_api_keys)
Expand Down Expand Up @@ -2600,7 +2558,6 @@ pub const SHORTHAND_MODEL_PREFIXES: &[&str] = &[
"gcp_vertex_anthropic::",
"hyperbolic::",
"groq::",
"kie::",
"mistral::",
"openai::",
"openrouter::",
Expand Down Expand Up @@ -2669,12 +2626,6 @@ impl ShorthandModelConfig for ModelConfig {
.get_defaulted_credential(None, default_credentials)
.await?,
)),
"kie" => ProviderConfig::KIE(KIEProvider::new(
model_name,
KIEKind
.get_defaulted_credential(None, default_credentials)
.await?,
)),
"mistral" => ProviderConfig::Mistral(MistralProvider::new(
model_name,
MistralKind
Expand Down
24 changes: 0 additions & 24 deletions tensorzero-core/src/model_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use crate::{
google_ai_studio_gemini::GoogleAIStudioCredentials,
groq::GroqCredentials,
hyperbolic::HyperbolicCredentials,
kie::KIECredentials,
mistral::MistralCredentials,
openai::OpenAICredentials,
openrouter::OpenRouterCredentials,
Expand Down Expand Up @@ -96,7 +95,6 @@ pub enum ProviderType {
GoogleAIStudioGemini,
Groq,
Hyperbolic,
KIE,
Mistral,
OpenAI,
OpenRouter,
Expand All @@ -120,7 +118,6 @@ impl Display for ProviderType {
ProviderType::GoogleAIStudioGemini => write!(f, "GoogleAIStudioGemini"),
ProviderType::Groq => write!(f, "Groq"),
ProviderType::Hyperbolic => write!(f, "Hyperbolic"),
ProviderType::KIE => write!(f, "KIE"),
ProviderType::Mistral => write!(f, "Mistral"),
ProviderType::OpenAI => write!(f, "OpenAI"),
ProviderType::OpenRouter => write!(f, "OpenRouter"),
Expand Down Expand Up @@ -378,7 +375,6 @@ pub struct ProviderTypeDefaultCredentials {
google_ai_studio_gemini: LazyCredential<GoogleAIStudioCredentials>,
groq: LazyCredential<GroqCredentials>,
hyperbolic: LazyCredential<HyperbolicCredentials>,
kie: LazyCredential<KIECredentials>,
mistral: LazyCredential<MistralCredentials>,
openai: LazyCredential<OpenAICredentials>,
openrouter: LazyCredential<OpenRouterCredentials>,
Expand Down Expand Up @@ -432,7 +428,6 @@ impl ProviderTypeDefaultCredentials {
.defaults
.api_key_location
.clone();
let kie_location = provider_types_config.kie.defaults.api_key_location.clone();
let mistral_location = provider_types_config
.mistral
.defaults
Expand Down Expand Up @@ -507,9 +502,6 @@ impl ProviderTypeDefaultCredentials {
load_credential_with_fallback(&hyperbolic_location, ProviderType::Hyperbolic)?
.try_into()
}),
kie: LazyCredential::new(move || {
load_credential_with_fallback(&kie_location, ProviderType::KIE)?.try_into()
}),
mistral: LazyCredential::new(move || {
load_credential_with_fallback(&mistral_location, ProviderType::Mistral)?.try_into()
}),
Expand Down Expand Up @@ -931,22 +923,6 @@ impl ProviderKind for HyperbolicKind {
}
}

pub struct KIEKind;

impl ProviderKind for KIEKind {
type Credential = KIECredentials;
fn get_provider_type(&self) -> ProviderType {
ProviderType::KIE
}

async fn get_credential_field(
&self,
default_credentials: &ProviderTypeDefaultCredentials,
) -> Result<Self::Credential, Error> {
default_credentials.kie.get_cloned()
}
}

pub struct MistralKind;

impl ProviderKind for MistralKind {
Expand Down
Loading
Loading