diff --git a/.gitignore b/.gitignore index 84fe2e3..9fe6a08 100644 --- a/.gitignore +++ b/.gitignore @@ -105,6 +105,7 @@ model.log */input.csv __pycache__ output/* +logs/* metadata/* venv/ .ipynb_checkpoints/ diff --git a/analysis/report.ipynb b/analysis/report.ipynb index fde8371..01a5752 100644 --- a/analysis/report.ipynb +++ b/analysis/report.ipynb @@ -29,7 +29,8 @@ "metadata": {}, "outputs": [], "source": [ - "OUTPUT_DIR = pathlib.Path(\"../output\")" + "OUTPUT_DIR = pathlib.Path(\"../output\")\n", + "LOG_DIR = pathlib.Path(\"../logs\")" ] }, { @@ -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", "}" ] diff --git a/analysis/vaccination_reference_report.ipynb b/analysis/vaccination_reference_report.ipynb index ab6217a..6570f20 100644 --- a/analysis/vaccination_reference_report.ipynb +++ b/analysis/vaccination_reference_report.ipynb @@ -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\")" ] }, { @@ -50,7 +51,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": null, "metadata": {}, "outputs": [], "source": [ @@ -58,7 +59,7 @@ " 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", diff --git a/project.yaml b/project.yaml index ac86c62..ecc7ad1 100644 --- a/project.yaml +++ b/project.yaml @@ -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