Merge pull request #442 from ga4gh/update-patterns

Good catch @korikuzma!
ga4gh · Dec 16, 2023 · 1b68dfb · 1b68dfb
2 parents 8dd56c6 + cfd63a1
commit 1b68dfb
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 54 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ docs/build
 venv
 pyproject.toml
 .vscode/settings.json
+.python-version
+.idea/
+.DS_Store
diff --git a/schema/merged.json b/schema/merged.json
@@ -128,7 +128,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -209,7 +209,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -285,7 +285,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -364,7 +364,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -446,7 +446,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -525,7 +525,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -600,7 +600,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -609,7 +609,7 @@
             "refgetAccession": {
                "description": "A `GA4GH RefGet <http://samtools.github.io/hts-specs/refget.html>` identifier for the referenced sequence,  using the sha512t24u digest.",
                "type": "string",
-               "pattern": "SQ.[0-9A-Za-z_\\-]{32}"
+               "pattern": "^SQ.[0-9A-Za-z_\\-]{32}$"
             },
             "residueAlphabet": {
                "type": "string",
@@ -673,7 +673,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -741,7 +741,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -798,7 +798,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -850,7 +850,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "count": {
                "oneOf": [
@@ -946,7 +946,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",

diff --git a/schema/merged.yaml b/schema/merged.yaml
@@ -89,7 +89,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: Allele
@@ -146,7 +146,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: Haplotype
@@ -211,7 +211,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: CopyNumberCount
@@ -269,7 +269,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: CopyNumberChange
@@ -336,7 +336,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: Genotype
@@ -401,7 +401,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: SequenceLocation
@@ -456,15 +456,15 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: SequenceReference
       refgetAccession:
         description: A `GA4GH RefGet <http://samtools.github.io/hts-specs/refget.html>`
           identifier for the referenced sequence,  using the sha512t24u digest.
         type: string
-        pattern: SQ.[0-9A-Za-z_\-]{32}
+        pattern: ^SQ.[0-9A-Za-z_\-]{32}$
       residueAlphabet:
         type: string
         description: The interpretation of the character codes referred to by the
@@ -514,7 +514,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: ReferenceLengthExpression
@@ -566,7 +566,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: LengthExpression
@@ -609,7 +609,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: LiteralSequenceExpression
@@ -653,7 +653,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       count:
         oneOf:
         - $ref: '#/$defs/Range'
@@ -728,7 +728,7 @@ $defs:
         description: A sha512t24u digest created using the VRS Computed Identifier
           algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: ^[0-9A-Za-z_\-]{32}$
       type:
         type: string
         const: Adjacency

diff --git a/schema/vrs-source.yaml b/schema/vrs-source.yaml
@@ -38,7 +38,7 @@ $defs:
       digest:
         description: A sha512t24u digest created using the VRS Computed Identifier algorithm.
         type: string
-        pattern: '[0-9A-Za-z_\-]{32}'
+        pattern: '^[0-9A-Za-z_\-]{32}$'
 
   Ga4ghIdentifiableObject:
     inherits: ValueObject
@@ -366,7 +366,7 @@ $defs:
           A `GA4GH RefGet <http://samtools.github.io/hts-specs/refget.html>` identifier for the referenced sequence, 
           using the sha512t24u digest.
         type: string
-        pattern: 'SQ.[0-9A-Za-z_\-]{32}'
+        pattern: '^SQ.[0-9A-Za-z_\-]{32}$'
       residueAlphabet:
         type: string
         description: >-

diff --git a/schema/vrs.json b/schema/vrs.json
@@ -128,7 +128,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -209,7 +209,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -285,7 +285,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -364,7 +364,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -446,7 +446,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -525,7 +525,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -600,7 +600,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -609,7 +609,7 @@
             "refgetAccession": {
                "description": "A `GA4GH RefGet <http://samtools.github.io/hts-specs/refget.html>` identifier for the referenced sequence,  using the sha512t24u digest.",
                "type": "string",
-               "pattern": "SQ.[0-9A-Za-z_\\-]{32}"
+               "pattern": "^SQ.[0-9A-Za-z_\\-]{32}$"
             },
             "residueAlphabet": {
                "type": "string",
@@ -673,7 +673,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -741,7 +741,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -798,7 +798,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",
@@ -850,7 +850,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "count": {
                "oneOf": [
@@ -946,7 +946,7 @@
             "digest": {
                "description": "A sha512t24u digest created using the VRS Computed Identifier algorithm.",
                "type": "string",
-               "pattern": "[0-9A-Za-z_\\-]{32}"
+               "pattern": "^[0-9A-Za-z_\\-]{32}$"
             },
             "type": {
                "type": "string",