Skip to content

Commit 12e18cc

Browse files
committed
chore: merge upstream/main into fix/typed-list-pydantic-parsed
Resolved merge conflicts in google/genai/types.py while preserving the list[pydantic.BaseModel] support in the parsed field type annotation.
2 parents 7001987 + 4b855e6 commit 12e18cc

File tree

186 files changed

+122733
-67931
lines changed

Some content is hidden

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

186 files changed

+122733
-67931
lines changed

.github/workflows/import.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
16+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
1717

1818
steps:
1919
- name: Checkout repository

.github/workflows/mypy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
17+
python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
1818

1919
steps:
2020
- name: Checkout code
@@ -29,7 +29,8 @@ jobs:
2929
run: |
3030
python -m pip install --upgrade pip
3131
pip install mypy
32+
sudo apt-get update && sudo apt-get install -y libjpeg-dev zlib1g-dev
3233
pip install -r requirements.txt
3334
3435
- name: Run mypy ${{ matrix.python-version }}
35-
run: mypy google/genai/ --strict --config-file=google/genai/mypy.ini
36+
run: mypy google/genai/

.github/workflows/stale.yml

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
2-
#
3-
# You can adjust the behavior by modifying this file.
4-
# For more information, see:
5-
# https://github.com/actions/stale
6-
name: Mark stale issues and pull requests
1+
# This workflow warns and then closes issues that have had no activity for a specified amount of time.
2+
name: Mark and close stale issues
73

84
on:
95
schedule:
@@ -16,33 +12,22 @@ jobs:
1612
runs-on: ubuntu-latest
1713
permissions:
1814
issues: write
19-
pull-requests: write
2015

2116
steps:
2217
- uses: actions/stale@v5
2318
with:
2419
repo-token: ${{ secrets.GITHUB_TOKEN }}
25-
days-before-issue-stale: 14
26-
days-before-issue-close: 14
20+
days-before-issue-stale: 7
21+
days-before-issue-close: 2
2722
stale-issue-label: "status:stale"
2823
close-issue-reason: not_planned
29-
any-of-labels: "status:awaiting user response,status:more data needed"
24+
any-of-labels: "status:awaiting user response"
25+
remove-stale-when-updated: true
26+
labels-to-remove-when-unstale: 'status:awaiting user response,status:stale'
3027
stale-issue-message: >
31-
Marking this issue as stale since it has been open for 14 days with no activity.
32-
This issue will be closed if no further activity occurs.
28+
This issue has been marked as stale because it has been open for 7 days with no activity. It will be closed in 2 days if no further activity occurs.
3329
close-issue-message: >
34-
This issue was closed because it has been inactive for 28 days.
30+
This issue was closed because it has been inactive for 9 days.
3531
Please post a new issue if you need further assistance. Thanks!
36-
days-before-pr-stale: 14
37-
days-before-pr-close: 14
38-
stale-pr-label: "status:stale"
39-
stale-pr-message: >
40-
Marking this pull request as stale since it has been open for 14 days with no activity.
41-
This PR will be closed if no further activity occurs.
42-
close-pr-message: >
43-
This pull request was closed because it has been inactive for 28 days.
44-
Please open a new pull request if you need further assistance. Thanks!
4532
# Label that can be assigned to issues to exclude them from being marked as stale
4633
exempt-issue-labels: 'override-stale'
47-
# Label that can be assigned to PRs to exclude them from being marked as stale
48-
exempt-pr-labels: "override-stale"

CHANGELOG.md

Lines changed: 595 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)