Skip to content

Commit f0a4f60

Browse files
Merge pull request #25 from DevCrew-io/add-podspec
Remove Image Formater & Add podspec
2 parents ab481a7 + beebb3f commit f0a4f60

File tree

3 files changed

+29
-65
lines changed

3 files changed

+29
-65
lines changed

OpenAIChatGPTiOSSDK.podspec

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Pod::Spec.new do |s|
2+
s.name = 'OpenAIChatGPTiOSSDK'
3+
s.version = '1.0.5'
4+
s.summary = 'OpenAIAPIManager'
5+
s.description = 'A comprehensive SDK for integrating OpenAI APIs into iOS applications. It provides a convenient and easy-to-use interface for making API requests and handling responses.'
6+
7+
s.homepage = 'https://github.com/DevCrew-io/openai-chatgpt-ios-sdk'
8+
s.license = { :type => "MIT", :file => "LICENSE" }
9+
s.author = { 'DevCrew.IO' => 'founders@devcrew.io' }
10+
11+
s.requires_arc = true
12+
s.swift_version = "5.0"
13+
s.osx.deployment_target = "10.13"
14+
s.ios.deployment_target = "9.0"
15+
16+
s.source = { :git => "https://github.com/DevCrew-io/openai-chatgpt-ios-sdk.git", :tag => s.version }
17+
s.source_files = 'Sources/**/*.swift'
18+
end
19+

Sources/OpenAIAPIManager/OpenAIAPIManager.swift

+10-23
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ final public class OpenAIAPIManager {
9292
/// - user: A unique identifier representing your end-user, which can help OpenAI monitor and detect abuse.
9393
/// - imageConversionFormat: (Optional) Convert invalid image type into open ai supported .rgba
9494
/// - completion: The completion block called with the result of the request. The block receives as Result object containing either the generated images Array as a String in case of success, or an Error in case of failure.
95-
public func createImageEditRequest(image: Data, mask: Data? = nil, prompt: String, n: Int = 1, size: ChatGPTImageSize = .fiveTwelve, responseFormat: ResponseFormat = .url, user: String? = nil, imageConversionFormat: ImageConversionFormat? = .rgba, completion: @escaping (Result<[String],Error>) -> Void) {
95+
public func createImageEditRequest(image: Data, mask: Data? = nil, prompt: String, n: Int = 1, size: ChatGPTImageSize = .fiveTwelve, responseFormat: ResponseFormat = .url, user: String? = nil, completion: @escaping (Result<[String],Error>) -> Void) {
9696

97-
self.editImageRequest(endPoint: .imageEdits, image: image, prompt: prompt, n: n, size: size, responseFormat: responseFormat, user: user, imageConversionFormat: imageConversionFormat, completion: completion)
97+
self.editImageRequest(endPoint: .imageEdits, image: image, prompt: prompt, n: n, size: size, responseFormat: responseFormat, user: user, completion: completion)
9898
}
9999

100100

@@ -109,9 +109,9 @@ final public class OpenAIAPIManager {
109109
/// - user: A unique identifier representing your end-user, which can help OpenAI monitor and detect abuse.
110110
/// - imageConversionFormat: (Optional) Convert invalid image type into open ai supported .rgba
111111
/// - completion: The completion block called with the result of the request. The block receives as Result object containing either the generated images Array as a String in case of success, or an Error in case of failure.
112-
public func createImageVariationsRequest(image: Data, n: Int = 1, size: ChatGPTImageSize = .fiveTwelve, response_format: ResponseFormat = .url, user: String? = nil, imageConversionFormat: ImageConversionFormat? = nil, completion: @escaping (Result<[String],Error>) -> Void) {
112+
public func createImageVariationsRequest(image: Data, n: Int = 1, size: ChatGPTImageSize = .fiveTwelve, response_format: ResponseFormat = .url, user: String? = nil, completion: @escaping (Result<[String],Error>) -> Void) {
113113

114-
self.imageVariationsRequest(endPoint:.imageVariations , image: image, n: n, size: size, responseFormat: response_format, user: user,imageConversionFormat: imageConversionFormat, completion: completion)
114+
self.imageVariationsRequest(endPoint:.imageVariations , image: image, n: n, size: size, responseFormat: response_format, user: user, completion: completion)
115115
}
116116

117117

@@ -386,7 +386,7 @@ final public class OpenAIAPIManager {
386386

387387
}
388388

389-
private func editImageRequest(endPoint: OpenAIAPIEndpoints, image: Data, mask: Data? = nil, prompt: String, n: Int?, size: ChatGPTImageSize?, responseFormat: ResponseFormat = .url, user: String?, imageConversionFormat: ImageConversionFormat?, completion: @escaping (Result<[String],Error>) -> Void) {
389+
private func editImageRequest(endPoint: OpenAIAPIEndpoints, image: Data, mask: Data? = nil, prompt: String, n: Int?, size: ChatGPTImageSize?, responseFormat: ResponseFormat = .url, user: String?, completion: @escaping (Result<[String],Error>) -> Void) {
390390

391391
// Define the key-value pairs
392392
var parameters: [String: Any] = [
@@ -410,15 +410,8 @@ final public class OpenAIAPIManager {
410410
var dataArray = [Data]()
411411
var fileNamesArray = [String]()
412412
fileNamesArray.append("image.png")
413-
if imageConversionFormat != nil {
414-
let convertedData = ImageFormatConvertor.converImage(with: image, format: .rgba)
415-
if let convertedData = convertedData {
416-
dataArray.append(convertedData)
417-
418-
}
419-
} else {
420-
dataArray.append(image)
421-
}
413+
dataArray.append(image)
414+
422415

423416
if let mask = mask {
424417
dataArray.append(mask)
@@ -453,7 +446,7 @@ final public class OpenAIAPIManager {
453446

454447

455448
}
456-
private func imageVariationsRequest(endPoint: OpenAIAPIEndpoints, image: Data, n: Int?,size: ChatGPTImageSize?, responseFormat: ResponseFormat, user: String?, imageConversionFormat: ImageConversionFormat?, completion: @escaping (Result<[String],Error>) -> Void) {
449+
private func imageVariationsRequest(endPoint: OpenAIAPIEndpoints, image: Data, n: Int?,size: ChatGPTImageSize?, responseFormat: ResponseFormat, user: String?, completion: @escaping (Result<[String],Error>) -> Void) {
457450
// Define the key-value pairs
458451
var parameters: [String: Any] = [
459452
"response_format": responseFormat.rawValue
@@ -474,14 +467,8 @@ final public class OpenAIAPIManager {
474467
var dataArray = [Data]()
475468
var fileNamesArray = [String]()
476469
fileNamesArray.append("image.png")
477-
if imageConversionFormat != nil {
478-
let convertedData = ImageFormatConvertor.converImage(with: image, format: .rgba)
479-
if let convertedData = convertedData {
480-
dataArray.append(convertedData)
481-
}
482-
} else {
483-
dataArray.append(image)
484-
}
470+
dataArray.append(image)
471+
485472

486473
guard let request = self.createMultiPartRequest(data: dataArray, fileNames: fileNamesArray, params: parameters, name: "image", contentType: "image/png", endPoint: endPoint) else {
487474
completion(.failure(NetworkError.invalidURL))

Sources/OpenAIAPIManager/Utils/ImageFormater.swift

-42
This file was deleted.

0 commit comments

Comments
 (0)