diff --git a/.gitignore b/.gitignore index b80794e..e3f3d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ *.Rproj /renv/ +/test/ model-metadata/README_files/ model-output/README_files/ diff --git a/hub-config/admin.json b/hub-config/admin.json index d7d62d9..f9bd6a7 100644 --- a/hub-config/admin.json +++ b/hub-config/admin.json @@ -1,7 +1,7 @@ { "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/admin-schema.json", "name": "COVID-19 Forecast Hub", - "maintainer": "CDC", + "maintainer": "US CDC", "contact": { "name": "Subekshya Bidari", "email": "covidhub@cdc.gov" diff --git a/hub-config/model-metadata-schema.json b/hub-config/model-metadata-schema.json index 55c39ad..f05820f 100644 --- a/hub-config/model-metadata-schema.json +++ b/hub-config/model-metadata-schema.json @@ -1,7 +1,7 @@ { "$schema": "https://json-schema.org/draft/2020-12/schema", "title": "Schema for Modeling Hub model metadata", - "description": "This is the schema for model metadata files, please refer to https://github.com/covid19-forecast-hub-europe/covid19-forecast-hub-europe/wiki/Metadata for more information.", + "description": "This is the schema for model metadata files, please refer to https://github.com/CDCgov/covid19-forecast-hub/blob/main/model-metadata/README.md for more information.", "type": "object", "properties": { "team_name": { @@ -39,16 +39,17 @@ "affiliation": { "type": "string" }, - "orcid": { - "type": "string", - "pattern": "^\\d{4}\\-\\d{4}\\-\\d{4}\\-[\\dX]{4}$" - }, "email": { "type": "string", "format": "email" }, - "additionalProperties": false - } + "orcid": { + "type": "string", + "pattern": "^\\d{4}\\-\\d{4}\\-\\d{4}\\-[\\dX]{4}$" + } + }, + "additionalProperties": false, + "required": ["name", "affiliation", "email"] } }, "website_url": { @@ -108,13 +109,9 @@ "ensemble_of_hub_models": { "description": "Indicator for whether this model is an ensemble of other models submitted to this Hub", "type": "boolean" - }, - "source_notes": { - "description": "Original source of the model output data", - "type": "string" } }, - "additionalProperties": true, + "additionalProperties": false, "required": [ "team_name", "team_abbr", diff --git a/hub-config/tasks.json b/hub-config/tasks.json index 5edc45b..b25e254 100644 --- a/hub-config/tasks.json +++ b/hub-config/tasks.json @@ -7,7 +7,7 @@ "task_ids": { "reference_date": { "required": null, - "optional": ["2024-11-09", "2024-11-16", "2024-11-23", + "optional": ["2024-11-16", "2024-11-23", "2024-11-30", "2024-12-07", "2024-12-14", "2024-12-21", "2024-12-28", "2025-01-04", "2025-01-11", "2025-01-18", "2025-01-25", "2025-02-01", "2025-02-08", "2025-02-15", @@ -84,7 +84,7 @@ }, "target_end_date": { "required": null, - "optional": ["2024-11-09", "2024-11-16", "2024-11-23", + "optional": ["2024-11-16", "2024-11-23", "2024-11-30", "2024-12-07", "2024-12-14", "2024-12-21", "2024-12-28", "2025-01-04", "2025-01-11", "2025-01-18", "2025-01-25", "2025-02-01", "2025-02-08", "2025-02-15", @@ -150,9 +150,7 @@ "target_name": "incident covid hospitalizations", "target_units": "count", "target_keys": { - "target": [ - "wk inc covid hosp" - ] + "target": "wk inc covid hosp" }, "target_type": "continuous", "description": "This target represents the count of new hospitalizations in the week ending on the date [horizon] weeks after the reference_date, on the target_end_date.",