simple test to passing

ga4gh · Nov 14, 2023 · bded4b7 · bded4b7
1 parent f7869b5
commit bded4b7
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 68 deletions.
diff --git a/examples/simple_breakpoint.yaml b/examples/simple_breakpoint.yaml
@@ -1,23 +1,16 @@
 id: simple_breakpoint
-type: Breakpoint
-breakends:
-  - type: Breakend
-    location:
-      type: SequenceLocation
-      sequenceReference:
-        refgetAccession: SQ.S_KjnFVz-FE7M0W6yoaUDgYxLPc1jyWU
-        residueAlphabet: na
-        id: NC_000001.10
-      start: 123
-      end: 123
-    orientation: DivergesAfter
-  - type: Breakend
-    location:
-      type: SequenceLocation
-      sequenceReference:
-        refgetAccession: SQ.9KdcA9ZpY1Cpvxvg8bMSLYDUpsX6GDLO
-        residueAlphabet: na
-        id: NC_000002.11
-      start: 456
-      end: 456
-    orientation: DivergesBefore
+type: Adjacency
+sequenceTerminals:
+  - type: SequenceLocation
+    sequenceReference:
+      refgetAccession: SQ.S_KjnFVz-FE7M0W6yoaUDgYxLPc1jyWU
+      residueAlphabet: na
+      id: NC_000001.10
+    end: 123
+  - type: SequenceLocation
+    sequenceReference:
+      refgetAccession: SQ.9KdcA9ZpY1Cpvxvg8bMSLYDUpsX6GDLO
+      residueAlphabet: na
+      id: NC_000002.11
+    start: 456
+    end: 456
diff --git a/schema/defs/vrs/LengthExpression.rst b/schema/defs/vrs/LengthExpression.rst
@@ -40,3 +40,7 @@ Some LengthExpression attributes are inherited from :ref:`SequenceExpression`.
           - string
           - 1..1
           - MUST be "LengthExpression"
+       *  - length
+          - :ref:`Range` | integer
+          - 0..1
+          - 
diff --git a/schema/defs/vrs/SequenceLocation.rst b/schema/defs/vrs/SequenceLocation.rst
@@ -46,9 +46,9 @@ Some SequenceLocation attributes are inherited from :ref:`Ga4ghIdentifiableObjec
           - A :ref:`SequenceReference`.
        *  - start
           - integer | :ref:`Range`
-          - 1..1
+          - 0..1
           - The start coordinate or range of the SequenceLocation. The minimum value of this coordinate or range is 0. MUST represent a coordinate or range less than or equal to the value of `end`.
        *  - end
           - integer | :ref:`Range`
-          - 1..1
+          - 0..1
           - The end coordinate or range of the SequenceLocation. The minimum value of this coordinate or range is 0. MUST represent a coordinate or range greater than or equal to the value of `start`.
diff --git a/schema/merged.json b/schema/merged.json
@@ -570,8 +570,6 @@
             }
          },
          "required": [
-            "end",
-            "start",
             "type"
          ],
          "additionalProperties": false
@@ -754,6 +752,16 @@
                "const": "LengthExpression",
                "default": "LengthExpression",
                "description": "MUST be \"LengthExpression\""
+            },
+            "length": {
+               "oneOf": [
+                  {
+                     "$ref": "#/$defs/Range"
+                  },
+                  {
+                     "type": "integer"
+                  }
+               ]
             }
          },
          "required": [
@@ -911,7 +919,8 @@
          "maturity": "Alpha",
          "ga4ghDigest": {
             "keys": [
-               "breakends",
+               "linker",
+               "sequenceTerminals",
                "type"
             ]
          },

diff --git a/schema/merged.yaml b/schema/merged.yaml
@@ -429,8 +429,6 @@ $defs:
           value of this coordinate or range is 0. MUST represent a coordinate or range
           greater than or equal to the value of `start`.
     required:
-    - end
-    - start
     - type
     additionalProperties: false
   SequenceReference:
@@ -577,6 +575,10 @@ $defs:
         const: LengthExpression
         default: LengthExpression
         description: MUST be "LengthExpression"
+      length:
+        oneOf:
+        - $ref: '#/$defs/Range'
+        - type: integer
     required:
     - type
     additionalProperties: false
@@ -699,7 +701,8 @@ $defs:
     maturity: Alpha
     ga4ghDigest:
       keys:
-      - breakends
+      - linker
+      - sequenceTerminals
       - type
     description: The `Adjacency` class represents the termination of a sequence and
       (when present) the beginning of an adjacent sequence, potentially with an intervening

diff --git a/schema/vrs-source.yaml b/schema/vrs-source.yaml
@@ -173,9 +173,9 @@ $defs:
         uniqueItems: false
         items:
           oneOf:
-          - $ref: "#/$defs/Adjacency"
-          - $ref: "#/$defs/Allele"
-          - $refCurie: gks.core:IRI
+            - $ref: "#/$defs/Adjacency"
+            - $ref: "#/$defs/Allele"
+            - $refCurie: gks.core:IRI
         description: >-
           A list of :ref:`Alleles <Allele>` and :ref:`Adjacencies <Adjacency>` that comprise a Haplotype. 
           Allele members must share the same reference sequence as adjacent members. Alleles should not have
@@ -386,9 +386,6 @@ $defs:
           The end coordinate or range of the SequenceLocation.
           The minimum value of this coordinate or range is 0.
           MUST represent a coordinate or range greater than or equal to the value of `start`.
-    required:
-      - start
-      - end
 
   SequenceReference:
     maturity: Alpha
@@ -498,6 +495,10 @@ $defs:
         const: "LengthExpression"
         default: "LengthExpression"
         description: MUST be "LengthExpression"
+      length:
+        oneOf:
+          - $ref: "#/$defs/Range"
+          - type: integer
 
   LiteralSequenceExpression:
     maturity: Alpha
@@ -784,7 +785,8 @@ $defs:
     ga4ghDigest:
       keys:
         - type
-        - breakends
+        - sequenceTerminals
+        - linker
     inherits: Ga4ghIdentifiableObject
     description:
       The `Adjacency` class represents the termination of a sequence and (when present)

diff --git a/schema/vrs.json b/schema/vrs.json
@@ -570,8 +570,6 @@
             }
          },
          "required": [
-            "end",
-            "start",
             "type"
          ],
          "additionalProperties": false
@@ -754,6 +752,16 @@
                "const": "LengthExpression",
                "default": "LengthExpression",
                "description": "MUST be \"LengthExpression\""
+            },
+            "length": {
+               "oneOf": [
+                  {
+                     "$ref": "#/$defs/Range"
+                  },
+                  {
+                     "type": "integer"
+                  }
+               ]
             }
          },
          "required": [
@@ -911,7 +919,8 @@
          "maturity": "Alpha",
          "ga4ghDigest": {
             "keys": [
-               "breakends",
+               "linker",
+               "sequenceTerminals",
                "type"
             ]
          },

diff --git a/schema/vrs.yaml b/schema/vrs.yaml
@@ -429,8 +429,6 @@ $defs:
           value of this coordinate or range is 0. MUST represent a coordinate or range
           greater than or equal to the value of `start`.
     required:
-    - end
-    - start
     - type
     additionalProperties: false
   SequenceReference:
@@ -577,6 +575,10 @@ $defs:
         const: LengthExpression
         default: LengthExpression
         description: MUST be "LengthExpression"
+      length:
+        oneOf:
+        - $ref: '#/$defs/Range'
+        - type: integer
     required:
     - type
     additionalProperties: false
@@ -699,7 +701,8 @@ $defs:
     maturity: Alpha
     ga4ghDigest:
       keys:
-      - breakends
+      - linker
+      - sequenceTerminals
       - type
     description: The `Adjacency` class represents the termination of a sequence and
       (when present) the beginning of an adjacent sequence, potentially with an intervening

diff --git a/tests/test_definitions.yaml b/tests/test_definitions.yaml
@@ -2,28 +2,28 @@ tests:
   - test_file: simple_breakpoint.yaml
     description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p2
     schema: vrs
-    definition: Breakpoint
-  - test_file: revcomp_breakpoint.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p8
-    schema: vrs
-    definition: Breakpoint
-  - test_file: terminal_breakend.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p9
-    schema: vrs
-    definition: Breakpoint
-  - test_file: sequence_homology.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p11
-    schema: vrs
-    definition: Breakpoint
-  - test_file: precise_linker.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p12
-    schema: vrs
-    definition: Breakpoint
-  - test_file: ambiguous_linker.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p13
-    schema: vrs
-    definition: Breakpoint
-  - test_file: sv_haplotype.yaml
-    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p15
-    schema: vrs
-    definition: Haplotype
+    definition: Adjacency
+#  - test_file: revcomp_breakpoint.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p8
+#    schema: vrs
+#    definition: Breakpoint
+#  - test_file: terminal_breakend.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p9
+#    schema: vrs
+#    definition: Breakpoint
+#  - test_file: sequence_homology.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p11
+#    schema: vrs
+#    definition: Breakpoint
+#  - test_file: precise_linker.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p12
+#    schema: vrs
+#    definition: Breakpoint
+#  - test_file: ambiguous_linker.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p13
+#    schema: vrs
+#    definition: Breakpoint
+#  - test_file: sv_haplotype.yaml
+#    description: https://docs.google.com/presentation/d/11Hm-_IvKGFUpdsqh_LiIrxjpvQazTxg1/edit#slide=id.p15
+#    schema: vrs
+#    definition: Haplotype