wip: state + location should use oneOf

ga4gh · Oct 11, 2024 · 8b88dca · 8b88dca
1 parent 817e23d
commit 8b88dca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/examples/Allele.json b/examples/Allele.json
@@ -59,7 +59,8 @@
       ]
     },
     "state": {
-      "anyOf": [
+      "description": "An expression of the sequence state",
+      "oneOf": [
         {
           "$ref": "/ga4gh/schema/vrs/2.x/json/LiteralSequenceExpression"
         },
@@ -69,8 +70,7 @@
         {
           "$ref": "/ga4gh/schema/vrs/2.x/json/LengthExpression"
         }
-      ],
-      "description": "An expression of the sequence state"
+      ]
     }
   },
   "required": [

diff --git a/examples/pydantic_to_json_schema.py b/examples/pydantic_to_json_schema.py
@@ -39,10 +39,9 @@ class Allele(models.Allele, extra="forbid"):
     class Config:
         @staticmethod
         def json_schema_extra(cls):
-            cls["properties"]["location"]["oneOf"] = cls["properties"]["location"][
-                "anyOf"
-            ]
-            del cls["properties"]["location"]["anyOf"]
+            for prop in {"location", "state"}:
+                cls["properties"][prop]["oneOf"] = cls["properties"][prop]["anyOf"]
+                del cls["properties"][prop]["anyOf"]
 
     expressions: Optional[List[models.Expression]] = Field(None, ordered=False)
     maturity: Literal["draft"] = Field("draft", frozen=True)