Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #59

Merged
merged 3 commits into from
Sep 20, 2024
Merged

Dev #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e8fe3b
fix gwmd datasettype
calmacx Sep 20, 2024
57b4470
revert
calmacx Sep 20, 2024
acdc4f0
Merge pull request #58 from HDRUK/hotfix/datasettype-in-gwdm
calmacx Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions hdr_schemata/models/GWDM/2.0/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,19 +570,6 @@
"title": "DatasetLinkage",
"type": "object"
},
"DatasetType": {
"anyOf": [
{
"maxLength": 100,
"minLength": 2,
"type": "string"
},
{
"type": "null"
}
],
"title": "DatasetType"
},
"DeliveryLeadTimeV2": {
"enum": [
"Less than 1 week",
Expand Down Expand Up @@ -1585,7 +1572,7 @@
"datasetType": {
"anyOf": [
{
"$ref": "#/$defs/DatasetType"
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"type": "null"
Expand Down Expand Up @@ -1640,7 +1627,7 @@
"datasetSubType": {
"anyOf": [
{
"$ref": "#/$defs/DatasetType"
"$ref": "#/$defs/CommaSeparatedValues"
},
{
"type": "null"
Expand Down
8 changes: 4 additions & 4 deletions hdr_schemata/models/GWDM/v2_0/Summary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Summary(BaseModel):

contactPoint: Optional[EmailStr] = Field(None, **an.contactPoint.__dict__)

datasetType: Optional[DatasetType] = Field(None, **an.datasetType.__dict__)
datasetType: Optional[CommaSeparatedValues] = Field(None, **an.datasetType.__dict__)

description: Optional[LongDescription] = Field(None, **an.description.__dict__)

Expand All @@ -43,8 +43,8 @@ class Summary(BaseModel):

populationSize: Optional[int] = Field(None, **an.populationSize.__dict__)

datasetSubType: Optional[DatasetType] = Field(None, **an.datasetSubType.__dict__)
datasetSubType: Optional[CommaSeparatedValues] = Field(
None, **an.datasetSubType.__dict__
)

inPipeline: Optional[Pipeline] = Field("Not available", **an.inPipeline.__dict__)


Loading