Skip to content

chore: bump doclling serve testcontainer to 1.35.0 #702

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

Merged
edeandrea merged 2 commits into from
Sep 25, 2026
+16 −5
Merged

chore: bump doclling serve testcontainer to 1.35.0 #702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
076740d
chore: bump doclling serve testcontainer to 1.35.0
edeandrea Sep 24, 2026
2513863
test: ignore image content hash in ZIP artifact entry names
edeandrea Sep 25, 2026
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
19 changes: 15 additions & 4 deletions ...g-serve-client/src/test/java/ai/docling/serve/client/AbstractDoclingServeClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import java.util.TreeSet;
import java.util.concurrent.Flow.Subscriber;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

Expand Down Expand Up @@ -102,6 +103,13 @@
abstract class AbstractDoclingServeClientTests {
private static final Logger LOG = LoggerFactory.getLogger(AbstractDoclingServeClientTests.class);

// docling-serve names extracted images after a hash of their content, which changes whenever the
// rendered image bytes do (e.g. across docling-serve versions), so ZIP entry names are compared
// with the hash replaced by a placeholder.
private static final String IMAGE_HASH_PLACEHOLDER = "<hash>";
private static final Pattern IMAGE_ARTIFACT_HASH = Pattern.compile("(?<=^artifacts/image_\\d{6}_)[0-9a-f]{64}(?=\\.png$)");
private static final String FIRST_IMAGE_ARTIFACT_ENTRY = "artifacts/image_000000_%s.png".formatted(IMAGE_HASH_PLACEHOLDER);

protected static final DoclingServeContainer doclingContainer = new DoclingServeContainer(
DoclingServeContainerConfig.builder()
.image(DoclingServeContainerConfig.DOCLING_IMAGE)
Expand Down Expand Up @@ -462,7 +470,10 @@ static void assertZipArchiveEntries(InputStream inputStream, Set<String> expecte
try (ZipInputStream zipInputStream = new ZipInputStream(inputStream)) {
ZipEntry entry;
while ((entry = zipInputStream.getNextEntry()) != null) {
actualEntries.add(entry.getName());
var normalizedName = IMAGE_ARTIFACT_HASH
.matcher(entry.getName())
.replaceFirst(IMAGE_HASH_PLACEHOLDER);
actualEntries.add(normalizedName);
LOG.info("Found entry in ZIP: {} (size: {} bytes)", entry.getName(), entry.getSize());
zipInputStream.closeEntry();
}
Expand Down Expand Up @@ -1004,7 +1015,7 @@ void shouldConvertSingleFileSourceWithZipTargetAndReferencedImageExportModeAsync
assertThat(((ZipArchiveConvertDocumentResponse) response).getFileName()).isEqualTo("converted_docs.zip");
assertThat(((ZipArchiveConvertDocumentResponse) response).getInputStream()).isNotNull();
assertZipArchiveEntries(((ZipArchiveConvertDocumentResponse) response).getInputStream(), Set
.of("2408.09869.md", "artifacts/", "artifacts/image_000000_4f05ea6de89ce20493a5d9cc2305a4feb948c7bb794d7b81ee29554ec56b8445.png"));
.of("2408.09869.md", "artifacts/", FIRST_IMAGE_ARTIFACT_ENTRY));
}

@Test
Expand Down Expand Up @@ -1058,7 +1069,7 @@ void shouldConvertMultipleFileSourcesWithReferencedImageExportModeAsync() {
assertThat(((ZipArchiveConvertDocumentResponse) response).getFileName()).isEqualTo("converted_docs.zip");
assertThat(((ZipArchiveConvertDocumentResponse) response).getInputStream()).isNotNull();
assertZipArchiveEntries(((ZipArchiveConvertDocumentResponse) response).getInputStream(), Set
.of("2408.09869.md", "story.md", "artifacts/", "artifacts/image_000000_4f05ea6de89ce20493a5d9cc2305a4feb948c7bb794d7b81ee29554ec56b8445.png"));
.of("2408.09869.md", "story.md", "artifacts/", FIRST_IMAGE_ARTIFACT_ENTRY));
}

@Test
Expand Down Expand Up @@ -1114,7 +1125,7 @@ void shouldConvertMultipleFileSourcesWithInBodyTargetAndReferencedImageExportMod
assertThat(((ZipArchiveConvertDocumentResponse) response).getFileName()).isEqualTo("converted_docs.zip");
assertThat(((ZipArchiveConvertDocumentResponse) response).getInputStream()).isNotNull();
assertZipArchiveEntries(((ZipArchiveConvertDocumentResponse) response).getInputStream(), Set
.of("2408.09869.md", "story.md", "artifacts/", "artifacts/image_000000_4f05ea6de89ce20493a5d9cc2305a4feb948c7bb794d7b81ee29554ec56b8445.png"));
.of("2408.09869.md", "story.md", "artifacts/", FIRST_IMAGE_ARTIFACT_ENTRY));
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion ...ers/src/main/java/ai/docling/testcontainers/serve/config/DoclingServeContainerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface DoclingServeContainerConfig {
/**
* Represents the version identifier for the docling-serve container image.
*/
String DOCLING_IMAGE_VERSION = "v1.29.0";
String DOCLING_IMAGE_VERSION = "v1.35.0";

/**
* Default image name
Expand Down
Loading