haplohub-cli 2.3.0__tar.gz → 2.4.0__tar.gz

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haplohub-cli
-Version: 2.3.0
+Version: 2.4.0
 Summary: HaploHub Command Line Interface
 Author-email: Mike Polcari <mike@haplotype-labs.com>, Ilya Khrustalev <ilya@haplotype-labs.com>
 Requires-Python: >=3.8

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/haplohub_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.4.0'
+__version_tuple__ = version_tuple = (2, 4, 0)
 
-__commit_id__ = commit_id = 'g6d8dda047'
+__commit_id__ = commit_id = 'gc36ea6d15'

haplohub_cli-2.4.0/haplohub_cli/commands/variant.py

@@ -0,0 +1,124 @@
+import click
+from haplohub import (
+    GetVariantRequest,
+    GwasTargetSchema,
+    HgvsTargetSchema,
+    RegionTargetSchema,
+    TargetsInner,
+    VariantFilterSchema,
+)
+
+from haplohub_cli.core.api.client import client
+
+
+def _selectors(clinvar: bool, gwas: bool) -> list[str] | None:
+    """Build the selector list; None when no annotations were requested."""
+    selectors = []
+    if clinvar:
+        selectors.append("clinvar")
+    if gwas:
+        selectors.append("gwas")
+    return selectors or None
+
+
+@click.group()
+def variant():
+    """
+    Work with variants
+    """
+    pass
+
+
+@variant.command()
+@click.argument("cohort_id", type=str)
+@click.option("--sample", "-s", "sample_ids", type=str, multiple=True, required=True, help="Sample ID (repeatable)")
+@click.option("--accession", "-a", type=str, required=True, help="Chromosome accession (e.g. NC_000001.11)")
+@click.option("--start", type=int, required=True, help="Genomic start position")
+@click.option("--end", type=int, required=True, help="Genomic end position")
+@click.option("--reference", type=str, default=None, help="Reference allele")
+@click.option("--alternate", type=str, default=None, help="Alternate allele")
+@click.option("--call-state", type=click.Choice(["called", "all"]), default="called", help="Filter by call state")
+@click.option("--clinvar", is_flag=True, default=False, help="Include ClinVar annotations")
+@click.option("--gwas", is_flag=True, default=False, help="Include GWAS Catalog annotations")
+def region(sample_ids, cohort_id, accession, start, end, reference, alternate, call_state, clinvar, gwas):
+    """
+    Query variants by genomic region
+    """
+    target = RegionTargetSchema(
+        accession=accession,
+        start=start,
+        end=end,
+        reference=reference,
+        alternate=alternate,
+    )
+
+    request = GetVariantRequest(
+        sample_ids=list(sample_ids),
+        targets=[TargetsInner(target)],
+        filters=VariantFilterSchema(call_state=call_state),
+        selectors=_selectors(clinvar, gwas),
+    )
+
+    return client.variant.get_variant(cohort_id, request)
+
+
+@variant.command()
+@click.argument("cohort_id", type=str)
+@click.option("--sample", "-s", "sample_ids", type=str, multiple=True, required=True, help="Sample ID (repeatable)")
+@click.option("--hgvs", "-h", type=str, multiple=True, required=True, help="HGVS notation (repeatable)")
+@click.option("--call-state", type=click.Choice(["called", "all"]), default="called", help="Filter by call state")
+@click.option("--clinvar", is_flag=True, default=False, help="Include ClinVar annotations")
+@click.option("--gwas", is_flag=True, default=False, help="Include GWAS Catalog annotations")
+def hgvs(sample_ids, cohort_id, hgvs, call_state, clinvar, gwas):
+    """
+    Query variants by HGVS notation
+    """
+    targets = [TargetsInner(HgvsTargetSchema(value=v)) for v in hgvs]
+
+    request = GetVariantRequest(
+        sample_ids=list(sample_ids),
+        targets=targets,
+        filters=VariantFilterSchema(call_state=call_state),
+        selectors=_selectors(clinvar, gwas),
+    )
+
+    return client.variant.get_variant(cohort_id, request)
+
+
+@variant.command()
+@click.argument("cohort_id", type=str)
+@click.option("--sample", "-s", "sample_ids", type=str, multiple=True, required=True, help="Sample ID (repeatable)")
+@click.option("--gene", type=str, default=None, help="Mapped gene symbol (e.g. TCF7L2)")
+@click.option("--trait-id", type=str, default=None, help="EFO trait id (e.g. EFO_0001360)")
+@click.option("--rs", "rs_ids", type=str, multiple=True, help="rsID to genotype (repeatable)")
+@click.option("--p-value-max", type=float, default=None, help="Keep only associations with p-value <= this")
+@click.option("--limit", type=int, default=100, help="Max associations to resolve (most significant first)")
+@click.option("--call-state", type=click.Choice(["called", "all"]), default="called", help="Filter by call state")
+@click.option("--clinvar", is_flag=True, default=False, help="Also include ClinVar annotations")
+def gwas(sample_ids, cohort_id, gene, trait_id, rs_ids, p_value_max, limit, call_state, clinvar):
+    """
+    Genotype the SNPs of GWAS Catalog associations in a sample.
+
+    Selects associations by --gene, --trait-id and/or --rs (at least one required),
+    genotypes their SNP positions in the sample, and attaches the matching GWAS
+    associations to each result. Combine with --clinvar to also attach ClinVar.
+    """
+    if not (gene or trait_id or rs_ids):
+        raise click.UsageError("Provide at least one of --gene, --trait-id or --rs.")
+
+    target = GwasTargetSchema(
+        gene=gene,
+        trait_id=trait_id,
+        rs_ids=list(rs_ids),
+        p_value_max=p_value_max,
+        limit=limit,
+    )
+
+    request = GetVariantRequest(
+        sample_ids=list(sample_ids),
+        targets=[TargetsInner(target)],
+        filters=VariantFilterSchema(call_state=call_state),
+        selectors=_selectors(clinvar, gwas=True),
+    )
+
+    return client.variant.get_variant(cohort_id, request)

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/haplohub_cli/formatters/algorithm.py

@@ -1,5 +1,8 @@
+from typing import Optional
+
 from haplohub import (
     AlgorithmSchema,
+    AlgorithmVersionSchema,
     PaginatedResponseAlgorithmSchema,
     ResultResponseAlgorithmSchema,
 )
@@ -9,14 +12,19 @@ from haplohub_cli.formatters import utils
 from haplohub_cli.formatters.decorators import register
 
 
+def _latest_version(version: Optional[AlgorithmVersionSchema]) -> str:
+    # Algorithms are identified by name now; a version is identified by its version string.
+    return version.version if version else "N/A"
+
+
 @register(AlgorithmSchema)
 def format_algorithm(data: AlgorithmSchema):
-    table = Table(title="Algorithm", caption=f"Id: {utils.format_id(data.id)}")
-    table.add_column("Id")
+    table = Table(title="Algorithm", caption=f"Name: {data.name}")
     table.add_column("Name")
     table.add_column("Description")
     table.add_column("Latest Version")
-    table.add_row(utils.format_id(data.id), data.name, data.description)
+    table.add_column("Owner")
+    table.add_row(data.name, data.description, _latest_version(data.latest_version), data.owner)
     return table
 
 
@@ -28,7 +36,6 @@ def format_single_algorithm(data: ResultResponseAlgorithmSchema):
 @register(PaginatedResponseAlgorithmSchema)
 def format_algorithms(data: PaginatedResponseAlgorithmSchema):
     table = Table(title="Algorithms", caption=f"Total: {data.total_count}")
-    table.add_column("Id")
     table.add_column("Name")
     table.add_column("Description")
     table.add_column("Latest Version")
@@ -36,10 +43,9 @@ def format_algorithms(data: PaginatedResponseAlgorithmSchema):
 
     for item in data.items:
         table.add_row(
-            utils.format_id(item.id),
             item.name,
             utils.truncate(item.description, 50),
-            "%s (%s)" % (utils.format_id(item.latest_version.id), item.latest_version.version),
+            _latest_version(item.latest_version),
             utils.format_dt(item.created),
         )
 

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/haplohub_cli/formatters/variant.py

@@ -16,10 +16,11 @@ def format_variant_results(data: ResultListResponseVariantResultSchema):
     table.add_column("Sample")
     table.add_column("Called")
     table.add_column("Dosage")
+    table.add_column("Annotations")
 
     for item in data.items:
         if item.error_message:
-            table.add_row(item.target.input, f"[red]{item.error_message}[/red]", "", "", "", "", "", "", "")
+            table.add_row(item.target.input, f"[red]{item.error_message}[/red]", "", "", "", "", "", "", "", "")
             continue
 
         variant = item.variant
@@ -30,9 +31,10 @@ def format_variant_results(data: ResultListResponseVariantResultSchema):
         reference = variant.reference or "" if variant else ""
         alternate = ", ".join(variant.alternate) if variant and variant.alternate else ""
         quality = f"{variant.quality:.4f}" if variant and variant.quality is not None else ""
+        annotations = _format_annotations(item.attachments)
 
         if not samples:
-            table.add_row(item.target.input, accession, position, reference, alternate, quality, "", "", "")
+            table.add_row(item.target.input, accession, position, reference, alternate, quality, "", "", "", annotations)
         else:
             for i, sample in enumerate(samples):
                 target_col = item.target.input if i == 0 else ""
@@ -41,10 +43,25 @@ def format_variant_results(data: ResultListResponseVariantResultSchema):
                 ref_col = reference if i == 0 else ""
                 alt_col = alternate if i == 0 else ""
                 qual_col = quality if i == 0 else ""
+                ann_col = annotations if i == 0 else ""
 
                 is_called = f"[green]{sample.is_called}[/green]" if sample.is_called else f"[red]{sample.is_called}[/red]"
                 dosage = str(sample.dosage) if sample.dosage is not None else ""
 
-                table.add_row(target_col, acc_col, pos_col, ref_col, alt_col, qual_col, sample.sample_id, is_called, dosage)
+                table.add_row(
+                    target_col, acc_col, pos_col, ref_col, alt_col, qual_col, sample.sample_id, is_called, dosage, ann_col
+                )
 
     return table
+
+
+def _format_annotations(attachments) -> str:
+    """Summarize per-source attachment counts, e.g. "clinvar:1 gwas:5"."""
+    if attachments is None:
+        return ""
+    parts = []
+    for source in ("clinvar", "gwas"):
+        rows = getattr(attachments, source, None) or []
+        if rows:
+            parts.append(f"{source}:{len(rows)}")
+    return " ".join(parts)

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/haplohub_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: haplohub-cli
-Version: 2.3.0
+Version: 2.4.0
 Summary: HaploHub Command Line Interface
 Author-email: Mike Polcari <mike@haplotype-labs.com>, Ilya Khrustalev <ilya@haplotype-labs.com>
 Requires-Python: >=3.8

{haplohub_cli-2.3.0 → haplohub_cli-2.4.0}/haplohub_cli.egg-info/SOURCES.txt

@@ -15,6 +15,8 @@ haplohub_cli.egg-info/SOURCES.txt
 haplohub_cli.egg-info/dependency_links.txt
 haplohub_cli.egg-info/entry_points.txt
 haplohub_cli.egg-info/requires.txt
+haplohub_cli.egg-info/scm_file_list.json
+haplohub_cli.egg-info/scm_version.json
 haplohub_cli.egg-info/top_level.txt
 haplohub_cli/auth/__init__.py
 haplohub_cli/auth/auth.py

haplohub_cli-2.4.0/haplohub_cli.egg-info/scm_file_list.json

@@ -0,0 +1,69 @@
+{
+  "files": [
+    ".pre-commit-config.yaml",
+    "README.md",
+    "uv.lock",
+    "pyproject.toml",
+    ".gitignore",
+    "haplohub_cli/__init__.py",
+    "haplohub_cli/settings.py",
+    "haplohub_cli/cli.py",
+    "haplohub_cli/commands/__init__.py",
+    "haplohub_cli/commands/version.py",
+    "haplohub_cli/commands/config.py",
+    "haplohub_cli/commands/file.py",
+    "haplohub_cli/commands/variant.py",
+    "haplohub_cli/commands/login.py",
+    "haplohub_cli/commands/cohort/biomarker.py",
+    "haplohub_cli/commands/cohort/__init__.py",
+    "haplohub_cli/commands/cohort/sample.py",
+    "haplohub_cli/commands/cohort/member/__init__.py",
+    "haplohub_cli/commands/cohort/member/report.py",
+    "haplohub_cli/commands/metadata/__init__.py",
+    "haplohub_cli/commands/algorithm/__init__.py",
+    "haplohub_cli/commands/algorithm/result/__init__.py",
+    "haplohub_cli/core/network.py",
+    "haplohub_cli/core/__init__.py",
+    "haplohub_cli/core/checksum.py",
+    "haplohub_cli/core/slug.py",
+    "haplohub_cli/core/upload.py",
+    "haplohub_cli/core/types.py",
+    "haplohub_cli/core/api/__init__.py",
+    "haplohub_cli/core/api/client.py",
+    "haplohub_cli/core/tests/test_checksum.py",
+    "haplohub_cli/core/tests/__init__.py",
+    "haplohub_cli/core/tests/test_slug.py",
+    "haplohub_cli/core/tests/test_network.py",
+    "haplohub_cli/auth/__init__.py",
+    "haplohub_cli/auth/token_storage.py",
+    "haplohub_cli/auth/auth.py",
+    "haplohub_cli/auth/oauth_client.py",
+    "haplohub_cli/auth/auth_web_server.py",
+    "haplohub_cli/auth/tests/test_token_storage.py",
+    "haplohub_cli/auth/tests/__init__.py",
+    "haplohub_cli/auth/tests/test_auth_web_server.py",
+    "haplohub_cli/config/__init__.py",
+    "haplohub_cli/config/config_manager.py",
+    "haplohub_cli/config/config.py",
+    "haplohub_cli/formatters/biomarker.py",
+    "haplohub_cli/formatters/__init__.py",
+    "haplohub_cli/formatters/algorithm.py",
+    "haplohub_cli/formatters/config.py",
+    "haplohub_cli/formatters/file.py",
+    "haplohub_cli/formatters/utils.py",
+    "haplohub_cli/formatters/member.py",
+    "haplohub_cli/formatters/cohort.py",
+    "haplohub_cli/formatters/decorators.py",
+    "haplohub_cli/formatters/formatter_registry.py",
+    "haplohub_cli/formatters/metadata.py",
+    "haplohub_cli/formatters/variant.py",
+    "haplohub_cli/formatters/algorithm_result.py",
+    "haplohub_cli/formatters/sample.py",
+    "haplohub_cli/formatters/generic.py",
+    "haplohub_cli/types/__init__.py",
+    "haplohub_cli/types/variant_range.py",
+    ".github/dependabot.yml",
+    ".github/workflows/on_pr.yml",
+    ".github/workflows/on_push_main.yml"
+  ]
+}

haplohub_cli-2.4.0/haplohub_cli.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.4.0",
+  "distance": 0,
+  "node": "gc36ea6d15ff868d555dd324ddcb48108cc132a63",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-07-04"
+}

haplohub_cli-2.3.0/haplohub_cli/commands/variant.py

@@ -1,66 +0,0 @@
-import click
-from haplohub import GetVariantRequest, HgvsTargetSchema, RegionTargetSchema, TargetsInner, VariantFilterSchema
-
-from haplohub_cli.core.api.client import client
-
-
-@click.group()
-def variant():
-    """
-    Work with variants
-    """
-    pass
-
-
-@variant.command()
-@click.argument("cohort_id", type=str)
-@click.option("--sample", "-s", "sample_ids", type=str, multiple=True, required=True, help="Sample ID (repeatable)")
-@click.option("--accession", "-a", type=str, required=True, help="Chromosome accession (e.g. NC_000001.11)")
-@click.option("--start", type=int, required=True, help="Genomic start position")
-@click.option("--end", type=int, required=True, help="Genomic end position")
-@click.option("--reference", type=str, default=None, help="Reference allele")
-@click.option("--alternate", type=str, default=None, help="Alternate allele")
-@click.option("--call-state", type=click.Choice(["called", "all"]), default="called", help="Filter by call state")
-@click.option("--clinvar", is_flag=True, default=False, help="Include ClinVar annotations")
-def region(sample_ids, cohort_id, accession, start, end, reference, alternate, call_state, clinvar):
-    """
-    Query variants by genomic region
-    """
-    target = RegionTargetSchema(
-        accession=accession,
-        start=start,
-        end=end,
-        reference=reference,
-        alternate=alternate,
-    )
-
-    request = GetVariantRequest(
-        sample_ids=list(sample_ids),
-        targets=[TargetsInner(target)],
-        filters=VariantFilterSchema(call_state=call_state),
-        selectors=["clinvar"] if clinvar else None,
-    )
-
-    return client.variant.get_variant(cohort_id, request)
-
-
-@variant.command()
-@click.argument("cohort_id", type=str)
-@click.option("--sample", "-s", "sample_ids", type=str, multiple=True, required=True, help="Sample ID (repeatable)")
-@click.option("--hgvs", "-h", type=str, multiple=True, required=True, help="HGVS notation (repeatable)")
-@click.option("--call-state", type=click.Choice(["called", "all"]), default="called", help="Filter by call state")
-@click.option("--clinvar", is_flag=True, default=False, help="Include ClinVar annotations")
-def hgvs(sample_ids, cohort_id, hgvs, call_state, clinvar):
-    """
-    Query variants by HGVS notation
-    """
-    targets = [TargetsInner(HgvsTargetSchema(value=v)) for v in hgvs]
-
-    request = GetVariantRequest(
-        sample_ids=list(sample_ids),
-        targets=targets,
-        filters=VariantFilterSchema(call_state=call_state),
-        selectors=["clinvar"] if clinvar else None,
-    )
-
-    return client.variant.get_variant(cohort_id, request)