Update version and add hit to Prod model

python-core/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deciphon-core"
-version = "0.23.1"
+version = "0.23.2"
 description = "Python wrapper around the Deciphon C library"
 authors = ["Danilo Horta <[email protected]>"]
 license = "MIT"

python-core/tests/test_scan.py

@@ -52,7 +52,7 @@ def test_scan(tmp_path, files_path: Path):
 
     shutil.unpack_archive(snapfile.path, format="zip")
     products = snapfile.basename / "products.tsv"
-    assert checksum(products)[:8] == "e06f9686"
+    assert checksum(products)[:8] == "ee567b88"
 
 
 sequences = [

snap/deciphon_snap/prod.py

@@ -20,6 +20,7 @@ class Prod(BaseModel):
     seq_id: int
     window: int
     window_interval: Interval
+    hit: int
     hit_interval: Interval
     profile: str
     abc: str

snap/deciphon_snap/snap_file.py

@@ -36,8 +36,9 @@ def __init__(self, filesystem):
             for idx, row in enumerate((csv_parse(fieldnames, r) for r in rows[1:])):
                 seq_id = int(row["sequence"])
                 window = int(row["window"])
+                hit = int(row["hit"])
                 profile = str(row["profile"])
-                with fs.open(f"{hmmer_dir}/{seq_id}/{window}/{profile}.h3r", "rb") as f2:
+                with fs.open(f"{hmmer_dir}/{seq_id}/{window}/{hit}/{profile}.h3r", "rb") as f2:
                     h3r = H3Result(raw=read_h3result(fileno=f2.fileno()))
                 window_start = int(row["window_start"])
                 window_stop = int(row["window_stop"])
@@ -51,6 +52,7 @@ def __init__(self, filesystem):
                         seq_id=seq_id,
                         window=window,
                         window_interval=window_interval,
+                        hit=hit,
                         hit_interval=hit_interval,
                         profile=profile,
                         abc=row["abc"],

snap/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "deciphon-snap"
-version = "0.10.2"
+version = "0.11.0"
 description = "Reader for Deciphon snap files."
 authors = ["Danilo Horta <[email protected]>"]
 license = "MIT"

snap/tests/test_alignments.py

@@ -0,0 +1,9 @@
+from pathlib import Path
+
+from deciphon_snap.read_snap import read_snap
+from deciphon_snap.view import view_alignments
+
+def test_alignments(files_path: Path):
+    snap_file = read_snap(files_path / "consensus.dcs")
+    txt = view_alignments(snap_file)
+    print(txt)