Remove apiVersion and location options (#8124)

firebase · Apr 4, 2024 · bf7d2d8 · bf7d2d8
1 parent d27cd8e
commit bf7d2d8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 61 deletions.
diff --git a/packages/vertexai/src/api.ts b/packages/vertexai/src/api.ts
@@ -20,7 +20,7 @@ import { Provider } from '@firebase/component';
 import { getModularInstance } from '@firebase/util';
 import { DEFAULT_LOCATION, VERTEX_TYPE } from './constants';
 import { VertexAIService } from './service';
-import { VertexAI, VertexAIOptions } from './public-types';
+import { VertexAI } from './public-types';
 import { ERROR_FACTORY, VertexError } from './errors';
 import { ModelParams, RequestOptions } from './types';
 import { GenerativeModel } from './models/generative-model';
@@ -42,16 +42,13 @@ declare module '@firebase/component' {
  *
  * @param app - The {@link @firebase/app#FirebaseApp} to use.
  */
-export function getVertexAI(
-  app: FirebaseApp = getApp(),
-  options?: VertexAIOptions
-): VertexAI {
+export function getVertexAI(app: FirebaseApp = getApp()): VertexAI {
   app = getModularInstance(app);
   // Dependencies
   const vertexProvider: Provider<'vertex'> = _getProvider(app, VERTEX_TYPE);
 
   return vertexProvider.getImmediate({
-    identifier: options?.location || DEFAULT_LOCATION
+    identifier: DEFAULT_LOCATION
   });
 }
 

diff --git a/packages/vertexai/src/index.test.ts b/packages/vertexai/src/index.test.ts
diff --git a/packages/vertexai/src/index.ts b/packages/vertexai/src/index.ts
@@ -37,11 +37,11 @@ function registerVertex(): void {
   _registerComponent(
     new Component(
       VERTEX_TYPE,
-      (container, { instanceIdentifier: location }) => {
+      container => {
         // getImmediate for FirebaseApp will always succeed
         const app = container.getProvider('app').getImmediate();
         const appCheckProvider = container.getProvider('app-check-internal');
-        return new VertexAIService(app, appCheckProvider, { location });
+        return new VertexAIService(app, appCheckProvider);
       },
       ComponentType.PUBLIC
     ).setMultipleInstances(true)

diff --git a/packages/vertexai/src/public-types.ts b/packages/vertexai/src/public-types.ts
@@ -30,7 +30,3 @@ export interface VertexAI {
   app: FirebaseApp;
   location: string;
 }
-
-export interface VertexAIOptions {
-  location?: string;
-}
diff --git a/packages/vertexai/src/requests/request.test.ts b/packages/vertexai/src/requests/request.test.ts
@@ -71,18 +71,6 @@ describe('request methods', () => {
       );
       expect(url.toString()).to.include(DEFAULT_API_VERSION);
     });
-    it('custom apiVersion', async () => {
-      const url = new RequestUrl(
-        'models/model-name',
-        Task.GENERATE_CONTENT,
-        fakeApiSettings,
-        false,
-        { apiVersion: 'v100omega' }
-      );
-      expect(url.toString()).to.include(
-        '/v100omega/projects/my-project/locations/us-central1/models/model-name'
-      );
-    });
     it('custom baseUrl', async () => {
       const url = new RequestUrl(
         'models/model-name',

diff --git a/packages/vertexai/src/requests/request.ts b/packages/vertexai/src/requests/request.ts
@@ -40,7 +40,8 @@ export class RequestUrl {
     public requestOptions?: RequestOptions
   ) {}
   toString(): string {
-    const apiVersion = this.requestOptions?.apiVersion || DEFAULT_API_VERSION;
+    // TODO: allow user-set option if that feature becomes available
+    const apiVersion = DEFAULT_API_VERSION;
     const baseUrl = this.requestOptions?.baseUrl || DEFAULT_BASE_URL;
     let url = `${baseUrl}/${apiVersion}`;
     url += `/projects/${this.apiSettings.project}`;

diff --git a/packages/vertexai/src/service.ts b/packages/vertexai/src/service.ts
@@ -16,7 +16,7 @@
  */
 
 import { FirebaseApp, _FirebaseService } from '@firebase/app';
-import { VertexAI, VertexAIOptions } from './public-types';
+import { VertexAI } from './public-types';
 import {
   AppCheckInternalComponentName,
   FirebaseAppCheckInternal
@@ -30,12 +30,12 @@ export class VertexAIService implements VertexAI, _FirebaseService {
 
   constructor(
     public app: FirebaseApp,
-    appCheckProvider?: Provider<AppCheckInternalComponentName>,
-    public options?: VertexAIOptions
+    appCheckProvider?: Provider<AppCheckInternalComponentName>
   ) {
     const appCheck = appCheckProvider?.getImmediate({ optional: true });
     this.appCheck = appCheck || null;
-    this.location = this.options?.location || DEFAULT_LOCATION;
+    // TODO: add in user-set location option when that feature is available
+    this.location = DEFAULT_LOCATION;
   }
 
   _delete(): Promise<void> {

diff --git a/packages/vertexai/src/types/requests.ts b/packages/vertexai/src/types/requests.ts
@@ -93,11 +93,6 @@ export interface RequestOptions {
    * Request timeout in milliseconds.
    */
   timeout?: number;
-  /**
-   * Version of API endpoint to call (e.g. "v1" or "v1beta"). If not specified,
-   * defaults to latest stable version.
-   */
-  apiVersion?: string;
   /**
    * Base url for endpoint. Defaults to https://firebaseml.googleapis.com
    */