Fix a bug in SessionUtils that filtered out all previous events in chats for Vertex stored sessions.

google-genai-bot · copybara-github · commit 06529d2d69e0 · 2025-06-10T04:24:31.000-07:00
PiperOrigin-RevId: 769565534
diff --git a/core/src/main/java/com/google/adk/sessions/SessionUtils.java b/core/src/main/java/com/google/adk/sessions/SessionUtils.java
@@ -52,7 +52,7 @@ public static Content encodeContent(Content content) {
         encodedParts.add(part);
       }
     }
-    return Content.builder().parts(encodedParts).build();
+    return toContent(encodedParts, content.role());
   }
 
   public static Content decodeContent(Content content) {
@@ -77,6 +77,12 @@ public static Content decodeContent(Content content) {
         decodedParts.add(part);
       }
     }
-    return Content.builder().parts(decodedParts).build();
+    return toContent(decodedParts, content.role());
+  }
+
+  private static Content toContent(List<Part> parts, Optional<String> role) {
+    Content.Builder contentBuilder = Content.builder().parts(parts);
+    role.ifPresent(contentBuilder::role);
+    return contentBuilder.build();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static Content encodeContent(Content content) {`
`52`	`52`	`encodedParts.add(part);`
`53`	`53`	`}`
`54`	`54`	`}`
`55`		`- return Content.builder().parts(encodedParts).build();`
	`55`	`+ return toContent(encodedParts, content.role());`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public static Content decodeContent(Content content) {`
`@@ -77,6 +77,12 @@ public static Content decodeContent(Content content) {`
`77`	`77`	`decodedParts.add(part);`
`78`	`78`	`}`
`79`	`79`	`}`
`80`		`- return Content.builder().parts(decodedParts).build();`
	`80`	`+ return toContent(decodedParts, content.role());`
	`81`	`+ }`
	`82`	`+`
	`83`	`+ private static Content toContent(List<Part> parts, Optional<String> role) {`
	`84`	`+ Content.Builder contentBuilder = Content.builder().parts(parts);`
	`85`	`+ role.ifPresent(contentBuilder::role);`
	`86`	`+ return contentBuilder.build();`
`81`	`87`	`}`
`82`	`88`	`}`