fix cherrypick issues

Author: ifsheldon

async-openai/Cargo.toml

@@ -47,6 +47,8 @@ eventsource-stream = "0.2"
 hmac = { version = "0.12", optional = true, default-features = false}
 sha2 = { version = "0.10", optional = true, default-features = false }
 hex = { version = "0.4", optional = true, default-features = false }
+serde_urlencoded = "0.7.1"
+url = "2.5"
 
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]

async-openai/src/admin_api_keys.rs

@@ -1,11 +1,10 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::admin::api_keys::{
         AdminApiKey, AdminApiKeyDeleteResponse, ApiKeyList, CreateAdminApiKeyRequest,
     },
-    Client, RequestOptions,
 };
 
 /// Admin API keys enable Organization Owners to programmatically manage various aspects of their

async-openai/src/assistants.rs

@@ -1,12 +1,11 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::assistants::{
         AssistantObject, CreateAssistantRequest, DeleteAssistantResponse, ListAssistantsResponse,
         ModifyAssistantRequest,
     },
-    Client, RequestOptions,
 };
 
 /// Build assistants that can call models and use tools to perform tasks.

async-openai/src/audit_logs.rs

@@ -1,6 +1,6 @@
 use crate::{
-    config::Config, error::OpenAIError, types::admin::audit_logs::ListAuditLogsResponse, Client,
-    RequestOptions,
+    Client, RequestOptions, config::Config, error::OpenAIError,
+    types::admin::audit_logs::ListAuditLogsResponse,
 };
 
 /// Logs of user actions and configuration changes within this organization.

async-openai/src/batches.rs

@@ -1,9 +1,8 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::batches::{Batch, BatchRequest, ListBatchesResponse},
-    Client, RequestOptions,
 };
 
 /// Create large batches of API requests for asynchronous processing. The Batch API returns completions within 24 hours for a 50% discount.

async-openai/src/certificates.rs

@@ -1,12 +1,11 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::admin::certificates::{
         Certificate, DeleteCertificateResponse, ListCertificatesResponse, ModifyCertificateRequest,
         ToggleCertificatesRequest, UploadCertificateRequest,
     },
-    Client, RequestOptions,
 };
 
 /// Certificates enable Mutual TLS (mTLS) authentication for your organization.

async-openai/src/chat.rs

@@ -1,13 +1,12 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::chat::{
         ChatCompletionDeleted, ChatCompletionList, ChatCompletionMessageList,
         ChatCompletionResponseStream, CreateChatCompletionRequest, CreateChatCompletionResponse,
         UpdateChatCompletionRequest,
     },
-    Client, RequestOptions,
 };
 
 /// Given a list of messages comprising a conversation, the model will return a response.

async-openai/src/chatkit.rs

@@ -1,12 +1,11 @@
 use crate::{
-    Client,
+    Client, RequestOptions,
     config::Config,
     error::OpenAIError,
     types::chatkit::{
         ChatSessionResource, CreateChatSessionBody, DeletedThreadResource, ThreadItemListResource,
         ThreadListResource, ThreadResource,
     },
-    Client, RequestOptions,
 };
 
 /// ChatKit API for managing sessions and threads.

async-openai/src/client.rs

@@ -17,7 +17,7 @@ use serde::{Serialize, de::DeserializeOwned};
 use crate::error::{ApiError, StreamError};
 use crate::{
     Assistants, Audio, Batches, Chat, Completions, Containers, Conversations, Embeddings, Evals,
-    FineTuning, Models, Responses, Threads, Uploads, Usage, VectorStores, Videos,
+    FineTuning, Models, RequestOptions, Responses, Threads, Uploads, Usage, VectorStores, Videos,
     admin::Admin,
     chatkit::Chatkit,
     config::{Config, OpenAIConfig},
@@ -26,8 +26,6 @@ use crate::{
     image::Images,
     moderation::Moderations,
     traits::AsyncTryFrom,
-    Assistants, Audio, Batches, Chat, Completions, Containers, Conversations, Embeddings, Evals,
-    FineTuning, Models, RequestOptions, Responses, Threads, Uploads, Usage, VectorStores, Videos,
 };
 
 #[cfg(feature = "realtime")]
@@ -223,9 +221,8 @@ impl<C: Config> Client<C> {
             }
 
             Ok(request_builder.build()?)
-        };
-
-        self.execute(request_maker).await
+        })
+        .await
     }
 
     /// Make a DELETE request to {path} and deserialize the response body

async-openai/src/completion.rs

@@ -1,9 +1,9 @@
 use crate::{
+    RequestOptions,
     client::Client,
     config::Config,
     error::OpenAIError,
     types::{CompletionResponseStream, CreateCompletionRequest, CreateCompletionResponse},
-    RequestOptions,
 };
 
 /// Given a prompt, the model will return one or more predicted completions,