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

NPS Code Update #925

Merged
merged 8 commits into from
Dec 28, 2023
Merged

NPS Code Update #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc61368
NPS Code Update
saanikaaa Nov 20, 2023
e332be7
NPS code modification
saanikaaa Nov 20, 2023
37c353b
Fixed lint
saanikaaa Nov 21, 2023
ae54114
Fixed test
saanikaaa Nov 21, 2023
863da23
Fixed test
saanikaaa Nov 21, 2023
cd6549a
Fixed code
saanikaaa Nov 21, 2023
03f5305
Merge branch 'datacommonsorg:master' into nps_refresh
saanikaaa Dec 22, 2023
9f9a5d8
Readme update
saanikaaa Dec 22, 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
4,592 changes: 2,377 additions & 2,215 deletions scripts/us_bjs/nps/NPS_1978-2018_Data.tsv → scripts/us_bjs/nps/NPS_1978-2021_Data.tsv
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 13 additions & 11 deletions scripts/us_bjs/nps/import.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import: {
import_name: "NationalPrisonerStatisticsImport6"
provenance_url: "https://www.icpsr.umich.edu/web/NACJD/studies/37639"
provenance_description: "Yearly data on national prisoner statistics in USA from the Bureau of Justice Statistics"
# Path to the resolved MCF. Can be a repeated field.
mcf_url: "gs://resolved_mcf/external_tables/NationalPrisonerStatisticsImport7/nodes.mcf-00000-of-00001"
# First date of imported data.
start_date: "1978"
# Last date of imported data.
end_date: "2018"
# Source data release schedule.
update_frequency: "P1Y"
import_name: "USNationalPrisonerStatistics"
provenance_url: "https://www.bjs.gov/index.cfm?ty=dcdetail&iid=269"
category: STATS
mcf_proto_url: "gs://resolved_mcf/us_nps/20231120/graph.tfrecord-00000-of-00001.gz"
import_groups: "infrequent"
import_groups: "frequent"
start_date_in_kg: "1978"
end_date_in_kg: "2021"
release_frequency: "P1Y"
table {
mapping_path: "gs://unresolved_mcf/us_nps/20231120/national_prison_stats.tmcf"
csv_path: "gs://unresolved_mcf/us_nps/20231120/national_prison_stats.csv"
}
}
47 changes: 13 additions & 34 deletions scripts/us_bjs/nps/import_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,23 @@

FLAGS = flags.FLAGS
flags.DEFINE_string('input_file',
'NPS_1978-2018_Data.tsv',
'NPS_1978-2021_Data.tsv',
'file path to tsv file with import data',
short_name='i')

AGGREGATE_COLUMNS = [
"Count_Person_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_WhiteAlone_MeasuredBasedOnJurisdiction",
"Count_Person_BlackOrAfricanAmericanAlone_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_HispanicOrLatino_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_AmericanIndianOrAlaskaNativeAlone_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_AsianAlone_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_NativeHawaiianOrOtherPacificIslanderAlone_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_TwoOrMoreRaces_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Incarcerated_JudicialExecution_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_IllnessOrNaturalCause_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_AIDS_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Incarcerated_IntentionalSelf-Harm(Suicide)_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Accidents(UnintentionalInjuries)_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_DeathDueToAnotherPerson_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Assault(Homicide)_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_MortalityEvent_Incarcerated_NPSOtherCauseOfDeath_MeasuredBasedOnJurisdiction",
"Count_IncarcerationEvent_AdmittedToPrison_Incarcerated_MaxSentenceGreaterThan1Year_Sentenced_MeasuredBasedOnJurisdiction",
"Count_IncarcerationEvent_Incarcerated_MaxSentenceGreaterThan1Year_ReleasedFromPrison_Sentenced_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_MaxSentenceGreaterThan1Year_Sentenced_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_MaxSentence1YearOrLess_Sentenced_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_Unsentenced_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_InState_PrivatelyOperated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_OutOfState_PrivatelyOperated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_Local_LocallyOperated_MeasuredBasedOnJurisdiction",
"Count_Person_FederallyOperated_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_OutOfState_StateOperated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_NotAUSCitizen_StateOperated&FederallyOperated&PrivatelyOperated_MeasuredBasedOnCustody",
"Count_Person_Incarcerated_MaxSentenceGreaterThan1Year_NotAUSCitizen_Sentenced_StateOperated&FederallyOperated&PrivatelyOperated_MeasuredBasedOnCustody",
"Count_Person_Incarcerated_MaxSentence1YearOrLess_NotAUSCitizen_Sentenced_StateOperated&FederallyOperated&PrivatelyOperated_MeasuredBasedOnCustody",
"Count_Person_Incarcerated_NotAUSCitizen_StateOperated&FederallyOperated&PrivatelyOperated_Unsentenced_MeasuredBasedOnCustody",
"Count_Person_Female_Incarcerated_MeasuredBasedOnJurisdiction",
"Count_Person_Incarcerated_Male_MeasuredBasedOnJurisdiction"
"dc/lnp5g90fwpct8", "dc/03l0q0wyqrk39", "dc/hxsdmw575en24",
"dc/wp843855b1r4c", "dc/0tn58fc77r0z6", "dc/zdb0f7sj2419d",
"dc/fs27m9j4vpvc7", "dc/yksgwhwsbtv9c", "dc/510pv6eq2vtw7",
"dc/rmwl11tzy7vkh", "dc/67ttwfn9dswch", "dc/xewq6n5r3nzch",
"dc/3s7lndm5j3wp4", "dc/tn5kxlgy0shl4", "dc/jte92xq8qsgtd",
"dc/80wsxnfj3secc", "dc/nz8kmke5yqvn", "dc/jtf63bh66k41g",
"dc/3kk4xws30zxlb", "dc/62pg70d2beyh9", "dc/ljrjkp31x9ny2",
"dc/g68w8e5hk1w2b", "dc/y01295f7b38n1", "dc/e3jblh1b616b5",
"dc/n92hgh8ned7k5", "dc/qgv9d3frn35qc", "dc/r5ebll5x2zxfg",
"dc/0mz1rg7mm3y66", "dc/91vy0sf20wlg9", "dc/b3jgznxenlrm2",
"dc/ryhy4qxqv6hg6", "dc/x0l8799rm6xg4", "dc/eergc1rzgq61b",
"dc/z6w4rxbxb4eg8"
]
FILENAME = 'national_prison_stats'

Expand Down
Loading
Loading