forked from MakazhanAlpamys/Soup
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathtest_issue302_vision_pad_token.py
More file actions
571 lines (453 loc) · 20.8 KB
/
Copy pathtest_issue302_vision_pad_token.py
File metadata and controls
571 lines (453 loc) · 20.8 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
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
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
"""Issue #302 — Idefics3 / SmolVLM vision-SFT pad_token routing.
SmolVLM uses an ``Idefics3Processor``. The shared LLaVA vision path sets
``self.tokenizer = <processor>`` and hands it to TRL's ``SFTTrainer`` as
``processing_class``. TRL reads ``processing_class.pad_token`` /
``.eos_token`` / ``.convert_tokens_to_ids`` directly, but HF vision processors
keep the text tokenizer nested at ``processor.tokenizer`` and do NOT forward
token-level attributes (``ProcessorMixin`` has no ``__getattr__``) — so training
crashes with ``AttributeError: 'Idefics3Processor' object has no attribute
'pad_token'``.
This suite pins ``_ensure_vision_processor_pad_token`` — it mirrors the inner
tokenizer's text-token surface onto the processor (setting pad_token = eos_token
when unset), reproducing TRL's exact ``args.pad_token or processing_class.pad_token
or processing_class.eos_token`` access. Both Idefics3 and LLaVA processors share
identical structure (``attributes = ['image_processor', 'tokenizer']``), so the
fix repairs both without regressing a processor that already exposes pad_token.
It also pins the end-to-end half of #302: legacy LLaVA ``<image>`` strings are
converted to structured multimodal content at collation time, where the real
processor can expand image tokens and emit pixel tensors for the model.
"""
from __future__ import annotations
import pytest
class _FakeTokenizer:
"""Text tokenizer with the token surface TRL reads off processing_class."""
def __init__(self, pad_token=None, eos_token="</s>"):
self.pad_token = pad_token
self.eos_token = eos_token
self.eos_token_id = 2
self.bos_token = "<s>"
self.bos_token_id = 1
@property
def pad_token_id(self):
# Mirrors a real tokenizer: None until pad_token is set.
return 0 if self.pad_token is not None else None
def convert_tokens_to_ids(self, token):
return {"</s>": 2, "<s>": 1, "<pad>": 0}.get(token, 2)
class _FakeIdefics3Processor:
"""Mimics Idefics3Processor: nested .tokenizer, NO pad_token forwarding."""
attributes = ["image_processor", "tokenizer"]
def __init__(self, tokenizer):
self.tokenizer = tokenizer
self.image_processor = object()
# No __getattr__ — accessing .pad_token raises AttributeError, exactly like
# the real ProcessorMixin subclass.
class _TokenizerLikeProcessor:
"""A processing_class that already exposes the token surface (regression guard)."""
def __init__(self):
self.pad_token = "<pad>"
self.eos_token = "</s>"
self.tokenizer = None
def convert_tokens_to_ids(self, token):
return 0
def _trl_pad_token(processing_class, args_pad_token=None):
"""Reproduce TRL SFTTrainer's pad-token resolution (sft_trainer.py:436)."""
return args_pad_token or processing_class.pad_token or processing_class.eos_token
class TestEnsureVisionProcessorPadToken:
def test_bare_processor_raises_before_fix(self):
# Sanity: the un-fixed processor reproduces the reported AttributeError.
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
with pytest.raises(AttributeError):
_ = proc.pad_token
def test_sets_pad_token_from_eos(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None, eos_token="</s>"))
_ensure_vision_processor_pad_token(proc)
# Inner tokenizer got pad_token = eos_token
assert proc.tokenizer.pad_token == "</s>"
# Processor now exposes the surface TRL reads
assert proc.pad_token == "</s>"
assert proc.eos_token == "</s>"
def test_trl_resolution_no_longer_crashes(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
_ensure_vision_processor_pad_token(proc)
pad = _trl_pad_token(proc)
assert pad == "</s>"
# convert_tokens_to_ids delegates to the inner tokenizer
assert proc.convert_tokens_to_ids(pad) == 2
def test_preserves_existing_pad_token(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
tok = _FakeTokenizer(pad_token="<pad>", eos_token="</s>")
proc = _FakeIdefics3Processor(tok)
_ensure_vision_processor_pad_token(proc)
assert proc.tokenizer.pad_token == "<pad>" # untouched
assert proc.pad_token == "<pad>"
def test_tokenizer_like_processor_unchanged(self):
# A processing_class that already exposes pad_token must not be clobbered.
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _TokenizerLikeProcessor()
_ensure_vision_processor_pad_token(proc)
assert proc.pad_token == "<pad>"
def test_no_nested_tokenizer_is_noop(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
class _NoTok:
pad_token = "<pad>"
eos_token = "</s>"
proc = _NoTok()
_ensure_vision_processor_pad_token(proc) # must not raise
assert proc.pad_token == "<pad>"
def test_convert_tokens_to_ids_mirrored(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
_ensure_vision_processor_pad_token(proc)
assert callable(proc.convert_tokens_to_ids)
assert proc.convert_tokens_to_ids("</s>") == 2
def test_eos_token_id_mirrored(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
_ensure_vision_processor_pad_token(proc)
assert proc.eos_token_id == 2
def test_pad_token_id_mirrored(self):
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
_ensure_vision_processor_pad_token(proc)
# inner tokenizer's pad_token_id property becomes 0 once pad is set
assert proc.pad_token_id == 0
def test_readonly_attr_degrades_gracefully(self):
# A processor whose attributes can't be set (e.g. __slots__) must not
# make the helper raise — the try/except degrades gracefully.
from soup_cli.trainer.sft import _ensure_vision_processor_pad_token
class _SlotsProcessor:
__slots__ = ("tokenizer",)
def __init__(self, tok):
self.tokenizer = tok
proc = _SlotsProcessor(_FakeTokenizer(pad_token=None))
# Must not raise even though setattr(proc, "pad_token", ...) fails.
_ensure_vision_processor_pad_token(proc)
# Inner tokenizer was still repaired (pad = eos).
assert proc.tokenizer.pad_token == "</s>"
class TestVisionSetupWiring:
def test_setup_vision_transformers_invokes_pad_token_mirror(self, monkeypatch):
# The fix is only useful if _setup_vision_transformers actually calls it.
# Mock the heavy loads; assert the processor gets pad_token mirrored.
from unittest.mock import MagicMock
import transformers
from soup_cli.config.loader import load_config_from_string
from soup_cli.trainer.sft import SFTTrainerWrapper
fake_proc = _FakeIdefics3Processor(_FakeTokenizer(pad_token=None))
monkeypatch.setattr(
transformers.AutoProcessor, "from_pretrained",
lambda *a, **k: fake_proc,
)
monkeypatch.setattr(
transformers.AutoModelForImageTextToText, "from_pretrained",
lambda *a, **k: MagicMock(),
)
import peft
monkeypatch.setattr(peft, "get_peft_model", lambda model, cfg: model)
monkeypatch.setattr(
"soup_cli.utils.quant_menu.build_quantization_config_for_loader",
lambda **k: None,
)
monkeypatch.setattr(
"soup_cli.utils.data_pipeline.apply_vocab_expansion",
lambda *a, **k: None,
)
monkeypatch.setattr(
SFTTrainerWrapper, "_apply_quantization_aware", lambda self, tcfg: None
)
cfg = load_config_from_string(
"base: fake/vlm\ntask: sft\nmodality: vision\n"
"data:\n train: x.jsonl\n format: llava\n max_length: 64\n"
"training:\n quantization: none\n lora:\n target_modules: [q_proj, v_proj]\n"
)
wrapper = SFTTrainerWrapper(cfg, device="cpu")
wrapper._setup_vision_transformers(cfg, cfg.training)
# The helper ran: the Idefics3-style processor now exposes pad_token.
assert wrapper.processor.pad_token == "</s>"
class _FakeVisionProcessor:
def __init__(self):
self.templated_messages = []
self.call_kwargs = None
def apply_chat_template(self, messages, **kwargs):
self.templated_messages.append(messages)
assert kwargs == {"tokenize": False, "add_generation_prompt": False}
return "rendered-with-<image>"
def __call__(self, **kwargs):
import torch
self.call_kwargs = kwargs
return {
"input_ids": torch.tensor([[11, 12, 13]]),
"attention_mask": torch.tensor([[1, 0, 1]]),
"pixel_values": torch.ones((1, 1, 3, 2, 2)),
}
class _FakeBosTokenizer:
bos_token_id = 1
def __init__(self, *, template_has_bos: bool):
self.template_has_bos = template_has_bos
def __call__(self, text, *, add_special_tokens):
del text
plain = [1, 41, 42] if self.template_has_bos else [41, 42]
if add_special_tokens and not self.template_has_bos:
plain = [self.bos_token_id, *plain]
return {"input_ids": plain}
def convert_tokens_to_ids(self, token):
return {"<image>": 99}.get(token, -1)
class _MeasuredVisionProcessor(_FakeVisionProcessor):
image_token = "<image>"
def __init__(self, *, template_has_bos: bool, rows: list[list[int]]):
super().__init__()
self.tokenizer = _FakeBosTokenizer(template_has_bos=template_has_bos)
self.rows = rows
def __call__(self, **kwargs):
import torch
self.call_kwargs = kwargs
rows = []
for row in self.rows:
if kwargs["add_special_tokens"] and row[0] != self.tokenizer.bos_token_id:
row = [self.tokenizer.bos_token_id, *row]
rows.append(row)
width = max(len(row) for row in rows)
padded = [row + [0] * (width - len(row)) for row in rows]
masks = [[1] * len(row) + [0] * (width - len(row)) for row in rows]
return {
"input_ids": torch.tensor(padded),
"attention_mask": torch.tensor(masks),
"pixel_values": torch.ones((len(rows), 1, 3, 2, 2)),
}
class TestVisionLanguageCollation:
def test_legacy_marker_becomes_structured_image_part(self):
from soup_cli.trainer.sft import VisionLanguageDataCollator
processor = _FakeVisionProcessor()
collator = VisionLanguageDataCollator(processor, max_length=128)
image = object()
batch = collator(
[
{
"messages": [
{"role": "user", "content": "<image>\nDescribe it."},
{"role": "assistant", "content": "A square."},
],
"images": [image],
}
]
)
user_parts = processor.templated_messages[0][0]["content"]
assert user_parts == [
{"type": "image"},
{"type": "text", "text": "Describe it."},
]
assert processor.call_kwargs["images"] == [[image]]
assert processor.call_kwargs["text"] == ["rendered-with-<image>"]
assert processor.call_kwargs["truncation"] is True
assert processor.call_kwargs["max_length"] == 128
assert batch["pixel_values"].shape == (1, 1, 3, 2, 2)
assert batch["labels"].tolist() == [[11, -100, 13]]
def test_masks_every_image_token_and_pins_the_trained_label_count(self):
from soup_cli.trainer.sft import VisionLanguageDataCollator
processor = _MeasuredVisionProcessor(
template_has_bos=True,
rows=[[1, 99, 99, 71, 72]],
)
collator = VisionLanguageDataCollator(processor, max_length=128)
batch = collator(
[{"messages": [{"role": "user", "content": "<image>"}], "images": [object()]}]
)
assert batch["labels"].tolist() == [[1, -100, -100, 71, 72]]
assert int((batch["labels"] != -100).sum()) == 3
def test_adds_bos_when_the_chat_template_does_not_supply_it(self):
from soup_cli.trainer.sft import VisionLanguageDataCollator
processor = _MeasuredVisionProcessor(
template_has_bos=False,
rows=[[41, 42, 43]],
)
collator = VisionLanguageDataCollator(processor, max_length=128)
batch = collator(
[{"messages": [{"role": "user", "content": "<image>"}], "images": [object()]}]
)
assert processor.call_kwargs["add_special_tokens"] is True
assert batch["input_ids"][0, 0].item() == processor.tokenizer.bos_token_id
def test_does_not_duplicate_bos_when_the_chat_template_supplies_it(self):
from soup_cli.trainer.sft import VisionLanguageDataCollator
processor = _MeasuredVisionProcessor(
template_has_bos=True,
rows=[[1, 41, 42]],
)
collator = VisionLanguageDataCollator(processor, max_length=128)
batch = collator(
[{"messages": [{"role": "user", "content": "<image>"}], "images": [object()]}]
)
assert processor.call_kwargs["add_special_tokens"] is False
assert batch["input_ids"][0].tolist().count(processor.tokenizer.bos_token_id) == 1
def test_two_different_examples_remain_two_rows_and_mask_independently(self):
from soup_cli.trainer.sft import VisionLanguageDataCollator
processor = _MeasuredVisionProcessor(
template_has_bos=True,
rows=[[1, 99, 71], [1, 99, 81, 82, 83]],
)
collator = VisionLanguageDataCollator(processor, max_length=128)
batch = collator(
[
{"messages": [{"role": "user", "content": "<image>A"}], "images": [object()]},
{"messages": [{"role": "user", "content": "<image>B"}], "images": [object()]},
]
)
assert batch["input_ids"].shape[0] == 2
assert batch["labels"].tolist() == [
[1, -100, 71, -100, -100],
[1, -100, 81, 82, 83],
]
def test_missing_marker_injects_image_into_first_user_turn(self):
from soup_cli.trainer.sft import _vision_messages_with_image_parts
messages = _vision_messages_with_image_parts(
[
{"role": "system", "content": "Be concise."},
{"role": "user", "content": "Describe it."},
],
image_count=1,
)
assert messages[0]["content"] == [{"type": "text", "text": "Be concise."}]
assert messages[1]["content"] == [
{"type": "image"},
{"type": "text", "text": "Describe it."},
]
def test_excess_image_markers_are_rejected_before_processor(self):
from soup_cli.trainer.sft import _vision_messages_with_image_parts
with pytest.raises(ValueError, match="2 image placeholder.*1 image"):
_vision_messages_with_image_parts(
[{"role": "user", "content": "<image><image>Compare."}],
image_count=1,
)
def test_dataset_keeps_messages_until_collation(self, tmp_path):
from PIL import Image
from soup_cli.trainer.sft import SFTTrainerWrapper
image_path = tmp_path / "sample.png"
Image.new("RGB", (8, 8), "red").save(image_path)
row = {
"messages": [{"role": "user", "content": "<image>\nDescribe."}],
"image": str(image_path),
}
wrapper = object.__new__(SFTTrainerWrapper)
train_ds, eval_ds = wrapper._prepare_vision_dataset({"train": [row]})
assert eval_ds is None
assert train_ds.column_names == ["messages", "images"]
assert train_ds[0]["messages"] == row["messages"]
assert len(train_ds[0]["images"]) == 1
def test_plain_trainer_receives_processor_aware_collator(self, monkeypatch):
import transformers
from soup_cli.trainer.sft import (
VisionLanguageDataCollator,
_make_vision_trainer,
)
captured = {}
class _FakeTrainer:
def __init__(
self,
model=None,
args=None,
data_collator=None,
train_dataset=None,
eval_dataset=None,
processing_class=None,
):
captured.update(
model=model,
args=args,
data_collator=data_collator,
train_dataset=train_dataset,
eval_dataset=eval_dataset,
processing_class=processing_class,
)
monkeypatch.setattr(transformers, "Trainer", _FakeTrainer)
processor = _FakeVisionProcessor()
trainer = _make_vision_trainer(
{
"model": "model",
"args": "args",
"train_dataset": "train",
"eval_dataset": None,
"processing_class": processor,
},
processor,
max_length=256,
)
assert isinstance(trainer, _FakeTrainer)
assert isinstance(captured["data_collator"], VisionLanguageDataCollator)
assert captured["data_collator"].max_length == 256
assert captured["processing_class"] is processor
def test_plain_trainer_uses_legacy_tokenizer_keyword_when_required(self, monkeypatch):
import transformers
from soup_cli.trainer.sft import _make_vision_trainer
captured = {}
class _LegacyTrainer:
def __init__(
self,
model=None,
args=None,
data_collator=None,
train_dataset=None,
eval_dataset=None,
tokenizer=None,
):
captured["tokenizer"] = tokenizer
monkeypatch.setattr(transformers, "Trainer", _LegacyTrainer)
processor = _FakeVisionProcessor()
_make_vision_trainer(
{
"model": "model",
"args": "args",
"train_dataset": "train",
"eval_dataset": None,
"processing_class": processor,
},
processor,
max_length=256,
)
assert captured["tokenizer"] is processor
def test_setup_routes_normal_vision_run_to_plain_trainer(self, monkeypatch, tmp_path):
from datasets import Dataset
import soup_cli.trainer.sft as sft_module
from soup_cli.config.loader import load_config_from_string
from soup_cli.trainer.sft import SFTTrainerWrapper
processor = _FakeVisionProcessor()
class _FakeModel:
def get_nb_trainable_parameters(self):
return 1, 2
def _fake_vision_setup(self, cfg, tcfg):
self.model = _FakeModel()
self.processor = processor
self.tokenizer = processor
def _fake_prepare(self, dataset):
train = Dataset.from_list([{"messages": [], "images": []}])
return train, None
sentinel = object()
captured = {}
def _fake_make(trainer_kwargs, processor, max_length):
captured.update(
trainer_kwargs=trainer_kwargs,
processor=processor,
max_length=max_length,
)
return sentinel
monkeypatch.setattr(
SFTTrainerWrapper, "_setup_vision_transformers", _fake_vision_setup
)
monkeypatch.setattr(SFTTrainerWrapper, "_prepare_vision_dataset", _fake_prepare)
monkeypatch.setattr(sft_module, "_make_vision_trainer", _fake_make)
cfg = load_config_from_string(
"base: fake/vlm\ntask: sft\nmodality: vision\n"
"data:\n train: x.jsonl\n format: llava\n max_length: 321\n"
"training:\n epochs: 1\n batch_size: 1\n"
" gradient_accumulation_steps: 1\n quantization: none\n"
" lora:\n target_modules: [q_proj, v_proj]\n"
f"output: {tmp_path.as_posix()}/output\n"
)
wrapper = SFTTrainerWrapper(cfg, device="cpu")
wrapper.setup({"train": [{"messages": [], "image": "unused"}]})
assert wrapper.trainer is sentinel
assert captured["processor"] is processor
assert captured["max_length"] == 321
assert captured["trainer_kwargs"]["train_dataset"].column_names == [
"messages",
"images",
]