Skip to content

Commit

Permalink
merge with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@calmacx
calmacx committed Apr 8, 2024
2 parents 3f79f71 + 1c80fc5 commit 4ba81bd
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 110 deletions.
132 changes: 66 additions & 66 deletions docs/HDRUK/2.2.1.md
View file

Large diffs are not rendered by default.

58 changes: 26 additions & 32 deletions docs/HDRUK/2.2.1.structure.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
"examples": null,
"type": [
"EmailAddress[{'anyOf': [{'format': 'email', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.EmailAddress.EmailAddress]]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -267,7 +267,7 @@
],
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.OneHundredFiftyCharacters.OneHundredFiftyCharacters]",
"List",
"null"
],
"is_list": false,
Expand All @@ -282,7 +282,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,
Expand Down Expand Up @@ -385,7 +385,7 @@
],
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
"List",
"null"
],
"is_list": false,
Expand All @@ -402,7 +402,7 @@
],
"type": [
"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]]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -434,7 +434,7 @@
],
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -613,13 +613,10 @@
"description": "Please indicate the source of the data extraction",
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.Source.Source]",
"null"
"Source['EPR','ELECTRONIC SURVEY','LIMS','OTHER INFORMATION SYSTEM','PAPER BASED','FREETEXT NLP','MACHINE GENERATED','OTHER']"
],
"is_list": false,
"is_optional": true,
"subItems": []
"is_list": true,
"is_optional": true
},
{
"name": "collectionSituation",
Expand All @@ -628,13 +625,10 @@
"description": "Please indicate the setting(s) where data was collected. Multiple settings may be provided",
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.Setting.Setting]",
"null"
"Setting['CLINIC','PRIMARY CARE','ACCIDENT AND EMERGENCY','OUTPATIENTS','IN-PATIENTS','SERVICES','COMMUNITY','HOME','PRIVATE','PHARMACY','SOCIAL CARE','LOCAL AUTHORITY','NATIONAL GOVERNMENT','OTHER']"
],
"is_list": false,
"is_optional": true,
"subItems": []
"is_list": true,
"is_optional": true
}
]
},
Expand Down Expand Up @@ -755,7 +749,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.DataUseLimitation.DataUseLimitation]",
"List",
"null"
],
"is_list": false,
Expand All @@ -770,7 +764,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.DataUseRequirements.DataUseRequirements]",
"List",
"null"
],
"is_list": false,
Expand All @@ -785,7 +779,7 @@
"examples": null,
"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,
Expand All @@ -800,7 +794,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
"List",
"null"
],
"is_list": false,
Expand All @@ -816,7 +810,7 @@
"type": [
"Doi[{'anyOf': [{'pattern': '^10.\\\\d{4,9}/[-._;()/:a-zA-Z0-9]+$', 'type': 'string'}, {'type': 'null'}]}]",
"str",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Doi.Doi]]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -875,7 +869,7 @@
"examples": null,
"type": [
"LongDescription[{'anyOf': [{'maxLength': 50000, 'minLength': 2, 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -903,7 +897,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.Isocountrycode.Isocountrycode]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -975,7 +969,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.ControlledVocabulary.ControlledVocabulary]",
"List",
"null"
],
"is_list": false,
Expand All @@ -990,7 +984,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.StandardisedDataModels.StandardisedDataModels]",
"List",
"null"
],
"is_list": false,
Expand All @@ -1005,7 +999,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.Language.Language]",
"List",
"null"
],
"is_list": false,
Expand All @@ -1020,7 +1014,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[hdr_schemata.definitions.HDRUK.Format.Format]",
"List",
"null"
],
"is_list": false,
Expand Down Expand Up @@ -1052,7 +1046,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Union[hdr_schemata.definitions.HDRUK.Url.Url, NoneType, hdr_schemata.definitions.HDRUK.OneHundredFiftyCharacters.OneHundredFiftyCharacters]]",
"List",
"null"
],
"is_list": false,
Expand All @@ -1067,7 +1061,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.AbstractText.AbstractText]]",
"List",
"null"
],
"is_list": false,
Expand All @@ -1082,7 +1076,7 @@
"examples": null,
"type": [
"CommaSeparatedValues[{'anyOf': [{'pattern': '([^,]+)', 'type': 'string'}, {'type': 'null'}]}]",
"typing.List[typing.Optional[hdr_schemata.definitions.HDRUK.Url.Url]]",
"List",
"null"
],
"is_list": false,
Expand Down
1 change: 1 addition & 0 deletions hdr_schemata/models/GWDM/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
from .v1_0 import Gwdm10
from .v1_1 import Gwdm11
from .v1_2 import Gwdm12
6 changes: 0 additions & 6 deletions hdr_schemata/models/HDRUK/2.2.1/schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1471,9 +1471,6 @@
},
"source": {
"anyOf": [
{
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"items": {
"$ref": "#/$defs/Source"
Expand All @@ -1490,9 +1487,6 @@
},
"collectionSituation": {
"anyOf": [
{
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"items": {
"$ref": "#/$defs/Setting"
Expand Down
8 changes: 3 additions & 5 deletions hdr_schemata/models/HDRUK/v2_2_1/Origin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ class Config:
extra = "forbid"

purpose: Optional[List[Purpose]] = Field(None, **an.purpose.__dict__)
source: Optional[Union[Optional[CommaSeparatedValues], List[Source]]] = Field(
None, **an.source.__dict__
source: Optional[List[Source]] = Field(None, **an.source.__dict__)
collectionSituation: Optional[List[Setting]] = Field(
None, **an.collectionSituation.__dict__
)
collectionSituation: Optional[
Union[Optional[CommaSeparatedValues], List[Setting]]
] = Field(None, **an.collectionSituation.__dict__)
1 change: 0 additions & 1 deletion hdr_schemata/models/HDRUK/v2_2_1/Provenance.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from typing import Optional
from .Origin import Origin


from .annotations import annotations

an = annotations.provenance
Expand Down

0 comments on commit 4ba81bd

Please sign in to comment.