Skip to content

VinF Hybrid Inference #2: Introduce ChromeAdapter class #8877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions common/api-review/vertexai.api.md
Original file line number Diff line number Diff line change
@@ -42,7 +42,8 @@ export class BooleanSchema extends Schema {
// @public
export class ChatSession {
// Warning: (ae-forgotten-export) The symbol "ApiSettings" needs to be exported by the entry point index.d.ts
constructor(apiSettings: ApiSettings, model: string, params?: StartChatParams | undefined, requestOptions?: RequestOptions | undefined);
// Warning: (ae-forgotten-export) The symbol "ChromeAdapter" needs to be exported by the entry point index.d.ts
constructor(apiSettings: ApiSettings, model: string, chromeAdapter: ChromeAdapter, params?: StartChatParams | undefined, requestOptions?: RequestOptions | undefined);
getHistory(): Promise<Content[]>;
// (undocumented)
model: string;
@@ -324,7 +325,7 @@ export interface GenerativeContentBlob {

// @public
export class GenerativeModel extends VertexAIModel {
constructor(vertexAI: VertexAI, modelParams: ModelParams, requestOptions?: RequestOptions);
constructor(vertexAI: VertexAI, modelParams: ModelParams, chromeAdapter: ChromeAdapter, requestOptions?: RequestOptions);
countTokens(request: CountTokensRequest | string | Array<string | Part>): Promise<CountTokensResponse>;
static DEFAULT_HYBRID_IN_CLOUD_MODEL: string;
generateContent(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentResult>;
12 changes: 11 additions & 1 deletion packages/vertexai/src/api.ts
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ import {
} from './types';
import { VertexAIError } from './errors';
import { VertexAIModel, GenerativeModel, ImagenModel } from './models';
import { ChromeAdapter } from './methods/chrome-adapter';

export { ChatSession } from './methods/chat-session';
export * from './requests/schema-builder';
@@ -91,7 +92,16 @@ export function getGenerativeModel(
`Must provide a model name. Example: getGenerativeModel({ model: 'my-model-name' })`
);
}
return new GenerativeModel(vertexAI, inCloudParams, requestOptions);
return new GenerativeModel(
vertexAI,
inCloudParams,
new ChromeAdapter(
window.ai as AI,
hybridParams.mode,
hybridParams.onDeviceParams
),
requestOptions
);
}

/**
19 changes: 16 additions & 3 deletions packages/vertexai/src/methods/chat-session.test.ts
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import * as generateContentMethods from './generate-content';
import { GenerateContentStreamResult } from '../types';
import { ChatSession } from './chat-session';
import { ApiSettings } from '../types/internal';
import { ChromeAdapter } from './chrome-adapter';

use(sinonChai);
use(chaiAsPromised);
@@ -44,7 +45,11 @@ describe('ChatSession', () => {
generateContentMethods,
'generateContent'
).rejects('generateContent failed');
const chatSession = new ChatSession(fakeApiSettings, 'a-model');
const chatSession = new ChatSession(
fakeApiSettings,
'a-model',
new ChromeAdapter()
);
await expect(chatSession.sendMessage('hello')).to.be.rejected;
expect(generateContentStub).to.be.calledWith(
fakeApiSettings,
@@ -61,7 +66,11 @@ describe('ChatSession', () => {
generateContentMethods,
'generateContentStream'
).rejects('generateContentStream failed');
const chatSession = new ChatSession(fakeApiSettings, 'a-model');
const chatSession = new ChatSession(
fakeApiSettings,
'a-model',
new ChromeAdapter()
);
await expect(chatSession.sendMessageStream('hello')).to.be.rejected;
expect(generateContentStreamStub).to.be.calledWith(
fakeApiSettings,
@@ -80,7 +89,11 @@ describe('ChatSession', () => {
generateContentMethods,
'generateContentStream'
).resolves({} as unknown as GenerateContentStreamResult);
const chatSession = new ChatSession(fakeApiSettings, 'a-model');
const chatSession = new ChatSession(
fakeApiSettings,
'a-model',
new ChromeAdapter()
);
await chatSession.sendMessageStream('hello');
expect(generateContentStreamStub).to.be.calledWith(
fakeApiSettings,
3 changes: 3 additions & 0 deletions packages/vertexai/src/methods/chat-session.ts
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ import { validateChatHistory } from './chat-session-helpers';
import { generateContent, generateContentStream } from './generate-content';
import { ApiSettings } from '../types/internal';
import { logger } from '../logger';
import { ChromeAdapter } from './chrome-adapter';

/**
* Do not log a message for this error.
@@ -50,6 +51,7 @@ export class ChatSession {
constructor(
apiSettings: ApiSettings,
public model: string,
private chromeAdapter: ChromeAdapter,
public params?: StartChatParams,
public requestOptions?: RequestOptions
) {
@@ -95,6 +97,7 @@ export class ChatSession {
this._apiSettings,
this.model,
generateContentRequest,
this.chromeAdapter,
this.requestOptions
)
)
47 changes: 47 additions & 0 deletions packages/vertexai/src/methods/chrome-adapter.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/**
* @license
* Copyright 2025 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import {
EnhancedGenerateContentResponse,
GenerateContentRequest,
InferenceMode
} from '../types';

/**
* Defines an inference "backend" that uses Chrome's on-device model,
* and encapsulates logic for detecting when on-device is possible.
*/
export class ChromeAdapter {
constructor(
private aiProvider?: AI,
private mode?: InferenceMode,
private onDeviceParams?: AILanguageModelCreateOptionsWithSystemPrompt
) {}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
async isAvailable(request: GenerateContentRequest): Promise<boolean> {
return false;
}
async generateContentOnDevice(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
request: GenerateContentRequest
): Promise<EnhancedGenerateContentResponse> {
return {
text: () => '',
functionCalls: () => undefined
};
}
}
60 changes: 50 additions & 10 deletions packages/vertexai/src/methods/generate-content.test.ts
Original file line number Diff line number Diff line change
@@ -30,6 +30,7 @@ import {
} from '../types';
import { ApiSettings } from '../types/internal';
import { Task } from '../requests/request';
import { ChromeAdapter } from './chrome-adapter';

use(sinonChai);
use(chaiAsPromised);
@@ -69,7 +70,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text()).to.include('Mountain View, California');
expect(makeRequestStub).to.be.calledWith(
@@ -91,7 +93,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text()).to.include('Use Freshly Ground Coffee');
expect(result.response.text()).to.include('30 minutes of brewing');
@@ -113,7 +116,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.usageMetadata?.totalTokenCount).to.equal(1913);
expect(result.response.usageMetadata?.candidatesTokenCount).to.equal(76);
@@ -145,7 +149,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text()).to.include(
'Some information cited from an external source'
@@ -171,7 +176,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text).to.throw('SAFETY');
expect(makeRequestStub).to.be.calledWith(
@@ -192,7 +198,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text).to.throw('SAFETY');
expect(makeRequestStub).to.be.calledWith(
@@ -211,7 +218,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text()).to.equal('');
expect(makeRequestStub).to.be.calledWith(
@@ -232,7 +240,8 @@ describe('generateContent()', () => {
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams
fakeRequestParams,
new ChromeAdapter()
);
expect(result.response.text()).to.include('Some text');
expect(makeRequestStub).to.be.calledWith(
@@ -251,7 +260,12 @@ describe('generateContent()', () => {
json: mockResponse.json
} as Response);
await expect(
generateContent(fakeApiSettings, 'model', fakeRequestParams)
generateContent(
fakeApiSettings,
'model',
fakeRequestParams,
new ChromeAdapter()
)
).to.be.rejectedWith(/400.*invalid argument/);
expect(mockFetch).to.be.called;
});
@@ -265,10 +279,36 @@ describe('generateContent()', () => {
json: mockResponse.json
} as Response);
await expect(
generateContent(fakeApiSettings, 'model', fakeRequestParams)
generateContent(
fakeApiSettings,
'model',
fakeRequestParams,
new ChromeAdapter()
)
).to.be.rejectedWith(
/firebasevertexai\.googleapis[\s\S]*my-project[\s\S]*api-not-enabled/
);
expect(mockFetch).to.be.called;
});
it('on-device', async () => {
const expectedText = 'hi';
const chromeAdapter = new ChromeAdapter();
const mockIsAvailable = stub(chromeAdapter, 'isAvailable').resolves(true);
const mockGenerateContent = stub(
chromeAdapter,
'generateContentOnDevice'
).resolves({
text: () => expectedText,
functionCalls: () => undefined
});
const result = await generateContent(
fakeApiSettings,
'model',
fakeRequestParams,
chromeAdapter
);
expect(result.response.text()).to.equal(expectedText);
expect(mockIsAvailable).to.be.called;
expect(mockGenerateContent).to.be.calledWith(fakeRequestParams);
});
});
27 changes: 25 additions & 2 deletions packages/vertexai/src/methods/generate-content.ts
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@
*/

import {
EnhancedGenerateContentResponse,
GenerateContentRequest,
GenerateContentResponse,
GenerateContentResult,
@@ -26,6 +27,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 { ChromeAdapter } from './chrome-adapter';

export async function generateContentStream(
apiSettings: ApiSettings,
@@ -44,12 +46,12 @@ export async function generateContentStream(
return processStream(response);
}

export async function generateContent(
async function generateContentOnCloud(
apiSettings: ApiSettings,
model: string,
params: GenerateContentRequest,
requestOptions?: RequestOptions
): Promise<GenerateContentResult> {
): Promise<EnhancedGenerateContentResponse> {
const response = await makeRequest(
model,
Task.GENERATE_CONTENT,
@@ -60,6 +62,27 @@ export async function generateContent(
);
const responseJson: GenerateContentResponse = await response.json();
const enhancedResponse = createEnhancedContentResponse(responseJson);
return enhancedResponse;
}

export async function generateContent(
apiSettings: ApiSettings,
model: string,
params: GenerateContentRequest,
chromeAdapter: ChromeAdapter,
requestOptions?: RequestOptions
): Promise<GenerateContentResult> {
let enhancedResponse;
if (await chromeAdapter.isAvailable(params)) {
enhancedResponse = await chromeAdapter.generateContentOnDevice(params);
} else {
enhancedResponse = await generateContentOnCloud(
apiSettings,
model,
params,
requestOptions
);
}
return {
response: enhancedResponse
};
Loading
Loading