Skip to content

Commit 8ec9376

Browse files
google-oss-botgoogle-oss-bot
authored
Merge main into release
2 parents 2eee61a + 95b4fc6 commit 8ec9376

40 files changed

+1109
-289
lines changed

‎.changeset/chilly-parrots-remember.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/vertexai': minor
3+
---
4+
5+
Add `systemInstruction`, `tools`, and `generationConfig` to `CountTokensRequest`.

‎.changeset/floppy-schools-battle.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/performance': patch
3+
'firebase': patch
4+
---
5+
6+
Modify the retry mechanism to stop when remaining tries is less than or equal to zero, improving the robustness of the retry handling.

‎.changeset/fluffy-otters-whisper.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/app-check': patch
3+
---
4+
5+
Improve error handling in AppCheck. The publicly-exported `getToken()` will now throw `internalError` strings it was previously ignoring.

‎.changeset/large-pants-hide.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/firestore': patch
3+
'firebase': patch
4+
---
5+
6+
Use lazy encoding in UTF-8 encoded byte comparison for strings.

‎.changeset/silver-jeans-sell.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
'@firebase/database-compat': patch
3+
'@firebase/database-types': patch
4+
'@firebase/database': patch
5+
---
6+
7+
Added non-null parent properties to ThenableReference

‎.changeset/stupid-apples-shave.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@firebase/vertexai': minor
3+
'firebase': minor
4+
---
5+
6+
Added missing `BlockReason` and `FinishReason` enum values.

‎.changeset/tricky-actors-exercise.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@firebase/data-connect': patch
3+
---
4+
5+
Update requests to point to v1 backend endpoints instead of v1beta

‎.github/workflows/check-changeset.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ jobs:
2828
name: Check changeset vs changed files
2929
runs-on: ubuntu-latest
3030

31+
permissions:
32+
pull-requests: write
33+
3134
steps:
3235
- name: Checkout Repo
3336
uses: actions/checkout@v4
@@ -89,4 +92,4 @@ jobs:
8992
# Don't want it to throw before editing the comment.
9093
- name: Fail if checker script logged a blocking failure
9194
if: ${{steps.check-changeset.outputs.BLOCKING_FAILURE == 'true'}}
92-
run: exit 1
95+
run: exit 1

‎.github/workflows/check-docs.yml

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,34 @@ jobs:
2222
runs-on: ubuntu-latest
2323

2424
steps:
25-
- name: Checkout Repo
26-
uses: actions/checkout@v4
27-
with:
28-
# get all history for the diff
29-
fetch-depth: 0
30-
- name: Set up Node (20)
31-
uses: actions/setup-node@v4
32-
with:
33-
node-version: 22.10.0
34-
- name: Yarn install
35-
run: yarn
36-
- name: Run doc generation
37-
run: yarn docgen:all
38-
- name: Check for changes in docs-devsite dir (fail if so)
39-
run: |
40-
if [[ -n "$(git status docs-devsite --porcelain)" ]]; then
41-
echo "Unstaged changes detected:"
42-
git status -s
43-
exit 1
44-
fi
45-
- name: Reference documentation needs to be updated. See message below.
46-
if: ${{ failure() }}
47-
run: echo "Changes in this PR affect the reference docs. Run \`yarn docgen:all\` locally to regenerate docs and add them to this PR."
25+
- name: Checkout Repo
26+
uses: actions/checkout@v4
27+
with:
28+
# get all history for the diff
29+
fetch-depth: 0
30+
- name: Set up Node (20)
31+
uses: actions/setup-node@v4
32+
with:
33+
node-version: 22.10.0
34+
- name: Yarn install
35+
run: yarn
36+
- name: Run doc generation
37+
run: yarn docgen:all
38+
# Fail first if there are docs-devsite changes since running yarn docgen:all
39+
# will also regenerate any API report changes.
40+
- name: Check for changes in docs-devsite dir (fail if so)
41+
run: |
42+
if [[ -n "$(git status docs-devsite --porcelain)" ]]; then
43+
echo "Unstaged changes detected in docs-devsite/:"
44+
git status -s
45+
echo "Changes in this PR affect the reference docs or API reports. Run \`yarn docgen:all\` locally to regenerate the changed files and add them to this PR."
46+
exit 1
47+
fi
48+
- name: Check for changes in common/api-review dir (fail if so)
49+
run: |
50+
if [[ -n "$(git status common/api-review --porcelain)" ]]; then
51+
echo "Unstaged changes detected in api-report(s):"
52+
git status -s
53+
echo "Changes in this PR affect the API reports. Run \`yarn build\` locally to regenerate the API reports and add them to this PR."
54+
exit 1
55+
fi

‎.github/workflows/update-api-reports.yml

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

‎common/api-review/database.api.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,10 @@ export function startAt(value?: number | string | boolean | null, key?: string):
228228

229229
// @public
230230
export interface ThenableReference extends DatabaseReference, Pick<Promise<DatabaseReference>, 'then' | 'catch'> {
231+
// (undocumented)
232+
key: string;
233+
// (undocumented)
234+
parent: DatabaseReference;
231235
}
232236

233237
// @public

‎common/api-review/vertexai.api.md

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export interface BaseParams {
2828

2929
// @public
3030
export enum BlockReason {
31-
// (undocumented)
31+
BLOCKLIST = "BLOCKLIST",
3232
OTHER = "OTHER",
33-
// (undocumented)
33+
PROHIBITED_CONTENT = "PROHIBITED_CONTENT",
3434
SAFETY = "SAFETY"
3535
}
3636

@@ -88,6 +88,9 @@ export interface Content {
8888
export interface CountTokensRequest {
8989
// (undocumented)
9090
contents: Content[];
91+
generationConfig?: GenerationConfig;
92+
systemInstruction?: string | Part | Content;
93+
tools?: Tool[];
9194
}
9295

9396
// @public
@@ -158,15 +161,14 @@ export interface FileDataPart {
158161

159162
// @public
160163
export enum FinishReason {
161-
// (undocumented)
164+
BLOCKLIST = "BLOCKLIST",
165+
MALFORMED_FUNCTION_CALL = "MALFORMED_FUNCTION_CALL",
162166
MAX_TOKENS = "MAX_TOKENS",
163-
// (undocumented)
164167
OTHER = "OTHER",
165-
// (undocumented)
168+
PROHIBITED_CONTENT = "PROHIBITED_CONTENT",
166169
RECITATION = "RECITATION",
167-
// (undocumented)
168170
SAFETY = "SAFETY",
169-
// (undocumented)
171+
SPII = "SPII",
170172
STOP = "STOP"
171173
}
172174

@@ -188,11 +190,8 @@ export interface FunctionCallingConfig {
188190

189191
// @public (undocumented)
190192
export enum FunctionCallingMode {
191-
// (undocumented)
192193
ANY = "ANY",
193-
// (undocumented)
194194
AUTO = "AUTO",
195-
// (undocumented)
196195
NONE = "NONE"
197196
}
198197

@@ -377,21 +376,15 @@ export interface GroundingMetadata {
377376

378377
// @public (undocumented)
379378
export enum HarmBlockMethod {
380-
// (undocumented)
381379
PROBABILITY = "PROBABILITY",
382-
// (undocumented)
383380
SEVERITY = "SEVERITY"
384381
}
385382

386383
// @public
387384
export enum HarmBlockThreshold {
388-
// (undocumented)
389385
BLOCK_LOW_AND_ABOVE = "BLOCK_LOW_AND_ABOVE",
390-
// (undocumented)
391386
BLOCK_MEDIUM_AND_ABOVE = "BLOCK_MEDIUM_AND_ABOVE",
392-
// (undocumented)
393387
BLOCK_NONE = "BLOCK_NONE",
394-
// (undocumented)
395388
BLOCK_ONLY_HIGH = "BLOCK_ONLY_HIGH"
396389
}
397390

@@ -409,25 +402,17 @@ export enum HarmCategory {
409402

410403
// @public
411404
export enum HarmProbability {
412-
// (undocumented)
413405
HIGH = "HIGH",
414-
// (undocumented)
415406
LOW = "LOW",
416-
// (undocumented)
417407
MEDIUM = "MEDIUM",
418-
// (undocumented)
419408
NEGLIGIBLE = "NEGLIGIBLE"
420409
}
421410

422411
// @public
423412
export enum HarmSeverity {
424-
// (undocumented)
425413
HARM_SEVERITY_HIGH = "HARM_SEVERITY_HIGH",
426-
// (undocumented)
427414
HARM_SEVERITY_LOW = "HARM_SEVERITY_LOW",
428-
// (undocumented)
429415
HARM_SEVERITY_MEDIUM = "HARM_SEVERITY_MEDIUM",
430-
// (undocumented)
431416
HARM_SEVERITY_NEGLIGIBLE = "HARM_SEVERITY_NEGLIGIBLE"
432417
}
433418

‎docs-devsite/database.thenablereference.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,25 @@ export declare interface ThenableReference extends DatabaseReference, Pick<Promi
1919
```
2020
<b>Extends:</b> [DatabaseReference](./database.databasereference.md#databasereference_interface)<!-- -->, Pick&lt;Promise&lt;[DatabaseReference](./database.databasereference.md#databasereference_interface)<!-- -->&gt;, 'then' \| 'catch'&gt;
2121
22+
## Properties
23+
24+
| Property | Type | Description |
25+
| --- | --- | --- |
26+
| [key](./database.thenablereference.md#thenablereferencekey) | string | |
27+
| [parent](./database.thenablereference.md#thenablereferenceparent) | [DatabaseReference](./database.databasereference.md#databasereference_interface) | |
28+
29+
## ThenableReference.key
30+
31+
<b>Signature:</b>
32+
33+
```typescript
34+
key: string;
35+
```
36+
37+
## ThenableReference.parent
38+
39+
<b>Signature:</b>
40+
41+
```typescript
42+
parent: DatabaseReference;
43+
```

‎docs-devsite/vertexai.counttokensrequest.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ export interface CountTokensRequest
2323
| Property | Type | Description |
2424
| --- | --- | --- |
2525
| [contents](./vertexai.counttokensrequest.md#counttokensrequestcontents) | [Content](./vertexai.content.md#content_interface)<!-- -->\[\] | |
26+
| [generationConfig](./vertexai.counttokensrequest.md#counttokensrequestgenerationconfig) | [GenerationConfig](./vertexai.generationconfig.md#generationconfig_interface) | Configuration options that control how the model generates a response. |
27+
| [systemInstruction](./vertexai.counttokensrequest.md#counttokensrequestsysteminstruction) | string \| [Part](./vertexai.md#part) \| [Content](./vertexai.content.md#content_interface) | Instructions that direct the model to behave a certain way. |
28+
| [tools](./vertexai.counttokensrequest.md#counttokensrequesttools) | [Tool](./vertexai.md#tool)<!-- -->\[\] | <code>[Tool](./vertexai.md#tool)</code> configuration. |
2629

2730
## CountTokensRequest.contents
2831

@@ -31,3 +34,33 @@ export interface CountTokensRequest
3134
```typescript
3235
contents: Content[];
3336
```
37+
38+
## CountTokensRequest.generationConfig
39+
40+
Configuration options that control how the model generates a response.
41+
42+
<b>Signature:</b>
43+
44+
```typescript
45+
generationConfig?: GenerationConfig;
46+
```
47+
48+
## CountTokensRequest.systemInstruction
49+
50+
Instructions that direct the model to behave a certain way.
51+
52+
<b>Signature:</b>
53+
54+
```typescript
55+
systemInstruction?: string | Part | Content;
56+
```
57+
58+
## CountTokensRequest.tools
59+
60+
<code>[Tool](./vertexai.md#tool)</code> configuration.
61+
62+
<b>Signature:</b>
63+
64+
```typescript
65+
tools?: Tool[];
66+
```

0 commit comments

Comments
 (0)