Skip to content

Preserve compaction fields omitted from streamed deltas #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sylvesterkaczmarek wants to merge 1 commit into from
+136 −2
Closed

Preserve compaction fields omitted from streamed deltas #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions anthropic-java-core/src/main/kotlin/com/anthropic/helpers/BetaMessageAccumulator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,14 @@ class BetaMessageAccumulator private constructor() {
val newCompactionBlock =
oldCompactionBlock
.toBuilder()
.content(compactionDelta.content())
.encryptedContent(compactionDelta.encryptedContent())
.apply {
if (!compactionDelta._content().isMissing()) {
content(compactionDelta.content())
}
if (!compactionDelta._encryptedContent().isMissing()) {
encryptedContent(compactionDelta.encryptedContent())
}
}
.build()

return BetaContentBlock.ofCompaction(newCompactionBlock)
Expand Down
128 changes: 128 additions & 0 deletions anthropic-java-core/src/test/kotlin/com/anthropic/helpers/BetaMessageAccumulatorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import com.anthropic.core.JsonValue
import com.anthropic.core.jsonMapper
import com.anthropic.errors.AnthropicInvalidDataException
import com.anthropic.models.beta.messages.*
import com.anthropic.models.beta.messages.BetaContentBlock
import com.anthropic.models.beta.messages.BetaRawContentBlockStartEvent.ContentBlock
import com.anthropic.models.messages.Model
import com.fasterxml.jackson.databind.JsonNode
Expand Down Expand Up @@ -450,6 +451,133 @@ internal class BetaMessageAccumulatorTest {
.isEqualTo("Summary of the conversation so far.")
}

@Test
fun compactionPartialDeltaPreservesEncryptedMetadata() {
val original =
compactionBlock("original")
.toBuilder()
.encryptedContent("checkpoint")
.signature("signature")
.build()
val result =
BetaMessageAccumulator.mergeCompactionDelta(
BetaContentBlock.ofCompaction(original),
BetaCompactionContentBlockDelta.builder()
.content("updated")
.encryptedContent(NOT_SET)
.build(),
)
.asCompaction()
assertThat(result.content()).contains("updated")
assertThat(result.encryptedContent()).contains("checkpoint")
assertThat(result.signature()).contains("signature")
assertThat(result.toParam().encryptedContent()).contains("checkpoint")
assertThat(original.content()).contains("original")
}

@Test
fun compactionMetadataOnlyDeltaPreservesSummary() {
val result =
BetaMessageAccumulator.mergeCompactionDelta(
BetaContentBlock.ofCompaction(compactionBlock("summary")),
BetaCompactionContentBlockDelta.builder()
.content(NOT_SET)
.encryptedContent("updated-checkpoint")
.build(),
)
.asCompaction()
assertThat(result.content()).contains("summary")
assertThat(result.encryptedContent()).contains("updated-checkpoint")
}

@Test
fun compactionMissingDeltaFieldsRemainMissing() {
val original =
BetaCompactionBlock.builder().content(NOT_SET).encryptedContent(NOT_SET).build()
val result =
BetaMessageAccumulator.mergeCompactionDelta(
BetaContentBlock.ofCompaction(original),
BetaCompactionContentBlockDelta.builder()
.content(NOT_SET)
.encryptedContent(NOT_SET)
.build(),
)
.asCompaction()
assertThat(result._content().isMissing()).isTrue()
assertThat(result._encryptedContent().isMissing()).isTrue()
}

@Test
fun compactionExplicitNullClearsOnlyThePresentField() {
val result =
BetaMessageAccumulator.mergeCompactionDelta(
BetaContentBlock.ofCompaction(
compactionBlock("summary")
.toBuilder()
.encryptedContent("checkpoint")
.build()
),
BetaCompactionContentBlockDelta.builder()
.content(null as String?)
.encryptedContent(NOT_SET)
.build(),
)
.asCompaction()
assertThat(result._content().isNull()).isTrue()
assertThat(result.encryptedContent()).contains("checkpoint")
}

@Test
fun compactionExplicitEmptyAndNullValuesStillReplace() {
val result =
BetaMessageAccumulator.mergeCompactionDelta(
BetaContentBlock.ofCompaction(
compactionBlock("summary")
.toBuilder()
.encryptedContent("checkpoint")
.build()
),
BetaCompactionContentBlockDelta.builder()
.content("")
.encryptedContent(null as String?)
.build(),
)
.asCompaction()
assertThat(result.content()).contains("")
assertThat(result._encryptedContent().isNull()).isTrue()
}

@Test
fun streamedPartialCompactionDeltaKeepsCheckpointForReplay() {
val accumulator = BetaMessageAccumulator.create()
accumulator.accumulate(messageStartEvent())
accumulator.accumulate(compactionContentBlockStartEvent(0L))
accumulator.accumulate(compactionContentBlockDeltaEvent(0L, "summary", "checkpoint"))
accumulator.accumulate(
BetaRawMessageStreamEvent.ofContentBlockDelta(
BetaRawContentBlockDeltaEvent.builder()
.index(0L)
.delta(
BetaRawContentBlockDelta.ofCompaction(
BetaCompactionContentBlockDelta.builder()
.content("updated")
.encryptedContent(NOT_SET)
.build()
)
)
.build()
)
)
accumulator.accumulate(contentBlockStopEvent(0L))
accumulator.accumulate(
messageDeltaEvent(stopReason = JsonField.of(BetaStopReason.END_TURN))
)
accumulator.accumulate(messageStopEvent())
val block = accumulator.message().content().single().asCompaction()
assertThat(block.content()).contains("updated")
assertThat(block.toParam().encryptedContent()).contains("checkpoint")
}

@Test
fun messageNotStarted() {
val accumulator = BetaMessageAccumulator.create()
Expand Down