some changes for keywords

HDRUK · Aug 13, 2024 · 8ad21ca · 8ad21ca
1 parent ffffb1c
commit 8ad21ca
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,4 +17,7 @@ env/
 .idea/
 
 # Ignore editor backup files
-*~
+*~
+
+# Ignore mac files
+*DS_store
diff --git a/docs/HDRUK/2.2.0.example.json b/docs/HDRUK/2.2.0.example.json
@@ -32,10 +32,10 @@
             "isPartOf": "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}] | typing.List[typing.Union[hdr_schemata.definitions.HDRUK.Url.Url, NoneType, hdr_schemata.definitions.HDRUK.OneHundredFiftyCharacters.OneHundredFiftyCharacters, hdr_schemata.definitions.HDRUK.IsPartOfEnum.IsPartOfEnum]] | null"
       },
       "coverage": {
-            "spatial": "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}] | typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]] | null",
-            "typicalAgeRange": "AgeRange[{'anyOf': [{'pattern': 'Not Known|(150|1[0-4][0-9]|[0-9]|[1-8][0-9]|9[0-9])-(150|1[0-4][0-9]|[0-9]|[1-8][0-9]|9[0-9])', 'type': 'string'}, {'type': 'null'}]}] | null",
+            "spatial": "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}] | null",
+            "pathway": "LongDescription[{'anyOf': [{'maxLength': 50000, 'minLength': 2, 'type': 'string'}, {'type': 'null'}]}] | null",
             "followup": "Followup['0 - 6 MONTHS','6 - 12 MONTHS','1 - 10 YEARS','> 10 YEARS','UNKNOWN','CONTINUOUS','OTHER',null] | null",
-            "pathway": "Description[{'anyOf': [{'maxLength': 10000, 'minLength': 2, 'type': 'string'}, {'type': 'null'}]}] | null",
+            "typicalAgeRange": "AgeRange[{'anyOf': [{'pattern': 'Not Known|(150|1[0-4][0-9]|[0-9]|[1-8][0-9]|9[0-9])-(150|1[0-4][0-9]|[0-9]|[1-8][0-9]|9[0-9])', 'type': 'string'}, {'type': 'null'}]}] | null",
             "gender": "GenderType['Male','Female','Other']",
             "biologicalsamples": "BiologicalSampleType['Blood','Other','Urine','Saliva']",
             "psychological": "PsychologicalType['Cognitive Function','Mental Health']",

diff --git a/docs/HDRUK/3.0.0.form.json b/docs/HDRUK/3.0.0.form.json
@@ -253,11 +253,12 @@
                         "Primary Care Prescription",
                         "Accident and Emergency Admissions"
                   ],
-                  "is_list": false,
+                  "is_list": true,
                   "is_optional": true,
                   "types": {
-                        "title": "CommaSeparatedValues",
-                        "pattern": "([^,]+)",
+                        "maxLength": 150,
+                        "minLength": 2,
+                        "title": "OneHundredFiftyCharacters",
                         "type": "string"
                   },
                   "location": "summary.keywords"

diff --git a/docs/HDRUK/3.0.0.md b/docs/HDRUK/3.0.0.md
diff --git a/docs/HDRUK/3.0.0.structure.json b/docs/HDRUK/3.0.0.structure.json
@@ -235,7 +235,7 @@
                                     "examples": null,
                                     "type": [
                                           "EmailAddress[{'anyOf': [{'format': 'email', 'type': 'string'}, {'type': 'null'}]}]",
-                                          "typing.List[hdr_schemata.definitions.HDRUK.EmailAddress.EmailAddress]"
+                                          "List"
                                     ],
                                     "is_list": false,
                                     "is_optional": false,
@@ -285,11 +285,9 @@
                               "Accident and Emergency Admissions"
                         ],
                         "type": [
-                              "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                              "typing.List[hdr_schemata.definitions.HDRUK.OneHundredFiftyCharacters.OneHundredFiftyCharacters]",
-                              "null"
+                              "OneHundredFiftyCharacters[{'maxLength': 150, 'minLength': 2, 'type': 'string'}]"
                         ],
-                        "is_list": false,
+                        "is_list": true,
                         "is_optional": true,
                         "subItems": []
                   },
@@ -335,7 +333,7 @@
                         "examples": null,
                         "type": [
                               "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                              "typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.ShortDescription.ShortDescription]]",
+                              "List",
                               "null"
                         ],
                         "is_list": false,
@@ -383,7 +381,7 @@
                         ],
                         "type": [
                               "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                              "typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
+                              "List",
                               "null"
                         ],
                         "is_list": false,
@@ -431,7 +429,7 @@
                         ],
                         "type": [
                               "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                              "typing.List[hdr_schemata.definitions.HDRUK.Url.Url]"
+                              "List"
                         ],
                         "is_list": false,
                         "is_optional": false,
@@ -805,7 +803,7 @@
                                     ],
                                     "type": [
                                           "ShortDescription[{'anyOf': [{'maxLength': 1000, 'minLength': 2, 'type': 'string'}, {'type': 'null'}]}]",
-                                          "typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.ShortDescription.ShortDescription]]",
+                                          "List",
                                           "null"
                                     ],
                                     "is_list": false,
@@ -926,7 +924,7 @@
                                     "examples": null,
                                     "type": [
                                           "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                                          "typing.List[hdr_schemata.definitions.HDRUK.Isocountrycode.Isocountrycode]",
+                                          "List",
                                           "null"
                                     ],
                                     "is_list": false,
@@ -1023,7 +1021,7 @@
                                     "examples": null,
                                     "type": [
                                           "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                                          "typing.List[hdr_schemata.definitions.HDRUK.Language.Language]",
+                                          "List",
                                           "null"
                                     ],
                                     "is_list": false,
@@ -1044,7 +1042,7 @@
                                     ],
                                     "type": [
                                           "CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
-                                          "typing.List[hdr_schemata.definitions.HDRUK.Format.Format]",
+                                          "List",
                                           "null"
                                     ],
                                     "is_list": false,

diff --git a/hdr_schemata/models/HDRUK/3.0.0/schema.json b/hdr_schemata/models/HDRUK/3.0.0/schema.json
@@ -1953,9 +1953,6 @@
                         },
                         "keywords": {
                               "anyOf": [
-                                    {
-                                          "$ref": "#/$defs/CommaSeparatedValues"
-                                    },
                                     {
                                           "items": {
                                                 "$ref": "#/$defs/OneHundredFiftyCharacters"

diff --git a/hdr_schemata/models/HDRUK/v3_0_0/Summary.py b/hdr_schemata/models/HDRUK/v3_0_0/Summary.py
@@ -29,7 +29,7 @@ class Config:
         ..., **an.populationSize.__dict__, json_schema_extra={"guidance": an.populationSize.guidance}
     )
 
-    keywords: Optional[Union[CommaSeparatedValues, List[OneHundredFiftyCharacters]]] = (
+    keywords: Optional[List[OneHundredFiftyCharacters]] = (
         Field(..., **an.keywords.__dict__, json_schema_extra={"guidance": an.keywords.guidance})
     )