@firebase/ai 2.4.0-20251007135320 → 2.4.0-canary.44d9891f9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/ai-public.d.ts +23 -0
- package/dist/ai.d.ts +23 -0
- package/dist/esm/index.esm.js +74 -30
- package/dist/esm/index.esm.js.map +1 -1
- package/dist/esm/src/methods/chrome-adapter.d.ts +1 -1
- package/dist/esm/src/requests/hybrid-helpers.d.ts +7 -2
- package/dist/esm/src/requests/response-helpers.d.ts +2 -2
- package/dist/esm/src/requests/stream-reader.d.ts +2 -1
- package/dist/esm/src/types/enums.d.ts +15 -0
- package/dist/esm/src/types/responses.d.ts +7 -1
- package/dist/index.cjs.js +74 -29
- package/dist/index.cjs.js.map +1 -1
- package/dist/index.node.cjs.js +54 -22
- package/dist/index.node.cjs.js.map +1 -1
- package/dist/index.node.mjs +54 -23
- package/dist/index.node.mjs.map +1 -1
- package/dist/src/methods/chrome-adapter.d.ts +1 -1
- package/dist/src/requests/hybrid-helpers.d.ts +7 -2
- package/dist/src/requests/response-helpers.d.ts +2 -2
- package/dist/src/requests/stream-reader.d.ts +2 -1
- package/dist/src/types/enums.d.ts +15 -0
- package/dist/src/types/responses.d.ts +7 -1
- package/package.json +8 -8
|
@@ -25,11 +25,11 @@ import { LanguageModel } from '../types/language-model';
|
|
|
25
25
|
export declare class ChromeAdapterImpl implements ChromeAdapter {
|
|
26
26
|
languageModelProvider: LanguageModel;
|
|
27
27
|
mode: InferenceMode;
|
|
28
|
-
onDeviceParams: OnDeviceParams;
|
|
29
28
|
static SUPPORTED_MIME_TYPES: string[];
|
|
30
29
|
private isDownloading;
|
|
31
30
|
private downloadPromise;
|
|
32
31
|
private oldSession;
|
|
32
|
+
onDeviceParams: OnDeviceParams;
|
|
33
33
|
constructor(languageModelProvider: LanguageModel, mode: InferenceMode, onDeviceParams?: OnDeviceParams);
|
|
34
34
|
/**
|
|
35
35
|
* Checks if a given request can be made on-device.
|
|
@@ -14,7 +14,11 @@
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
-
import { GenerateContentRequest, ChromeAdapter } from '../types';
|
|
17
|
+
import { GenerateContentRequest, ChromeAdapter, InferenceSource } from '../types';
|
|
18
|
+
interface CallResult<Response> {
|
|
19
|
+
response: Response;
|
|
20
|
+
inferenceSource: InferenceSource;
|
|
21
|
+
}
|
|
18
22
|
/**
|
|
19
23
|
* Dispatches a request to the appropriate backend (on-device or in-cloud)
|
|
20
24
|
* based on the inference mode.
|
|
@@ -25,4 +29,5 @@ import { GenerateContentRequest, ChromeAdapter } from '../types';
|
|
|
25
29
|
* @param inCloudCall - The function to call for in-cloud inference.
|
|
26
30
|
* @returns The response from the backend.
|
|
27
31
|
*/
|
|
28
|
-
export declare function callCloudOrDevice<Response>(request: GenerateContentRequest, chromeAdapter: ChromeAdapter | undefined, onDeviceCall: () => Promise<Response>, inCloudCall: () => Promise<Response>): Promise<Response
|
|
32
|
+
export declare function callCloudOrDevice<Response>(request: GenerateContentRequest, chromeAdapter: ChromeAdapter | undefined, onDeviceCall: () => Promise<Response>, inCloudCall: () => Promise<Response>): Promise<CallResult<Response>>;
|
|
33
|
+
export {};
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
-
import { EnhancedGenerateContentResponse, FunctionCall, GenerateContentResponse, ImagenGCSImage, ImagenInlineImage, InlineDataPart, Part } from '../types';
|
|
17
|
+
import { EnhancedGenerateContentResponse, FunctionCall, GenerateContentResponse, ImagenGCSImage, ImagenInlineImage, InlineDataPart, Part, InferenceSource } from '../types';
|
|
18
18
|
/**
|
|
19
19
|
* Creates an EnhancedGenerateContentResponse object that has helper functions and
|
|
20
20
|
* other modifications that improve usability.
|
|
21
21
|
*/
|
|
22
|
-
export declare function createEnhancedContentResponse(response: GenerateContentResponse): EnhancedGenerateContentResponse;
|
|
22
|
+
export declare function createEnhancedContentResponse(response: GenerateContentResponse, inferenceSource?: InferenceSource): EnhancedGenerateContentResponse;
|
|
23
23
|
/**
|
|
24
24
|
* Adds convenience helper methods to a response object, including stream
|
|
25
25
|
* chunks (as long as each chunk is a complete GenerateContentResponse JSON).
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { GenerateContentResponse, GenerateContentStreamResult } from '../types';
|
|
18
18
|
import { ApiSettings } from '../types/internal';
|
|
19
|
+
import { InferenceSource } from '../public-types';
|
|
19
20
|
/**
|
|
20
21
|
* Process a response.body stream from the backend and return an
|
|
21
22
|
* iterator that provides one complete GenerateContentResponse at a time
|
|
@@ -24,7 +25,7 @@ import { ApiSettings } from '../types/internal';
|
|
|
24
25
|
*
|
|
25
26
|
* @param response - Response from a fetch call
|
|
26
27
|
*/
|
|
27
|
-
export declare function processStream(response: Response, apiSettings: ApiSettings): GenerateContentStreamResult;
|
|
28
|
+
export declare function processStream(response: Response, apiSettings: ApiSettings, inferenceSource?: InferenceSource): GenerateContentStreamResult;
|
|
28
29
|
/**
|
|
29
30
|
* Reads a raw stream from the fetch response and join incomplete
|
|
30
31
|
* chunks, returning a new stream that provides a single complete
|
|
@@ -349,6 +349,21 @@ export declare const InferenceMode: {
|
|
|
349
349
|
* @beta
|
|
350
350
|
*/
|
|
351
351
|
export type InferenceMode = (typeof InferenceMode)[keyof typeof InferenceMode];
|
|
352
|
+
/**
|
|
353
|
+
* Indicates whether inference happened on-device or in-cloud.
|
|
354
|
+
*
|
|
355
|
+
* @beta
|
|
356
|
+
*/
|
|
357
|
+
export declare const InferenceSource: {
|
|
358
|
+
readonly ON_DEVICE: "on_device";
|
|
359
|
+
readonly IN_CLOUD: "in_cloud";
|
|
360
|
+
};
|
|
361
|
+
/**
|
|
362
|
+
* Indicates whether inference happened on-device or in-cloud.
|
|
363
|
+
*
|
|
364
|
+
* @beta
|
|
365
|
+
*/
|
|
366
|
+
export type InferenceSource = (typeof InferenceSource)[keyof typeof InferenceSource];
|
|
352
367
|
/**
|
|
353
368
|
* Represents the result of the code execution.
|
|
354
369
|
*
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { Content, FunctionCall, InlineDataPart } from './content';
|
|
18
|
-
import { BlockReason, FinishReason, HarmCategory, HarmProbability, HarmSeverity, Modality } from './enums';
|
|
18
|
+
import { BlockReason, FinishReason, HarmCategory, HarmProbability, HarmSeverity, InferenceSource, Modality } from './enums';
|
|
19
19
|
/**
|
|
20
20
|
* Result object returned from {@link GenerativeModel.generateContent} call.
|
|
21
21
|
*
|
|
@@ -76,6 +76,12 @@ export interface EnhancedGenerateContentResponse extends GenerateContentResponse
|
|
|
76
76
|
* set to `true`.
|
|
77
77
|
*/
|
|
78
78
|
thoughtSummary: () => string | undefined;
|
|
79
|
+
/**
|
|
80
|
+
* Indicates whether inference happened on-device or in-cloud.
|
|
81
|
+
*
|
|
82
|
+
* @beta
|
|
83
|
+
*/
|
|
84
|
+
inferenceSource?: InferenceSource;
|
|
79
85
|
}
|
|
80
86
|
/**
|
|
81
87
|
* Individual response from {@link GenerativeModel.generateContent} and
|
package/dist/index.cjs.js
CHANGED
|
@@ -8,7 +8,7 @@ var util = require('@firebase/util');
|
|
|
8
8
|
var logger$1 = require('@firebase/logger');
|
|
9
9
|
|
|
10
10
|
var name = "@firebase/ai";
|
|
11
|
-
var version = "2.4.0-
|
|
11
|
+
var version = "2.4.0-canary.44d9891f9";
|
|
12
12
|
|
|
13
13
|
/**
|
|
14
14
|
* @license
|
|
@@ -383,6 +383,15 @@ const InferenceMode = {
|
|
|
383
383
|
'ONLY_IN_CLOUD': 'only_in_cloud',
|
|
384
384
|
'PREFER_IN_CLOUD': 'prefer_in_cloud'
|
|
385
385
|
};
|
|
386
|
+
/**
|
|
387
|
+
* Indicates whether inference happened on-device or in-cloud.
|
|
388
|
+
*
|
|
389
|
+
* @beta
|
|
390
|
+
*/
|
|
391
|
+
const InferenceSource = {
|
|
392
|
+
'ON_DEVICE': 'on_device',
|
|
393
|
+
'IN_CLOUD': 'in_cloud'
|
|
394
|
+
};
|
|
386
395
|
/**
|
|
387
396
|
* Represents the result of the code execution.
|
|
388
397
|
*
|
|
@@ -892,22 +901,35 @@ var Availability;
|
|
|
892
901
|
* See the License for the specific language governing permissions and
|
|
893
902
|
* limitations under the License.
|
|
894
903
|
*/
|
|
904
|
+
// Defaults to support image inputs for convenience.
|
|
905
|
+
const defaultExpectedInputs = [{ type: 'image' }];
|
|
895
906
|
/**
|
|
896
907
|
* Defines an inference "backend" that uses Chrome's on-device model,
|
|
897
908
|
* and encapsulates logic for detecting when on-device inference is
|
|
898
909
|
* possible.
|
|
899
910
|
*/
|
|
900
911
|
class ChromeAdapterImpl {
|
|
901
|
-
constructor(languageModelProvider, mode, onDeviceParams
|
|
902
|
-
createOptions: {
|
|
903
|
-
// Defaults to support image inputs for convenience.
|
|
904
|
-
expectedInputs: [{ type: 'image' }]
|
|
905
|
-
}
|
|
906
|
-
}) {
|
|
912
|
+
constructor(languageModelProvider, mode, onDeviceParams) {
|
|
907
913
|
this.languageModelProvider = languageModelProvider;
|
|
908
914
|
this.mode = mode;
|
|
909
|
-
this.onDeviceParams = onDeviceParams;
|
|
910
915
|
this.isDownloading = false;
|
|
916
|
+
this.onDeviceParams = {
|
|
917
|
+
createOptions: {
|
|
918
|
+
expectedInputs: defaultExpectedInputs
|
|
919
|
+
}
|
|
920
|
+
};
|
|
921
|
+
if (onDeviceParams) {
|
|
922
|
+
this.onDeviceParams = onDeviceParams;
|
|
923
|
+
if (!this.onDeviceParams.createOptions) {
|
|
924
|
+
this.onDeviceParams.createOptions = {
|
|
925
|
+
expectedInputs: defaultExpectedInputs
|
|
926
|
+
};
|
|
927
|
+
}
|
|
928
|
+
else if (!this.onDeviceParams.createOptions.expectedInputs) {
|
|
929
|
+
this.onDeviceParams.createOptions.expectedInputs =
|
|
930
|
+
defaultExpectedInputs;
|
|
931
|
+
}
|
|
932
|
+
}
|
|
911
933
|
}
|
|
912
934
|
/**
|
|
913
935
|
* Checks if a given request can be made on-device.
|
|
@@ -1596,7 +1618,7 @@ function hasValidCandidates(response) {
|
|
|
1596
1618
|
* Creates an EnhancedGenerateContentResponse object that has helper functions and
|
|
1597
1619
|
* other modifications that improve usability.
|
|
1598
1620
|
*/
|
|
1599
|
-
function createEnhancedContentResponse(response) {
|
|
1621
|
+
function createEnhancedContentResponse(response, inferenceSource = InferenceSource.IN_CLOUD) {
|
|
1600
1622
|
/**
|
|
1601
1623
|
* The Vertex AI backend omits default values.
|
|
1602
1624
|
* This causes the `index` property to be omitted from the first candidate in the
|
|
@@ -1607,6 +1629,7 @@ function createEnhancedContentResponse(response) {
|
|
|
1607
1629
|
response.candidates[0].index = 0;
|
|
1608
1630
|
}
|
|
1609
1631
|
const responseWithHelpers = addHelpers(response);
|
|
1632
|
+
responseWithHelpers.inferenceSource = inferenceSource;
|
|
1610
1633
|
return responseWithHelpers;
|
|
1611
1634
|
}
|
|
1612
1635
|
/**
|
|
@@ -1983,16 +2006,16 @@ const responseLineRE = /^data\: (.*)(?:\n\n|\r\r|\r\n\r\n)/;
|
|
|
1983
2006
|
*
|
|
1984
2007
|
* @param response - Response from a fetch call
|
|
1985
2008
|
*/
|
|
1986
|
-
function processStream(response, apiSettings) {
|
|
2009
|
+
function processStream(response, apiSettings, inferenceSource) {
|
|
1987
2010
|
const inputStream = response.body.pipeThrough(new TextDecoderStream('utf8', { fatal: true }));
|
|
1988
2011
|
const responseStream = getResponseStream(inputStream);
|
|
1989
2012
|
const [stream1, stream2] = responseStream.tee();
|
|
1990
2013
|
return {
|
|
1991
|
-
stream: generateResponseSequence(stream1, apiSettings),
|
|
1992
|
-
response: getResponsePromise(stream2, apiSettings)
|
|
2014
|
+
stream: generateResponseSequence(stream1, apiSettings, inferenceSource),
|
|
2015
|
+
response: getResponsePromise(stream2, apiSettings, inferenceSource)
|
|
1993
2016
|
};
|
|
1994
2017
|
}
|
|
1995
|
-
async function getResponsePromise(stream, apiSettings) {
|
|
2018
|
+
async function getResponsePromise(stream, apiSettings, inferenceSource) {
|
|
1996
2019
|
const allResponses = [];
|
|
1997
2020
|
const reader = stream.getReader();
|
|
1998
2021
|
while (true) {
|
|
@@ -2002,12 +2025,12 @@ async function getResponsePromise(stream, apiSettings) {
|
|
|
2002
2025
|
if (apiSettings.backend.backendType === BackendType.GOOGLE_AI) {
|
|
2003
2026
|
generateContentResponse = mapGenerateContentResponse(generateContentResponse);
|
|
2004
2027
|
}
|
|
2005
|
-
return createEnhancedContentResponse(generateContentResponse);
|
|
2028
|
+
return createEnhancedContentResponse(generateContentResponse, inferenceSource);
|
|
2006
2029
|
}
|
|
2007
2030
|
allResponses.push(value);
|
|
2008
2031
|
}
|
|
2009
2032
|
}
|
|
2010
|
-
async function* generateResponseSequence(stream, apiSettings) {
|
|
2033
|
+
async function* generateResponseSequence(stream, apiSettings, inferenceSource) {
|
|
2011
2034
|
const reader = stream.getReader();
|
|
2012
2035
|
while (true) {
|
|
2013
2036
|
const { value, done } = await reader.read();
|
|
@@ -2016,10 +2039,10 @@ async function* generateResponseSequence(stream, apiSettings) {
|
|
|
2016
2039
|
}
|
|
2017
2040
|
let enhancedResponse;
|
|
2018
2041
|
if (apiSettings.backend.backendType === BackendType.GOOGLE_AI) {
|
|
2019
|
-
enhancedResponse = createEnhancedContentResponse(mapGenerateContentResponse(value));
|
|
2042
|
+
enhancedResponse = createEnhancedContentResponse(mapGenerateContentResponse(value), inferenceSource);
|
|
2020
2043
|
}
|
|
2021
2044
|
else {
|
|
2022
|
-
enhancedResponse = createEnhancedContentResponse(value);
|
|
2045
|
+
enhancedResponse = createEnhancedContentResponse(value, inferenceSource);
|
|
2023
2046
|
}
|
|
2024
2047
|
const firstCandidate = enhancedResponse.candidates?.[0];
|
|
2025
2048
|
// Don't yield a response with no useful data for the developer.
|
|
@@ -2189,31 +2212,52 @@ const errorsCausingFallback = [
|
|
|
2189
2212
|
*/
|
|
2190
2213
|
async function callCloudOrDevice(request, chromeAdapter, onDeviceCall, inCloudCall) {
|
|
2191
2214
|
if (!chromeAdapter) {
|
|
2192
|
-
return
|
|
2215
|
+
return {
|
|
2216
|
+
response: await inCloudCall(),
|
|
2217
|
+
inferenceSource: InferenceSource.IN_CLOUD
|
|
2218
|
+
};
|
|
2193
2219
|
}
|
|
2194
2220
|
switch (chromeAdapter.mode) {
|
|
2195
2221
|
case InferenceMode.ONLY_ON_DEVICE:
|
|
2196
2222
|
if (await chromeAdapter.isAvailable(request)) {
|
|
2197
|
-
return
|
|
2223
|
+
return {
|
|
2224
|
+
response: await onDeviceCall(),
|
|
2225
|
+
inferenceSource: InferenceSource.ON_DEVICE
|
|
2226
|
+
};
|
|
2198
2227
|
}
|
|
2199
2228
|
throw new AIError(AIErrorCode.UNSUPPORTED, 'Inference mode is ONLY_ON_DEVICE, but an on-device model is not available.');
|
|
2200
2229
|
case InferenceMode.ONLY_IN_CLOUD:
|
|
2201
|
-
return
|
|
2230
|
+
return {
|
|
2231
|
+
response: await inCloudCall(),
|
|
2232
|
+
inferenceSource: InferenceSource.IN_CLOUD
|
|
2233
|
+
};
|
|
2202
2234
|
case InferenceMode.PREFER_IN_CLOUD:
|
|
2203
2235
|
try {
|
|
2204
|
-
return
|
|
2236
|
+
return {
|
|
2237
|
+
response: await inCloudCall(),
|
|
2238
|
+
inferenceSource: InferenceSource.IN_CLOUD
|
|
2239
|
+
};
|
|
2205
2240
|
}
|
|
2206
2241
|
catch (e) {
|
|
2207
2242
|
if (e instanceof AIError && errorsCausingFallback.includes(e.code)) {
|
|
2208
|
-
return
|
|
2243
|
+
return {
|
|
2244
|
+
response: await onDeviceCall(),
|
|
2245
|
+
inferenceSource: InferenceSource.ON_DEVICE
|
|
2246
|
+
};
|
|
2209
2247
|
}
|
|
2210
2248
|
throw e;
|
|
2211
2249
|
}
|
|
2212
2250
|
case InferenceMode.PREFER_ON_DEVICE:
|
|
2213
2251
|
if (await chromeAdapter.isAvailable(request)) {
|
|
2214
|
-
return
|
|
2252
|
+
return {
|
|
2253
|
+
response: await onDeviceCall(),
|
|
2254
|
+
inferenceSource: InferenceSource.ON_DEVICE
|
|
2255
|
+
};
|
|
2215
2256
|
}
|
|
2216
|
-
return
|
|
2257
|
+
return {
|
|
2258
|
+
response: await inCloudCall(),
|
|
2259
|
+
inferenceSource: InferenceSource.IN_CLOUD
|
|
2260
|
+
};
|
|
2217
2261
|
default:
|
|
2218
2262
|
throw new AIError(AIErrorCode.ERROR, `Unexpected infererence mode: ${chromeAdapter.mode}`);
|
|
2219
2263
|
}
|
|
@@ -2243,8 +2287,8 @@ async function generateContentStreamOnCloud(apiSettings, model, params, requestO
|
|
|
2243
2287
|
/* stream */ true, JSON.stringify(params), requestOptions);
|
|
2244
2288
|
}
|
|
2245
2289
|
async function generateContentStream(apiSettings, model, params, chromeAdapter, requestOptions) {
|
|
2246
|
-
const
|
|
2247
|
-
return processStream(response, apiSettings); // TODO: Map streaming responses
|
|
2290
|
+
const callResult = await callCloudOrDevice(params, chromeAdapter, () => chromeAdapter.generateContentStream(params), () => generateContentStreamOnCloud(apiSettings, model, params, requestOptions));
|
|
2291
|
+
return processStream(callResult.response, apiSettings); // TODO: Map streaming responses
|
|
2248
2292
|
}
|
|
2249
2293
|
async function generateContentOnCloud(apiSettings, model, params, requestOptions) {
|
|
2250
2294
|
if (apiSettings.backend.backendType === BackendType.GOOGLE_AI) {
|
|
@@ -2254,9 +2298,9 @@ async function generateContentOnCloud(apiSettings, model, params, requestOptions
|
|
|
2254
2298
|
/* stream */ false, JSON.stringify(params), requestOptions);
|
|
2255
2299
|
}
|
|
2256
2300
|
async function generateContent(apiSettings, model, params, chromeAdapter, requestOptions) {
|
|
2257
|
-
const
|
|
2258
|
-
const generateContentResponse = await processGenerateContentResponse(response, apiSettings);
|
|
2259
|
-
const enhancedResponse = createEnhancedContentResponse(generateContentResponse);
|
|
2301
|
+
const callResult = await callCloudOrDevice(params, chromeAdapter, () => chromeAdapter.generateContent(params), () => generateContentOnCloud(apiSettings, model, params, requestOptions));
|
|
2302
|
+
const generateContentResponse = await processGenerateContentResponse(callResult.response, apiSettings);
|
|
2303
|
+
const enhancedResponse = createEnhancedContentResponse(generateContentResponse, callResult.inferenceSource);
|
|
2260
2304
|
return {
|
|
2261
2305
|
response: enhancedResponse
|
|
2262
2306
|
};
|
|
@@ -4138,6 +4182,7 @@ exports.ImagenModel = ImagenModel;
|
|
|
4138
4182
|
exports.ImagenPersonFilterLevel = ImagenPersonFilterLevel;
|
|
4139
4183
|
exports.ImagenSafetyFilterLevel = ImagenSafetyFilterLevel;
|
|
4140
4184
|
exports.InferenceMode = InferenceMode;
|
|
4185
|
+
exports.InferenceSource = InferenceSource;
|
|
4141
4186
|
exports.IntegerSchema = IntegerSchema;
|
|
4142
4187
|
exports.Language = Language;
|
|
4143
4188
|
exports.LiveGenerativeModel = LiveGenerativeModel;
|