Skip to content

Switch Summarize sample to Generate Content sample #1694

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
merged 2 commits into from
Apr 29, 2025
Merged

Switch Summarize sample to Generate Content sample #1694

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
fb4c9a3
Switch Summarize sample to Generate Content sample
paulb777 Apr 29, 2025
4a22599
remove unused variable
paulb777 Apr 29, 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
16 changes: 8 additions & 8 deletions firebaseai/FirebaseAIExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
8848C8352B0D04BC007B434F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8848C8342B0D04BC007B434F /* ContentView.swift */; };
8848C8372B0D04BD007B434F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C8362B0D04BD007B434F /* Assets.xcassets */; };
8848C83A2B0D04BD007B434F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C8392B0D04BD007B434F /* Preview Assets.xcassets */; };
886F95D52B17BA010036F07A /* SummarizeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1B2B0FBDC300F64795 /* SummarizeScreen.swift */; };
886F95D62B17BA010036F07A /* SummarizeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1D2B0FBDC300F64795 /* SummarizeViewModel.swift */; };
886F95D52B17BA010036F07A /* GenerateContentScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1B2B0FBDC300F64795 /* GenerateContentScreen.swift */; };
886F95D62B17BA010036F07A /* GenerateContentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1D2B0FBDC300F64795 /* GenerateContentViewModel.swift */; };
886F95D82B17BA420036F07A /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 886F95D72B17BA420036F07A /* MarkdownUI */; };
886F95DB2B17BAEF0036F07A /* PhotoReasoningViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8802666F2B0FC39000CF7CB6 /* PhotoReasoningViewModel.swift */; };
886F95DC2B17BAEF0036F07A /* PhotoReasoningScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 880266752B0FC39000CF7CB6 /* PhotoReasoningScreen.swift */; };
Expand All @@ -41,8 +41,8 @@
86C1F4802BC726150026816F /* FunctionCallingViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FunctionCallingViewModel.swift; sourceTree = "<group>"; };
8802666F2B0FC39000CF7CB6 /* PhotoReasoningViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoReasoningViewModel.swift; sourceTree = "<group>"; };
880266752B0FC39000CF7CB6 /* PhotoReasoningScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotoReasoningScreen.swift; sourceTree = "<group>"; };
88209C1B2B0FBDC300F64795 /* SummarizeScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SummarizeScreen.swift; sourceTree = "<group>"; };
88209C1D2B0FBDC300F64795 /* SummarizeViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SummarizeViewModel.swift; sourceTree = "<group>"; };
88209C1B2B0FBDC300F64795 /* GenerateContentScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenerateContentScreen.swift; sourceTree = "<group>"; };
88209C1D2B0FBDC300F64795 /* GenerateContentViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GenerateContentViewModel.swift; sourceTree = "<group>"; };
88263BEE2B239BFE008AB09B /* ErrorView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ErrorView.swift; sourceTree = "<group>"; };
8848C82F2B0D04BC007B434F /* FirebaseAISample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FirebaseAISample.app; sourceTree = BUILT_PRODUCTS_DIR; };
8848C8322B0D04BC007B434F /* FirebaseAISampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FirebaseAISampleApp.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -127,15 +127,15 @@
88209C1A2B0FBDC300F64795 /* Screens */ = {
isa = PBXGroup;
children = (
88209C1B2B0FBDC300F64795 /* SummarizeScreen.swift */,
88209C1B2B0FBDC300F64795 /* GenerateContentScreen.swift */,
);
path = Screens;
sourceTree = "<group>";
};
88209C1C2B0FBDC300F64795 /* ViewModels */ = {
isa = PBXGroup;
children = (
88209C1D2B0FBDC300F64795 /* SummarizeViewModel.swift */,
88209C1D2B0FBDC300F64795 /* GenerateContentViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
Expand Down Expand Up @@ -383,7 +383,7 @@
886F95DE2B17D5010036F07A /* ChatMessage.swift in Sources */,
88263BF12B239C11008AB09B /* ErrorDetailsView.swift in Sources */,
8848C8352B0D04BC007B434F /* ContentView.swift in Sources */,
886F95D52B17BA010036F07A /* SummarizeScreen.swift in Sources */,
886F95D52B17BA010036F07A /* GenerateContentScreen.swift in Sources */,
8848C8332B0D04BC007B434F /* FirebaseAISampleApp.swift in Sources */,
886F95E02B17D5010036F07A /* ConversationViewModel.swift in Sources */,
886F95DD2B17D5010036F07A /* MessageView.swift in Sources */,
Expand All @@ -393,7 +393,7 @@
886F95DB2B17BAEF0036F07A /* PhotoReasoningViewModel.swift in Sources */,
886F95E12B17D5010036F07A /* ConversationScreen.swift in Sources */,
88263BF02B239C09008AB09B /* ErrorView.swift in Sources */,
886F95D62B17BA010036F07A /* SummarizeViewModel.swift in Sources */,
886F95D62B17BA010036F07A /* GenerateContentViewModel.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
4 changes: 2 additions & 2 deletions firebaseai/FirebaseAISample/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ struct ContentView: View {

Section("Samples") {
NavigationLink {
SummarizeScreen(firebaseService: firebaseService)
GenerateContentScreen(firebaseService: firebaseService)
} label: {
Label("Text", systemImage: "doc.text")
Label("Generate Content", systemImage: "doc.text")
}
NavigationLink {
PhotoReasoningScreen(firebaseService: firebaseService)
Expand Down
21 changes: 11 additions & 10 deletions ...ITextSample/Screens/SummarizeScreen.swift → ...ample/Screens/GenerateContentScreen.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,15 @@ import MarkdownUI
import SwiftUI
import FirebaseAI

struct SummarizeScreen: View {
struct GenerateContentScreen: View {
let firebaseService: FirebaseAI
@StateObject var viewModel: SummarizeViewModel
@StateObject var viewModel: GenerateContentViewModel
@State var userInput = ""

init(firebaseService: FirebaseAI) {
self.firebaseService = firebaseService
_viewModel = StateObject(wrappedValue: SummarizeViewModel(firebaseService: firebaseService))
_viewModel =
StateObject(wrappedValue: GenerateContentViewModel(firebaseService: firebaseService))
}

enum FocusedField: Hashable {
Expand All @@ -36,17 +37,17 @@ struct SummarizeScreen: View {
var body: some View {
VStack {
VStack(alignment: .leading) {
Text("Enter some text, then tap on _Go_ to summarize it.")
Text("Enter some text, then tap on _Go_ to run generateContent on it.")
.padding(.horizontal, 6)
HStack(alignment: .top) {
TextField("Enter text summarize", text: $userInput, axis: .vertical)
TextField("Enter generate content input", text: $userInput, axis: .vertical)
.focused($focusedField, equals: .message)
.textFieldStyle(.roundedBorder)
.onSubmit {
onSummarizeTapped()
onGenerateContentTapped()
}
Button("Go") {
onSummarizeTapped()
onGenerateContentTapped()
}
.padding(.top, 4)
}
Expand All @@ -71,17 +72,17 @@ struct SummarizeScreen: View {
.navigationTitle("Text sample")
}

private func onSummarizeTapped() {
private func onGenerateContentTapped() {
focusedField = nil

Task {
await viewModel.summarize(inputText: userInput)
await viewModel.generateContent(inputText: userInput)
}
}
}

#Preview {
NavigationStack {
SummarizeScreen(firebaseService: FirebaseAI.firebaseAI())
GenerateContentScreen(firebaseService: FirebaseAI.firebaseAI())
}
}
8 changes: 3 additions & 5 deletions ...ample/ViewModels/SummarizeViewModel.swift → ...ViewModels/GenerateContentViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Foundation
import OSLog

@MainActor
class SummarizeViewModel: ObservableObject {
class GenerateContentViewModel: ObservableObject {
private var logger = Logger(subsystem: Bundle.main.bundleIdentifier!, category: "generative-ai")

@Published
Expand All @@ -35,7 +35,7 @@ class SummarizeViewModel: ObservableObject {
model = firebaseService.generativeModel(modelName: "gemini-2.0-flash-001")
}

func summarize(inputText: String) async {
func generateContent(inputText: String) async {
defer {
inProgress = false
}
Expand All @@ -48,9 +48,7 @@ class SummarizeViewModel: ObservableObject {
errorMessage = nil
outputText = ""

let prompt = "Summarize the following text for me: \(inputText)"

let outputContentStream = try model.generateContentStream(prompt)
let outputContentStream = try model.generateContentStream(inputText)

// stream response
for try await outputContent in outputContentStream {
Expand Down