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 Austin Bikeshare dataset #156

Merged
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/austin_bikeshare/_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/austin_bikeshare/_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"
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
@@ -0,0 +1,167 @@
# 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.


import datetime
import json
import logging
import math
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,
) -> None:

logging.info(
f"Austin bikeshare {pipeline_name} 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 from {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"Transforming {source_file}... ")

logging.info(f"Transform: Rename columns.. {source_file}")
rename_headers(df, rename_mappings)

logging.info(f"Transform: Converting date values for {source_file}... ")
df["modified_date"] = df["modified_date"].apply(convert_dt_format)

logging.info(f"Transform: filtering rows for {source_file}... ")
filter_null_rows(df)

logging.info(f"Transform: converting to integer {source_file}... ")
df["city_asset_number"] = df["city_asset_number"].apply(convert_to_int)
df["number_of_docks"] = df["number_of_docks"].apply(convert_to_int)
df["footprint_length"] = df["footprint_length"].apply(convert_to_int)
df["council_district"] = df["council_district"].apply(convert_to_int)

logging.info(f"Transform: cremoving NaN values {source_file}... ")
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
df["footprint_width"] = df["footprint_width"].apply(resolve_nan)

logging.info("Transform: Reordering headers..")
df = df[headers]

logging.info(f"Saving to output file.. {target_file}")
try:
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)

logging.info(
f"Austin bikeshare {pipeline_name} process completed at "
+ str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"))
)


def resolve_nan(input: str) -> str:
str_val = ""
if input == "" or (math.isnan(input)):
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
str_val = ""
else:
str_val = str(input)
return str_val.replace("None", "")


def convert_to_int(input: str) -> str:
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
str_val = ""
if input == "" or (math.isnan(input)):
str_val = ""
else:
str_val = str(int(round(input, 0)))
return str_val


def rename_headers(df: pd.DataFrame, rename_mappings: dict) -> None:
df.rename(columns=rename_mappings, inplace=True)


def convert_dt_format(dt_str: str) -> str:
# Old format: MM/dd/yyyy hh:mm:ss aa
# New format: yyyy-MM-dd HH:mm:ss
if dt_str is None or len(dt_str) == 0:
adlersantos marked this conversation as resolved.
Show resolved Hide resolved
return dt_str
else:
return datetime.datetime.strptime(dt_str, "%m/%d/%Y %H:%M:%S %p").strftime(
"%Y-%m-%d %H:%M:%S"
)


def filter_null_rows(df: pd.DataFrame) -> None:
df = df[df.station_id != ""]


def save_to_new_file(df: pd.DataFrame, file_path: str) -> None:
df.to_csv(file_path, index=False)


def download_file(source_url: str, source_file: pathlib.Path) -> None:
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)

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
pandas
google-cloud-storage
26 changes: 26 additions & 0 deletions datasets/austin_bikeshare/_terraform/austin_bikeshare_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" "austin_bikeshare" {
dataset_id = "austin_bikeshare"
project = var.project_id
description = "Austin Bikeshare dataset"
}

output "bigquery_dataset-austin_bikeshare-dataset_id" {
value = google_bigquery_dataset.austin_bikeshare.dataset_id
}
@@ -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" "bikeshare_stations" {
project = var.project_id
dataset_id = "austin_bikeshare"
table_id = "bikeshare_stations"

description = "Austin Bikeshare Stations table"




depends_on = [
google_bigquery_dataset.austin_bikeshare
]
}

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

output "bigquery_table-bikeshare_stations-id" {
value = google_bigquery_table.bikeshare_stations.id
}
28 changes: 28 additions & 0 deletions datasets/austin_bikeshare/_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
}
23 changes: 23 additions & 0 deletions datasets/austin_bikeshare/_terraform/variables.tf
@@ -0,0 +1,23 @@
/**
* 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.
*/


variable "project_id" {}
variable "bucket_name_prefix" {}
variable "impersonating_acct" {}
variable "region" {}
variable "env" {}