-
Notifications
You must be signed in to change notification settings - Fork 62
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 Chicago Crime dataset #171
Closed
dipannitab2392
wants to merge
6
commits into
GoogleCloudPlatform:main
from
dipannitab2392:chicago-crime
Closed
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6192d7a
feat: Onboard Chicago Crime dataset
dipannitab2392 4752323
feat: Onboard Chicago Crime dataset
dipannitab2392 08b5f42
fix: working on review comments
dipannitab2392 e52664c
fix: review comments
dipannitab2392 50f1ea0
Merge branch 'GoogleCloudPlatform:main' into chicago-crime
dipannitab2392 6a74259
Delete terraform.tfvars
dipannitab2392 File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
datasets/chicago_crime/_images/run_csv_transform_kub/Dockerfile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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"] |
226 changes: 226 additions & 0 deletions
226
datasets/chicago_crime/_images/run_csv_transform_kub/csv_transform.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,226 @@ | ||
# 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 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, | ||
) -> None: | ||
|
||
logging.info( | ||
"Chicago Crime 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) | ||
|
||
logging.info(f"Opening file {source_file}") | ||
df = pd.read_csv(source_file) | ||
|
||
logging.info(f"Transforming {source_file} ...") | ||
|
||
logging.info(f"Transform: Rename columns {source_file} ...") | ||
rename_headers(df) | ||
|
||
logging.info("Transform: Converting date format.. ") | ||
convert_values(df) | ||
|
||
logging.info("Transform: Removing null values.. ") | ||
filter_null_rows(df) | ||
|
||
logging.info("Transform: Converting to integers..") | ||
convert_values_to_integer_string(df) | ||
|
||
logging.info("Transform: Converting to float..") | ||
removing_nan_values(df) | ||
|
||
logging.info("Transform: Reordering headers..") | ||
df = df[ | ||
[ | ||
"unique_key", | ||
"case_number", | ||
"date", | ||
"block", | ||
"iucr", | ||
"primary_type", | ||
"description", | ||
"location_description", | ||
"arrest", | ||
"domestic", | ||
"beat", | ||
"district", | ||
"ward", | ||
"community_area", | ||
"fbi_code", | ||
"x_coordinate", | ||
"y_coordinate", | ||
"year", | ||
"updated_on", | ||
"latitude", | ||
"longitude", | ||
"location", | ||
] | ||
] | ||
|
||
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( | ||
"Chicago crime process completed at " | ||
+ str(datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")) | ||
) | ||
|
||
|
||
def resolve_nan(input: typing.Union[str, float]) -> str: | ||
str_val = "" | ||
if not input or (math.isnan(input)): | ||
str_val = "" | ||
else: | ||
str_val = str(input) | ||
return str_val.replace("None", "") | ||
|
||
|
||
def removing_nan_values(df: pd.DataFrame) -> None: | ||
cols = ["x_coordinate", "y_coordinate", "latitude", "longitude"] | ||
|
||
for cols in cols: | ||
df[cols] = df[cols].apply(resolve_nan) | ||
|
||
|
||
def convert_to_integer_string(input: typing.Union[str, float]) -> str: | ||
str_val = "" | ||
if not input or (math.isnan(input)): | ||
str_val = "" | ||
else: | ||
str_val = str(int(round(input, 0))) | ||
return str_val | ||
|
||
|
||
def convert_values_to_integer_string(df: pd.DataFrame) -> None: | ||
cols = ["unique_key", "beat", "district", "ward", "community_area", "year"] | ||
|
||
for cols in cols: | ||
df[cols] = df[cols].apply(convert_to_integer_string) | ||
|
||
|
||
def rename_headers(df: pd.DataFrame) -> None: | ||
header_names = { | ||
"ID": "unique_key", | ||
"Case Number": "case_number", | ||
"Date": "date", | ||
"Block": "block", | ||
"IUCR": "iucr", | ||
"Primary Type": "primary_type", | ||
"Description": "description", | ||
"Location Description": "location_description", | ||
"Arrest": "arrest", | ||
"Domestic": "domestic", | ||
"Beat": "beat", | ||
"District": "district", | ||
"Ward": "ward", | ||
"Community Area": "community_area", | ||
"FBI Code": "fbi_code", | ||
"X Coordinate": "x_coordinate", | ||
"Y Coordinate": "y_coordinate", | ||
"Year": "year", | ||
"Updated On": "updated_on", | ||
"Latitude": "latitude", | ||
"Longitude": "longitude", | ||
"Location": "location", | ||
} | ||
|
||
df.rename(columns=header_names, 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: | ||
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 convert_values(df: pd.DataFrame) -> None: | ||
dt_cols = ["date", "updated_on"] | ||
|
||
for dt_col in dt_cols: | ||
df[dt_col] = df[dt_col].apply(convert_dt_format) | ||
|
||
|
||
def filter_null_rows(df: pd.DataFrame) -> None: | ||
df = df[df.unique_key != ""] | ||
|
||
|
||
def save_to_new_file(df: pd.DataFrame, file_path: pathlib.Path) -> 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"], | ||
) |
3 changes: 3 additions & 0 deletions
3
datasets/chicago_crime/_images/run_csv_transform_kub/requirements.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
requests | ||
pandas | ||
google-cloud-storage |
26 changes: 26 additions & 0 deletions
26
datasets/chicago_crime/_terraform/chicago_crime_dataset.tf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" "chicago_crime" { | ||
dataset_id = "chicago_crime" | ||
project = var.project_id | ||
description = "chicago crime" | ||
} | ||
|
||
output "bigquery_dataset-chicago_crime-dataset_id" { | ||
value = google_bigquery_dataset.chicago_crime.dataset_id | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" "crime" { | ||
project = var.project_id | ||
dataset_id = "chicago_crime" | ||
table_id = "crime" | ||
|
||
description = "chicago crime dataset" | ||
|
||
|
||
|
||
|
||
depends_on = [ | ||
google_bigquery_dataset.chicago_crime | ||
] | ||
} | ||
|
||
output "bigquery_table-crime-table_id" { | ||
value = google_bigquery_table.crime.table_id | ||
} | ||
|
||
output "bigquery_table-crime-id" { | ||
value = google_bigquery_table.crime.id | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" {} | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Extra commented line