Skip to content

Commit 16a29c9

Browse files
MarkDaoustcopybara-github
authored andcommitted
feat: Add store to GenerateContentConfig (Gemini Developer API only) and labels to LiveConnectConfig.
PiperOrigin-RevId: 1005110886
1 parent adbc79c commit 16a29c9

7 files changed

Lines changed: 94 additions & 0 deletions

File tree

‎google/genai/_live_converters.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,9 @@ def _LiveConnectConfig_to_mldev(
975975
),
976976
)
977977

978+
if getv(from_object, ['labels']) is not None:
979+
setv(parent_object, ['setup', 'labels'], getv(from_object, ['labels']))
980+
978981
return to_object
979982

980983

@@ -1165,6 +1168,9 @@ def _LiveConnectConfig_to_vertex(
11651168
),
11661169
)
11671170

1171+
if getv(from_object, ['labels']) is not None:
1172+
setv(parent_object, ['setup', 'labels'], getv(from_object, ['labels']))
1173+
11681174
return to_object
11691175

11701176

‎google/genai/_tokens_converters.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,9 @@ def _LiveConnectConfig_to_mldev(
431431
),
432432
)
433433

434+
if getv(from_object, ['labels']) is not None:
435+
setv(parent_object, ['setup', 'labels'], getv(from_object, ['labels']))
436+
434437
return to_object
435438

436439

‎google/genai/batches.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,9 @@ def _GenerateContentConfig_to_mldev(
11661166
' Enterprise Agent Platform mode, not in Gemini Developer API mode.'
11671167
)
11681168

1169+
if getv(from_object, ['store']) is not None:
1170+
setv(parent_object, ['store'], getv(from_object, ['store']))
1171+
11691172
return to_object
11701173

11711174

‎google/genai/models.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,6 +1355,9 @@ def _GenerateContentConfig_to_mldev(
13551355
' Enterprise Agent Platform mode, not in Gemini Developer API mode.'
13561356
)
13571357

1358+
if getv(from_object, ['store']) is not None:
1359+
setv(parent_object, ['store'], getv(from_object, ['store']))
1360+
13581361
return to_object
13591362

13601363

@@ -1566,6 +1569,12 @@ def _GenerateContentConfig_to_vertex(
15661569
getv(from_object, ['generation_output_config']),
15671570
)
15681571

1572+
if getv(from_object, ['store']) is not None:
1573+
raise ValueError(
1574+
'store parameter is only supported in Gemini Developer API mode, not in'
1575+
' Gemini Enterprise Agent Platform mode.'
1576+
)
1577+
15691578
return to_object
15701579

15711580

‎google/genai/tests/live/test_live.py‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1778,6 +1778,46 @@ async def test_bidi_setup_to_api_with_translation_config(vertexai):
17781778
assert result == expected_result
17791779

17801780

1781+
@pytest.mark.parametrize('vertexai', [True, False])
1782+
@pytest.mark.asyncio
1783+
async def test_bidi_setup_to_api_with_labels(vertexai):
1784+
api_client = mock_api_client(vertexai=vertexai)
1785+
1786+
if vertexai:
1787+
expected_result = {
1788+
'setup': {
1789+
'model': (
1790+
'projects/test_project/locations/us-central1/publishers/google/models/test_model'
1791+
),
1792+
'generationConfig': {'responseModalities': ['AUDIO']},
1793+
'labels': {'team': 'sdk'},
1794+
}
1795+
}
1796+
else:
1797+
expected_result = {
1798+
'setup': {
1799+
'model': 'models/test_model',
1800+
'labels': {'team': 'sdk'},
1801+
}
1802+
}
1803+
1804+
# Config defined using dict representation.
1805+
result = await get_connect_message(
1806+
api_client=api_client,
1807+
model='test_model',
1808+
config={'labels': {'team': 'sdk'}},
1809+
)
1810+
assert result == expected_result
1811+
1812+
# Config defined using types.LiveConnectConfig.
1813+
result = await get_connect_message(
1814+
api_client=api_client,
1815+
model='test_model',
1816+
config=types.LiveConnectConfig(labels={'team': 'sdk'}),
1817+
)
1818+
assert result == expected_result
1819+
1820+
17811821
@pytest.mark.parametrize('vertexai', [True, False])
17821822
def test_parse_client_message_str( mock_websocket, vertexai):
17831823
session = live.AsyncSession(

‎google/genai/tests/models/test_generate_content.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,17 @@ class InstrumentEnum(Enum):
593593
),
594594
exception_if_vertex='400',
595595
),
596+
pytest_helper.TestTableItem(
597+
name='test_store',
598+
parameters=types._GenerateContentParameters(
599+
model='gemini-3.8-flash',
600+
contents=t.t_contents('What is your name?'),
601+
config={
602+
'store': True,
603+
},
604+
),
605+
exception_if_vertex='only supported in Gemini Developer API mode',
606+
),
596607
pytest_helper.TestTableItem(
597608
name='test_audio_transcription_config',
598609
parameters=types._GenerateContentParameters(

‎google/genai/types.py‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6793,6 +6793,13 @@ class GenerateContentConfig(_common.BaseModel):
67936793
storage.
67946794
""",
67956795
)
6796+
store: Optional[bool] = Field(
6797+
default=None,
6798+
description="""Configures the logging behavior for a given request. If set, it
6799+
takes precedence over the project-level logging config. This field is not
6800+
supported in Gemini Enterprise Agent Platform.
6801+
""",
6802+
)
67966803

67976804
@pydantic.field_validator('response_schema', mode='before')
67986805
@classmethod
@@ -7032,6 +7039,12 @@ class GenerateContentConfigDict(TypedDict, total=False):
70327039
storage.
70337040
"""
70347041

7042+
store: Optional[bool]
7043+
"""Configures the logging behavior for a given request. If set, it
7044+
takes precedence over the project-level logging config. This field is not
7045+
supported in Gemini Enterprise Agent Platform.
7046+
"""
7047+
70357048

70367049
GenerateContentConfigOrDict = Union[
70377050
GenerateContentConfig, GenerateContentConfigDict
@@ -21983,6 +21996,11 @@ class LiveConnectConfig(_common.BaseModel):
2198321996
translation_config: Optional[TranslationConfig] = Field(
2198421997
default=None, description="""Config for translation."""
2198521998
)
21999+
labels: Optional[dict[str, str]] = Field(
22000+
default=None,
22001+
description="""Labels with user-defined metadata for the session. In Gemini
22002+
Enterprise Agent Platform, they are used for billing and reporting.""",
22003+
)
2198622004

2198722005

2198822006
class LiveConnectConfigDict(TypedDict, total=False):
@@ -22104,6 +22122,10 @@ class LiveConnectConfigDict(TypedDict, total=False):
2210422122
translation_config: Optional[TranslationConfigDict]
2210522123
"""Config for translation."""
2210622124

22125+
labels: Optional[dict[str, str]]
22126+
"""Labels with user-defined metadata for the session. In Gemini
22127+
Enterprise Agent Platform, they are used for billing and reporting."""
22128+
2210722129

2210822130
LiveConnectConfigOrDict = Union[LiveConnectConfig, LiveConnectConfigDict]
2210922131

0 commit comments

Comments
 (0)