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

Fix/deploy may 2023 #166

Merged
merged 14 commits into from
Jun 12, 2023
Merged

Fix/deploy may 2023 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
5abc4cf
Update Unpaywall schema and add fix for OpenAlex
jdddog May 29, 2023
deef0d4
Update
jdddog May 30, 2023
52102f2
Update schema
jdddog May 31, 2023
f8a640c
Update datasets
jdddog Jun 5, 2023
3caed90
Fix openalex tests
jdddog Jun 6, 2023
e2d86c8
Fix tests
jdddog Jun 6, 2023
6b178e7
Update dataset
jdddog Jun 8, 2023
04ee21b
Remove MAG from create_aggregate.sql.jinja2
jdddog Jun 8, 2023
1a0c36a
Update version num
jdddog Jun 9, 2023
c942786
Update schema
jdddog Jun 12, 2023
cd35da8
Add country_name and country_code to Zenodo export for institutions
jdddog Jun 12, 2023
fed20a4
Remove percentiles
jdddog Jun 12, 2023
c602d07
Add tasks back
jdddog Jun 12, 2023
fbaef6d
Fix tests
jdddog Jun 12, 2023
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
38 changes: 36 additions & 2 deletions ...c_observatory_workflows/database/schema/crossref_fundref/crossref_fundref_2014-03-01.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,26 @@
{
"fields": [
{
"fields": [
{
"mode": "REPEATED",
"name": "parent",
"type": "STRING"
},
{
"mode": "NULLABLE",
"name": "name",
"type": "STRING"
},
{
"mode": "NULLABLE",
"name": "funder",
"type": "STRING"
}
],
"mode": "REPEATED",
"name": "parent",
"type": "STRING"
"type": "RECORD"
},
{
"mode": "NULLABLE",
Expand Down Expand Up @@ -111,9 +128,26 @@
{
"fields": [
{
"fields": [
{
"mode": "REPEATED",
"name": "children",
"type": "STRING"
},
{
"mode": "NULLABLE",
"name": "name",
"type": "STRING"
},
{
"mode": "NULLABLE",
"name": "funder",
"type": "STRING"
}
],
"mode": "REPEATED",
"name": "children",
"type": "STRING"
"type": "RECORD"
},
{
"mode": "NULLABLE",
Expand Down
54 changes: 51 additions & 3 deletions academic_observatory_workflows/database/schema/openalex/authors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
"mode": "NULLABLE",
"description": "The total number Works that cite a work this author has created."
},
{
"name": "oa_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
Expand Down Expand Up @@ -154,23 +160,65 @@
"type": "RECORD",
"mode": "NULLABLE",
"fields": [
{
"name": "2yr_cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_mean_citedness",
"type": "FLOAT",
"mode": "NULLABLE",
"description": "The 2-year mean citedness for this author. Also known as impact factor."
"description": ""
},
{
"name": "2yr_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The h-index for this author."
"description": ""
},
{
"name": "i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The i-10 index for this author."
"description": ""
},
{
"name": "oa_percent",
"type": "FLOAT",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
}
],
"description": "Citation metrics for this author."
Expand Down
54 changes: 51 additions & 3 deletions academic_observatory_workflows/database/schema/openalex/concepts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
"mode": "NULLABLE",
"description": "The number citations to works that have been tagged with this concept. Or less formally: the number of citations to this concept. For example, if there are just two works tagged with this concept and one of them has been cited 10 times, and the other has been cited 1 time, cited_by_count for this concept would be 11."
},
{
"name": "oa_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
Expand Down Expand Up @@ -238,23 +244,65 @@
"type": "RECORD",
"mode": "NULLABLE",
"fields": [
{
"name": "2yr_cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_mean_citedness",
"type": "FLOAT",
"mode": "NULLABLE",
"description": "The 2-year mean citedness for this concept. Also known as impact factor."
"description": ""
},
{
"name": "2yr_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The h-index for this concept."
"description": ""
},
{
"name": "i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The i-10 index for this concept."
"description": ""
},
{
"name": "oa_percent",
"type": "FLOAT",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
}
],
"description": "Citation metrics for this concept."
Expand Down
107 changes: 103 additions & 4 deletions academic_observatory_workflows/database/schema/openalex/institutions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@
"mode": "NULLABLE",
"description": "The total number Works that cite a work created by an author affiliated with this institution. Or less formally: the number of citations this institution has collected."
},
{
"name": "oa_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
Expand Down Expand Up @@ -104,6 +110,28 @@
"mode": "REPEATED",
"description": "Other names people may use for this institution. "
},
{
"name": "roles",
"type": "RECORD",
"mode": "REPEATED",
"fields": [
{
"name": "role",
"type": "STRING",
"mode": "NULLABLE"
},
{
"name": "id",
"type": "STRING",
"mode": "NULLABLE"
},
{
"name": "works_count",
"type": "INTEGER",
"mode": "NULLABLE"
}
]
},
{
"name": "geo",
"type": "RECORD",
Expand Down Expand Up @@ -152,7 +180,7 @@
"description": "The sub-national region (state, province) where this institution lives."
}
],
"description": "A bunch of stuff we know about the location of this institution:"
"description": "A bunch of stuff we know about the location of this institution"
},
{
"name": "homepage_url",
Expand Down Expand Up @@ -258,28 +286,57 @@
{
"name": "id",
"type": "STRING",
"mode": "NULLABLE",
"description": "The OpenAlex ID of the repository."
},
{
"name": "issn_l",
"type": "STRING",
"mode": "NULLABLE"
},
{
"name": "issn",
"type": "STRING",
"mode": "REPEATED"
},
{
"name": "display_name",
"type": "STRING",
"mode": "NULLABLE",
"description": "The repositories display name."
},
{
"name": "publisher",
"type": "STRING",
"mode": "NULLABLE"
},
{
"name": "host_organization",
"type": "STRING",
"mode": "NULLABLE",
"description": "The OpenAlex ID of the host organisation."
},
{
"name": "host_organization_name",
"type": "STRING",
"mode": "NULLABLE",
"description": "The host organisations name."
},
{
"name": "host_organization_lineage",
"type": "STRING",
"mode": "REPEATED",
"description": "The host organisations lineage."
},
{
"name": "publisher_id",
"type": "STRING",
"mode": "NULLABLE"
},
{
"name": "type",
"type": "STRING",
"mode": "NULLABLE"
}
]
},
Expand All @@ -294,23 +351,65 @@
"type": "RECORD",
"mode": "NULLABLE",
"fields": [
{
"name": "2yr_cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "2yr_mean_citedness",
"type": "FLOAT",
"mode": "NULLABLE",
"description": "The 2-year mean citedness for this institutions. Also known as impact factor."
"description": ""
},
{
"name": "2yr_works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "cited_by_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
},
{
"name": "h_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The h-index for this institutions."
"description": ""
},
{
"name": "i10_index",
"type": "INTEGER",
"mode": "NULLABLE",
"description": "The i-10 index for this institutions."
"description": ""
},
{
"name": "oa_percent",
"type": "FLOAT",
"mode": "NULLABLE",
"description": ""
},
{
"name": "works_count",
"type": "INTEGER",
"mode": "NULLABLE",
"description": ""
}
],
"description": "Citation metrics for this institutions."
Expand Down
Loading