09f347da2873b42ab1b5c6f5684e429dc4e321d5 lrnassar Mon May 4 08:52:54 2026 -0700 Switch mpravardbToBed sanitize map to str.maketrans with \u escape keys per CR feedback. refs #37359 Replaces literal UTF-8 characters in the dictionary keys (curly quotes, primes, dashes, NBSP, mojibake) with their \uXXXX escape forms so an editor can't silently re-encode them and break the pipeline. Translation now uses str.translate(), and the whitespace-collapse regex is precompiled at module level. diff --git src/hg/makeDb/scripts/mpravardb/mpravardbToBed.py src/hg/makeDb/scripts/mpravardb/mpravardbToBed.py index c97884640b5..6a6aa29f8cb 100644 --- src/hg/makeDb/scripts/mpravardb/mpravardbToBed.py +++ src/hg/makeDb/scripts/mpravardb/mpravardbToBed.py @@ -1,218 +1,218 @@ #!/usr/bin/env python3 """ Convert mpravardb.csv to BED9+ format, liftOver hg19 to hg38, merge, and create bigBed. Usage: cd /hive/data/genomes/hg38/bed/mpra/mpravardb python3 ~/kent/src/hg/makeDb/scripts/mpravardb/mpravardbToBed.py """ import csv import re import subprocess import sys import os import math SCRIPT_DIR = os.path.join(os.environ["HOME"], "kent/src/hg/makeDb/scripts/mpravardb") AS_FILE = os.path.join(SCRIPT_DIR, "mpravardb.as") LIFTOVER_CHAIN = "/gbdb/hg19/liftOver/hg19ToHg38.over.chain.gz" CHROM_SIZES = "/hive/data/genomes/hg38/chrom.sizes" INPUT_CSV = "mpravardb.csv" # Upstream CSV contains UTF-8 curly quotes, primes, and NBSP mojibake. # Browser does not transcode UTF-8 in bigBed fields, so everything user-visible -# must be plain ASCII. Transliterate or strip. -_SANITIZE_MAP = { - "’": "'", # RIGHT SINGLE QUOTATION MARK (used as apostrophe) - "‘": "'", # LEFT SINGLE QUOTATION MARK - "“": '"', # LEFT DOUBLE QUOTATION MARK - "”": '"', # RIGHT DOUBLE QUOTATION MARK - "′": "'", # PRIME (used after numerals: 3'UTR) - "″": '"', # DOUBLE PRIME - "–": "-", # EN DASH - "—": "-", # EM DASH - "…": "...", # HORIZONTAL ELLIPSIS - " ": " ", # NO-BREAK SPACE - "¬": "", # NOT SIGN (NBSP mojibake pair) - "†": "", # DAGGER (NBSP mojibake pair) -} -_SANITIZE_RE = re.compile("|".join(re.escape(k) for k in _SANITIZE_MAP)) +# must be plain ASCII. Transliterate or strip. Keys use \u escapes rather than +# literal characters so an editor can't silently re-encode them. +_SANITIZE_MAP = str.maketrans({ + "\u2019": "'", # RIGHT SINGLE QUOTATION MARK (used as apostrophe) + "\u2018": "'", # LEFT SINGLE QUOTATION MARK + "\u201c": '"', # LEFT DOUBLE QUOTATION MARK + "\u201d": '"', # RIGHT DOUBLE QUOTATION MARK + "\u2032": "'", # PRIME (used after numerals: 3'UTR) + "\u2033": '"', # DOUBLE PRIME + "\u2013": "-", # EN DASH + "\u2014": "-", # EM DASH + "\u2026": "...", # HORIZONTAL ELLIPSIS + "\u00a0": " ", # NO-BREAK SPACE + "\u00ac": "", # NOT SIGN (NBSP mojibake pair) + "\u2020": "", # DAGGER (NBSP mojibake pair) +}) +_WS_RE = re.compile(r"\s+") def sanitize_text(s): """Return ASCII-only version of s for bigBed string fields.""" - if s is None: + if not s: return "" - out = _SANITIZE_RE.sub(lambda m: _SANITIZE_MAP[m.group()], s) + s = s.translate(_SANITIZE_MAP) # Drop any remaining non-ASCII (rare), then collapse runs of whitespace - out = out.encode("ascii", "ignore").decode("ascii") - out = re.sub(r"\s+", " ", out).strip() - return out + s = s.encode("ascii", "ignore").decode("ascii") + return _WS_RE.sub(" ", s).strip() def pval_to_score(pval): """Convert p-value to a 0-1000 score using -log10. Missing / out-of-range / non-numeric → 0 (not 1000). Many rows upstream encode NA as literal 0.0, which is indistinguishable from a true p=0; treat all non-positive inputs as unscored.""" if pval is None or pval in ("", "NA"): return 0 try: p = float(pval) except ValueError: return 0 if p <= 0 or p > 1: return 0 score = int(-math.log10(p) * 100) return max(0, min(1000, score)) def pval_to_color(pval, fdr): """Color by significance: red if FDR<0.05, orange if p<0.05, grey otherwise.""" try: fdr_val = float(fdr) if fdr not in (None, "", "NA") else 1.0 except ValueError: fdr_val = 1.0 try: p_val = float(pval) if pval not in (None, "", "NA") else 1.0 except ValueError: p_val = 1.0 if fdr_val < 0.05: return "200,0,0" # dark red - FDR significant elif p_val < 0.05: return "255,165,0" # orange - nominally significant else: return "190,190,190" # grey - not significant def safe_float(val): """Convert to float, return NaN for NA / empty / non-numeric. Using NaN (rather than 0.0) keeps untested variants out of filterByRange sliders by default and avoids masquerading as p=0 / fdr=0 in the details page. bedToBigBed accepts the literal string "nan" in float fields.""" if val in (None, "", "NA"): return math.nan try: return float(val) except ValueError: return math.nan def csv_to_bed(input_csv, hg19_bed, hg38_bed): """Parse CSV and write two BED files, one per assembly.""" hg19_count = 0 hg38_count = 0 with open(input_csv, newline="") as fin, \ open(hg19_bed, "w") as f19, \ open(hg38_bed, "w") as f38: reader = csv.reader(fin) header = next(reader) for row in reader: chrom_num, pos, ref, alt, genome = row[0], row[1], row[2], row[3], row[4] rsid, disease, cellline = row[5], row[6], row[7] desc, log2fc, pvalue, fdr, study = row[8], row[9], row[10], row[11], row[12] # Sanitize user-visible string fields (ASCII only, drop NBSP mojibake) rsid = sanitize_text(rsid) disease = sanitize_text(disease) cellline = sanitize_text(cellline) desc = sanitize_text(desc) study = sanitize_text(study) ref = sanitize_text(ref) alt = sanitize_text(alt) chrom = "chr" + chrom_num try: start = int(pos) - 1 # CSV uses 1-based coordinates except ValueError: continue end = start + max(1, len(ref)) # span the reference allele # Build name if rsid and rsid != "NA": name = rsid else: name = f"{chrom}:{pos}:{ref}>{alt}" score = pval_to_score(pvalue) color = pval_to_color(pvalue, fdr) # Truncate long string fields to stay within bigBed limits if len(desc) > 250: desc = desc[:247] + "..." if len(study) > 250: study = study[:247] + "..." # Short values for mouseOver (3 significant digits) log2fc_val = safe_float(log2fc) pvalue_val = safe_float(pvalue) fdr_val = safe_float(fdr) mo_log2fc = f"{log2fc_val:.3g}" mo_pvalue = f"{pvalue_val:.3g}" mo_fdr = f"{fdr_val:.3g}" fields = [ chrom, str(start), str(end), name, str(score), ".", str(start), str(end), color, ref, alt, rsid if rsid and rsid != "NA" else ".", disease, cellline, desc, str(log2fc_val), str(pvalue_val), str(fdr_val), study, mo_log2fc, mo_pvalue, mo_fdr, ] line = "\t".join(fields) + "\n" if genome == "hg19": f19.write(line) hg19_count += 1 elif genome == "hg38": f38.write(line) hg38_count += 1 print(f"Wrote {hg19_count} hg19 rows to {hg19_bed}") print(f"Wrote {hg38_count} hg38 rows to {hg38_bed}") def run(cmd): """Run a shell command, exit on failure.""" print(f" Running: {cmd}") result = subprocess.run(cmd, shell=True) if result.returncode != 0: print(f"ERROR: command failed with exit code {result.returncode}", file=sys.stderr) sys.exit(1) def main(): hg19_bed = "mpravardb.hg19.bed" hg38_bed = "mpravardb.hg38.bed" lifted_bed = "mpravardb.hg19lifted.bed" unmapped_bed = "mpravardb.unmapped.bed" merged_bed = "mpravardb.bed" output_bb = "mpravardb.bb" print("Step 1: Converting CSV to BED format...") csv_to_bed(INPUT_CSV, hg19_bed, hg38_bed) print("\nStep 2: Lifting hg19 coordinates to hg38...") run(f"liftOver -bedPlus=9 -tab {hg19_bed} {LIFTOVER_CHAIN} {lifted_bed} {unmapped_bed}") # Count unmapped unmapped = sum(1 for line in open(unmapped_bed) if not line.startswith("#")) lifted = sum(1 for _ in open(lifted_bed)) print(f" Lifted: {lifted}, Unmapped: {unmapped}") print("\nStep 3: Merging hg38 native + lifted hg19...") run(f"cat {hg38_bed} {lifted_bed} > {merged_bed}.tmp") run(f"bedSort {merged_bed}.tmp {merged_bed}") os.remove(f"{merged_bed}.tmp") total = sum(1 for _ in open(merged_bed)) print(f" Total merged rows: {total}") print("\nStep 4: Converting to bigBed...") run(f"bedToBigBed -type=bed9+ -tab -as={AS_FILE} {merged_bed} {CHROM_SIZES} {output_bb}") print(f"\nDone. Output: {output_bb}") print(f"File size: {os.path.getsize(output_bb) / 1024 / 1024:.1f} MB") if __name__ == "__main__": main()