mii/openai-api-rs
1
0
Fork 0
mirror of https://github.com/mii443/openai-api-rs.git synced 2025-08-22 23:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

preserve query parameters from the url

Browse Source
This commit is contained in:
Hitesh Joshi
2025-04-30 17:54:22 +05:30
parent 6b2577dc8f
commit 6ea6beb4df
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -40,3 +40,6 @@ features = ["connect"]
[dependencies.futures-util] [dependencies.futures-util]
version = "0.3.31" version = "0.3.31"
features = ["sink", "std"] features = ["sink", "std"]
[dependencies.url]
version = "2.5.4"

28
src/v1/api.rs
View File

@ -43,6 +43,7 @@ use reqwest::multipart::{Form, Part};
use reqwest::{Client, Method, Response}; use reqwest::{Client, Method, Response};
use serde::Serialize; use serde::Serialize;
use serde_json::Value; use serde_json::Value;
use url::Url;
use std::error::Error; use std::error::Error;
use std::fs::{create_dir_all, File}; use std::fs::{create_dir_all, File};
@ -56,7 +57,6 @@ const API_URL_V1: &str = "https://api.openai.com/v1";
pub struct OpenAIClientBuilder { pub struct OpenAIClientBuilder {
api_endpoint: Option<String>, api_endpoint: Option<String>,
api_key: Option<String>, api_key: Option<String>,
api_version: Option<String>,
organization: Option<String>, organization: Option<String>,
proxy: Option<String>, proxy: Option<String>,
timeout: Option<u64>, timeout: Option<u64>,
@ -67,7 +67,6 @@ pub struct OpenAIClientBuilder {
pub struct OpenAIClient { pub struct OpenAIClient {
api_endpoint: String, api_endpoint: String,
api_key: Option<String>, api_key: Option<String>,
api_version: Option<String>,
organization: Option<String>, organization: Option<String>,
proxy: Option<String>, proxy: Option<String>,
timeout: Option<u64>, timeout: Option<u64>,
@ -84,11 +83,6 @@ impl OpenAIClientBuilder {
self self
} }
pub fn with_api_version(mut self, api_version: impl Into<String>) -> Self {
self.api_version = Some(api_version.into());
self
}
pub fn with_endpoint(mut self, endpoint: impl Into<String>) -> Self { pub fn with_endpoint(mut self, endpoint: impl Into<String>) -> Self {
self.api_endpoint = Some(endpoint.into()); self.api_endpoint = Some(endpoint.into());
self self
@ -125,7 +119,6 @@ impl OpenAIClientBuilder {
Ok(OpenAIClient { Ok(OpenAIClient {
api_endpoint, api_endpoint,
api_version: self.api_version,
api_key: self.api_key, api_key: self.api_key,
organization: self.organization, organization: self.organization,
proxy: self.proxy, proxy: self.proxy,
@ -141,11 +134,9 @@ impl OpenAIClient {
} }
async fn build_request(&self, method: Method, path: &str) -> reqwest::RequestBuilder { async fn build_request(&self, method: Method, path: &str) -> reqwest::RequestBuilder {
let mut url = format!("{}/{}", self.api_endpoint, path); let url = self
.build_url_with_preserved_query(path)
if let Some(api_version) = &self.api_version { .unwrap_or_else(|_| format!("{}/{}", self.api_endpoint, path));
url = format!("{}?api-version={}", url, api_version);
}
let client = Client::builder(); let client = Client::builder();
@ -790,7 +781,18 @@ impl OpenAIClient {
let url = Self::query_params(limit, None, after, None, "batches".to_string()); let url = Self::query_params(limit, None, after, None, "batches".to_string());
self.get(&url).await self.get(&url).await
} }
fn build_url_with_preserved_query(&self, path: &str) -> Result<String, url::ParseError> {
let base = Url::parse(&self.api_endpoint)?;
let mut url = base.join(path)?;
if let Some(q) = base.query() {
for (k, v) in url::form_urlencoded::parse(q.as_bytes()) {
url.query_pairs_mut().append_pair(&k, &v);
}
}
Ok(url.to_string())
}
fn query_params( fn query_params(
limit: Option<i64>, limit: Option<i64>,
order: Option<String>, order: Option<String>,