Fixes to address PR comments, fix config.ts

Author: jenh

Node/call-vertex-remote-config-server/client/config.ts

@@ -1,8 +1,8 @@
 export const firebaseConfig = {
-  ${YOUR_FIREBASE_CONFIG}  
+  YOUR_FIREBASE_CONFIG
 };
 
   // Your ReCAPTCHA Enterprise site key (must be from the same project
   // as the Firebase config above).
 export const RECAPTCHA_ENTERPRISE_SITE_KEY =
-  "${YOUR_RECAPTCHA_KEY}";
+  "YOUR_RECAPTCHA_KEY";

Node/call-vertex-remote-config-server/functions/index.js

@@ -114,8 +114,7 @@ exports.callVertexWithRC = onCall(
         generation_config: generationConfig,
       });
 
-      // Create the chat; append user input to Remote Config-defined prompt.
-      const chat = generativeModel.startChat();
+      // Combine prompt from Remote Config with optional user input.
       const chatInput = textPrompt + " " + userInput;
 
       if (!chatInput) {
@@ -141,7 +140,7 @@ exports.callVertexWithRC = onCall(
         "\n"
       );
 
-      const result = await chat.sendMessageStream(chatInput);
+      const result = await generativeModel.generateContentStream(chatInput);
 
       const chunks = [];
       for await (const item of result.stream) {
@@ -152,7 +151,7 @@ exports.callVertexWithRC = onCall(
 
       return chunks.join(""); // Return the concatenated chunks
     } catch (error) {
-      console.error(error);
+      logger.error(error);
       throw new HttpsError("internal", "Internal server error");
     }
   }

Node/remote-config-server-with-vertex/functions/index.js

@@ -80,8 +80,7 @@ exports.generateWithVertex = onRequest(async (request, response) => {
       generation_config: generationConfig,
     });
 
-    // Create the chat; append user input to Remote Config-defined prompt.
-    const chat = generativeModel.startChat();
+    // Combine prompt from Remote Config with optional user input.
     const chatInput = textPrompt + " " + userInput;
 
     if (!chatInput) {
@@ -95,23 +94,23 @@ exports.generateWithVertex = onRequest(async (request, response) => {
       return;
     }
 
-    console.log("\nRunning with model ", textModel, ", prompt: ", textPrompt,
+    logger.log("\nRunning with model ", textModel, ", prompt: ", textPrompt,
       ", generationConfig: ", generationConfig, ", safetySettings: ",
       safetySettings, " in ", location, "\n");
 
-    const result = await chat.sendMessageStream(chatInput);
+    const result = await generativeModel.generateContentStream(chatInput); 
     response.writeHead(200, { 'Content-Type': 'text/plain' });
 
     for await (const item of result.stream) {
       const chunk = item.candidates[0].content.parts[0].text;
-      console.log("Received chunk:", chunk);
+      logger.log("Received chunk:", chunk);
       response.write(chunk);
     }
 
     response.end();
 
   } catch (error) {
-    console.error(error);
+    logger.error(error);
     response.status(500).send('Internal server error');
   }
 });