agglovar 0.0.1.dev3__tar.gz → 0.0.1.dev4__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {agglovar-0.0.1.dev3/src/agglovar.egg-info → agglovar-0.0.1.dev4}/PKG-INFO +1 -1
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/__init__.py +1 -1
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/cumulative.py +8 -8
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4/src/agglovar.egg-info}/PKG-INFO +1 -1
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/LICENSE +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/README.md +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/pyproject.toml +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/setup.cfg +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/align/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/align/op.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/align/score.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/dev/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/dev/imports.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/fa.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/io.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/kmer/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/kmer/plot.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/kmer/util.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/base.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/config/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/config/parser.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/config/stage.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/config/strategy.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/om/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/om/_executor_base.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/merge/om/_executor_nr.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/meta/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/meta/decorators.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/meta/descriptors.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/base.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/dedup.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/overlap.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/sequential.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/pairwise/weights.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/schema.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/seqmatch.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/util/__init__.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/util/str.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar/util/var.py +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar.egg-info/SOURCES.txt +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar.egg-info/dependency_links.txt +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar.egg-info/requires.txt +0 -0
- {agglovar-0.0.1.dev3 → agglovar-0.0.1.dev4}/src/agglovar.egg-info/top_level.txt +0 -0
|
@@ -28,6 +28,7 @@ import polars.selectors as cs
|
|
|
28
28
|
from ..meta.decorators import immutable
|
|
29
29
|
from ..pairwise.base import PairwiseJoin
|
|
30
30
|
from ..meta.decorators import immutable
|
|
31
|
+
from ..util.var import id_version_expr
|
|
31
32
|
|
|
32
33
|
from .base import (
|
|
33
34
|
CallsetDefType,
|
|
@@ -150,6 +151,7 @@ class MergeCumulative(MergeBase):
|
|
|
150
151
|
raise ValueError('Missing pairwise_join')
|
|
151
152
|
|
|
152
153
|
self.pairwise_join = pairwise_join
|
|
154
|
+
self.lead_strategy = lead_strategy
|
|
153
155
|
|
|
154
156
|
def __call__(
|
|
155
157
|
self,
|
|
@@ -160,10 +162,8 @@ class MergeCumulative(MergeBase):
|
|
|
160
162
|
Intersect callsets.
|
|
161
163
|
|
|
162
164
|
:param callsets: Callsets to intersect.
|
|
163
|
-
:param
|
|
164
|
-
|
|
165
|
-
a lazy frame was input with non-trivial transformations. Should be True for most
|
|
166
|
-
input.
|
|
165
|
+
:param retain_index: If `True`, do not drop an existing "_index" column in callset tables
|
|
166
|
+
if they exist.
|
|
167
167
|
|
|
168
168
|
:return: A merged callset table.
|
|
169
169
|
"""
|
|
@@ -178,7 +178,7 @@ class MergeCumulative(MergeBase):
|
|
|
178
178
|
|
|
179
179
|
for df_next, src_name, src_index in callsets:
|
|
180
180
|
if missing_cols := required_cols - set(df_next.collect_schema().names()):
|
|
181
|
-
raise ValueError(f'Missing columns for source ({
|
|
181
|
+
raise ValueError(f'Missing columns for source ({src_name}, index {src_index}): "{", ".join(sorted(missing_cols))}"')
|
|
182
182
|
|
|
183
183
|
for col, dtype in df_next.collect_schema().items():
|
|
184
184
|
if col not in all_col_dict:
|
|
@@ -273,9 +273,9 @@ class MergeCumulative(MergeBase):
|
|
|
273
273
|
)
|
|
274
274
|
|
|
275
275
|
# Choose lead variant
|
|
276
|
-
if lead_strategy is LeadStrategy.LEFT:
|
|
276
|
+
if self.lead_strategy is LeadStrategy.LEFT:
|
|
277
277
|
src_index_expr = pl.col('mg_src_pos').list.arg_min()
|
|
278
|
-
elif lead_strategy is LeadStrategy.FIRST:
|
|
278
|
+
elif self.lead_strategy is LeadStrategy.FIRST:
|
|
279
279
|
src_index_expr = pl.lit(0)
|
|
280
280
|
else:
|
|
281
281
|
raise ValueError(f'Unknown lead_strategy: {lead_strategy!r}')
|
|
@@ -327,7 +327,7 @@ class MergeCumulative(MergeBase):
|
|
|
327
327
|
on='_mg_index', how='inner'
|
|
328
328
|
)
|
|
329
329
|
.drop('_mg_index')
|
|
330
|
-
.with_columns(
|
|
330
|
+
.with_columns(id_version_expr())
|
|
331
331
|
.select(col_order)
|
|
332
332
|
.sort('chrom', 'pos', 'end', 'id')
|
|
333
333
|
)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|