Skip to content

chore(multipart): fmt code #575

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
0x676e67 merged 2 commits into from
Apr 15, 2026
Merged

chore(multipart): fmt code #575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d02967
chore(multipart): fmt code
0x676e67 Apr 15, 2026
5767f5a
fmt
0x676e67 Apr 15, 2026
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
60 changes: 24 additions & 36 deletions src/client/body/multipart.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ impl Multipart {
fn build_form(&mut self, py: Python) -> PyResult<multipart::Form> {
let mut form = multipart::Form::new();
for part in &mut self.parts {
let (name, inner) = part.build_form_part(py)?;
let (name, inner) = part.build_part(py)?;
form = form.part(name, inner);
}
Ok(form)
Expand Down Expand Up @@ -121,55 +121,43 @@ impl Part {
}
}

fn build_inner(value: Value, length: Option<u64>) -> Result<multipart::Part, Error> {
Ok(match value {
Value::Text(text) => multipart::Part::stream(Body::from(Bytes::from_owner(text))),
Value::Bytes(bytes) => multipart::Part::stream(Body::from(Bytes::from_owner(bytes))),
Value::File(path) => pyo3_async_runtimes::tokio::get_runtime()
.block_on(multipart::Part::file(path))
.map_err(Error::from)?,
Value::Stream(stream) => {
let stream = Body::wrap_stream(stream);
match length {
Some(length) => multipart::Part::stream_with_length(stream, length),
None => multipart::Part::stream(stream),
}
}
})
}

fn clone_value_or_take(&mut self, py: Python) -> PyResult<Value> {
self.value
fn build_part(&mut self, py: Python) -> PyResult<(String, multipart::Part)> {
let value = self
.value
.as_ref()
.and_then(|value| value.try_clone(py))
.or_else(|| self.value.take())
.ok_or_else(|| Error::Memory.into())
}

fn build_form_part(&mut self, py: Python) -> PyResult<(String, multipart::Part)> {
let value = self.clone_value_or_take(py)?;
let name = self.name.clone();
let filename = self.filename.clone();
let mime = self.mime.clone();
let length = self.length;
let headers = self.headers.clone();
.ok_or_else(|| Error::Memory)?;

py.detach(move || {
let mut inner = Self::build_inner(value, length)?;
let mut inner = match value {
Value::Text(text) => multipart::Part::stream(Bytes::from_owner(text)),
Value::Bytes(bytes) => multipart::Part::stream(Bytes::from_owner(bytes)),
Value::File(path) => pyo3_async_runtimes::tokio::get_runtime()
.block_on(multipart::Part::file(path))
.map_err(Error::from)?,
Value::Stream(stream) => {
let stream = Body::wrap_stream(stream);
match self.length {
Some(length) => multipart::Part::stream_with_length(stream, length),
None => multipart::Part::stream(stream),
}
}
};

if let Some(filename) = filename {
if let Some(filename) = self.filename.clone() {
inner = inner.file_name(filename);
}

if let Some(mime) = mime {
inner = inner.mime_str(&mime).map_err(Error::Library)?;
if let Some(ref mime) = self.mime {
inner = inner.mime_str(mime).map_err(Error::Library)?;
}

if let Some(headers) = headers {
if let Some(headers) = self.headers.clone() {
inner = inner.headers(headers.0);
}

Ok((name, inner))
Ok((self.name.clone(), inner))
})
}

Expand Down
Loading