Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <[email protected]>
  • Loading branch information
jessfraz committed Apr 10, 2024
1 parent 3dfead2 commit f365343
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.65
0.2.66
4 changes: 2 additions & 2 deletions kittycad.rs.patch.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"path": "/info/x-rust",
"value": {
"client": "// Authenticate via an API token.\nlet client = kittycad::Client::new(\"$TOKEN\");\n\n// - OR -\n\n// Authenticate with your token and host parsed from the environment variables:\n// `KITTYCAD_API_TOKEN`.\nlet client = kittycad::Client::new_from_env();",
"install": "[dependencies]\nkittycad = \"0.2.65\""
"install": "[dependencies]\nkittycad = \"0.2.66\""
}
},
{
Expand Down Expand Up @@ -163,7 +163,7 @@
"op": "add",
"path": "/paths/~1debug~1uploads/post/x-rust",
"value": {
"example": "/// Uploads files to public blob storage for debugging purposes.\n/// \n/// Do NOT send files here that you don't want to be public.\nasync fn example_meta_create_debug_uploads() -> anyhow::Result<()> {\n let client = kittycad::Client::new_from_env();\n let result: Vec<String> = client\n .meta()\n .create_debug_uploads(\n vec![kittycad::types::multipart::Attachment {\n name: \"thing\".to_string(),\n filename: Some(\"myfile.json\".to_string()),\n content_type: Some(\"application/json\".to_string()),\n data: std::fs::read(\"myfile.json\").unwrap(),\n }],\n &bytes::Bytes::from(\"some-string\"),\n )\n .await?;\n println!(\"{:?}\", result);\n Ok(())\n}\n",
"example": "/// Uploads files to public blob storage for debugging purposes.\n/// \n/// Do NOT send files here that you don't want to be public.\nasync fn example_meta_create_debug_uploads() -> anyhow::Result<()> {\n let client = kittycad::Client::new_from_env();\n let result: Vec<String> = client\n .meta()\n .create_debug_uploads(vec![kittycad::types::multipart::Attachment {\n name: \"thing\".to_string(),\n filename: Some(\"myfile.json\".to_string()),\n content_type: Some(\"application/json\".to_string()),\n data: std::fs::read(\"myfile.json\").unwrap(),\n }])\n .await?;\n println!(\"{:?}\", result);\n Ok(())\n}\n",
"libDocsLink": "https://docs.rs/kittycad/latest/kittycad/meta/struct.Meta.html#method.create_debug_uploads"
}
},
Expand Down
2 changes: 1 addition & 1 deletion kittycad/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "kittycad"
description = "A fully generated & opinionated API client for the KittyCAD API."
version = "0.2.65"
version = "0.2.66"
documentation = "https://docs.rs/kittycad"
readme = "README.md"
repository = "https://github.com/KittyCAD/kittycad.rs/tree/main/kittycad"
Expand Down
2 changes: 1 addition & 1 deletion kittycad/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ To install the library, add the following to your `Cargo.toml` file.

```toml
[dependencies]
kittycad = "0.2.65"
kittycad = "0.2.66"
```

## Basic example
Expand Down
2 changes: 1 addition & 1 deletion kittycad/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
//!
//! ```toml
//! [dependencies]
//! kittycad = "0.2.65"
//! kittycad = "0.2.66"
//! ```
//!
//! ## Basic example
Expand Down
12 changes: 5 additions & 7 deletions kittycad/src/meta.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,11 @@ impl Meta {
here that you don't want to be public.\n\n```rust,no_run\nasync fn \
example_meta_create_debug_uploads() -> anyhow::Result<()> {\n let client = \
kittycad::Client::new_from_env();\n let result: Vec<String> = client\n \
.meta()\n .create_debug_uploads(\n \
vec![kittycad::types::multipart::Attachment {\n name: \
\"thing\".to_string(),\n filename: \
Some(\"myfile.json\".to_string()),\n content_type: \
Some(\"application/json\".to_string()),\n data: \
std::fs::read(\"myfile.json\").unwrap(),\n }],\n \
&bytes::Bytes::from(\"some-string\"),\n )\n .await?;\n \
.meta()\n .create_debug_uploads(vec![kittycad::types::multipart::Attachment \
{\n name: \"thing\".to_string(),\n filename: \
Some(\"myfile.json\".to_string()),\n content_type: \
Some(\"application/json\".to_string()),\n data: \
std::fs::read(\"myfile.json\").unwrap(),\n }])\n .await?;\n \
println!(\"{:?}\", result);\n Ok(())\n}\n```"]
#[tracing::instrument]
pub async fn create_debug_uploads<'a>(
Expand Down
11 changes: 8 additions & 3 deletions openapitor/src/functions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1443,8 +1443,13 @@ fn generate_example_code_fn(
// Get the request body for the function if there is one.
let request_body = if let Some(rb) = get_request_body_example(type_space, name, method, op)? {
let t = rb.type_name;
// We add the comma at the front, so it works.
quote!(&#t)
if is_multipart(type_space, name, method, op)? && !multipart_has_body(&t)? {
// We don't have a request body, so we'll return nothing.
quote!()
} else {
// We add the comma at the front, so it works.
quote!(&#t)
}
} else {
// We don't have a request body, so we'll return nothing.
quote!()
Expand Down Expand Up @@ -1633,7 +1638,7 @@ fn fmt_external_example_code(t: &proc_macro2::TokenStream, opts: &crate::Opts) -
}

fn multipart_has_body(request_body: &proc_macro2::TokenStream) -> Result<bool> {
Ok(request_body.rendered()? != "bytes::Bytes")
Ok(!request_body.rendered()?.starts_with("bytes::Bytes"))
}

#[cfg(test)]
Expand Down

0 comments on commit f365343

Please sign in to comment.