test: cover inline data metadata on session reloads

PiperOrigin-RevId: 1008101726

Author: google-genai-bot

core/src/test/java/com/google/adk/sessions/SessionJsonConverterTest.java

@@ -744,7 +744,8 @@ public void convertEventToJson_thenFromApiEvent_roundTripsWholeEvent() throws Ex
   }
 
   @Test
-  public void convertEventToJson_thenFromApiEvent_roundTripsInlineBytes() throws Exception {
+  public void convertEventToJson_thenFromApiEventWithoutTypedContent_readsInlineDataFromRawEvent()
+      throws Exception {
     byte[] data = {(byte) 0xfb, (byte) 0xff, 0x01};
     Event event =
         Event.builder()
@@ -753,9 +754,12 @@ public void convertEventToJson_thenFromApiEvent_roundTripsInlineBytes() throws E
             .timestamp(1_700_000_000_123L)
             .content(Content.fromParts(Part.fromBytes(data, "image/png")))
             .build();
+    Map<String, Object> storedEvent = asStoredEvent(event);
+    // Without the typed content, only rawEvent can supply the bytes and MIME type.
+    storedEvent.remove("content");
 
     Blob reloaded =
-        SessionJsonConverter.fromApiEvent(asStoredEvent(event))
+        SessionJsonConverter.fromApiEvent(storedEvent)
             .content()
             .get()
             .parts()
@@ -765,10 +769,41 @@ public void convertEventToJson_thenFromApiEvent_roundTripsInlineBytes() throws E
             .get();
 
     assertThat(reloaded.data().get()).isEqualTo(data);
-    // Only rawEvent keeps the MIME type, so this proves the bytes came from it.
     assertThat(reloaded.mimeType()).hasValue("image/png");
   }
 
+  @Test
+  public void convertEventToJson_thenFromApiEventWithoutRawEvent_keepsInlineData()
+      throws Exception {
+    byte[] data = {(byte) 0xfb, (byte) 0xff, 0x01};
+    Blob inlineData =
+        Blob.builder().data(data).mimeType("image/png").displayName("cat.png").build();
+    Event event =
+        Event.builder()
+            .author("user")
+            .invocationId("inv-1")
+            .timestamp(1_700_000_000_123L)
+            .content(Content.fromParts(Part.builder().inlineData(inlineData).build()))
+            .build();
+    Map<String, Object> storedEvent = asStoredEvent(event);
+    // An event stored without rawEvent reloads from the typed fields.
+    storedEvent.remove("rawEvent");
+
+    Blob reloaded =
+        SessionJsonConverter.fromApiEvent(storedEvent)
+            .content()
+            .get()
+            .parts()
+            .get()
+            .get(0)
+            .inlineData()
+            .get();
+
+    assertThat(reloaded.data().get()).isEqualTo(data);
+    assertThat(reloaded.mimeType()).hasValue("image/png");
+    assertThat(reloaded.displayName()).hasValue("cat.png");
+  }
+
   @Test
   public void fromApiEvent_pythonWrittenRawEvent_readsFieldsJavaModels() {
     // As Python ADK dumps it: float seconds, URL-safe base64 and keys Java does not model.

core/src/test/java/com/google/adk/sessions/SessionUtilsTest.java

@@ -17,77 +17,61 @@
 package com.google.adk.sessions;
 
 import static com.google.common.truth.Truth.assertThat;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.adk.JsonBaseModel;
-import com.google.adk.events.Event;
 import com.google.genai.types.Blob;
 import com.google.genai.types.Content;
 import com.google.genai.types.Part;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
+import java.util.Base64;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
 public class SessionUtilsTest {
 
-  private static final ObjectMapper objectMapper = JsonBaseModel.getMapper();
-  private static final byte[] PAYLOAD = "payload".getBytes(StandardCharsets.UTF_8);
+  private static final byte[] payload = "payload".getBytes(UTF_8);
 
-  private static Content contentWithInlineData() {
+  private static Content contentWithInlineData(byte[] data) {
     return Content.builder()
         .role("user")
         .parts(
             Part.builder()
-                .inlineData(Blob.builder().mimeType("image/png").data(PAYLOAD).build())
+                .inlineData(
+                    Blob.builder().mimeType("image/png").displayName("cat.png").data(data).build())
                 .build())
         .build();
   }
 
   @Test
-  public void encodeContent_inlineData_preservesMimeType() {
-    Content encoded = SessionUtils.encodeContent(contentWithInlineData());
+  public void encodeContent_inlineData_encodesDataAndKeepsMetadata() {
+    Content encoded = SessionUtils.encodeContent(contentWithInlineData(payload));
 
-    Blob encodedBlob = encoded.parts().get().get(0).inlineData().get();
-    assertThat(encodedBlob.mimeType()).hasValue("image/png");
+    Blob blob = encoded.parts().get().get(0).inlineData().get();
+    assertThat(Base64.getDecoder().decode(blob.data().get())).isEqualTo(payload);
+    assertThat(blob.mimeType()).hasValue("image/png");
+    assertThat(blob.displayName()).hasValue("cat.png");
   }
 
   @Test
-  public void decodeContent_inlineData_preservesMimeType() {
-    Content decoded = SessionUtils.decodeContent(contentWithInlineData());
+  public void decodeContent_base64InlineData_decodesDataAndKeepsMetadata() {
+    Content decoded =
+        SessionUtils.decodeContent(contentWithInlineData(Base64.getEncoder().encode(payload)));
 
-    Blob decodedBlob = decoded.parts().get().get(0).inlineData().get();
-    assertThat(decodedBlob.mimeType()).hasValue("image/png");
+    Blob blob = decoded.parts().get().get(0).inlineData().get();
+    assertThat(blob.data().get()).isEqualTo(payload);
+    assertThat(blob.mimeType()).hasValue("image/png");
+    assertThat(blob.displayName()).hasValue("cat.png");
   }
 
   @Test
   public void decodeContent_encodeContent_roundTripsInlineData() {
     Content roundTripped =
-        SessionUtils.decodeContent(SessionUtils.encodeContent(contentWithInlineData()));
+        SessionUtils.decodeContent(SessionUtils.encodeContent(contentWithInlineData(payload)));
 
     Blob blob = roundTripped.parts().get().get(0).inlineData().get();
+    assertThat(blob.data().get()).isEqualTo(payload);
     assertThat(blob.mimeType()).hasValue("image/png");
-    assertThat(blob.data().get()).isEqualTo(PAYLOAD);
-  }
-
-  /** The MIME type has to survive the JSON the Vertex AI Sessions API stores the event in. */
-  @Test
-  public void convertEventToJson_inlineData_persistsMimeType() throws Exception {
-    Event event =
-        Event.builder()
-            .author("user")
-            .invocationId("inv-123")
-            .timestamp(Instant.parse("2023-01-01T00:00:00Z").toEpochMilli())
-            .content(contentWithInlineData())
-            .build();
-
-    JsonNode jsonNode = objectMapper.readTree(SessionJsonConverter.convertEventToJson(event));
-
-    JsonNode inlineData = jsonNode.get("content").get("parts").get(0).get("inlineData");
-    assertThat(inlineData.has("mimeType")).isTrue();
-    assertThat(inlineData.get("mimeType").asText()).isEqualTo("image/png");
+    assertThat(blob.displayName()).hasValue("cat.png");
   }
 }