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.

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

feat: Onboard COVID19-Italy dataset #148

Merged
merged 3 commits into from Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 38 additions & 0 deletions datasets/covid19_italy/_images/run_csv_transform_kub/Dockerfile
@@ -0,0 +1,38 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# The base image for this build
# FROM gcr.io/google.com/cloudsdktool/cloud-sdk:slim
FROM python:3.8

# Allow statements and log messages to appear in Cloud logs
ENV PYTHONUNBUFFERED True

# Copy the requirements file into the image
COPY requirements.txt ./

# Install the packages specified in the requirements file
RUN python3 -m pip install --no-cache-dir -r requirements.txt

# The WORKDIR instruction sets the working directory for any RUN, CMD,
# ENTRYPOINT, COPY and ADD instructions that follow it in the Dockerfile.
# If the WORKDIR doesn’t exist, it will be created even if it’s not used in
# any subsequent Dockerfile instruction
WORKDIR /custom

# Copy the specific data processing script/s in the image under /custom/*
COPY ./csv_transform.py .

# Command to run the data processing script when the container is run
CMD ["python3", "csv_transform.py"]
13 changes: 13 additions & 0 deletions datasets/covid19_italy/_images/run_csv_transform_kub/Pipfile
@@ -0,0 +1,13 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
requests = "*"
vaex = "*"

[dev-packages]

[requires]
python_version = "3.9"
149 changes: 149 additions & 0 deletions datasets/covid19_italy/_images/run_csv_transform_kub/csv_transform.py
@@ -0,0 +1,149 @@
# Copyright 2021 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# CSV transform for: covid19_italy
adlersantos marked this conversation as resolved.
Show resolved Hide resolved

import datetime
import json
import logging
import os
import pathlib
import typing

import pandas as pd
import requests
from google.cloud import storage


def main(
source_url: str,
source_file: pathlib.Path,
target_file: pathlib.Path,
target_gcs_bucket: str,
target_gcs_path: str,
headers: typing.List[str],
rename_mappings: dict,
pipeline_name: str,
):
adlersantos marked this conversation as resolved.
Show resolved Hide resolved

logging.info(
"Covid-19 Italy process started at "
+ str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
)

logging.info("creating 'files' folder")
pathlib.Path("./files").mkdir(parents=True, exist_ok=True)

logging.info(f"Downloading file {source_url}")
download_file(source_url, source_file)

# open the input file
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
logging.info(f"Opening file {source_file}")

df = pd.read_csv(str(source_file))

# steps in the pipeline
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
logging.info(f"Transformation Process Starting.. {source_file}")

# rename the headers
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
logging.info(f"Transform: Renaming Headers.. {source_file}")
rename_headers(df, rename_mappings)

# create location_geom
logging.info(f"Transform: Creating Geometry Column.. {pipeline_name}")
if pipeline_name == "data_by_province" or pipeline_name == "data_by_region":
df["location_geom"] = (
"POINT("
+ df["longitude"].astype(str).replace("nan", "")
+ " "
+ df["latitude"].astype(str).replace("nan", "")
+ ")"
)
# replace blank POINT( ) valye with blank
df.location_geom = df.location_geom.replace("POINT( )", "")

# reorder headers in output
logging.info("Transform: Reordering headers..")
df = df[headers]

# steps in the pipeline
logging.info(f"Transformation Process complete .. {source_file}")

# save to output file
logging.info(f"Saving to output file.. {target_file}")

try:
# save_to_new_file(df, file_path=str(target_file))
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
save_to_new_file(df, file_path=str(target_file))
except Exception as e:
logging.error(f"Error saving output file: {e}.")

logging.info(
f"Uploading output file to.. gs://{target_gcs_bucket}/{target_gcs_path}"
)
upload_file_to_gcs(target_file, target_gcs_bucket, target_gcs_path)

# log completion
logging.info(
"Covid-19 Italy process completed at "
+ str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
)


def convert_dt_format(date_str, time_str):
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
# date_str, time_str
# 10/26/2014,13:12:00
return str(datetime.datetime.strptime(date_str, "%m/%d/%Y").date()) + " " + time_str


def rename_headers(df, rename_mappings: dict):
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
df.rename(columns=rename_mappings, inplace=True)


def save_to_new_file(df, file_path):
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
df.to_csv(file_path, float_format="%.0f", index=False)


def download_file(source_url: str, source_file: pathlib.Path):
logging.info(f"Downloading {source_url} into {source_file}")
r = requests.get(source_url, stream=True)
if r.status_code == 200:
with open(source_file, "wb") as f:
for chunk in r:
f.write(chunk)
else:
logging.error(f"Couldn't download {source_url}: {r.text}")


def upload_file_to_gcs(file_path: pathlib.Path, gcs_bucket: str, gcs_path: str) -> None:
storage_client = storage.Client()
bucket = storage_client.bucket(gcs_bucket)
blob = bucket.blob(gcs_path)
blob.upload_from_filename(file_path)


if __name__ == "__main__":
logging.getLogger().setLevel(logging.INFO)

# if os.environ["PIPELINE"] == 'data_by_province':
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
main(
source_url=os.environ["SOURCE_URL"],
source_file=pathlib.Path(os.environ["SOURCE_FILE"]).expanduser(),
target_file=pathlib.Path(os.environ["TARGET_FILE"]).expanduser(),
target_gcs_bucket=os.environ["TARGET_GCS_BUCKET"],
target_gcs_path=os.environ["TARGET_GCS_PATH"],
headers=json.loads(os.environ["CSV_HEADERS"]),
rename_mappings=json.loads(os.environ["RENAME_MAPPINGS"]),
pipeline_name=os.environ["PIPELINE_NAME"],
)
@@ -0,0 +1,3 @@
requests
vaex
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
google-cloud-storage
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
26 changes: 26 additions & 0 deletions datasets/covid19_italy/_terraform/covid19_italy_dataset.tf
@@ -0,0 +1,26 @@
/**
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


resource "google_bigquery_dataset" "covid19_italy" {
dataset_id = "covid19_italy"
project = var.project_id
description = "ETL Processes for Covid 19 Italy"
}

output "bigquery_dataset-covid19_italy-dataset_id" {
value = google_bigquery_dataset.covid19_italy.dataset_id
}
39 changes: 39 additions & 0 deletions datasets/covid19_italy/_terraform/data_by_province_pipeline.tf
@@ -0,0 +1,39 @@
/**
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


resource "google_bigquery_table" "data_by_province" {
project = var.project_id
dataset_id = "covid19_italy"
table_id = "data_by_province"

description = "covid19 Italy Data By Province"




depends_on = [
google_bigquery_dataset.covid19_italy
]
}

output "bigquery_table-data_by_province-table_id" {
value = google_bigquery_table.data_by_province.table_id
}

output "bigquery_table-data_by_province-id" {
value = google_bigquery_table.data_by_province.id
}
39 changes: 39 additions & 0 deletions datasets/covid19_italy/_terraform/data_by_region_pipeline.tf
@@ -0,0 +1,39 @@
/**
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


resource "google_bigquery_table" "data_by_region" {
project = var.project_id
dataset_id = "covid19_italy"
table_id = "data_by_region"

description = "covid19 Italy Data By Region"




depends_on = [
google_bigquery_dataset.covid19_italy
]
}

output "bigquery_table-data_by_region-table_id" {
value = google_bigquery_table.data_by_region.table_id
}

output "bigquery_table-data_by_region-id" {
value = google_bigquery_table.data_by_region.id
}
39 changes: 39 additions & 0 deletions datasets/covid19_italy/_terraform/national_trends_pipeline.tf
@@ -0,0 +1,39 @@
/**
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


resource "google_bigquery_table" "national_trends" {
project = var.project_id
dataset_id = "covid19_italy"
table_id = "national_trends"

description = "covid19 Italy National Trends"




depends_on = [
google_bigquery_dataset.covid19_italy
]
}

output "bigquery_table-national_trends-table_id" {
value = google_bigquery_table.national_trends.table_id
}

output "bigquery_table-national_trends-id" {
value = google_bigquery_table.national_trends.id
}
28 changes: 28 additions & 0 deletions datasets/covid19_italy/_terraform/provider.tf
@@ -0,0 +1,28 @@
/**
* Copyright 2021 Google LLC
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/


provider "google" {
project = var.project_id
impersonate_service_account = var.impersonating_acct
region = var.region
}

data "google_client_openid_userinfo" "me" {}

output "impersonating-account" {
value = data.google_client_openid_userinfo.me.email
}