Check dimension sizes for named VCF Number fields

Author: tomwhite

bio2zarr/icf.py

@@ -1042,6 +1042,7 @@ def generate_schema(
         if local_alleles is None:
             local_alleles = False
 
+        max_alleles = max(self.fields["ALT"].vcf_field.summary.max_number + 1, 2)
         dimensions = {
             "variants": vcz.VcfZarrDimension(
                 size=m, chunk_size=variants_chunk_size or vcz.DEFAULT_VARIANT_CHUNK_SIZE
@@ -1050,9 +1051,8 @@ def generate_schema(
                 size=n, chunk_size=samples_chunk_size or vcz.DEFAULT_SAMPLE_CHUNK_SIZE
             ),
             # ploidy added conditionally below
-            "alleles": vcz.VcfZarrDimension(
-                size=max(self.fields["ALT"].vcf_field.summary.max_number + 1, 2)
-            ),
+            "alleles": vcz.VcfZarrDimension(size=max_alleles),
+            "alt_alleles": vcz.VcfZarrDimension(size=max_alleles - 1),
             "filters": vcz.VcfZarrDimension(size=self.metadata.num_filters),
         }
 

bio2zarr/vcz.py

@@ -174,19 +174,29 @@ def from_field(
             array_name = prefix + vcf_field.name
 
         max_number = vcf_field.max_number
-        if (max_number > 0 and vcf_field.vcf_number in ("R", "A", "G")) or (
-            max_number > 1 or vcf_field.full_name == "FORMAT/LAA"
-        ):
-            # TODO we should really be checking this to see if the named dimensions
-            # are actually correct.
-            if vcf_field.vcf_number == "R":
+        if vcf_field.vcf_number == "R":
+            max_alleles = schema.dimensions["alleles"].size
+            if max_number > max_alleles:
+                raise ValueError(
+                    f"Max number of values {max_number} exceeds max alleles "
+                    f"{max_alleles} for {vcf_field.full_name}"
+                )
+            if max_alleles > 0:
                 dimensions.append("alleles")
-            elif vcf_field.vcf_number == "A":
+        elif vcf_field.vcf_number == "A":
+            max_alt_alleles = schema.dimensions["alt_alleles"].size
+            if max_number > max_alt_alleles:
+                raise ValueError(
+                    f"Max number of values {max_number} exceeds max alt alleles "
+                    f"{max_alt_alleles} for {vcf_field.full_name}"
+                )
+            if max_alt_alleles > 0:
                 dimensions.append("alt_alleles")
-            elif vcf_field.vcf_number == "G":
-                dimensions.append("genotypes")
-            else:
-                dimensions.append(f"{vcf_field.category}_{vcf_field.name}_dim")
+        elif max_number > 0 and vcf_field.vcf_number == "G":
+            # TODO: need max_genotypes
+            dimensions.append("genotypes")
+        elif max_number > 1 or vcf_field.full_name == "FORMAT/LAA":
+            dimensions.append(f"{vcf_field.category}_{vcf_field.name}_dim")
         if dimensions[-1] not in schema.dimensions:
             schema.dimensions[dimensions[-1]] = VcfZarrDimension(
                 size=vcf_field.max_number