Skip to content

Commit 0c87381

Browse files
seasidesparrowseasidesparrow
authored
Merge pull request #34 from seasidesparrow/update_id
Minor update for forwards compatibility with Honeycomb and `fulltext_data_model`
2 parents 3b071ef + b62d0b4 commit 0c87381

4 files changed

Lines changed: 51 additions & 25 deletions

File tree

‎adsingestschema/Document.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"$schema": "http://json-schema.org/draft-07/schema#",
3+
"$id": "https://raw.githubusercontent.com/adsabs/ingest_data_model/refs/tags/v1.0.13/adsingestschema/Document.json",
34
"title": "Document",
45
"description": "Data schema for importing metadata into ADS pipeline",
56
"type": "object",
@@ -55,10 +56,18 @@
5556
}
5657
},
5758
"title": {
58-
"$ref": "./Title.json"
59+
"type": "array",
60+
"description": "Array of Title.json objects for multilingual support",
61+
"items": {
62+
"$ref": "./Title.json"
63+
}
5964
},
6065
"subtitle": {
61-
"$ref": "./Title.json"
66+
"type": "array",
67+
"description": "Array of Title.json objects for multilingual support",
68+
"items": {
69+
"$ref": "./Title.json"
70+
}
6271
},
6372
"abstract": {
6473
"type": "object",

‎adsingestschema/RecordData.json‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"description": "Timestamp for when the metadata was harvested (e.g. file created timestamp)",
88
"type": "string"
99
},
10-
"parsedTime": {
11-
"description": "Timestamp for when parsing commenced.",
10+
"dataType": {
11+
"description": "Data set, bib data, etc.",
1212
"type": "string"
1313
},
1414
"loadType": {
@@ -41,18 +41,33 @@
4141
"description": "If loadtype is fromFile, path to file; if fromURL, it's a URL",
4242
"type": "string"
4343
},
44+
"masterRecord": {
45+
"description": "Canonical record identifier with which this object is associated",
46+
"type": "string"
47+
},
48+
"parsedTime": {
49+
"description": "Timestamp for when parsing commenced.",
50+
"type": "string"
51+
},
4452
"recordOrigin": {
4553
"description": "Provider of record (e.g. Publisher, STI, arXiv)",
4654
"type": "string"
55+
},
56+
"UUID": {
57+
"description": "Internal identifier UUID for this object",
58+
"type": "string"
4759
}
4860
},
4961
"required": [
5062
"createdTime",
51-
"parsedTime",
52-
"loadType",
63+
"dataType",
5364
"loadFormat",
5465
"loadLocation",
55-
"recordOrigin"
66+
"loadType",
67+
"masterRecord",
68+
"parsedTime",
69+
"recordOrigin",
70+
"UUID"
5671
],
5772
"additionalProperties": false
5873
}

‎test_data/gcnc.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
{
22
"recordData": {
33
"createdTime": "2021-08-30Z12:00:00",
4-
"parsedTime": "2021-10-02Z18:50:00",
4+
"dataType": "",
55
"loadType": "fromFile",
66
"loadFormat": "Text",
77
"loadLocation": "./real_data/14500.gcn3",
8-
"recordOrigin": "Publisher"
8+
"masterRecord": "",
9+
"parsedTime": "2021-10-02Z18:50:00",
10+
"recordOrigin": "Publisher",
11+
"UUID": "06994ac1-c50b-7fa0-a500-7f08892d0d0b"
912
},
1013
"pubDate": {
1114
"electrDate": "2013-04-29"
1215
},
13-
"title": {
14-
"textEnglish": "GRB 100728A: GROND host detection and X-shooter redshift"
15-
},
16+
"title": [
17+
{
18+
"textEnglish": "GRB 100728A: GROND host detection and X-shooter redshift"
19+
}
20+
],
1621
"authors": [
1722
{
1823
"name": {
@@ -61,10 +66,6 @@
6166
"abstract": {
6267
"textEnglish": "TITLE: GCN CIRCULAR\nNUMBER: 14500\nSUBJECT: GRB 100728A: GROND host detection and X-shooter redshift\nDATE: 13/04/29 11:32:33 GMT\nFROM: Thomas Kruehler at Dark Cosmology Center <tom@dark-cosmology.dk>\n\nT. Kruehler (DARK), J. Greiner (MPE) and D. A. Kann (TLS) report:\n\nWe performed deep observations of the field of GRB 100728A\nsimultaneously in g'r'i'z'JHK with GROND (Greiner et al. 2008,\nPASP 120, 405). GRB 100728A triggered Swift (Cannizzo et al.,\nGCN 11004), GBM (von Kienlin, GCN 11006), Konus-Wind (Golenetskii\net al., GCN 11021) and Suzaku WAM (Tsai et al., GCN 11037).\n\nOur late observations were performed on 2010-11-10, 105 days\nafter the trigger, and consisted of dithered images with a total of\n4427 s exposure in g'r'i'z' and 3600 s in JHK under clear sky\nconditions and a seeing of 0.8\".\n\nInside the enhanced X-ray error-circle\n(http://www.swift.ac.uk/xrt_positions), we detect an extended\nobject with an r'-band AB magnitude of r' = 25.0 +/- 0.2.\n\nIts barycentric coordinates are:\n\nRA (J2000) = 05:55:01.98\nDec. (J2000) = -15:15:19.7\n\nwith uncertainties of 0.3\" in each coordinate.\nRegistering the early afterglow images (Olivares et al., GCN 11020)\nagainst the late host frame, we derive an offset between galaxy\ncenter and afterglow of approximately 0.4\".\n\nA spectrum of this galaxy was taken on 2012-11-15 with the ESO VLT\nUT2 equipped with the X-shooter spectrograph, covering the\nwavelength range 3000-25000 AA. The seeing was 1.2\" and the\ntotal exposure of our spectrum was 2400 s. In the VIS and NIR arm,\nwe detect emission lines, which we interpret as being due to\n[O II](3729) and Halpha at a common redshift of z = 1.567.\n\nThe bright X-ray emission (Evans et al., GCN 11014), coupled with the\nfaint and red optical/NIR afterglow (Olivares et al., GCN 11020) is\ncharacteristic of dust-extinguished events. Fitting the available\nafterglow data with synchrotron models, the visual extinction along\nthe GRB sightline is constrained to 1.5 mag < A_V < 3 mag at z = 1.567.\n\n"
6368
},
64-
"fulltext": {
65-
"language": "en",
66-
"body": "TITLE: GCN CIRCULAR\nNUMBER: 14500\nSUBJECT: GRB 100728A: GROND host detection and X-shooter redshift\nDATE: 13/04/29 11:32:33 GMT\nFROM: Thomas Kruehler at Dark Cosmology Center <tom@dark-cosmology.dk>\n\nT. Kruehler (DARK), J. Greiner (MPE) and D. A. Kann (TLS) report:\n\nWe performed deep observations of the field of GRB 100728A\nsimultaneously in g'r'i'z'JHK with GROND (Greiner et al. 2008,\nPASP 120, 405). GRB 100728A triggered Swift (Cannizzo et al.,\nGCN 11004), GBM (von Kienlin, GCN 11006), Konus-Wind (Golenetskii\net al., GCN 11021) and Suzaku WAM (Tsai et al., GCN 11037).\n\nOur late observations were performed on 2010-11-10, 105 days\nafter the trigger, and consisted of dithered images with a total of\n4427 s exposure in g'r'i'z' and 3600 s in JHK under clear sky\nconditions and a seeing of 0.8\".\n\nInside the enhanced X-ray error-circle\n(http://www.swift.ac.uk/xrt_positions), we detect an extended\nobject with an r'-band AB magnitude of r' = 25.0 +/- 0.2.\n\nIts barycentric coordinates are:\n\nRA (J2000) = 05:55:01.98\nDec. (J2000) = -15:15:19.7\n\nwith uncertainties of 0.3\" in each coordinate.\nRegistering the early afterglow images (Olivares et al., GCN 11020)\nagainst the late host frame, we derive an offset between galaxy\ncenter and afterglow of approximately 0.4\".\n\nA spectrum of this galaxy was taken on 2012-11-15 with the ESO VLT\nUT2 equipped with the X-shooter spectrograph, covering the\nwavelength range 3000-25000 AA. The seeing was 1.2\" and the\ntotal exposure of our spectrum was 2400 s. In the VIS and NIR arm,\nwe detect emission lines, which we interpret as being due to\n[O II](3729) and Halpha at a common redshift of z = 1.567.\n\nThe bright X-ray emission (Evans et al., GCN 11014), coupled with the\nfaint and red optical/NIR afterglow (Olivares et al., GCN 11020) is\ncharacteristic of dust-extinguished events. Fitting the available\nafterglow data with synchrotron models, the visual extinction along\nthe GRB sightline is constrained to 1.5 mag < A_V < 3 mag at z = 1.567.\n\n"
67-
},
6869
"astronomicalObjects": [
6970
"GRB 100728A"
7071
],

‎test_data/gcnc_fails.json‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,23 @@
11
{
22
"recordData": {
33
"createdTime": "2021-08-30Z12:00:00",
4-
"parsedTime": "2021-10-02Z18:50:00",
4+
"dataType": "",
55
"loadType": "fromFile",
66
"loadFormat": "Text",
77
"loadLocation": "./real_data/14500.gcn3",
8-
"recordOrigin": "Publisher"
8+
"masterRecord": "",
9+
"parsedTime": "2021-10-02Z18:50:00",
10+
"recordOrigin": "Publisher",
11+
"UUID": "06994ac1-c50b-7966-b000-0cb4922cb7ea"
912
},
1013
"pubDate": {
1114
"electrDate": "2013-04-29"
1215
},
13-
"title": {
14-
"textEnglish": "GRB 100728A: GROND host detection and X-shooter redshift"
15-
},
16+
"title": [
17+
{
18+
"textEnglish": "GRB 100728A: GROND host detection and X-shooter redshift"
19+
}
20+
],
1621
"authors": [
1722
{
1823
"name": {
@@ -61,10 +66,6 @@
6166
"abstract": {
6267
"textEnglish": "TITLE: GCN CIRCULAR\nNUMBER: 14500\nSUBJECT: GRB 100728A: GROND host detection and X-shooter redshift\nDATE: 13/04/29 11:32:33 GMT\nFROM: Thomas Kruehler at Dark Cosmology Center <tom@dark-cosmology.dk>\n\nT. Kruehler (DARK), J. Greiner (MPE) and D. A. Kann (TLS) report:\n\nWe performed deep observations of the field of GRB 100728A\nsimultaneously in g'r'i'z'JHK with GROND (Greiner et al. 2008,\nPASP 120, 405). GRB 100728A triggered Swift (Cannizzo et al.,\nGCN 11004), GBM (von Kienlin, GCN 11006), Konus-Wind (Golenetskii\net al., GCN 11021) and Suzaku WAM (Tsai et al., GCN 11037).\n\nOur late observations were performed on 2010-11-10, 105 days\nafter the trigger, and consisted of dithered images with a total of\n4427 s exposure in g'r'i'z' and 3600 s in JHK under clear sky\nconditions and a seeing of 0.8\".\n\nInside the enhanced X-ray error-circle\n(http://www.swift.ac.uk/xrt_positions), we detect an extended\nobject with an r'-band AB magnitude of r' = 25.0 +/- 0.2.\n\nIts barycentric coordinates are:\n\nRA (J2000) = 05:55:01.98\nDec. (J2000) = -15:15:19.7\n\nwith uncertainties of 0.3\" in each coordinate.\nRegistering the early afterglow images (Olivares et al., GCN 11020)\nagainst the late host frame, we derive an offset between galaxy\ncenter and afterglow of approximately 0.4\".\n\nA spectrum of this galaxy was taken on 2012-11-15 with the ESO VLT\nUT2 equipped with the X-shooter spectrograph, covering the\nwavelength range 3000-25000 AA. The seeing was 1.2\" and the\ntotal exposure of our spectrum was 2400 s. In the VIS and NIR arm,\nwe detect emission lines, which we interpret as being due to\n[O II](3729) and Halpha at a common redshift of z = 1.567.\n\nThe bright X-ray emission (Evans et al., GCN 11014), coupled with the\nfaint and red optical/NIR afterglow (Olivares et al., GCN 11020) is\ncharacteristic of dust-extinguished events. Fitting the available\nafterglow data with synchrotron models, the visual extinction along\nthe GRB sightline is constrained to 1.5 mag < A_V < 3 mag at z = 1.567.\n\n"
6368
},
64-
"fulltext": {
65-
"language": "en",
66-
"body": "TITLE: GCN CIRCULAR\nNUMBER: 14500\nSUBJECT: GRB 100728A: GROND host detection and X-shooter redshift\nDATE: 13/04/29 11:32:33 GMT\nFROM: Thomas Kruehler at Dark Cosmology Center <tom@dark-cosmology.dk>\n\nT. Kruehler (DARK), J. Greiner (MPE) and D. A. Kann (TLS) report:\n\nWe performed deep observations of the field of GRB 100728A\nsimultaneously in g'r'i'z'JHK with GROND (Greiner et al. 2008,\nPASP 120, 405). GRB 100728A triggered Swift (Cannizzo et al.,\nGCN 11004), GBM (von Kienlin, GCN 11006), Konus-Wind (Golenetskii\net al., GCN 11021) and Suzaku WAM (Tsai et al., GCN 11037).\n\nOur late observations were performed on 2010-11-10, 105 days\nafter the trigger, and consisted of dithered images with a total of\n4427 s exposure in g'r'i'z' and 3600 s in JHK under clear sky\nconditions and a seeing of 0.8\".\n\nInside the enhanced X-ray error-circle\n(http://www.swift.ac.uk/xrt_positions), we detect an extended\nobject with an r'-band AB magnitude of r' = 25.0 +/- 0.2.\n\nIts barycentric coordinates are:\n\nRA (J2000) = 05:55:01.98\nDec. (J2000) = -15:15:19.7\n\nwith uncertainties of 0.3\" in each coordinate.\nRegistering the early afterglow images (Olivares et al., GCN 11020)\nagainst the late host frame, we derive an offset between galaxy\ncenter and afterglow of approximately 0.4\".\n\nA spectrum of this galaxy was taken on 2012-11-15 with the ESO VLT\nUT2 equipped with the X-shooter spectrograph, covering the\nwavelength range 3000-25000 AA. The seeing was 1.2\" and the\ntotal exposure of our spectrum was 2400 s. In the VIS and NIR arm,\nwe detect emission lines, which we interpret as being due to\n[O II](3729) and Halpha at a common redshift of z = 1.567.\n\nThe bright X-ray emission (Evans et al., GCN 11014), coupled with the\nfaint and red optical/NIR afterglow (Olivares et al., GCN 11020) is\ncharacteristic of dust-extinguished events. Fitting the available\nafterglow data with synchrotron models, the visual extinction along\nthe GRB sightline is constrained to 1.5 mag < A_V < 3 mag at z = 1.567.\n\n"
67-
},
6869
"astronomicalObjects": [
6970
"GRB 100728A"
7071
],

0 commit comments

Comments
 (0)