Skip to content

Fix mask parameter for ImageEdit request #132

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix mask parameter for ImageEdit request #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
769dcf9
Fix `mask` parameter for `ImageEdit` request
glyuck Apr 7, 2025
58cb602
Merge branch 'main' into fix_image_edit_mask
glyuck May 5, 2025
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
20 changes: 11 additions & 9 deletions Sources/OpenAI/Private/Networking/MultipartFormDataBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ struct MultipartFormDataBuilder {

enum MultipartFormDataEntry {

case file(paramName: String, fileName: String?, fileData: Data, contentType: String)
case file(paramName: String, fileName: String?, fileData: Data?, contentType: String)
case string(paramName: String, value: Any?)
}

Expand All @@ -47,15 +47,17 @@ extension MultipartFormDataEntry {
var body = Data()
switch self {
case .file(let paramName, let fileName, let fileData, let contentType):
body.append("--\(boundary)\r\n")
if let fileName = fileName {
body.append("Content-Disposition: form-data; name=\"\(paramName)\"; filename=\"\(fileName)\"\r\n")
} else {
body.append("Content-Disposition: form-data; name=\"\(paramName)\"\r\n")
if let fileData {
body.append("--\(boundary)\r\n")
if let fileName = fileName {
body.append("Content-Disposition: form-data; name=\"\(paramName)\"; filename=\"\(fileName)\"\r\n")
} else {
body.append("Content-Disposition: form-data; name=\"\(paramName)\"\r\n")
}
body.append("Content-Type: \(contentType)\r\n\r\n")
body.append(fileData)
body.append("\r\n")
}
body.append("Content-Type: \(contentType)\r\n\r\n")
body.append(fileData)
body.append("\r\n")
case .string(let paramName, let value):
if let value {
body.append("--\(boundary)\r\n")
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenAI/Public/Parameters/Image/ImageEditParameters.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public struct ImageEditParameters: Encodable {
if imageData == nil {
assertionFailure("Failed to get image data")
}
if maskData == nil {
if mask != nil, maskData == nil {
assertionFailure("Failed to get mask data")
}

Expand All @@ -94,7 +94,7 @@ extension ImageEditParameters: MultipartFormDataParameters {
MultipartFormDataBuilder(boundary: boundary, entries: [
.file(paramName: Self.CodingKeys.image.rawValue, fileName: "", fileData: image, contentType: "image/png"),
.string(paramName: Self.CodingKeys.prompt.rawValue, value: prompt),
.string(paramName: Self.CodingKeys.mask.rawValue, value: mask),
.file(paramName: Self.CodingKeys.mask.rawValue, fileName: "mask.png", fileData: mask, contentType: "image/png"),
.string(paramName: Self.CodingKeys.model.rawValue, value: model),
.string(paramName: Self.CodingKeys.n.rawValue, value: n),
.string(paramName: Self.CodingKeys.size.rawValue, value: size),
Expand Down