Commit 594c26c
committed
Adds vision-capable model + matching mmproj + a CC0/PD test image to all
four Java test jobs (Linux x86_64, macOS arm64 with/without Metal,
Windows x86_64) and a model-gated MultimodalIntegrationTest that proves
the typed ChatMessage(role, List<ContentPart>) surface from PR #189
round-trips through the upstream mtmd pipeline end-to-end.
CI changes (.github/workflows/publish.yml)
- New env vars: VISION_MODEL_URL / VISION_MODEL_NAME pointing at
ggml-org/SmolVLM-500M-Instruct-Q8_0.gguf (smallest reliable vision
GGUF on community ggml-org), VISION_MMPROJ_URL / _NAME for the
matching mmproj, VISION_IMAGE_URL / _NAME for a small PD red-apple
image from Wikimedia Commons.
- Each of the four Java test jobs gains three download steps and three
-D system properties on the mvn test invocation:
-Dnet.ladenthin.llama.vision.model / .mmproj / .image.
Validation scripts
- validate-models.sh refactored into validate_gguf() + validate_image()
helpers with a 'required' vs 'optional' mode. Required models still
fail-fast; the new vision GGUFs and PD image are validated only when
present so jobs that skip them keep passing.
- validate-models.bat extended with a parallel OPTIONAL_MODELS loop.
Test (src/test/java/.../MultimodalIntegrationTest.java)
- Self-skips via Assume when any of the three -D paths is unset or its
file is missing, so local mvn test stays green without the artifacts.
- multimodalRequestProducesNonEmptyReply: builds a ChatMessage.userMultimodal
with ContentPart.text(...) + ContentPart.imageFile(Paths.get(image)),
calls chatCompleteText, asserts non-empty reply. Does NOT assert reply
semantics — a 500M model can caption inaccurately and CI must
not flap on model quality.
- multimodalThenTextOnSameModel: sanity check that a multimodal call
followed by a text-only call on the same model both succeed (catches
any parts/legacy split poisoning the inference context).
TestConstants gains PROP_VISION_MODEL_PATH / PROP_VISION_MMPROJ_PATH /
PROP_VISION_IMAGE_PATH so the test reads the system properties via the
same naming pattern as PROP_NOMIC_MODEL_PATH.
Docs
- docs/history/49be664_open_issues.md: #103 and #34 PARTIALLY FIXED ->
FIXED in the per-issue blocks, the verdict guide, the status overview
table, the deep-dive table, the cannot-be-closed-by-unit-tests-alone
table, and the recommended-sequencing list. Bottom-line summary
updated to reflect that 0 of the original LIKELY/PARTIALLY FIXED items
remain partially fixed.
- (docs/feature-investigation-llama-stack-client-kotlin.md §2.1 was
already updated in the PR-189 typed-multimodal-surface commit.)
Verified locally
- mvn test-compile: clean.
- mvn test -Dtest=MultimodalIntegrationTest: SKIPPED (no -D properties
set; expected self-skip path).
- mvn javadoc:jar: BUILD SUCCESS.
1 parent 871a700 commit 594c26c
6 files changed
Lines changed: 333 additions & 30 deletions
File tree
- .github
- workflows
- docs/history
- src/test/java/net/ladenthin/llama
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
14 | | - | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
15 | 20 | | |
16 | 21 | | |
17 | 22 | | |
| |||
37 | 42 | | |
38 | 43 | | |
39 | 44 | | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
40 | 64 | | |
41 | 65 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
22 | 35 | | |
23 | | - | |
24 | | - | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
25 | 43 | | |
26 | | - | |
27 | | - | |
| 44 | + | |
28 | 45 | | |
29 | 46 | | |
30 | 47 | | |
31 | 48 | | |
32 | 49 | | |
33 | | - | |
34 | | - | |
| 50 | + | |
35 | 51 | | |
36 | 52 | | |
37 | 53 | | |
38 | 54 | | |
39 | 55 | | |
40 | | - | |
41 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
42 | 94 | | |
43 | 95 | | |
44 | 96 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
25 | 39 | | |
26 | 40 | | |
27 | 41 | | |
| |||
393 | 407 | | |
394 | 408 | | |
395 | 409 | | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
396 | 416 | | |
397 | 417 | | |
398 | 418 | | |
| |||
408 | 428 | | |
409 | 429 | | |
410 | 430 | | |
411 | | - | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
412 | 437 | | |
413 | 438 | | |
414 | 439 | | |
| |||
455 | 480 | | |
456 | 481 | | |
457 | 482 | | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
458 | 489 | | |
459 | 490 | | |
460 | 491 | | |
| |||
468 | 499 | | |
469 | 500 | | |
470 | 501 | | |
471 | | - | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
472 | 507 | | |
473 | 508 | | |
474 | 509 | | |
| |||
508 | 543 | | |
509 | 544 | | |
510 | 545 | | |
| 546 | + | |
| 547 | + | |
| 548 | + | |
| 549 | + | |
| 550 | + | |
| 551 | + | |
511 | 552 | | |
512 | 553 | | |
513 | 554 | | |
| |||
521 | 562 | | |
522 | 563 | | |
523 | 564 | | |
524 | | - | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
525 | 570 | | |
526 | 571 | | |
527 | 572 | | |
| |||
564 | 609 | | |
565 | 610 | | |
566 | 611 | | |
| 612 | + | |
| 613 | + | |
| 614 | + | |
| 615 | + | |
| 616 | + | |
| 617 | + | |
567 | 618 | | |
568 | 619 | | |
569 | 620 | | |
| |||
576 | 627 | | |
577 | 628 | | |
578 | 629 | | |
579 | | - | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
580 | 635 | | |
581 | 636 | | |
582 | 637 | | |
| |||
0 commit comments