strkit 0.12.0__tar.gz → 0.12.0a1__tar.gz

{strkit-0.12.0/strkit.egg-info → strkit-0.12.0a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strkit
-Version: 0.12.0
+Version: 0.12.0a1
 Summary: A toolkit for analyzing variation in short(ish) tandem repeats.
 Home-page: https://github.com/davidlougheed/strkit
 Author: David Lougheed
@@ -16,7 +16,6 @@ Requires-Dist: Flask<3.1,>=2.2.5
 Requires-Dist: pysam<0.23,>=0.19
 Requires-Dist: numpy<1.27,>=1.23.4
 Requires-Dist: parasail<1.4,>=1.2.4
-Requires-Dist: pyfamsa<0.4,>=0.3.0
 Requires-Dist: scikit-learn<1.4,>=1.2.1
 Requires-Dist: scipy<1.12,>=1.10
 Requires-Dist: statsmodels<0.15,>=0.14.0
@@ -116,8 +115,6 @@ long read data should still work.
   * Whole-genome and targeted genotyping modes to adjust this re-weighting.
 * Incorporation of single-nucleotide variation (SNVs) for better and faster calling plus 
   additional downstream analysis possibilities.
-  * Recommended for **HiFi data only**. In my testing, this worsens runtime and call quality for 
-    ONT-UL data, but speeds up the tool and improves call quality for HiFi data. 
 * Parallelized for faster computing on clusters and for ad-hoc fast analysis of single samples.
 * 95% confidence intervals on calls via a user-configurable optional parametric bootstrapping process.
 
@@ -131,11 +128,10 @@ strkit call \
   --realign \  # If using PacBio HiFi reads, enable this to enable local realignment / read recovery
   --ref path/to/reference.fa.gz \  # [REQUIRED] Indexed FASTA-formatted reference genome
   --loci path/to/loci.bed \  # [REQUIRED] TRF-formatted (or 4-col, with motif as last column) list of loci to genotype
-  --incorporate-snvs path/to/dbsnp.vcf.gz \   # [RECOMMENDED FOR HIFI ONLY] If you want SNV calls to help phase STRs & speed up calling
+  --incorporate-snvs path/to/dbsnp.vcf.gz \   # If you want SNV calls to help phase STRs & speed up STRkit, include this
   --min-reads 4 \  # Minimum number of supporting reads needed to make a call
   --min-allele-reads 2 \  # Minimum number of supporting reads needed to call a specific allele size 
   --flank-size 70 \  # Size of the flanking region to use on either side of a region to properly anchor reads
-  --consensus \  # If this flag is set, consensus sequences are calculated for alleles. This increases runtime! 
   --seed 183 \  # Fixed random number generator seed for replicability
   --processes 10  # Number of parallel processes to use; DEFAULT: 1
 ```
@@ -164,9 +160,6 @@ specify a path to output a more detailed JSON document to. This document contain
 labels, and some other information that isn't included in the normal TSV file. If you want this
 file to be indented and human-readable, use the `--indent-json` flag in addition to `--json ...`.
 
-If you want to output a VCF file (currently with STR sequences only, not with phased SNVs), use the
-`--vcf ...` argument.
-
 See the '[Caller catalog format & choosing a catalog](./docs/caller_catalog.md)' page for more on
 how to format a locus catalog or choose from existing available catalogs.
 

{strkit-0.12.0 → strkit-0.12.0a1}/README.md

@@ -90,8 +90,6 @@ long read data should still work.
   * Whole-genome and targeted genotyping modes to adjust this re-weighting.
 * Incorporation of single-nucleotide variation (SNVs) for better and faster calling plus 
   additional downstream analysis possibilities.
-  * Recommended for **HiFi data only**. In my testing, this worsens runtime and call quality for 
-    ONT-UL data, but speeds up the tool and improves call quality for HiFi data. 
 * Parallelized for faster computing on clusters and for ad-hoc fast analysis of single samples.
 * 95% confidence intervals on calls via a user-configurable optional parametric bootstrapping process.
 
@@ -105,11 +103,10 @@ strkit call \
   --realign \  # If using PacBio HiFi reads, enable this to enable local realignment / read recovery
   --ref path/to/reference.fa.gz \  # [REQUIRED] Indexed FASTA-formatted reference genome
   --loci path/to/loci.bed \  # [REQUIRED] TRF-formatted (or 4-col, with motif as last column) list of loci to genotype
-  --incorporate-snvs path/to/dbsnp.vcf.gz \   # [RECOMMENDED FOR HIFI ONLY] If you want SNV calls to help phase STRs & speed up calling
+  --incorporate-snvs path/to/dbsnp.vcf.gz \   # If you want SNV calls to help phase STRs & speed up STRkit, include this
   --min-reads 4 \  # Minimum number of supporting reads needed to make a call
   --min-allele-reads 2 \  # Minimum number of supporting reads needed to call a specific allele size 
   --flank-size 70 \  # Size of the flanking region to use on either side of a region to properly anchor reads
-  --consensus \  # If this flag is set, consensus sequences are calculated for alleles. This increases runtime! 
   --seed 183 \  # Fixed random number generator seed for replicability
   --processes 10  # Number of parallel processes to use; DEFAULT: 1
 ```
@@ -138,9 +135,6 @@ specify a path to output a more detailed JSON document to. This document contain
 labels, and some other information that isn't included in the normal TSV file. If you want this
 file to be indented and human-readable, use the `--indent-json` flag in addition to `--json ...`.
 
-If you want to output a VCF file (currently with STR sequences only, not with phased SNVs), use the
-`--vcf ...` argument.
-
 See the '[Caller catalog format & choosing a catalog](./docs/caller_catalog.md)' page for more on
 how to format a locus catalog or choose from existing available catalogs.
 

{strkit-0.12.0 → strkit-0.12.0a1}/setup.py

@@ -18,7 +18,6 @@ setup(
         "pysam>=0.19,<0.23",
         "numpy>=1.23.4,<1.27",
         "parasail>=1.2.4,<1.4",
-        "pyfamsa>=0.3.0,<0.4",
         "scikit-learn>=1.2.1,<1.4",
         "scipy>=1.10,<1.12",
         "statsmodels>=0.14.0,<0.15",

strkit-0.12.0a1/strkit/VERSION

@@ -0,0 +1 @@
+0.12.0a1

{strkit-0.12.0 → strkit-0.12.0a1}/strkit/call/call_locus.py

@@ -18,11 +18,10 @@ from sklearn.cluster import AgglomerativeClustering
 from numpy.typing import NDArray
 from typing import Iterable, Literal, Optional, Union
 
-from strkit.call.allele import CallDict, call_alleles
+from strkit.call.allele import CallDict, get_n_alleles, call_alleles
 from strkit.utils import apply_or_none
 
 from .align_matrix import match_score
-from .consensus import consensus_seq
 from .realign import realign_read
 from .repeats import get_repeat_count, get_ref_repeat_count
 from .snvs import (
@@ -110,10 +109,6 @@ def get_read_coords_from_matched_pairs(
     left_flank_start, _ = matched_pairs[lhs]
     # ------------------------------------------------------------------------------------------------------------------
 
-    # Binary search for left flank end ---------------------------------------------------------------------------------
-    # TODO
-    # ------------------------------------------------------------------------------------------------------------------
-
     for query_coord, ref_coord in matched_pairs[lhs+1:]:
         # Skip gaps on either side to find mapped flank indices
         if ref_coord < left_coord:
@@ -141,7 +136,7 @@ def get_read_coords_from_matched_pairs(
 
 
 def get_overlapping_segments_and_related_data(
-    bfs: tuple[pysam.AlignmentFile, ...],
+    bfs: tuple[pysam.AlignmentFile],
     read_contig: str,
     left_flank_coord: int,
     right_flank_coord: int,
@@ -556,7 +551,6 @@ def debug_log_flanking_seq(logger_: logging.Logger, locus_log_str: str, rn: str,
 def call_locus(
     t_idx: int,
     t: tuple,
-    n_alleles: int,
     bfs: tuple[AlignmentFile, ...],
     ref: FastaFile,
     min_reads: int,
@@ -567,6 +561,7 @@ def call_locus(
     seed: int,
     logger_: logging.Logger,
     sample_id: Optional[str] = None,
+    sex_chroms: Optional[str] = None,
     realign: bool = False,
     hq: bool = False,
     # incorporate_snvs: bool = False,
@@ -577,7 +572,6 @@ def call_locus(
     fractional: bool = False,
     respect_ref: bool = False,
     count_kmers: str = "none",  # "none" | "peak" | "read"
-    consensus: bool = False,
     log_level: int = logging.WARNING,
     read_file_has_chr: bool = True,
     ref_file_has_chr: bool = True,
@@ -605,6 +599,10 @@ def call_locus(
     ref_seq: str = ""
     raised: bool = False
 
+    n_alleles: Optional[int] = get_n_alleles(2, sex_chroms, contig)
+    if n_alleles is None:  # Sex chromosome, but we don't have a specified sex chromosome karyotype
+        return None
+
     # Currently, only support diploid use of SNVs. There's not much of a point with haploid loci,
     # and polyploidy is hard.
     # should_incorporate_snvs: bool = incorporate_snvs and n_alleles == 2
@@ -801,7 +799,6 @@ def call_locus(
         flank_len: int = len(flank_left_seq) + len(flank_right_seq)
         tr_len_w_flank: int = tr_len + flank_len
 
-        tr_read_seq = qs[left_flank_end:right_flank_start]
         tr_read_seq_wc = calculate_seq_with_wildcards(qs[left_flank_end:right_flank_start], qqs)
 
         if count_kmers != "none":
@@ -851,7 +848,6 @@ def call_locus(
         read_dict_extra[rn] = {
             "_ref_start": segment_start,
             "_ref_end": segment_end,
-            **({"_tr_seq": tr_read_seq} if consensus else {}),
         }
 
         # Reads can show up more than once - TODO - cache this information across loci
@@ -890,7 +886,6 @@ def call_locus(
         }),
         "motif": motif,
         "ref_cn": ref_cn,
-        **({"ref_seq": ref_seq} if consensus else {}),
         "reads": read_dict,
     }
 
@@ -1013,13 +1008,12 @@ def call_locus(
     call_stdevs = call_data.get("peak_stdevs")
     call_modal_n = call_data.get("modal_n_peaks")
 
-    # Assign reads to peaks and compute peak k-mers (and optionally consensus sequences) -------------------------------
+    # Assign reads to peaks and compute peak k-mers --------------------------------------------------------------------
 
     # We cannot call read-level cluster labels with >2 peaks using distance alone;
     # don't know how re-sampling has occurred.
     call_peak_n_reads: list[int] = []
     peak_kmers: list[Counter] = [Counter() for _ in range(call_modal_n or 0)]
-    call_seqs: list[str] = []
     if read_peaks_called := call_modal_n and call_modal_n <= 2:
         peaks: NDArray[np.float_] = call_peaks[:call_modal_n]
         stdevs: NDArray[np.float_] = call_stdevs[:call_modal_n]
@@ -1065,11 +1059,6 @@ def call_locus(
 
         call_peak_n_reads = list(map(len, allele_reads))
 
-        if consensus:
-            call_seqs = list(
-                map(lambda a: consensus_seq(map(lambda rr: read_dict_extra[rr]["_tr_seq"], a)), allele_reads)
-            )
-
     peak_data = {
         "means": call_peaks.tolist(),  # from np.ndarray
         "weights": call_weights.tolist(),  # from np.ndarray
@@ -1077,7 +1066,6 @@ def call_locus(
         "modal_n": call_modal_n,
         "n_reads": call_peak_n_reads,
         **({"kmers": list(map(dict, peak_kmers))} if count_kmers in ("peak", "both") else {}),
-        **({"seqs": call_seqs} if consensus else {}),
     } if call_data else None
 
     # Calculate call time ----------------------------------------------------------------------------------------------

{strkit-0.12.0 → strkit-0.12.0a1}/strkit/call/call_sample.py

@@ -9,19 +9,22 @@ import pathlib
 import numpy as np
 import os
 import re
+import sys
 import time
 
 from datetime import datetime
 from multiprocessing.synchronize import Event as EventClass  # For type hinting
 from pysam import AlignmentFile
 
-from typing import Literal, Optional
+from typing import Literal, Optional, Union
+
+from strkit import __version__
+
+from strkit.json import dumps_indented, json
 from strkit.logger import logger
 
-from .allele import get_n_alleles
 from .call_locus import call_locus
 from .non_daemonic_pool import NonDaemonicPool
-from .output import output_json_report, output_tsv as output_tsv_fn, output_vcf
 from .utils import get_new_seed
 
 __all__ = [
@@ -45,6 +48,7 @@ def locus_worker(
     num_bootstrap: int,
     flank_size: int,
     sample_id: Optional[str],
+    sex_chroms: Optional[str],
     realign: bool,
     hq: bool,
     # incorporate_snvs: bool,
@@ -53,7 +57,6 @@ def locus_worker(
     fractional: bool,
     respect_ref: bool,
     count_kmers: str,
-    consensus: bool,
     log_level: int,
     locus_queue: mp.Queue,
     is_single_processed: bool,
@@ -99,9 +102,9 @@ def locus_worker(
         if td is None:  # Kill signal
             break
 
-        t_idx, t, n_alleles, locus_seed = td
+        t_idx, t, locus_seed = td
         res = call_locus(
-            t_idx, t, n_alleles, bfs, ref,
+            t_idx, t, bfs, ref,
             min_reads=min_reads,
             min_allele_reads=min_allele_reads,
             min_avg_phred=min_avg_phred,
@@ -110,6 +113,7 @@ def locus_worker(
             seed=locus_seed,
             logger_=lg,
             sample_id=sample_id,
+            sex_chroms=sex_chroms,
             realign=realign,
             hq=hq,
             # incorporate_snvs=incorporate_snvs,
@@ -120,7 +124,6 @@ def locus_worker(
             fractional=fractional,
             respect_ref=respect_ref,
             count_kmers=count_kmers,
-            consensus=consensus,
             log_level=log_level,
             read_file_has_chr=read_file_has_chr,
             ref_file_has_chr=ref_file_has_chr,
@@ -179,6 +182,10 @@ def parse_loci_bed(loci_file: str):
         yield from (tuple(line.split("\t")) for line in (s.strip() for s in tf) if line and not line.startswith("#"))
 
 
+def _cn_to_str(cn: Union[int, float]) -> str:
+    return f"{cn:.1f}" if isinstance(cn, float) else str(cn)
+
+
 def call_sample(
     read_files: tuple[str, ...],
     reference_file: str,
@@ -198,10 +205,8 @@ def call_sample(
     fractional: bool = False,
     respect_ref: bool = False,
     count_kmers: str = "none",  # "none" | "peak" | "read"
-    consensus: bool = False,
     log_level: int = logging.WARNING,
     json_path: Optional[str] = None,
-    vcf_path: Optional[str] = None,
     indent_json: bool = False,
     output_tsv: bool = True,
     processes: int = 1,
@@ -248,17 +253,11 @@ def call_sample(
     # Keep track of all contigs we are processing to speed up downstream Mendelian inheritance analysis.
     contig_set: set[str] = set()
     for t_idx, t in enumerate(parse_loci_bed(loci_file), 1):
-        contig = t[0]
-
-        n_alleles: Optional[int] = get_n_alleles(2, sex_chroms, contig)
-        if n_alleles is None:  # Sex chromosome, but we don't have a specified sex chromosome karyotype
-            continue  # --> skip the locus
-
         # We use locus-specific random seeds for replicability, no matter which order
         # the loci are yanked out of the queue / how many processes we have.
         # Tuple of (1-indexed locus index, locus data, locus-specific random seed)
-        locus_queue.put((t_idx, t, n_alleles, get_new_seed(rng)))
-        contig_set.add(contig)
+        locus_queue.put((t_idx, t, get_new_seed(rng)))
+        contig_set.add(t[0])
         num_loci += 1
 
     # At the end of the queue, add a None value (* the # of processes).
@@ -276,6 +275,7 @@ def call_sample(
         "num_bootstrap": num_bootstrap,
         "flank_size": flank_size,
         "sample_id": sample_id_final,
+        "sex_chroms": sex_chroms,
         "realign": realign,
         "hq": hq,
         # "incorporate_snvs": incorporate_snvs,
@@ -284,7 +284,6 @@ def call_sample(
         "fractional": fractional,
         "respect_ref": respect_ref,
         "count_kmers": count_kmers,
-        "consensus": consensus,
         "log_level": log_level,
     }
 
@@ -318,19 +317,54 @@ def call_sample(
     time_taken = datetime.now() - start_time
 
     if output_tsv:
-        output_tsv_fn(results, has_snv_vcf=snv_vcf is not None)
+        for res in results:
+            has_call = res["call"] is not None
+            # n_peaks = res["peaks"]["modal_n"]
+
+            sys.stdout.write("\t".join((
+                res["contig"],
+                str(res["start"]),
+                str(res["end"]),
+                res["motif"],
+                _cn_to_str(res["ref_cn"]),
+                ",".join(map(_cn_to_str, sorted(r["cn"] for r in res["reads"].values()))) if res["reads"] else ".",
+                "|".join(map(_cn_to_str, res["call"])) if has_call else ".",
+                ("|".join("-".join(map(_cn_to_str, gc)) for gc in res["call_95_cis"]) if has_call else "."),
+                # *((res["assign_method"] if has_call else ".",) if incorporate_snvs else ()),
+                *((res["assign_method"] if has_call else ".",) if snv_vcf is not None else ()),
+
+                # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["means"][:n_peaks]))
+                #  if has_call and n_peaks <= 2 else "."),
+                # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["weights"][:n_peaks]))
+                #  if has_call and n_peaks <= 2 else "."),
+                # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["stdevs"][:n_peaks]))
+                #  if has_call and n_peaks <= 2 else "."),
+            )) + "\n")
 
     if json_path:
-        output_json_report(
-            sample_id_final,
-            job_params,
-            processes,
-            time_taken,
-            contig_set,
-            results,
-            json_path,
-            indent_json,
-        )
-
-    if vcf_path:
-        output_vcf(sample_id_final, reference_file, results, vcf_path)
+        json_report = {
+            "sample_id": sample_id_final,
+            "caller": {
+                "name": "strkit",
+                "version": __version__,
+            },
+            "parameters": {
+                **job_params,
+                "processes": processes,
+            },
+            "runtime": time_taken.total_seconds(),
+            "contigs": tuple(contig_set),
+            "results": results,
+        }
+
+        dfn = dumps_indented if indent_json else json.dumps
+        report_data = dfn(json_report)
+
+        if json_path == "stdout":
+            sys.stdout.buffer.write(report_data)
+            sys.stdout.write("\n")
+            sys.stdout.flush()
+        else:
+            with open(json_path, "wb") as jf:
+                jf.write(report_data)
+                jf.write(b"\n")

{strkit-0.12.0 → strkit-0.12.0a1}/strkit/call/types.py

@@ -1,5 +1,5 @@
 # import pysam
-from typing import Literal, TypedDict, Union
+from typing import Literal, Optional, TypedDict, Union
 
 
 __all__ = [
@@ -34,14 +34,12 @@ class ReadDict(_ReadDictBase, total=False):
 
 
 class ReadDictExtra(TypedDict, total=False):
+    # Below are only added if SNVs are being incorporated:
+
     _ref_start: int  # Read start in ref coordinates
     _ref_end: int  # Read end in ref coordinates
 
-    _tr_seq: str  # Tandem repeat sequence... only added if consensus is being calculated
-
-    # Below are only added if SNVs are being incorporated:
-
-    _qs: str  # Query (read) sequence
+    _qs: str  # Query (read) sequence... only added if SNVs are being incorporated
 
     sig_clip_left: bool  # Significant amounts of clipping (5' of read)
     sig_clip_right: bool  # Significant amounts of clipping (3' of read)

{strkit-0.12.0 → strkit-0.12.0a1}/strkit/entry.py

@@ -92,11 +92,6 @@ def add_call_parser_args(call_parser):
              "expansion patterns. If set to 'peak', read-level counts will be aggregated into peak-level counts for "
              "more efficient space and processing. This is the default if the flag is passed by itself.")
 
-    call_parser.add_argument(
-        "--consensus", "-c",
-        action="store_true",
-        help="Calculate consensus sequences for alleles. This flag increases runtime.")
-
     call_parser.add_argument(
         "--min-reads",
         type=int,
@@ -142,9 +137,6 @@ def add_call_parser_args(call_parser):
         help="Sex chromosome configuration to use for this sample (XX, XY, etc.) If left out, sex chromosomes will not "
              "be genotyped.")
 
-    # BEGIN FILE OUTPUT ARGUMENTS ======================================================================================
-
-    # Begin JSON output arguments --------------------------------------------------------------------------------------
     call_parser.add_argument(
         "--json", "-j",
         type=str,
@@ -156,23 +148,12 @@ def add_call_parser_args(call_parser):
         action="store_true",
         help="If passed alongside --json [x], the JSON output will be indented to be more human readable but "
              "less compact.")
-    # End JSON output arguments ----------------------------------------------------------------------------------------
-
-    # Begin VCF output arguments ---------------------------------------------------------------------------------------
-    call_parser.add_argument(
-        "--vcf",
-        type=str,
-        help="Path to write VCF-formatted calls to. STR alleles are currently formatted symbolically rather than as "
-             "consensus sequences.")
-    # End VCF output arguments -----------------------------------------------------------------------------------------
 
     call_parser.add_argument(
         "--no-tsv",
         action="store_true",
         help="If passed, no TSV call output will be written to stdout.")
 
-    # END FILE OUTPUT ARGUMENTS ========================================================================================
-
     call_parser.add_argument(
         "--seed",
         type=int,
@@ -370,11 +351,9 @@ def _exec_call(p_args) -> None:
         fractional=p_args.fractional,
         respect_ref=p_args.respect_ref,
         count_kmers=p_args.count_kmers,
-        consensus=p_args.consensus or not (not p_args.vcf),  # Consensus calculation is required for VCF output.
         log_level=log_levels[p_args.log_level],
         json_path=p_args.json,
         indent_json=p_args.indent_json,
-        vcf_path=p_args.vcf,
         output_tsv=not p_args.no_tsv,
         processes=p_args.processes,
         seed=p_args.seed,

{strkit-0.12.0 → strkit-0.12.0a1/strkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strkit
-Version: 0.12.0
+Version: 0.12.0a1
 Summary: A toolkit for analyzing variation in short(ish) tandem repeats.
 Home-page: https://github.com/davidlougheed/strkit
 Author: David Lougheed
@@ -16,7 +16,6 @@ Requires-Dist: Flask<3.1,>=2.2.5
 Requires-Dist: pysam<0.23,>=0.19
 Requires-Dist: numpy<1.27,>=1.23.4
 Requires-Dist: parasail<1.4,>=1.2.4
-Requires-Dist: pyfamsa<0.4,>=0.3.0
 Requires-Dist: scikit-learn<1.4,>=1.2.1
 Requires-Dist: scipy<1.12,>=1.10
 Requires-Dist: statsmodels<0.15,>=0.14.0
@@ -116,8 +115,6 @@ long read data should still work.
   * Whole-genome and targeted genotyping modes to adjust this re-weighting.
 * Incorporation of single-nucleotide variation (SNVs) for better and faster calling plus 
   additional downstream analysis possibilities.
-  * Recommended for **HiFi data only**. In my testing, this worsens runtime and call quality for 
-    ONT-UL data, but speeds up the tool and improves call quality for HiFi data. 
 * Parallelized for faster computing on clusters and for ad-hoc fast analysis of single samples.
 * 95% confidence intervals on calls via a user-configurable optional parametric bootstrapping process.
 
@@ -131,11 +128,10 @@ strkit call \
   --realign \  # If using PacBio HiFi reads, enable this to enable local realignment / read recovery
   --ref path/to/reference.fa.gz \  # [REQUIRED] Indexed FASTA-formatted reference genome
   --loci path/to/loci.bed \  # [REQUIRED] TRF-formatted (or 4-col, with motif as last column) list of loci to genotype
-  --incorporate-snvs path/to/dbsnp.vcf.gz \   # [RECOMMENDED FOR HIFI ONLY] If you want SNV calls to help phase STRs & speed up calling
+  --incorporate-snvs path/to/dbsnp.vcf.gz \   # If you want SNV calls to help phase STRs & speed up STRkit, include this
   --min-reads 4 \  # Minimum number of supporting reads needed to make a call
   --min-allele-reads 2 \  # Minimum number of supporting reads needed to call a specific allele size 
   --flank-size 70 \  # Size of the flanking region to use on either side of a region to properly anchor reads
-  --consensus \  # If this flag is set, consensus sequences are calculated for alleles. This increases runtime! 
   --seed 183 \  # Fixed random number generator seed for replicability
   --processes 10  # Number of parallel processes to use; DEFAULT: 1
 ```
@@ -164,9 +160,6 @@ specify a path to output a more detailed JSON document to. This document contain
 labels, and some other information that isn't included in the normal TSV file. If you want this
 file to be indented and human-readable, use the `--indent-json` flag in addition to `--json ...`.
 
-If you want to output a VCF file (currently with STR sequences only, not with phased SNVs), use the
-`--vcf ...` argument.
-
 See the '[Caller catalog format & choosing a catalog](./docs/caller_catalog.md)' page for more on
 how to format a locus catalog or choose from existing available catalogs.
 

{strkit-0.12.0 → strkit-0.12.0a1}/strkit.egg-info/SOURCES.txt

@@ -23,17 +23,12 @@ strkit/call/allele.py
 strkit/call/call_locus.py
 strkit/call/call_sample.py
 strkit/call/cigar.py
-strkit/call/consensus.py
 strkit/call/non_daemonic_pool.py
 strkit/call/realign.py
 strkit/call/repeats.py
 strkit/call/snvs.py
 strkit/call/types.py
 strkit/call/utils.py
-strkit/call/output/__init__.py
-strkit/call/output/json_report.py
-strkit/call/output/tsv.py
-strkit/call/output/vcf.py
 strkit/catalog/__init__.py
 strkit/catalog/combine.py
 strkit/convert/__init__.py

{strkit-0.12.0 → strkit-0.12.0a1}/strkit.egg-info/requires.txt

@@ -2,7 +2,6 @@ Flask<3.1,>=2.2.5
 pysam<0.23,>=0.19
 numpy<1.27,>=1.23.4
 parasail<1.4,>=1.2.4
-pyfamsa<0.4,>=0.3.0
 scikit-learn<1.4,>=1.2.1
 scipy<1.12,>=1.10
 statsmodels<0.15,>=0.14.0

strkit-0.12.0/strkit/VERSION

@@ -1 +0,0 @@
-0.12.0

strkit-0.12.0/strkit/call/consensus.py

@@ -1,26 +0,0 @@
-import numpy as np
-import pyfamsa
-from scipy.stats import mode
-from typing import Iterable
-
-__all__ = [
-    "consensus_seq",
-]
-
-GAP_ORD = ord("-")
-
-aligner = pyfamsa.Aligner(threads=1, guide_tree="upgma", keep_duplicates=True)
-join_str = "".join
-
-
-def _not_gap(x: int) -> bool:
-    return x != GAP_ORD
-
-
-def consensus_seq(seqs: Iterable[str]) -> str:
-    # Align all the allele tandem repeat sequences together into a multiple sequence alignment
-    msa = aligner.align(pyfamsa.Sequence(f"s{i}".encode("ascii"), seq.encode("ascii")) for i, seq in enumerate(seqs))
-    # Turn the MSA into a numpy matrix as setup for calculating the modal value at each position
-    msa_grid = np.array(list(map(lambda aseq: list(map(int, aseq.sequence)), msa)))
-    # Return a stringified, gapless version of the column-wise mode for the MSA
-    return join_str(map(chr, filter(_not_gap, getattr(mode(msa_grid), "mode", ()))))

strkit-0.12.0/strkit/call/output/__init__.py

@@ -1,9 +0,0 @@
-from .json_report import output_json_report
-from .tsv import output_tsv
-from .vcf import output_vcf
-
-__all__ = [
-    "output_json_report",
-    "output_tsv",
-    "output_vcf",
-]

strkit-0.12.0/strkit/call/output/json_report.py

@@ -1,46 +0,0 @@
-import sys
-from datetime import timedelta
-from typing import Optional
-
-from strkit import __version__
-from strkit.json import dumps_indented, json
-
-__all__ = ["output_json_report"]
-
-
-def output_json_report(
-    sample_id: Optional[str],
-    job_params: dict,
-    processes: int,
-    time_taken: timedelta,
-    contig_set: set[str],
-    results: tuple[dict, ...],
-    json_path: str,
-    indent_json: bool,
-):
-    json_report = {
-        "sample_id": sample_id,
-        "caller": {
-            "name": "strkit",
-            "version": __version__,
-        },
-        "parameters": {
-            **job_params,
-            "processes": processes,
-        },
-        "runtime": time_taken.total_seconds(),
-        "contigs": tuple(contig_set),
-        "results": results,
-    }
-
-    dfn = dumps_indented if indent_json else json.dumps
-    report_data = dfn(json_report)
-
-    if json_path == "stdout":
-        sys.stdout.buffer.write(report_data)
-        sys.stdout.write("\n")
-        sys.stdout.flush()
-    else:
-        with open(json_path, "wb") as jf:
-            jf.write(report_data)
-            jf.write(b"\n")

strkit-0.12.0/strkit/call/output/tsv.py

@@ -1,34 +0,0 @@
-import sys
-from typing import Union
-
-__all__ = ["output_tsv"]
-
-
-def _cn_to_str(cn: Union[int, float]) -> str:
-    return f"{cn:.1f}" if isinstance(cn, float) else str(cn)
-
-
-def output_tsv(results: tuple[dict, ...], has_snv_vcf: bool):
-    for res in results:
-        has_call = res["call"] is not None
-        # n_peaks = res["peaks"]["modal_n"]
-
-        sys.stdout.write("\t".join((
-            res["contig"],
-            str(res["start"]),
-            str(res["end"]),
-            res["motif"],
-            _cn_to_str(res["ref_cn"]),
-            ",".join(map(_cn_to_str, sorted(r["cn"] for r in res["reads"].values()))) if res["reads"] else ".",
-            "|".join(map(_cn_to_str, res["call"])) if has_call else ".",
-            ("|".join("-".join(map(_cn_to_str, gc)) for gc in res["call_95_cis"]) if has_call else "."),
-            # *((res["assign_method"] if has_call else ".",) if incorporate_snvs else ()),
-            *((res["assign_method"] if has_call else ".",) if has_snv_vcf else ()),
-
-            # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["means"][:n_peaks]))
-            #  if has_call and n_peaks <= 2 else "."),
-            # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["weights"][:n_peaks]))
-            #  if has_call and n_peaks <= 2 else "."),
-            # ("|".join(map(lambda x: f"{x:.5f}", res["peaks"]["stdevs"][:n_peaks]))
-            #  if has_call and n_peaks <= 2 else "."),
-        )) + "\n")

strkit-0.12.0/strkit/call/output/vcf.py

@@ -1,170 +0,0 @@
-import pathlib
-import pysam
-
-from typing import Optional
-
-__all__ = ["output_vcf"]
-
-
-# VCF_ALLELE_CNV_TR = "<CNV:TR>"
-
-# VCF_TR_INFO_RECORDS: tuple[tuple[str, str, str, str], ...] = (
-#     ("SVLEN", "A", "Integer", "Length of the structural variant"),
-#     ("CN", "A", "Float", "Copy number of allele"),
-#     ("RN", "A", "Integer", "Total number of repeat sequences in this allele"),
-#     ("RUS", ".", "String", "Repeat unit sequence of the corresponding repeat sequence"),
-#     ("RUL", ".", "Integer", "Repeat unit length of the corresponding repeat sequence"),
-#     ("RB", ".", "Integer", "Total number of bases in the corresponding repeat sequence"),
-#     ("CIRUC", ".", "Float", "Confidence interval around RUC"),
-#     ("CIRB", ".", "Integer", "Confidence interval around RB"),
-# )
-
-
-def _build_variant_header(sample_id: str, reference_file: str) -> pysam.VariantHeader:
-    vh = pysam.VariantHeader()  # automatically sets VCF version to 4.2
-
-    # Add an absolute path to the reference genome
-    vh.add_meta("reference", f"file://{str(pathlib.Path(reference_file).absolute())}")
-
-    # Add all contigs from the reference genome file + lengths
-    rf = pysam.FastaFile(reference_file)
-    try:
-        for contig in rf.references:
-            vh.contigs.add(contig, length=rf.get_reference_length(contig))
-    finally:
-        rf.close()
-
-    # Add CNV:TR alt type (symbolic allele: tandem repeat)
-    vh.add_meta("ALT", "<ID=CNV:TR,Description=\"Tandem repeat\">")
-
-    # Set up basic VCF formats
-    vh.formats.add("AD", "R", "Integer", "Read depth for each allele")
-    vh.formats.add("DP", 1, "Integer", "Read depth")
-    vh.formats.add("GT", 1, "String", "Genotype")
-    # vh.formats.add("PS", 1, "String", "Phase set")  TODO
-
-    # Add INFO records for tandem repeat copies - these are new to VCF4.4!  TODO
-    # for iv in VCF_TR_INFO_RECORDS:
-    #     vh.info.add(*iv)
-
-    # Add the sample
-    vh.add_sample(sample_id)
-
-    return vh
-
-
-def _vr_pos_key(vr: pysam.VariantRecord) -> int:
-    return vr.pos
-
-
-def output_vcf(
-    sample_id: Optional[str],
-    reference_file: str,
-    results: tuple[dict, ...],
-    vcf_path: str,
-):
-    sample_id_str: str = sample_id or "sample"
-
-    vh = _build_variant_header(sample_id_str, reference_file)
-    vf = pysam.VariantFile(vcf_path, "w", header=vh)
-
-    contig_vrs: list[pysam.VariantRecord] = []
-
-    def _write_contig_vrs():
-        # sort the variant records by position
-        contig_vrs.sort(key=_vr_pos_key)
-
-        # write them to the VCF
-        for contig_vr in contig_vrs:
-            vf.write(contig_vr)
-
-        # clear the contig variant record list for the new contig
-        contig_vrs.clear()
-
-    try:
-        last_contig = results[0]["contig"] if results else ""
-
-        has_at_least_one_snv_set = next((r.get("snvs") is not None for r in results), None) is not None
-
-        for result_idx, result in enumerate(results, 1):
-            contig = result["contig"]
-
-            if contig != last_contig:
-                # we moved on from the last contig, so write the last batch of variant records to the VCF
-                _write_contig_vrs()
-
-            # TODO: fix-up coordinates / note positioning
-            start = result["start_adj"]
-            end = result["end_adj"]
-            call = result["call"]
-
-            # ref_cn = result["ref_cn"]
-            ref_seq = result["ref_seq"].lower()
-
-            seqs = tuple(map(str.lower, (result["peaks"] or {}).get("seqs", ())))
-
-            # cn_alts = sorted(set(c for c in call if c != ref_cn)) if call is not None else ()
-            seq_alts = sorted(set(filter(lambda c: c != ref_seq, seqs)))
-
-            # cn_alleles = (ref_cn, *cn_alts) if call is not None else (".",)
-            seq_alleles = (ref_seq, *(seq_alts or (".",))) if call is not None else (".",)
-
-            vr: pysam.VariantRecord = vf.new_record(
-                contig=contig,
-                start=start,
-                stop=end,
-                alleles=seq_alleles,
-            )
-
-            # TODO: right now we only call one repeat in one allele and use the canonical motif sequence, even though
-            #  there may be multiple motifs present.
-            # motif = result["motif"]
-            # vr.info["SVLEN"] = math.ceil(end - start)
-            # vr.info["CN"] = tuple(a / ref_cn for a in alts) if ref_cn else tuple([1] * len(alts))
-            # vr.info["RN"] = tuple([1] * len(alts))
-            # vr.info["RUS"] = tuple([motif] * len(alts))
-            # vr.info["RUL"] = tuple([len(motif)] * len(alts))
-
-            # TODO: set up tandem repeat info fields
-
-            vr.samples[sample_id_str]["GT"] = tuple(map(seq_alleles.index, seqs)) if seqs else (".",)
-            vr.samples[sample_id_str]["DP"] = sum(result["peaks"]["n_reads"])
-
-            # TODO: output SNVs
-
-            # if has_at_least_one_snv_set:
-            #     vr.samples[sample_id_str].phased = True
-            #     vr.samples[sample_id_str]["PS"] = str(result_idx)
-
-            # for snv in result.get("snvs", ()):
-            #     print(snv)
-            #
-            #     ref = snv["ref"]
-            #     snv_alts = tuple(filter(lambda v: v != ref, snv["call"]))
-            #     snv_alleles = (ref, *snv_alts)
-            #
-            #     snv_vr = vf.new_record(
-            #         contig=contig,
-            #         id=snv["id"],
-            #         # TODO: fix-up coordinates
-            #         start=snv["pos"],
-            #         stop=snv["pos"] + 1,
-            #         alleles=snv_alleles,
-            #     )
-            #
-            #     # TODO: write "rcs" for sample SNV genotypes - list of #reads per allele
-            #
-            #     snv_vr.samples[sample_id_str]["GT"] = tuple(map(snv_alleles.index, snv["call"]))
-            #     # snv_vr.samples[sample_id_str].phased = True
-            #     snv_vr.samples[sample_id_str]["PS"] = str(result_idx)
-            #
-            #     contig_vrs.append(snv_vr)
-            #
-            #     # TODO: now is the time to figure out phasing SNVs across different TRs
-
-            contig_vrs.append(vr)
-
-        _write_contig_vrs()  # write the final contig's worth of variant records to the VCF at the end
-
-    finally:
-        vf.close()