Skip to content

Add JSON header and use simple strings for enumerations #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

Add JSON header and use simple strings for enumerations #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion openai_client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ categories = ["api-bindings", "web-programming::http-client"]
description = "A native Rust client for the complete OpenAI REST API."

[dependencies]
reqwest = { version = "0.12.22", features = ["multipart"] }
reqwest = { version = "0.12.22", features = ["multipart", "json"] }
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
tokio = { version = "1.46.0", features = ["rt", "macros"] }
Expand Down
30 changes: 7 additions & 23 deletions openai_client/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,9 @@ fn parse_object_type(name: &str, schema: &Yaml, output_file: &mut File) {
if let Some(type_label) = schema_map.get(&Yaml::String("x-oaiTypeLabel".to_string())) {
let type_label_str = type_label.as_str().unwrap();
match type_label_str {
"map" => writeln!(output_file, "pub struct {}(pub serde_json::Value);\n", name).unwrap(),
"map" => {
writeln!(output_file, "pub struct {}(pub serde_json::Value);\n", name).unwrap()
}
_ => unimplemented!("{} with type label {:?}", name, type_label),
}
} else {
Expand Down Expand Up @@ -520,6 +522,7 @@ fn parse_oneof_type(name: &str, schema: &Yaml, output_file: &mut File) {
writeln!(output_file, "#[serde(untagged)]").unwrap();
writeln!(output_file, "pub enum {} {{", name).unwrap();

let mut string_enum_already_processed = false;
for (index, one_of_variant) in one_of_list.iter().enumerate() {
let one_of_variant_hash = one_of_variant.as_hash().unwrap();
if let Some(doc) = one_of_variant_hash
Expand All @@ -544,28 +547,9 @@ fn parse_oneof_type(name: &str, schema: &Yaml, output_file: &mut File) {
{
match variant_type.as_str() {
"string" => {
// Some variants have two String types to account for enumerations but for
// our type this is not necessary because all String representations are
// equal
if let Some(Yaml::Array(enum_list)) =
one_of_variant_hash.get(&Yaml::String("enum".to_string()))
{
for string_variant in enum_list {
writeln!(
output_file,
"\t#[serde(rename=\"{}\")]",
string_variant.as_str().unwrap()
)
.unwrap();
writeln!(
output_file,
"\t{},",
str_to_camel_case(string_variant.as_str().unwrap())
)
.unwrap();
}
} else {
if !string_enum_already_processed {
writeln!(output_file, "\tString(String),").unwrap();
string_enum_already_processed = true;
}
}
"integer" => {
Expand Down Expand Up @@ -1299,7 +1283,7 @@ fn parse_endpoint_path(path_schema: &Yaml, client_output_file: &mut File) {
if request_body_is_required {
writeln!(
client_output_file,
"\t\trequest = request.body(serde_json::to_string(&request_body)?);",
"\t\trequest = request.json(&request_body);",
)
.unwrap();
} else {
Expand Down
Loading