feat(*): use genkit where possible

firestore-genai-chatbot/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 0.0.11
+
+fix - update default Gemini models
+
 ## Version 0.0.10
 
 - Add docs on regional support for Gemini APIs

firestore-genai-chatbot/POSTINSTALL.md

@@ -40,7 +40,7 @@ The extension gives you a choice of what provider to use for the available model
 ## About the models
 
 For Google AI the list of supported models is [here](https://ai.google.dev/models/gemini), and this parameter should be set to the model name, the second segment of the model code (for
-example models/gemini-pro should be chosen as gemini-pro).
+example `models/gemini-1.0-pro` should be chosen as `gemini-1.0-pro`).
 
 For Vertex AI, the list of models is [here](https://cloud.google.com/vertex-ai/docs/generative-ai/learn/models).
 

firestore-genai-chatbot/extension.yaml

@@ -1,5 +1,5 @@
 name: firestore-genai-chatbot
-version: 0.0.10
+version: 0.0.11
 specVersion: v1beta
 
 icon: icon.png
@@ -108,7 +108,7 @@ params:
       [Google AI Gemini models](https://ai.google.dev/models/gemini)
     type: string
     required: true
-    default: gemini-pro
+    default: gemini-1.0-pro
     immutable: false
 
   - param: COLLECTION_NAME

firestore-genai-chatbot/functions/__tests__/google_ai/index.test.ts

@@ -32,6 +32,8 @@ jest.mock('../../src/config', () => ({
     provider: 'google-ai',
     model: 'gemini-pro',
     apiKey: 'test-api-key',
+    candidateCount: 2,
+    candidateField: 'candidates',
   },
 }));
 

firestore-genai-chatbot/functions/__tests__/util.ts

@@ -27,6 +27,7 @@ export const expectToProcessCorrectly = (
   expect(firestoreCallData[2]).toEqual({
     ...message,
     response: mockResponse,
+    candidates: expect.any(Array),
     createTime: expect.any(Timestamp),
     status: {
       state: 'COMPLETED',

firestore-genai-chatbot/functions/__tests__/vertex_ai/index.test.ts

@@ -16,11 +16,11 @@ process.env.FIRESTORE_EMULATOR_HOST = '127.0.0.1:8080';
 jest.mock('../../src/config', () => ({
   default: {
     googleAi: {
-      model: 'gemini-pro',
+      model: 'gemini-1.0-pro',
       apiKey: 'test-api-key',
     },
     vertex: {
-      model: 'gemini-pro',
+      model: 'gemini-1.0-pro',
     },
     collectionName: 'discussionsTestGenerative/{discussionId}/messages',
     location: 'us-central1',
@@ -30,8 +30,10 @@ jest.mock('../../src/config', () => ({
     enableDiscussionOptionOverrides: true,
     candidatesField: 'candidates',
     provider: 'vertex-ai',
-    model: 'gemini-pro',
+    model: 'gemini-1.0-pro',
     apiKey: 'test-api-key',
+    candidateCount: 2,
+    candidateField: 'candidates',
   },
 }));