Return $id to metadata files, remove URLs from __init__ files

ACCESS-NRI · Sep 8, 2024 · 26f7395 · 26f7395
1 parent 7341436
commit 26f7395
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/src/access_nri_intake/catalog/__init__.py b/src/access_nri_intake/catalog/__init__.py
@@ -18,8 +18,6 @@
 NAME_COLUMN = "name"
 TRANSLATOR_GROUPBY_COLUMNS = ["model", "realm", "frequency"]
 
-# SCHEMA_URL = "https://raw.githubusercontent.com/ACCESS-NRI/schema/e9055da95093ec2faa555c090fc5af17923d1566/au.org.access-nri/model/output/experiment-metadata/1-0-2.json"
-# SCHEMA_HASH = "ecb72c1adde3679896ceeca96aa6500d07ea2e05810155ec7a5dc301593c1dc7"
 
 EXP_JSONSCHEMA, CATALOG_JSONSCHEMA = get_jsonschema(
     metadata_file="data/metadata_schema_experiment.json", required=CORE_COLUMNS

diff --git a/src/access_nri_intake/data/metadata_schema_experiment.json b/src/access_nri_intake/data/metadata_schema_experiment.json
@@ -1,4 +1,5 @@
 {
+    "$id": "https://raw.githubusercontent.com/ACCESS-NRI/schema/e9055da95093ec2faa555c090fc5af17923d1566/au.org.access-nri/model/output/experiment-metadata/1-0-2.json",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "title": "Experiment metadata",
     "description": "The metadata associated with a model experiment",

diff --git a/src/access_nri_intake/data/metadata_schema_file.json b/src/access_nri_intake/data/metadata_schema_file.json
@@ -1,4 +1,5 @@
 {
+    "$id": "https://raw.githubusercontent.com/ACCESS-NRI/schema/e9055da95093ec2faa555c090fc5af17923d1566/au.org.access-nri/model/output/file-metadata/1-0-1.json",
     "$schema": "https://json-schema.org/draft/2020-12/schema",
     "title": "File metadata",
     "description": "The metadata associated with a file containing or referencing climate model data",

diff --git a/src/access_nri_intake/source/__init__.py b/src/access_nri_intake/source/__init__.py
@@ -17,8 +17,6 @@
 PATH_COLUMN = "path"
 VARIABLE_COLUMN = "variable"
 
-# SCHEMA_URL = "https://raw.githubusercontent.com/ACCESS-NRI/schema/e9055da95093ec2faa555c090fc5af17923d1566/au.org.access-nri/model/output/file-metadata/1-0-1.json"
-# SCHEMA_HASH = "8f2f069fa06d81ff086b91daa6503f75615aa90385ab61ee2d1a7956dc96f9a6"
 
 _, ESM_JSONSCHEMA = get_jsonschema(
     metadata_file="data/metadata_schema_file.json", required=CORE_COLUMNS