Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ model.log
*/input.csv
__pycache__
output/*
logs/*
metadata/*
venv/
.ipynb_checkpoints/
5 changes: 3 additions & 2 deletions analysis/report.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"metadata": {},
"outputs": [],
"source": [
"OUTPUT_DIR = pathlib.Path(\"../output\")"
"OUTPUT_DIR = pathlib.Path(\"../output\")\n",
"LOG_DIR = pathlib.Path(\"../logs\")"
]
},
{
Expand All @@ -50,7 +51,7 @@
"log = {\n",
" d[\"event\"]: d\n",
" for d in (\n",
" json.loads(line) for line in (OUTPUT_DIR / \"log.json\").read_text().splitlines()\n",
" json.loads(line) for line in (LOG_DIR / \"log.json\").read_text().splitlines()\n",
" )\n",
"}"
]
Expand Down
9 changes: 5 additions & 4 deletions analysis/vaccination_reference_report.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@
},
{
"cell_type": "code",
"execution_count": 3,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"OUTPUT_DIR = pathlib.Path(\"../output\")"
"OUTPUT_DIR = pathlib.Path(\"../output\")\n",
"LOG_DIR = pathlib.Path(\"../logs\")"
]
},
{
Expand All @@ -50,15 +51,15 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": null,
"metadata": {},
"outputs": [],
"source": [
"log = {\n",
" d[\"event\"]: d\n",
" for d in (\n",
" json.loads(line)\n",
" for line in (OUTPUT_DIR / \"vaccination_reference_log.json\")\n",
" for line in (LOG_DIR / \"vaccination_reference_log.json\")\n",
" .read_text()\n",
" .splitlines()\n",
" )\n",
Expand Down
16 changes: 8 additions & 8 deletions project.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,45 @@ actions:
run: >
sqlrunner:latest
--output output/rows.csv
--log-file output/log.json
--log-file logs/log.json
analysis/query.sql
outputs:
moderately_sensitive:
rows: output/rows.csv
log: output/log.json
log: logs/log.json

data_dictionary_query:
run: >
sqlrunner:latest
--output output/data_dictionary.csv
--log-file output/data_dictionary_log.json
--log-file logs/data_dictionary_log.json
analysis/data_dictionary_query.sql
outputs:
moderately_sensitive:
rows: output/data_dictionary.csv
log: output/data_dictionary_log.json
log: logs/data_dictionary_log.json

decision_support_value_reference_query:
run: >
sqlrunner:latest
--output output/decision_support_value_reference.csv
--log-file output/decision_support_value_reference_log.json
--log-file logs/decision_support_value_reference_log.json
analysis/decision_support_value_reference_query.sql
outputs:
moderately_sensitive:
rows: output/decision_support_value_reference.csv
log: output/decision_support_value_reference_log.json
log: logs/decision_support_value_reference_log.json

vaccination_reference_query:
run: >
sqlrunner:latest
--output output/vaccination_reference.csv
--log-file output/vaccination_reference_log.json
--log-file logs/vaccination_reference_log.json
analysis/vaccination_reference_query.sql
outputs:
moderately_sensitive:
rows: output/vaccination_reference.csv
log: output/vaccination_reference_log.json
log: logs/vaccination_reference_log.json

make-html-reports:
# --execute
Expand Down