simplify

Author: 64bit

async-openai/src/beta.rs

@@ -7,7 +7,7 @@ use reqwest_eventsource::{Error as EventSourceError, Event, EventSource, Request
 use serde::{de::DeserializeOwned, Serialize};
 
 use crate::{
-    beta::Beta,
+    chatkit::Chatkit,
     config::{Config, OpenAIConfig},
     error::{map_deserialization_error, ApiError, OpenAIError, StreamError, WrappedError},
     file::Files,
@@ -189,26 +189,14 @@ impl<C: Config> Client<C> {
         Evals::new(self)
     }
 
-    /// Access beta APIs like ChatKit.
-    ///
-    /// Beta APIs require special headers that are automatically added.
-    /// Use `client.beta().chatkit()` to access ChatKit APIs.
-    pub fn beta(&self) -> Beta<'_, C> {
-        Beta::new_generic(self)
+    pub fn chatkit(&self) -> Chatkit<'_, C> {
+        Chatkit::new(self)
     }
 
     pub fn config(&self) -> &C {
         &self.config
     }
 
-    pub(crate) fn http_client(&self) -> &reqwest::Client {
-        &self.http_client
-    }
-
-    pub(crate) fn backoff(&self) -> &backoff::ExponentialBackoff {
-        &self.backoff
-    }
-
     /// Make a GET request to {path} and deserialize the response body
     pub(crate) async fn get<O>(&self, path: &str) -> Result<O, OpenAIError>
     where

async-openai/src/client.rs

@@ -144,7 +144,6 @@ mod assistants;
 mod audio;
 mod audit_logs;
 mod batches;
-mod beta;
 mod chat;
 mod chatkit;
 mod client;
@@ -194,7 +193,6 @@ pub use assistants::Assistants;
 pub use audio::Audio;
 pub use audit_logs::AuditLogs;
 pub use batches::Batches;
-pub use beta::Beta;
 pub use chat::Chat;
 pub use chatkit::Chatkit;
 pub use client::Client;

async-openai/src/lib.rs

@@ -41,8 +41,10 @@ pub struct ChatkitWorkflow {
     /// Identifier of the workflow backing the session.
     pub id: String,
     /// Specific workflow version used for the session. Defaults to null when using the latest deployment.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub version: Option<String>,
     /// State variable key-value pairs applied when invoking the workflow. Defaults to null when no overrides were provided.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub state_variables: Option<HashMap<String, serde_json::Value>>,
     /// Tracing settings applied to the workflow.
     pub tracing: ChatkitWorkflowTracing,
@@ -95,8 +97,10 @@ pub struct ChatSessionFileUpload {
     /// Indicates if uploads are enabled for the session.
     pub enabled: bool,
     /// Maximum upload size in megabytes.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_file_size: Option<i32>,
     /// Maximum number of uploads allowed during the session.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub max_files: Option<i32>,
 }
 
@@ -106,14 +110,15 @@ pub struct ChatSessionHistory {
     /// Indicates if chat history is persisted for the session.
     pub enabled: bool,
     /// Number of prior threads surfaced in history views. Defaults to null when all history is retained.
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub recent_threads: Option<i32>,
 }
 
 /// Parameters for provisioning a new ChatKit session.
-#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "CreateChatSessionRequestArgs")]
 #[builder(pattern = "mutable")]
-#[builder(setter(into, strip_option))]
+#[builder(setter(into, strip_option), default)]
 #[builder(derive(Debug))]
 #[builder(build_fn(error = "OpenAIError"))]
 pub struct CreateChatSessionBody {
@@ -133,10 +138,10 @@ pub struct CreateChatSessionBody {
 }
 
 /// Workflow reference and overrides applied to the chat session.
-#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "WorkflowParamArgs")]
 #[builder(pattern = "mutable")]
-#[builder(setter(into, strip_option))]
+#[builder(setter(into, strip_option), default)]
 #[builder(derive(Debug))]
 #[builder(build_fn(error = "OpenAIError"))]
 pub struct WorkflowParam {
@@ -167,10 +172,10 @@ pub struct WorkflowTracingParam {
 }
 
 /// Controls when the session expires relative to an anchor timestamp.
-#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "ExpiresAfterParamArgs")]
 #[builder(pattern = "mutable")]
-#[builder(setter(into, strip_option))]
+#[builder(setter(into, strip_option), default)]
 #[builder(derive(Debug))]
 #[builder(build_fn(error = "OpenAIError"))]
 pub struct ExpiresAfterParam {
@@ -187,7 +192,7 @@ fn default_anchor() -> String {
 }
 
 /// Controls request rate limits for the session.
-#[derive(Clone, Serialize, Default, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "RateLimitsParamArgs")]
 #[builder(pattern = "mutable")]
 #[builder(setter(into, strip_option), default)]
@@ -200,7 +205,7 @@ pub struct RateLimitsParam {
 }
 
 /// Optional per-session configuration settings for ChatKit behavior.
-#[derive(Clone, Serialize, Default, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "ChatkitConfigurationParamArgs")]
 #[builder(pattern = "mutable")]
 #[builder(setter(into, strip_option), default)]
@@ -219,7 +224,7 @@ pub struct ChatkitConfigurationParam {
 }
 
 /// Controls whether ChatKit automatically generates thread titles.
-#[derive(Clone, Serialize, Default, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "AutomaticThreadTitlingParamArgs")]
 #[builder(pattern = "mutable")]
 #[builder(setter(into, strip_option), default)]
@@ -232,7 +237,7 @@ pub struct AutomaticThreadTitlingParam {
 }
 
 /// Controls whether users can upload files.
-#[derive(Clone, Serialize, Default, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "FileUploadParamArgs")]
 #[builder(pattern = "mutable")]
 #[builder(setter(into, strip_option), default)]
@@ -251,7 +256,7 @@ pub struct FileUploadParam {
 }
 
 /// Controls how much historical context is retained for the session.
-#[derive(Clone, Serialize, Default, Debug, Deserialize, Builder, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, Builder, PartialEq, Default)]
 #[builder(name = "HistoryParamArgs")]
 #[builder(pattern = "mutable")]
 #[builder(setter(into, strip_option), default)]

async-openai/src/types/chatkit/session.rs

@@ -39,7 +39,7 @@ pub enum ThreadStatus {
 }
 
 /// A paginated list of ChatKit threads.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct ThreadListResource {
     /// The type of object returned, must be `list`.
     #[serde(default = "default_list_object")]
@@ -59,7 +59,7 @@ fn default_list_object() -> String {
 }
 
 /// Confirmation payload returned after deleting a thread.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct DeletedThreadResource {
     /// Identifier of the deleted thread.
     pub id: String,
@@ -75,7 +75,7 @@ fn default_deleted_object() -> String {
 }
 
 /// A paginated list of thread items rendered for the ChatKit API.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct ThreadItemListResource {
     /// The type of object returned, must be `list`.
     #[serde(default = "default_list_object")]
@@ -115,7 +115,7 @@ pub enum ThreadItem {
 }
 
 /// User-authored messages within a thread.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct UserMessageItem {
     /// Identifier of the thread item.
     pub id: String,
@@ -177,7 +177,7 @@ pub enum AttachmentType {
 }
 
 /// Model and tool overrides applied when generating the assistant response.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct InferenceOptions {
     /// Preferred tool to invoke. Defaults to null when ChatKit should auto-select.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -188,14 +188,14 @@ pub struct InferenceOptions {
 }
 
 /// Tool selection that the assistant should honor when executing the item.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct ToolChoice {
     /// Identifier of the requested tool.
     pub id: String,
 }
 
 /// Assistant-authored message within a thread.
-#[derive(Clone, Serialize, Debug, Deserialize, PartialEq)]
+#[derive(Clone, Serialize, Debug, Deserialize, PartialEq, Default)]
 pub struct AssistantMessageItem {
     /// Identifier of the thread item.
     pub id: String,
@@ -397,4 +397,3 @@ pub struct TaskGroupTask {
     /// Optional summary that describes the grouped task. Defaults to null when omitted.
     pub summary: Option<String>,
 }
-