Skip to content

Commit 1b03909

Browse files
hkt74copybara-github
authored andcommitted
fix: Breaking change for Interactions, rename ContentDelta unions.
PiperOrigin-RevId: 883221998
1 parent 3442105 commit 1b03909

1 file changed

Lines changed: 79 additions & 81 deletions

File tree

google/genai/_interactions/types/content_delta.py

Lines changed: 79 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -32,37 +32,37 @@
3232
__all__ = [
3333
"ContentDelta",
3434
"Delta",
35-
"DeltaTextDelta",
36-
"DeltaImageDelta",
37-
"DeltaAudioDelta",
38-
"DeltaDocumentDelta",
39-
"DeltaVideoDelta",
40-
"DeltaThoughtSummaryDelta",
41-
"DeltaThoughtSummaryDeltaContent",
42-
"DeltaThoughtSignatureDelta",
43-
"DeltaFunctionCallDelta",
44-
"DeltaFunctionResultDelta",
45-
"DeltaFunctionResultDeltaResult",
46-
"DeltaFunctionResultDeltaResultItems",
47-
"DeltaFunctionResultDeltaResultItemsItem",
48-
"DeltaCodeExecutionCallDelta",
49-
"DeltaCodeExecutionResultDelta",
50-
"DeltaURLContextCallDelta",
51-
"DeltaURLContextResultDelta",
52-
"DeltaGoogleSearchCallDelta",
53-
"DeltaGoogleSearchResultDelta",
54-
"DeltaMCPServerToolCallDelta",
55-
"DeltaMCPServerToolResultDelta",
56-
"DeltaMCPServerToolResultDeltaResult",
57-
"DeltaMCPServerToolResultDeltaResultItems",
58-
"DeltaMCPServerToolResultDeltaResultItemsItem",
59-
"DeltaFileSearchCallDelta",
60-
"DeltaFileSearchResultDelta",
61-
"DeltaFileSearchResultDeltaResult",
35+
"DeltaText",
36+
"DeltaImage",
37+
"DeltaAudio",
38+
"DeltaDocument",
39+
"DeltaVideo",
40+
"DeltaThoughtSummary",
41+
"DeltaThoughtSummaryContent",
42+
"DeltaThoughtSignature",
43+
"DeltaFunctionCall",
44+
"DeltaFunctionResult",
45+
"DeltaFunctionResultResult",
46+
"DeltaFunctionResultResultItems",
47+
"DeltaFunctionResultResultItemsItem",
48+
"DeltaCodeExecutionCall",
49+
"DeltaCodeExecutionResult",
50+
"DeltaURLContextCall",
51+
"DeltaURLContextResult",
52+
"DeltaGoogleSearchCall",
53+
"DeltaGoogleSearchResult",
54+
"DeltaMCPServerToolCall",
55+
"DeltaMCPServerToolResult",
56+
"DeltaMCPServerToolResultResult",
57+
"DeltaMCPServerToolResultResultItems",
58+
"DeltaMCPServerToolResultResultItemsItem",
59+
"DeltaFileSearchCall",
60+
"DeltaFileSearchResult",
61+
"DeltaFileSearchResultResult",
6262
]
6363

6464

65-
class DeltaTextDelta(BaseModel):
65+
class DeltaText(BaseModel):
6666
text: str
6767

6868
type: Literal["text"]
@@ -71,7 +71,7 @@ class DeltaTextDelta(BaseModel):
7171
"""Citation information for model-generated content."""
7272

7373

74-
class DeltaImageDelta(BaseModel):
74+
class DeltaImage(BaseModel):
7575
type: Literal["image"]
7676

7777
data: Optional[str] = None
@@ -84,7 +84,7 @@ class DeltaImageDelta(BaseModel):
8484
uri: Optional[str] = None
8585

8686

87-
class DeltaAudioDelta(BaseModel):
87+
class DeltaAudio(BaseModel):
8888
type: Literal["audio"]
8989

9090
data: Optional[str] = None
@@ -94,7 +94,7 @@ class DeltaAudioDelta(BaseModel):
9494
uri: Optional[str] = None
9595

9696

97-
class DeltaDocumentDelta(BaseModel):
97+
class DeltaDocument(BaseModel):
9898
type: Literal["document"]
9999

100100
data: Optional[str] = None
@@ -104,7 +104,7 @@ class DeltaDocumentDelta(BaseModel):
104104
uri: Optional[str] = None
105105

106106

107-
class DeltaVideoDelta(BaseModel):
107+
class DeltaVideo(BaseModel):
108108
type: Literal["video"]
109109

110110
data: Optional[str] = None
@@ -129,26 +129,24 @@ class DeltaVideoDelta(BaseModel):
129129
uri: Optional[str] = None
130130

131131

132-
DeltaThoughtSummaryDeltaContent: TypeAlias = Annotated[
133-
Union[TextContent, ImageContent], PropertyInfo(discriminator="type")
134-
]
132+
DeltaThoughtSummaryContent: TypeAlias = Annotated[Union[TextContent, ImageContent], PropertyInfo(discriminator="type")]
135133

136134

137-
class DeltaThoughtSummaryDelta(BaseModel):
135+
class DeltaThoughtSummary(BaseModel):
138136
type: Literal["thought_summary"]
139137

140-
content: Optional[DeltaThoughtSummaryDeltaContent] = None
138+
content: Optional[DeltaThoughtSummaryContent] = None
141139
"""A new summary item to be added to the thought."""
142140

143141

144-
class DeltaThoughtSignatureDelta(BaseModel):
142+
class DeltaThoughtSignature(BaseModel):
145143
type: Literal["thought_signature"]
146144

147145
signature: Optional[str] = None
148146
"""Signature to match the backend source to be part of the generation."""
149147

150148

151-
class DeltaFunctionCallDelta(BaseModel):
149+
class DeltaFunctionCall(BaseModel):
152150
id: str
153151
"""A unique ID for this specific tool call."""
154152

@@ -159,21 +157,21 @@ class DeltaFunctionCallDelta(BaseModel):
159157
type: Literal["function_call"]
160158

161159

162-
DeltaFunctionResultDeltaResultItemsItem: TypeAlias = Union[TextContent, ImageContent]
160+
DeltaFunctionResultResultItemsItem: TypeAlias = Union[TextContent, ImageContent]
163161

164162

165-
class DeltaFunctionResultDeltaResultItems(BaseModel):
166-
items: Optional[List[DeltaFunctionResultDeltaResultItemsItem]] = None
163+
class DeltaFunctionResultResultItems(BaseModel):
164+
items: Optional[List[DeltaFunctionResultResultItemsItem]] = None
167165

168166

169-
DeltaFunctionResultDeltaResult: TypeAlias = Union[DeltaFunctionResultDeltaResultItems, str, object]
167+
DeltaFunctionResultResult: TypeAlias = Union[DeltaFunctionResultResultItems, str, object]
170168

171169

172-
class DeltaFunctionResultDelta(BaseModel):
170+
class DeltaFunctionResult(BaseModel):
173171
call_id: str
174172
"""ID to match the ID from the function call block."""
175173

176-
result: DeltaFunctionResultDeltaResult
174+
result: DeltaFunctionResultResult
177175
"""Tool call result delta."""
178176

179177
type: Literal["function_result"]
@@ -186,7 +184,7 @@ class DeltaFunctionResultDelta(BaseModel):
186184
"""A signature hash for backend validation."""
187185

188186

189-
class DeltaCodeExecutionCallDelta(BaseModel):
187+
class DeltaCodeExecutionCall(BaseModel):
190188
id: str
191189
"""A unique ID for this specific tool call."""
192190

@@ -196,7 +194,7 @@ class DeltaCodeExecutionCallDelta(BaseModel):
196194
type: Literal["code_execution_call"]
197195

198196

199-
class DeltaCodeExecutionResultDelta(BaseModel):
197+
class DeltaCodeExecutionResult(BaseModel):
200198
call_id: str
201199
"""ID to match the ID from the function call block."""
202200

@@ -210,7 +208,7 @@ class DeltaCodeExecutionResultDelta(BaseModel):
210208
"""A signature hash for backend validation."""
211209

212210

213-
class DeltaURLContextCallDelta(BaseModel):
211+
class DeltaURLContextCall(BaseModel):
214212
id: str
215213
"""A unique ID for this specific tool call."""
216214

@@ -220,7 +218,7 @@ class DeltaURLContextCallDelta(BaseModel):
220218
type: Literal["url_context_call"]
221219

222220

223-
class DeltaURLContextResultDelta(BaseModel):
221+
class DeltaURLContextResult(BaseModel):
224222
call_id: str
225223
"""ID to match the ID from the function call block."""
226224

@@ -234,7 +232,7 @@ class DeltaURLContextResultDelta(BaseModel):
234232
"""A signature hash for backend validation."""
235233

236234

237-
class DeltaGoogleSearchCallDelta(BaseModel):
235+
class DeltaGoogleSearchCall(BaseModel):
238236
id: str
239237
"""A unique ID for this specific tool call."""
240238

@@ -244,7 +242,7 @@ class DeltaGoogleSearchCallDelta(BaseModel):
244242
type: Literal["google_search_call"]
245243

246244

247-
class DeltaGoogleSearchResultDelta(BaseModel):
245+
class DeltaGoogleSearchResult(BaseModel):
248246
call_id: str
249247
"""ID to match the ID from the function call block."""
250248

@@ -258,7 +256,7 @@ class DeltaGoogleSearchResultDelta(BaseModel):
258256
"""A signature hash for backend validation."""
259257

260258

261-
class DeltaMCPServerToolCallDelta(BaseModel):
259+
class DeltaMCPServerToolCall(BaseModel):
262260
id: str
263261
"""A unique ID for this specific tool call."""
264262

@@ -271,21 +269,21 @@ class DeltaMCPServerToolCallDelta(BaseModel):
271269
type: Literal["mcp_server_tool_call"]
272270

273271

274-
DeltaMCPServerToolResultDeltaResultItemsItem: TypeAlias = Union[TextContent, ImageContent]
272+
DeltaMCPServerToolResultResultItemsItem: TypeAlias = Union[TextContent, ImageContent]
275273

276274

277-
class DeltaMCPServerToolResultDeltaResultItems(BaseModel):
278-
items: Optional[List[DeltaMCPServerToolResultDeltaResultItemsItem]] = None
275+
class DeltaMCPServerToolResultResultItems(BaseModel):
276+
items: Optional[List[DeltaMCPServerToolResultResultItemsItem]] = None
279277

280278

281-
DeltaMCPServerToolResultDeltaResult: TypeAlias = Union[DeltaMCPServerToolResultDeltaResultItems, str, object]
279+
DeltaMCPServerToolResultResult: TypeAlias = Union[DeltaMCPServerToolResultResultItems, str, object]
282280

283281

284-
class DeltaMCPServerToolResultDelta(BaseModel):
282+
class DeltaMCPServerToolResult(BaseModel):
285283
call_id: str
286284
"""ID to match the ID from the function call block."""
287285

288-
result: DeltaMCPServerToolResultDeltaResult
286+
result: DeltaMCPServerToolResultResult
289287
"""Tool call result delta."""
290288

291289
type: Literal["mcp_server_tool_result"]
@@ -298,14 +296,14 @@ class DeltaMCPServerToolResultDelta(BaseModel):
298296
"""A signature hash for backend validation."""
299297

300298

301-
class DeltaFileSearchCallDelta(BaseModel):
299+
class DeltaFileSearchCall(BaseModel):
302300
id: str
303301
"""A unique ID for this specific tool call."""
304302

305303
type: Literal["file_search_call"]
306304

307305

308-
class DeltaFileSearchResultDeltaResult(BaseModel):
306+
class DeltaFileSearchResultResult(BaseModel):
309307
"""The result of the File Search."""
310308

311309
file_search_store: Optional[str] = None
@@ -318,39 +316,39 @@ class DeltaFileSearchResultDeltaResult(BaseModel):
318316
"""The title of the search result."""
319317

320318

321-
class DeltaFileSearchResultDelta(BaseModel):
319+
class DeltaFileSearchResult(BaseModel):
322320
call_id: str
323321
"""ID to match the ID from the function call block."""
324322

325323
type: Literal["file_search_result"]
326324

327-
result: Optional[List[DeltaFileSearchResultDeltaResult]] = None
325+
result: Optional[List[DeltaFileSearchResultResult]] = None
328326

329327
signature: Optional[str] = None
330328
"""A signature hash for backend validation."""
331329

332330

333331
Delta: TypeAlias = Annotated[
334332
Union[
335-
DeltaTextDelta,
336-
DeltaImageDelta,
337-
DeltaAudioDelta,
338-
DeltaDocumentDelta,
339-
DeltaVideoDelta,
340-
DeltaThoughtSummaryDelta,
341-
DeltaThoughtSignatureDelta,
342-
DeltaFunctionCallDelta,
343-
DeltaFunctionResultDelta,
344-
DeltaCodeExecutionCallDelta,
345-
DeltaCodeExecutionResultDelta,
346-
DeltaURLContextCallDelta,
347-
DeltaURLContextResultDelta,
348-
DeltaGoogleSearchCallDelta,
349-
DeltaGoogleSearchResultDelta,
350-
DeltaMCPServerToolCallDelta,
351-
DeltaMCPServerToolResultDelta,
352-
DeltaFileSearchCallDelta,
353-
DeltaFileSearchResultDelta,
333+
DeltaText,
334+
DeltaImage,
335+
DeltaAudio,
336+
DeltaDocument,
337+
DeltaVideo,
338+
DeltaThoughtSummary,
339+
DeltaThoughtSignature,
340+
DeltaFunctionCall,
341+
DeltaFunctionResult,
342+
DeltaCodeExecutionCall,
343+
DeltaCodeExecutionResult,
344+
DeltaURLContextCall,
345+
DeltaURLContextResult,
346+
DeltaGoogleSearchCall,
347+
DeltaGoogleSearchResult,
348+
DeltaMCPServerToolCall,
349+
DeltaMCPServerToolResult,
350+
DeltaFileSearchCall,
351+
DeltaFileSearchResult,
354352
],
355353
PropertyInfo(discriminator="type"),
356354
]

0 commit comments

Comments
 (0)