Merge pull request #76 from Blankeos/oai-compat-fix

feat: fix API path for OpenAI-compatible providers

Author: surafelfikru

CHANGELOG.md

@@ -25,6 +25,9 @@ Changelog entries are grouped by type, with the following types:
 - Added embedding support to `OpenRouter` provider (delegates to OpenAI)
 - Added embedding support to `TogetherAI` provider (delegates to OpenAI)
 - Added embedding support to `Vercel` provider (delegates to OpenAI)
+- Added `openai_compatible` provider. (#76) by @Blankeos
+
+### Changed
 
 ## [0.4.0] - 2026-01-24
 

Cargo.toml

@@ -15,8 +15,9 @@ keywords = ["ai", "sdk", "aisdk", "ai-sdk-rs", "openai"]
 categories = ["api-bindings", "asynchronous"]
 
 [features]
-full = ["prompt", "openai", "openaichatcompletions", "anthropic", "groq", "vercel", "google", "openrouter", "deepseek", "amazon-bedrock", "togetherai", "xai"]
+full = ["prompt", "openai", "openaicompatible", "openaichatcompletions", "anthropic", "groq", "vercel", "google", "openrouter", "deepseek", "amazon-bedrock", "togetherai", "xai"]
 openai = []
+openaicompatible = ["openaichatcompletions"]
 openaichatcompletions = []
 anthropic = []
 groq = ["openaichatcompletions"]
@@ -70,6 +71,11 @@ name = "openai_tests"
 path = "tests/provider/openai_tests.rs"
 required-features = ["openai", "test-access"]
 
+[[test]]
+name = "openai_compatible_tests"
+path = "tests/provider/openai_compatible_tests.rs"
+required-features = ["openaicompatible", "test-access"]
+
 [[test]]
 name = "anthropic_tests"
 path = "tests/provider/anthropic_tests.rs"

src/core/client.rs

@@ -1,6 +1,7 @@
 //! This module provides the client for interacting with the AI providers.
 //! It is a thin wrapper around the `reqwest` crate.
 
+use crate::core::utils::join_url;
 use crate::error::{Error, Result};
 use futures::Stream;
 use futures::StreamExt;
@@ -24,13 +25,7 @@ pub(crate) trait LanguageModelClient {
     async fn send(&self, base_url: impl IntoUrl) -> Result<Self::Response> {
         let client = reqwest::Client::new();
 
-        let base_url = base_url
-            .into_url()
-            .map_err(|_| Error::InvalidInput("Invalid base URL".into()))?;
-
-        let url = base_url
-            .join(&self.path())
-            .map_err(|_| Error::InvalidInput("Failed to join base URL and path".into()))?;
+        let url = join_url(base_url, &self.path())?;
 
         let max_retries = 5;
         let mut retry_count = 0;
@@ -95,13 +90,7 @@ pub(crate) trait LanguageModelClient {
     {
         let client = reqwest::Client::new();
 
-        let base_url = base_url
-            .into_url()
-            .map_err(|_| Error::InvalidInput("Invalid base URL".into()))?;
-
-        let url = base_url
-            .join(&self.path())
-            .map_err(|_| Error::InvalidInput("Failed to join base URL and path".into()))?;
+        let url = join_url(base_url, &self.path())?;
 
         // Establish the event source stream directly
         // Note: Status code errors (including 429) will be surfaced as stream events

src/core/utils.rs

@@ -1,7 +1,9 @@
 //! Helper functions for `aisdk`
 
+use reqwest::{IntoUrl, Url};
+
 use crate::{
-    Error,
+    Error, Result,
     core::{Message, language_model::LanguageModelOptions, messages::TaggedMessage},
 };
 
@@ -118,6 +120,38 @@ pub(crate) fn validate_base_url(s: &str) -> crate::error::Result<String> {
     Ok(url.to_string())
 }
 
+/// Joins a base URL with a path, handling trailing/leading slashes automatically.
+///
+/// This function normalizes the URL components to ensure proper joining:
+/// - Strips trailing slashes from base_url
+/// - Strips leading slashes from path
+/// - Joins them with a single slash
+///
+/// # Examples
+///
+/// ```ignore
+/// // All of these produce "https://api.example.com/v1/chat/completions"
+/// join_url("https://api.example.com/v1", "chat/completions");
+/// join_url("https://api.example.com/v1/", "chat/completions");
+/// join_url("https://api.example.com/v1", "/chat/completions");
+/// join_url("https://api.example.com/v1/", "/chat/completions");
+/// ```
+pub(crate) fn join_url(base_url: impl IntoUrl, path: &str) -> Result<Url> {
+    let base_url = base_url
+        .into_url()
+        .map_err(|_| Error::InvalidInput("Invalid base URL".into()))?;
+
+    // Normalize: strip trailing slashes from base, strip leading slashes from path
+    let base_str = base_url.as_str().trim_end_matches('/');
+    let path_str = path.trim_start_matches('/');
+
+    // Join with a single slash
+    let full_url = format!("{}/{}", base_str, path_str);
+
+    Url::parse(&full_url)
+        .map_err(|_| Error::InvalidInput("Failed to join base URL and path".into()))
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -145,4 +179,19 @@ mod tests {
     fn test_sum_options_both_none() {
         assert_eq!(sum_options(None, None), None);
     }
+
+    #[test]
+    fn test_join_url() {
+        let url = join_url("https://api.example.com/v1", "chat/completions").unwrap();
+        assert_eq!(url.as_str(), "https://api.example.com/v1/chat/completions");
+
+        let url = join_url("https://api.example.com/v1/", "chat/completions").unwrap();
+        assert_eq!(url.as_str(), "https://api.example.com/v1/chat/completions");
+
+        let url = join_url("https://api.example.com/v1", "/chat/completions").unwrap();
+        assert_eq!(url.as_str(), "https://api.example.com/v1/chat/completions");
+
+        let url = join_url("https://api.example.com/v1/", "/chat/completions").unwrap();
+        assert_eq!(url.as_str(), "https://api.example.com/v1/chat/completions");
+    }
 }

src/providers/amazon_bedrock/settings.rs

@@ -22,7 +22,7 @@ impl Default for AmazonBedrockProviderSettings {
     fn default() -> Self {
         Self {
             provider_name: "AmazonBedrock".to_string(),
-            base_url: "https://bedrock-runtime.us-east-1.amazonaws.com/openai/".to_string(),
+            base_url: "https://bedrock-runtime.us-east-1.amazonaws.com/openai/v1".to_string(),
             api_key: std::env::var("BEDROCK_API_KEY").unwrap_or_default(),
         }
     }

src/providers/deepseek/settings.rs

@@ -21,7 +21,7 @@ impl Default for DeepSeekProviderSettings {
     fn default() -> Self {
         Self {
             provider_name: "DeepSeek".to_string(),
-            base_url: "https://api.deepseek.com/v1/".to_string(),
+            base_url: "https://api.deepseek.com/v1".to_string(),
             api_key: std::env::var("DEEPSEEK_API_KEY").unwrap_or_default(),
         }
     }

src/providers/groq/settings.rs

@@ -21,7 +21,7 @@ impl Default for GroqProviderSettings {
     fn default() -> Self {
         Self {
             provider_name: "Groq".to_string(),
-            base_url: "https://api.groq.com/openai/".to_string(),
+            base_url: "https://api.groq.com/openai/v1".to_string(),
             api_key: std::env::var("GROQ_API_KEY").unwrap_or_default(),
         }
     }

src/providers/mod.rs

@@ -6,6 +6,12 @@ pub mod openai;
 #[cfg(feature = "openai")]
 pub use openai::OpenAI;
 
+// Public OpenAI-compatible provider
+#[cfg(feature = "openaicompatible")]
+pub mod openai_compatible;
+#[cfg(feature = "openaicompatible")]
+pub use openai_compatible::OpenAICompatible;
+
 #[cfg(feature = "anthropic")]
 pub mod anthropic;
 #[cfg(feature = "anthropic")]

src/providers/openai_chat_completions/client/mod.rs

@@ -17,7 +17,7 @@ impl<M: ModelName> LanguageModelClient for OpenAIChatCompletions<M> {
     type StreamEvent = ChatCompletionsStreamEvent;
 
     fn path(&self) -> String {
-        "v1/chat/completions".to_string()
+        "chat/completions".to_string()
     }
 
     fn method(&self) -> reqwest::Method {

src/providers/openai_chat_completions/client/types.rs

@@ -294,6 +294,10 @@ pub(crate) struct Delta {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub content: Option<String>,
 
+    /// Reasoning content for reasoning models (e.g., OpenAI o1, DeepSeek R1)
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub reasoning_content: Option<String>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub tool_calls: Option<Vec<DeltaToolCall>>,
 }