Skip to content

Fix overwrite conflict report generation to correctly handle deletions #223

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
C-Achard merged 15 commits into from
Jun 11, 2026
Merged

Fix overwrite conflict report generation to correctly handle deletions #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
20e1c91
Handle deletions and save-scope in keypoint merges
C-Achard Jun 3, 2026
0ca5a3e
Extract drop_likelihood; report keypoint deletions
C-Achard Jun 3, 2026
5013e91
Improve overwrite conflict dialog and reporting
C-Achard Jun 3, 2026
e6f89d9
Add separator and tweak overwrite dialogs
C-Achard Jun 3, 2026
c35e286
Harmonize indexes for keypoint deletions
C-Achard Jun 3, 2026
6d9cc5d
Update conflicts tests for deletions & completion
C-Achard Jun 3, 2026
0f187ae
Add tests for save/merge and keypoint utilities
C-Achard Jun 3, 2026
688391a
Move conflict details builder into model
C-Achard Jun 5, 2026
fa3b19a
Warn and cancel save on unresolved DLC paths
C-Achard Jun 5, 2026
a5aa2e5
Report deletions in overwrite confirmation
C-Achard Jun 5, 2026
32e1885
Use report model in overwrite confirmation test
C-Achard Jun 5, 2026
136af77
Enhance project-less save E2E tests
C-Achard Jun 5, 2026
ae98ba3
Validate row-index overlap in merge_save_df
C-Achard Jun 5, 2026
c830d17
Harmonize keypoint columns, use canonical header
C-Achard Jun 5, 2026
1d90923
Add regression test for GT keypoint deletion
C-Achard Jun 5, 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
12 changes: 6 additions & 6 deletions src/napari_deeplabcut/_tests/core/io/test_write_routing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import pytest

from napari_deeplabcut.config.models import AnnotationKind, DLCHeaderModel
from napari_deeplabcut.core.dataframes import drop_likelihood_columns
from napari_deeplabcut.core.errors import AmbiguousSaveError, MissingProvenanceError
from napari_deeplabcut.core.io import (
_drop_likelihood_columns,
_drop_likelihood_from_header,
resolve_output_path_from_metadata,
write_hdf,
Expand Down Expand Up @@ -133,8 +133,8 @@ def test_drop_likelihood_before_merge_prevents_machine_likelihood_from_leaking()
)

# Mimic writer behavior: strip likelihood on both sides before merge
df_old = _drop_likelihood_columns(df_old)
df_new = _drop_likelihood_columns(df_new)
df_old = drop_likelihood_columns(df_old)
df_new = drop_likelihood_columns(df_new)

df_out = df_new.combine_first(df_old)

Expand Down Expand Up @@ -169,8 +169,8 @@ def test_drop_likelihood_cleans_existing_gt_columns_too():
columns=cols_with_likelihood,
)

df_old = _drop_likelihood_columns(df_old)
df_new = _drop_likelihood_columns(df_new)
df_old = drop_likelihood_columns(df_old)
df_new = drop_likelihood_columns(df_new)
df_out = df_new.combine_first(df_old)

coords = df_out.columns.get_level_values("coords")
Expand All @@ -188,7 +188,7 @@ def test_drop_likelihood_columns_removes_likelihood_from_empty_dataframe():
)
df = pd.DataFrame([], columns=cols, index=pd.Index([], name="image"))

out = _drop_likelihood_columns(df)
out = drop_likelihood_columns(df)

assert out.empty
assert "likelihood" not in out.columns.get_level_values("coords")
Expand Down
Loading
Loading