Skip to content

Commit 1de7f6f

Browse files
authored
[Vertex AI] Replace ImagenImage protocol with _ImagenImage struct (#14249)
1 parent c986629 commit 1de7f6f

File tree

8 files changed

+15
-55
lines changed

8 files changed

+15
-55
lines changed

FirebaseVertexAI/Sources/Types/Internal/Imagen/InternalImagenImage.swift

-29
This file was deleted.

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenFileDataImage.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public struct ImagenFileDataImage {
2727

2828
@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
2929
extension ImagenFileDataImage: ImagenImageRepresentable {
30-
public var imagenImage: any ImagenImage {
31-
InternalImagenImage(mimeType: mimeType, bytesBase64Encoded: nil, gcsURI: gcsURI)
30+
public var _imagenImage: _ImagenImage {
31+
_ImagenImage(mimeType: mimeType, bytesBase64Encoded: nil, gcsURI: gcsURI)
3232
}
3333
}
3434

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenImage.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import Foundation
1616

1717
@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
18-
public protocol ImagenImage: ImagenImageRepresentable {
19-
var mimeType: String { get }
20-
var bytesBase64Encoded: String? { get }
21-
var gcsURI: String? { get }
18+
public struct _ImagenImage {
19+
let mimeType: String
20+
let bytesBase64Encoded: String?
21+
let gcsURI: String?
2222
}

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenImageRepresentable.swift

+1-8
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,5 @@ import Foundation
1616

1717
@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
1818
public protocol ImagenImageRepresentable {
19-
var imagenImage: any ImagenImage { get }
20-
}
21-
22-
@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
23-
public extension ImagenImage {
24-
var imagenImage: any ImagenImage {
25-
return self
26-
}
19+
var _imagenImage: _ImagenImage { get }
2720
}

FirebaseVertexAI/Sources/Types/Public/Imagen/ImagenInlineDataImage.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public struct ImagenInlineDataImage {
3131

3232
@available(iOS 15.0, macOS 12.0, macCatalyst 15.0, tvOS 15.0, watchOS 8.0, *)
3333
extension ImagenInlineDataImage: ImagenImageRepresentable {
34-
public var imagenImage: any ImagenImage {
35-
InternalImagenImage(
34+
public var _imagenImage: _ImagenImage {
35+
_ImagenImage(
3636
mimeType: mimeType,
3737
bytesBase64Encoded: data.base64EncodedString(),
3838
gcsURI: nil

FirebaseVertexAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift

-4
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@ final class IntegrationTests: XCTestCase {
267267
let image = try XCTUnwrap(response.images.first)
268268
XCTAssertEqual(image.mimeType, "image/jpeg")
269269
XCTAssertGreaterThan(image.data.count, 0)
270-
let imagenImage = image.imagenImage
271-
XCTAssertEqual(imagenImage.mimeType, image.mimeType)
272-
XCTAssertEqual(imagenImage.bytesBase64Encoded, image.data.base64EncodedString())
273-
XCTAssertNil(imagenImage.gcsURI)
274270
#if canImport(UIKit)
275271
let uiImage = try XCTUnwrap(UIImage(data: image.data))
276272
XCTAssertEqual(uiImage.size.width, 1408.0)

FirebaseVertexAI/Tests/Unit/Types/Imagen/ImagenFileDataImageTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ final class ImagenFileDataImageTests: XCTestCase {
3535

3636
XCTAssertEqual(image.mimeType, mimeType)
3737
XCTAssertEqual(image.gcsURI, gcsURI)
38-
XCTAssertEqual(image.imagenImage.mimeType, mimeType)
39-
XCTAssertEqual(image.imagenImage.gcsURI, gcsURI)
40-
XCTAssertNil(image.imagenImage.bytesBase64Encoded)
38+
XCTAssertEqual(image._imagenImage.mimeType, mimeType)
39+
XCTAssertEqual(image._imagenImage.gcsURI, gcsURI)
40+
XCTAssertNil(image._imagenImage.bytesBase64Encoded)
4141
}
4242

4343
func testDecodeImage_missingGCSURI_throws() throws {

FirebaseVertexAI/Tests/Unit/Types/Imagen/ImagenInlineDataImageTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ final class ImagenInlineDataImageTests: XCTestCase {
3535

3636
XCTAssertEqual(image.mimeType, mimeType)
3737
XCTAssertEqual(image.data.base64EncodedString(), bytesBase64Encoded)
38-
XCTAssertEqual(image.imagenImage.mimeType, mimeType)
39-
XCTAssertEqual(image.imagenImage.bytesBase64Encoded, bytesBase64Encoded)
40-
XCTAssertNil(image.imagenImage.gcsURI)
38+
XCTAssertEqual(image._imagenImage.mimeType, mimeType)
39+
XCTAssertEqual(image._imagenImage.bytesBase64Encoded, bytesBase64Encoded)
40+
XCTAssertNil(image._imagenImage.gcsURI)
4141
}
4242

4343
func testDecodeImage_missingBytesBase64Encoded_throws() throws {

0 commit comments

Comments
 (0)