Skip to content

Commit 3f3607a

Browse files
committed
fixes
1 parent 3f49b09 commit 3f3607a

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

FirebaseAI/Sources/TemplateVariable.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ enum TemplateVariable: Encodable, Sendable {
3030
self = .int(value)
3131
case let value as Double:
3232
self = .double(value)
33+
case let value as Float:
34+
self = .double(Double(value))
3335
case let value as Bool:
3436
self = .bool(value)
3537
case let value as [Any]:

FirebaseAI/Tests/TestApp/Tests/Integration/ServerPromptTemplateIntegrationTests.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ final class ServerPromptTemplateIntegrationTests: XCTestCase {
3333
]
3434
)
3535
let text = try XCTUnwrap(response.text)
36-
print(text)
3736
XCTAssert(text.contains("Paul"))
3837
}
3938

@@ -161,4 +160,4 @@ final class ServerPromptTemplateIntegrationTests: XCTestCase {
161160
XCTAssertEqual(chatSession.history.count, 4)
162161
XCTAssertEqual((chatSession.history[2].parts.first as? TextPart)?.text, userMessage)
163162
}
164-
}
163+
}

FirebaseAI/Tests/Unit/TemplateChatSessionTests.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,7 @@ final class TemplateChatSessionTests: XCTestCase {
6565
let chat = model.startChat(template: "test-template")
6666
let stream = try chat.sendMessageStream("Hello", variables: ["name": "test"])
6767

68-
var content = ""
69-
for try await response in stream {
70-
if let text = response.text {
71-
content += text
72-
}
73-
}
68+
let content = try await GenerativeModelTestUtil.collectTextFromStream(stream)
7469

7570
XCTAssertEqual(content, "The capital of Wyoming is **Cheyenne**.\n")
7671
XCTAssertEqual(chat.history.count, 2)

FirebaseAI/Tests/Unit/TemplateGenerativeModelTests.swift

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,7 @@ final class TemplateGenerativeModelTests: XCTestCase {
6666
variables: ["name": "test"]
6767
)
6868

69-
var content = ""
70-
for try await response in stream {
71-
if let text = response.text {
72-
content += text
73-
}
74-
}
69+
let content = try await GenerativeModelTestUtil.collectTextFromStream(stream)
7570
XCTAssertEqual(content, "The capital of Wyoming is **Cheyenne**.\n")
7671
}
7772
}

FirebaseAI/Tests/Unit/TestUtilities/GenerativeModelTestUtil.swift

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,19 @@ enum GenerativeModelTestUtil {
8888
#endif // os(watchOS)
8989
}
9090

91+
static func collectTextFromStream(_ stream: AsyncThrowingStream<
92+
GenerateContentResponse,
93+
Error
94+
>) async throws -> String {
95+
var content = ""
96+
for try await response in stream {
97+
if let text = response.text {
98+
content += text
99+
}
100+
}
101+
return content
102+
}
103+
91104
static func nonHTTPRequestHandler() throws -> ((URLRequest) -> (
92105
URLResponse,
93106
AsyncLineSequence<URL.AsyncBytes>?

0 commit comments

Comments
 (0)