Skip to content

Commit 29318a4

Browse files
committed
Merge branch 'main' into ch-thinking-levels
2 parents 101059f + 2ecf78b commit 29318a4

File tree

259 files changed

+68049
-1540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+68049
-1540
lines changed

.changeset/big-pipeline-release.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': minor
3+
'firebase': minor
4+
---
5+
6+
Release Firestore Pipelines for Enterprise edition in public preview.

.changeset/four-vans-mix.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/gentle-queens-argue.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/gorgeous-rice-carry.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/long-keys-watch.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'firebase': minor
3+
'@firebase/ai': minor
4+
---
5+
6+
Add support for `AbortSignal`, allowing requests to be aborted.

.changeset/spicy-ways-yawn.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/ai': minor
3+
'firebase': minor
4+
---
5+
6+
Update default hybrid-in-cloud model to `gemini-2.5-flash-lite`.

.changeset/thin-sheep-smoke.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

common/api-review/ai.api.md

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ export class ChatSession {
150150
params?: StartChatParams | undefined;
151151
// (undocumented)
152152
requestOptions?: RequestOptions | undefined;
153-
sendMessage(request: string | Array<string | Part>): Promise<GenerateContentResult>;
154-
sendMessageStream(request: string | Array<string | Part>): Promise<GenerateContentStreamResult>;
153+
sendMessage(request: string | Array<string | Part>, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
154+
sendMessageStream(request: string | Array<string | Part>, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
155155
}
156156

157157
// @beta
@@ -539,9 +539,9 @@ export interface GenerativeContentBlob {
539539
export class GenerativeModel extends AIModel {
540540
// Warning: (ae-incompatible-release-tags) The symbol "__constructor" is marked as @public, but its signature references "ChromeAdapter" which is marked as @beta
541541
constructor(ai: AI, modelParams: ModelParams, requestOptions?: RequestOptions, chromeAdapter?: ChromeAdapter | undefined);
542-
countTokens(request: CountTokensRequest | string | Array<string | Part>): Promise<CountTokensResponse>;
543-
generateContent(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentResult>;
544-
generateContentStream(request: GenerateContentRequest | string | Array<string | Part>): Promise<GenerateContentStreamResult>;
542+
countTokens(request: CountTokensRequest | string | Array<string | Part>, singleRequestOptions?: SingleRequestOptions): Promise<CountTokensResponse>;
543+
generateContent(request: GenerateContentRequest | string | Array<string | Part>, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
544+
generateContentStream(request: GenerateContentRequest | string | Array<string | Part>, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
545545
// (undocumented)
546546
generationConfig: GenerationConfig;
547547
// (undocumented)
@@ -784,9 +784,9 @@ export interface ImagenInlineImage {
784784
// @public
785785
export class ImagenModel extends AIModel {
786786
constructor(ai: AI, modelParams: ImagenModelParams, requestOptions?: RequestOptions | undefined);
787-
generateImages(prompt: string): Promise<ImagenGenerationResponse<ImagenInlineImage>>;
787+
generateImages(prompt: string, singleRequestOptions?: SingleRequestOptions): Promise<ImagenGenerationResponse<ImagenInlineImage>>;
788788
// @internal
789-
generateImagesGCS(prompt: string, gcsURI: string): Promise<ImagenGenerationResponse<ImagenGCSImage>>;
789+
generateImagesGCS(prompt: string, gcsURI: string, singleRequestOptions?: SingleRequestOptions): Promise<ImagenGenerationResponse<ImagenGCSImage>>;
790790
generationConfig?: ImagenGenerationConfig;
791791
// (undocumented)
792792
requestOptions?: RequestOptions | undefined;
@@ -1294,6 +1294,11 @@ export interface Segment {
12941294
text: string;
12951295
}
12961296

1297+
// @public
1298+
export interface SingleRequestOptions extends RequestOptions {
1299+
signal?: AbortSignal;
1300+
}
1301+
12971302
// @beta
12981303
export interface SpeechConfig {
12991304
voiceConfig?: VoiceConfig;
@@ -1333,8 +1338,8 @@ export class TemplateGenerativeModel {
13331338
constructor(ai: AI, requestOptions?: RequestOptions);
13341339
// @internal (undocumented)
13351340
_apiSettings: ApiSettings;
1336-
generateContent(templateId: string, templateVariables: object): Promise<GenerateContentResult>;
1337-
generateContentStream(templateId: string, templateVariables: object): Promise<GenerateContentStreamResult>;
1341+
generateContent(templateId: string, templateVariables: object, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentResult>;
1342+
generateContentStream(templateId: string, templateVariables: object, singleRequestOptions?: SingleRequestOptions): Promise<GenerateContentStreamResult>;
13381343
requestOptions?: RequestOptions;
13391344
}
13401345

@@ -1343,7 +1348,7 @@ export class TemplateImagenModel {
13431348
constructor(ai: AI, requestOptions?: RequestOptions);
13441349
// @internal (undocumented)
13451350
_apiSettings: ApiSettings;
1346-
generateImages(templateId: string, templateVariables: object): Promise<ImagenGenerationResponse<ImagenInlineImage>>;
1351+
generateImages(templateId: string, templateVariables: object, singleRequestOptions?: SingleRequestOptions): Promise<ImagenGenerationResponse<ImagenInlineImage>>;
13471352
requestOptions?: RequestOptions;
13481353
}
13491354

0 commit comments

Comments
 (0)