Skip to content

Commit 44e8c72

Browse files
committed
Add fallback to merge samples without stacking in amdirt viewer
1 parent e3f2b97 commit 44e8c72

1 file changed

Lines changed: 15 additions & 2 deletions

File tree

amdirt/core/__init__.py

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,20 @@ def get_libraries(
210210
sel_col = ["archive_accession"]
211211
else:
212212
sel_col = ["archive_accession", "sample_host"]
213-
libraries = libraries.merge(
213+
libraries_subset = libraries.merge(
214214
stacked_samples[sel_col],
215215
left_on="archive_sample_accession",
216216
right_on="archive_accession",
217217
)
218218
select_libs = list(stacked_samples["archive_accession"])
219-
selected_libraries = libraries.query("archive_sample_accession in @select_libs")
219+
if libraries_subset.shape[0] == 0:
220+
libraries_subset = libraries.merge(
221+
samples[sel_col],
222+
left_on="archive_sample_accession",
223+
right_on="archive_accession",
224+
)
225+
select_libs = list(samples["archive_accession"])
226+
selected_libraries = libraries_subset.query("archive_sample_accession in @select_libs")
220227

221228
return selected_libraries
222229

@@ -628,6 +635,12 @@ def is_merge_size_zero(
628635
left_on="archive_sample_accession",
629636
right_on="archive_accession",
630637
)
638+
if library_selected.shape[0] == 0:
639+
library_selected = library.merge(
640+
samples[sel_col],
641+
left_on="archive_sample_accession",
642+
right_on="archive_accession",
643+
)
631644

632645
if samples.shape[0] != 0 and library_selected.shape[0] == 0:
633646
return True

0 commit comments

Comments
 (0)