Skip to content

Commit 5692bae

Browse files
authored
Merge pull request #3189 from bghira/fix/3188-lightbox-step-gallery
Fix validation lightbox checkpoint switching
2 parents 22b2b91 + 0670588 commit 5692bae

3 files changed

Lines changed: 14 additions & 3 deletions

File tree

simpletuner/static/js/training_metrics_component.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,6 @@
761761
: images.length - 1;
762762
const next = images[clamped];
763763
this.trainingMediaLightbox.path = next.item.path;
764-
this.selectedTrainingMediaStep = next.item.step;
765764
},
766765

767766
setTrainingLightboxStepOffset(offset) {
@@ -771,7 +770,6 @@
771770
const next = images[currentIndex + offset];
772771
if (next) {
773772
this.trainingMediaLightbox.path = next.item.path;
774-
this.selectedTrainingMediaStep = next.item.step;
775773
}
776774
},
777775

tests/js/training_metrics_component.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ describe('training metrics component', () => {
227227
{ type: 'image', label: 'portrait', step: 20, index: 0, path: 'step-20-a.webp', url: '/c.webp' },
228228
],
229229
};
230+
state.selectedTrainingMediaStep = 10;
230231
state.openTrainingMediaLightbox(state.trainingRunData.media[0]);
231232

232233
state.setTrainingLightboxImageOffset(1);
@@ -235,10 +236,11 @@ describe('training metrics component', () => {
235236
state.setTrainingLightboxImageOffset(-1);
236237
state.setTrainingLightboxStepOffset(1);
237238
expect(state.currentTrainingLightboxImage().item.path).toBe('step-20-a.webp');
238-
expect(state.selectedTrainingMediaStep).toBe(20);
239+
expect(state.selectedTrainingMediaStep).toBe(10);
239240

240241
state.setTrainingLightboxStepIndex(0);
241242
expect(state.currentTrainingLightboxImage().item.path).toBe('step-10-a.webp');
243+
expect(state.selectedTrainingMediaStep).toBe(10);
242244
expect(state.trainingLightboxStepLabel()).toBe('Step 10');
243245
});
244246

tests/test_webui_e2e.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,17 @@ def scenario(driver, _browser):
960960
lightbox_step_slider,
961961
)
962962
WebDriverWait(driver, 5).until(lambda _driver: "step 10" in lightbox.text)
963+
background_media_state = driver.execute_script(
964+
"""
965+
const stepSlider = document.querySelector("input[aria-label='Validation checkpoint step']");
966+
return {
967+
imageCount: document.querySelectorAll(".training-media-grid figure img").length,
968+
stepSliderValue: stepSlider ? stepSlider.value : null,
969+
};
970+
"""
971+
)
972+
self.assertEqual(background_media_state["imageCount"], 10, background_media_state)
973+
self.assertEqual(background_media_state["stepSliderValue"], "1", background_media_state)
963974
lightbox.find_element(By.CSS_SELECTOR, ".training-media-lightbox-toolbar button[title='Close image']").click()
964975
WebDriverWait(driver, 5).until(EC.invisibility_of_element_located((By.CSS_SELECTOR, ".training-media-lightbox")))
965976

0 commit comments

Comments
 (0)