Rename all instances of Developer API to Google AI

Author: dlarocque

packages/vertexai/src/developerAPI.ts

@@ -22,7 +22,7 @@ import {
 } from '../types';
 import { Task, makeRequest } from '../requests/request';
 import { ApiSettings } from '../types/internal';
-import * as DeveloperAPIMapper from '../developerAPI'; // FIXME: (code smell) Is there a better way to namespace this?
+import * as GoogleAIMapper from '../googleAIMappers'; // FIXME: (code smell) Is there a better way to namespace this?
 
 export async function countTokens(
   apiSettings: ApiSettings,
@@ -32,7 +32,7 @@ export async function countTokens(
 ): Promise<CountTokensResponse> {
   let body: string = '';
   if (apiSettings.backend.backendType === 'GOOGLE_AI') {
-    const mappedParams = DeveloperAPIMapper.mapCountTokensRequest(
+    const mappedParams = GoogleAIMapper.mapCountTokensRequest(
       params,
     );
     body = JSON.stringify(mappedParams);

packages/vertexai/src/methods/count-tokens.ts

@@ -26,7 +26,7 @@ import { Task, makeRequest } from '../requests/request';
 import { createEnhancedContentResponse } from '../requests/response-helpers';
 import { processStream } from '../requests/stream-reader';
 import { ApiSettings } from '../types/internal';
-import * as DeveloperAPIMapper from '../developerAPI'; // FIXME: (code smell) Is there a better way to namespace this?
+import * as GoogleAIMapper from '../googleAIMappers'; // FIXME: (code smell) Is there a better way to namespace this?
 
 export async function generateContentStream(
   apiSettings: ApiSettings,
@@ -35,7 +35,7 @@ export async function generateContentStream(
   requestOptions?: RequestOptions
 ): Promise<GenerateContentStreamResult> {
   if (apiSettings.backend.backendType === 'GOOGLE_AI') {
-    params = DeveloperAPIMapper.mapGenerateContentRequest(params);
+    params = GoogleAIMapper.mapGenerateContentRequest(params);
   }
   const response = await makeRequest(
     model,
@@ -55,7 +55,7 @@ export async function generateContent(
   requestOptions?: RequestOptions
 ): Promise<GenerateContentResult> {
   if (apiSettings.backend.backendType === 'GOOGLE_AI') {
-    params = DeveloperAPIMapper.mapGenerateContentRequest(params);
+    params = GoogleAIMapper.mapGenerateContentRequest(params);
   }
   const response = await makeRequest(
     model,
@@ -83,7 +83,7 @@ async function handleGenerateContentResponse(
 ): Promise<GenerateContentResponse> {
   const responseJson = await response.json();
   if (apiSettings.backend.backendType === 'GOOGLE_AI') {
-    return DeveloperAPIMapper.mapGenerateContentResponse(responseJson);
+    return GoogleAIMapper.mapGenerateContentResponse(responseJson);
   } else {
     return responseJson;
   }

packages/vertexai/src/methods/generate-content.ts

@@ -114,13 +114,13 @@ export abstract class GenAIModel {
     backendType: BackendType
   ): string {
     if (backendType === 'GOOGLE_AI') {
-      return GenAIModel.normalizeDeveloperApiModelName(modelName);
+      return GenAIModel.normalizeGoogleAIModelName(modelName);
     } else {
       return GenAIModel.normalizeVertexAIModelName(modelName);
     }
   }
 
-  private static normalizeDeveloperApiModelName(modelName: string): string {
+  private static normalizeGoogleAIModelName(modelName: string): string {
     return `models/${modelName}`;
     // TODO (dlarocque): rename this to be projects/project-id/models/model-name
   }

packages/vertexai/src/models/genai-model.ts

@@ -25,8 +25,8 @@ import {
 } from '../types';
 import { GenAIError } from '../errors';
 import { createEnhancedContentResponse } from './response-helpers';
-import * as DeveloperAPIMapper from '../developerAPI';
-import { DeveloperAPIGenerateContentResponse } from '../types/developerAPI';
+import * as GoogleAIMapper from '../googleAIMappers';
+import { GoogleAIGenerateContentResponse } from '../types/googleAI';
 import { ApiSettings } from '../types/internal';
 
 const responseLineRE = /^data\: (.*)(?:\n\n|\r\r|\r\n\r\n)/;
@@ -66,8 +66,8 @@ async function getResponsePromise(
     if (done) {
       let generateContentResponse = aggregateResponses(allResponses);
       if (apiSettings.backend.backendType === 'GOOGLE_AI') {
-        generateContentResponse = DeveloperAPIMapper.mapGenerateContentResponse(
-          generateContentResponse as DeveloperAPIGenerateContentResponse
+        generateContentResponse = GoogleAIMapper.mapGenerateContentResponse(
+          generateContentResponse as GoogleAIGenerateContentResponse
         );
       }
       return createEnhancedContentResponse(generateContentResponse);
@@ -91,8 +91,8 @@ async function* generateResponseSequence(
     const enhancedResponse =
       apiSettings.backend.backendType === 'GOOGLE_AI'
         ? createEnhancedContentResponse(
-            DeveloperAPIMapper.mapGenerateContentResponse(
-              value as DeveloperAPIGenerateContentResponse
+            GoogleAIMapper.mapGenerateContentResponse(
+              value as GoogleAIGenerateContentResponse
             )
           )
         : createEnhancedContentResponse(value);