Commit 12e18cc
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.186 files changed
Lines changed: 122733 additions & 67931 deletions
File tree
- .github/workflows
- docs
- _sources
- _static
- scripts
- styles
- google/genai
- tests
- afc
- batches
- caches
- chats
- client
- common
- data
- file_search_stores
- files
- live
- local_tokenizer
- models
- operations
- tokens
- transformers
- tunings
- types
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | | - | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
| 32 | + | |
32 | 33 | | |
33 | 34 | | |
34 | 35 | | |
35 | | - | |
| 36 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | | - | |
| 1 | + | |
| 2 | + | |
7 | 3 | | |
8 | 4 | | |
9 | 5 | | |
| |||
16 | 12 | | |
17 | 13 | | |
18 | 14 | | |
19 | | - | |
20 | 15 | | |
21 | 16 | | |
22 | 17 | | |
23 | 18 | | |
24 | 19 | | |
25 | | - | |
26 | | - | |
| 20 | + | |
| 21 | + | |
27 | 22 | | |
28 | 23 | | |
29 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
30 | 27 | | |
31 | | - | |
32 | | - | |
| 28 | + | |
33 | 29 | | |
34 | | - | |
| 30 | + | |
35 | 31 | | |
36 | | - | |
37 | | - | |
38 | | - | |
39 | | - | |
40 | | - | |
41 | | - | |
42 | | - | |
43 | | - | |
44 | | - | |
45 | 32 | | |
46 | 33 | | |
47 | | - | |
48 | | - | |
Large diffs are not rendered by default.
0 commit comments