Revert switching to gemini-1.5-pro-latest in samples

andrewheard · andrewheard · commit 823ddce6a6c7 · 2024-04-19T14:05:34.000-04:00
diff --git a/Examples/GenerativeAICLI/Sources/GenerateContent.swift b/Examples/GenerativeAICLI/Sources/GenerateContent.swift
@@ -117,8 +117,10 @@ struct GenerateContent: AsyncParsableCommand {
   func modelNameOrDefault() -> String {
     if let modelName = modelName {
       return modelName
+    } else if imageURL != nil {
+      return "gemini-1.0-pro-vision-latest"
     } else {
-      return "gemini-1.5-pro-latest"
+      return "gemini-1.0-pro"
     }
   }
 }
diff --git a/Examples/GenerativeAISample/ChatSample/ViewModels/ConversationViewModel.swift b/Examples/GenerativeAISample/ChatSample/ViewModels/ConversationViewModel.swift
@@ -36,7 +36,7 @@ class ConversationViewModel: ObservableObject {
   private var chatTask: Task<Void, Never>?
 
   init() {
-    model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)
+    model = GenerativeModel(name: "gemini-1.0-pro", apiKey: APIKey.default)
     chat = model.startChat()
   }
 
diff --git a/Examples/GenerativeAISample/FunctionCallingSample/ViewModels/FunctionCallingViewModel.swift b/Examples/GenerativeAISample/FunctionCallingSample/ViewModels/FunctionCallingViewModel.swift
@@ -39,7 +39,7 @@ class FunctionCallingViewModel: ObservableObject {
 
   init() {
     model = GenerativeModel(
-      name: "gemini-1.5-pro-latest",
+      name: "gemini-1.0-pro",
       apiKey: APIKey.default,
       tools: [Tool(functionDeclarations: [
         FunctionDeclaration(
diff --git a/Examples/GenerativeAISample/GenerativeAIMultimodalSample/ViewModels/PhotoReasoningViewModel.swift b/Examples/GenerativeAISample/GenerativeAIMultimodalSample/ViewModels/PhotoReasoningViewModel.swift
@@ -44,7 +44,7 @@ class PhotoReasoningViewModel: ObservableObject {
   private var model: GenerativeModel?
 
   init() {
-    model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)
+    model = GenerativeModel(name: "gemini-1.0-pro-vision-latest", apiKey: APIKey.default)
   }
 
   func reason() async {
diff --git a/Examples/GenerativeAISample/GenerativeAITextSample/ViewModels/SummarizeViewModel.swift b/Examples/GenerativeAISample/GenerativeAITextSample/ViewModels/SummarizeViewModel.swift
@@ -32,7 +32,7 @@ class SummarizeViewModel: ObservableObject {
   private var model: GenerativeModel?
 
   init() {
-    model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)
+    model = GenerativeModel(name: "gemini-1.0-pro", apiKey: APIKey.default)
   }
 
   func summarize(inputText: String) async {

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,10 @@ struct GenerateContent: AsyncParsableCommand {`
`117`	`117`	`func modelNameOrDefault() -> String {`
`118`	`118`	`if let modelName = modelName {`
`119`	`119`	`return modelName`
	`120`	`+ } else if imageURL != nil {`
	`121`	`+ return "gemini-1.0-pro-vision-latest"`
`120`	`122`	`} else {`
`121`		`- return "gemini-1.5-pro-latest"`
	`123`	`+ return "gemini-1.0-pro"`
`122`	`124`	`}`
`123`	`125`	`}`
`124`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ConversationViewModel: ObservableObject {`
`36`	`36`	`private var chatTask: Task<Void, Never>?`
`37`	`37`
`38`	`38`	`init() {`
`39`		`- model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)`
	`39`	`+ model = GenerativeModel(name: "gemini-1.0-pro", apiKey: APIKey.default)`
`40`	`40`	`chat = model.startChat()`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class PhotoReasoningViewModel: ObservableObject {`
`44`	`44`	`private var model: GenerativeModel?`
`45`	`45`
`46`	`46`	`init() {`
`47`		`- model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)`
	`47`	`+ model = GenerativeModel(name: "gemini-1.0-pro-vision-latest", apiKey: APIKey.default)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func reason() async {`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class SummarizeViewModel: ObservableObject {`
`32`	`32`	`private var model: GenerativeModel?`
`33`	`33`
`34`	`34`	`init() {`
`35`		`- model = GenerativeModel(name: "gemini-1.5-pro-latest", apiKey: APIKey.default)`
	`35`	`+ model = GenerativeModel(name: "gemini-1.0-pro", apiKey: APIKey.default)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`func summarize(inputText: String) async {`