fix(sdk): let interactions.get(id) omit stream query param when stream=None (#2661)

google/genai/_gaos/google_genai.py

@@ -294,15 +294,19 @@ def get(
             api_version: Optional[str] = None,
             include_input: Any = None,
             last_event_id: Any = None,
-            stream: Any = False,
+            stream: Optional[bool] = None,
             extra_headers: Optional[Mapping[str, str]] = None,
             extra_query: Optional[Mapping[str, Any]] = None,
             timeout: Optional[Union[float, httpx.Timeout]] = None,
         ) -> Union[
             interactions.Interaction,
             eventstreaming.Stream[interactions.InteractionSSEEvent],
         ]:
-            stream_bool = bool(_optional_bool(stream, default=False))
+            # Preserve the caller's stream value (None → not sent) so callers
+            # can opt out of serializing 'stream' on the wire. The earlier
+            # bool(...) wrapper collapsed None to False and forced serialization.
+            # Fix for #2661.
+            stream_bool = _optional_bool(stream, default=None)
             response = wrap_sdk_call(
                 super().get,
                 id=id,
@@ -446,15 +450,19 @@ async def get(
             api_version: Optional[str] = None,
             include_input: Any = None,
             last_event_id: Any = None,
-            stream: Any = False,
+            stream: Optional[bool] = None,
             extra_headers: Optional[Mapping[str, str]] = None,
             extra_query: Optional[Mapping[str, Any]] = None,
             timeout: Optional[Union[float, httpx.Timeout]] = None,
         ) -> Union[
             interactions.Interaction,
             eventstreaming.AsyncStream[interactions.InteractionSSEEvent],
         ]:
-            stream_bool = bool(_optional_bool(stream, default=False))
+            # Preserve the caller's stream value (None → not sent) so callers
+            # can opt out of serializing 'stream' on the wire. The earlier
+            # bool(...) wrapper collapsed None to False and forced serialization.
+            # Fix for #2661.
+            stream_bool = _optional_bool(stream, default=None)
             response = await async_wrap_sdk_call(
                 super().get,
                 id=id,
@@ -941,6 +949,20 @@ def _is_step_block(value: dict[str, Any]) -> bool:
 
 
 def _optional_bool(value: Any, default: Optional[bool] = None) -> Optional[bool]:
+    """Coerce a value to a bool-or-None, preserving None as 'omit'.
+
+    Pre-fix semantics: any non-bool input (including None) was collapsed to
+    the ``default``. That defeated callers who wanted to opt out of
+    serializing an Optional query param by passing ``stream=None`` — the
+    None was forced to False and shipped as ``?stream=false``.
+
+    Fix #2661: explicitly distinguish None (preserve as None → "omit this
+    query param") from "no argument supplied" (use default). A None input
+    now returns None regardless of the default; only falsy-but-defined
+    values like 0 or "" continue to be coerced via the default.
+    """
+    if value is None:
+        return None
     if isinstance(value, bool):
         return value
     return default

google/genai/_gaos/interactions.py

@@ -828,7 +828,7 @@ def get(
         self,
         id: str,
         *,
-        stream: Optional[bool] = False,
+        stream: Optional[bool] = None,
         last_event_id: Optional[str] = None,
         include_input: Optional[bool] = False,
         api_version: Optional[str] = None,
@@ -2255,7 +2255,7 @@ async def get(
         self,
         id: str,
         *,
-        stream: Optional[bool] = False,
+        stream: Optional[bool] = None,
         last_event_id: Optional[str] = None,
         include_input: Optional[bool] = False,
         api_version: Optional[str] = None,

google/genai/_gaos/utils/values.py

@@ -144,6 +144,12 @@ def _get_serialized_params(
 
     serialization = metadata.serialization
     if serialization == "json":
+        # Skip None: serialize None would marshal to "null", which the
+        # query-string layer ships as e.g. "?stream=null". For Optional
+        # query params, callers use None to mean "omit this parameter
+        # from the wire" — see #2661.
+        if obj is None:
+            return params
         params[field_name] = marshal_json(obj, typ)
 
     return params

google/genai/batches.py

@@ -2164,7 +2164,7 @@ def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -2264,7 +2264,7 @@ def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -2794,7 +2794,7 @@ async def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -2894,7 +2894,7 @@ async def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value

google/genai/caches.py

@@ -1419,7 +1419,7 @@ def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1579,7 +1579,7 @@ def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1880,7 +1880,7 @@ async def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -2042,7 +2042,7 @@ async def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value

google/genai/files.py

@@ -244,7 +244,7 @@ def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -491,7 +491,7 @@ def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -862,7 +862,7 @@ async def _list(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1111,7 +1111,7 @@ async def delete(
         else {},
     )
     return_value.sdk_http_response = types.HttpResponse(
-        headers=response.headers
+        headers=response.headers, body=response.body
     )
     self._api_client._verify_response(return_value)
     return return_value