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 San francisco film locations #190
Merged
adlersantos
merged 5 commits into
GoogleCloudPlatform:main
from
nlarge-google:san-francisco-film-locations
Oct 13, 2021
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4b495cc
feat: San Francisco Film Locations
nlarge-google 03e3744
fix: resolved BQ write error by adding 'added_quoted_newlines' to pip…
nlarge-google f09b39d
fix: resolved flake8 issues
nlarge-google 8b2186a
fix: improved chunking format
nlarge-google 95dae98
fix: Resolved pre-commit issues
nlarge-google 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/san_francisco_film_locations/_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"] |
175 changes: 175 additions & 0 deletions
175
datasets/san_francisco_film_locations/_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,175 @@ | ||
# 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 modules | ||
import datetime | ||
import logging | ||
import os | ||
import pathlib | ||
import subprocess | ||
|
||
import pandas as pd | ||
import requests | ||
from google.cloud import storage | ||
|
||
|
||
def main( | ||
source_url: str, | ||
source_file: pathlib.Path, | ||
target_file: pathlib.Path, | ||
chunksize: str, | ||
target_gcs_bucket: str, | ||
target_gcs_path: str, | ||
) -> None: | ||
|
||
logging.info("San Francisco - Film Locations process started") | ||
|
||
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) | ||
|
||
chunksz = int(chunksize) | ||
|
||
logging.info(f"Opening batch file {source_file}") | ||
with pd.read_csv( | ||
source_file, engine="python", encoding="utf-8", quotechar='"', chunksize=chunksz | ||
) as reader: | ||
for chunk_number, chunk in enumerate(reader): | ||
logging.info(f"Processing batch {chunk_number}") | ||
target_file_batch = str(target_file).replace( | ||
".csv", "-" + str(chunk_number) + ".csv" | ||
) | ||
df = pd.DataFrame() | ||
df = pd.concat([df, chunk]) | ||
processChunk(df, target_file_batch) | ||
adlersantos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
logging.info(f"Appending batch {chunk_number} to {target_file}") | ||
if chunk_number == 0: | ||
subprocess.run(["cp", target_file_batch, target_file]) | ||
else: | ||
subprocess.check_call(f"sed -i '1d' {target_file_batch}", shell=True) | ||
subprocess.check_call( | ||
f"cat {target_file_batch} >> {target_file}", shell=True | ||
) | ||
subprocess.run(["rm", target_file_batch]) | ||
|
||
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("San Francisco - Film Locations process completed") | ||
|
||
|
||
def download_file(source_url: str, source_file: pathlib.Path) -> None: | ||
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 processChunk(df: pd.DataFrame, target_file_batch: str) -> None: | ||
|
||
logging.info("Transformation Process Starting") | ||
|
||
logging.info("Renaming Headers") | ||
rename_headers(df) | ||
|
||
logging.info("Trimming Whitespace") | ||
df["distributor"] = df["distributor"].apply(lambda x: str(x).strip()) | ||
df["director"] = df["director"].apply(lambda x: str(x).strip()) | ||
df["actor_2"] = df["actor_2"].apply(lambda x: str(x).strip()) | ||
|
||
logging.info("Reordering headers..") | ||
df = df[ | ||
[ | ||
"title", | ||
"release_year", | ||
"locations", | ||
"fun_facts", | ||
"production_company", | ||
"distributor", | ||
"director", | ||
"writer", | ||
"actor_1", | ||
"actor_2", | ||
"actor_3", | ||
] | ||
] | ||
|
||
logging.info(f"Saving to target file.. {target_file_batch}") | ||
|
||
try: | ||
save_to_new_file(df, file_path=str(target_file_batch)) | ||
except Exception as e: | ||
logging.error(f"Error saving to target file: {e}.") | ||
|
||
logging.info(f"Saved transformed source data to target file .. {target_file_batch}") | ||
|
||
|
||
def convert_dt_format(dt_str: str) -> str: | ||
if not dt_str or dt_str == "nan": | ||
return str("") | ||
adlersantos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
else: | ||
return str( | ||
datetime.datetime.strptime(str(dt_str), "%m/%d/%Y %H:%M:%S %p").strftime( | ||
"%Y-%m-%d %H:%M:%S" | ||
) | ||
) | ||
|
||
|
||
def rename_headers(df: pd.DataFrame) -> None: | ||
header_names = { | ||
"Title": "title", | ||
"Release Year": "release_year", | ||
"Locations": "locations", | ||
"Fun Facts": "fun_facts", | ||
"Production Company": "production_company", | ||
"Distributor": "distributor", | ||
"Director": "director", | ||
"Writer": "writer", | ||
"Actor 1": "actor_1", | ||
"Actor 2": "actor_2", | ||
"Actor 3": "actor_3", | ||
} | ||
|
||
df = df.rename(columns=header_names, inplace=True) | ||
|
||
|
||
def save_to_new_file(df: pd.DataFrame, file_path) -> None: | ||
df.to_csv(file_path, index=False) | ||
|
||
|
||
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(), | ||
chunksize=os.environ["CHUNKSIZE"], | ||
target_gcs_bucket=os.environ["TARGET_GCS_BUCKET"], | ||
target_gcs_path=os.environ["TARGET_GCS_PATH"], | ||
) |
3 changes: 3 additions & 0 deletions
3
datasets/san_francisco_film_locations/_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 |
39 changes: 39 additions & 0 deletions
39
datasets/san_francisco_film_locations/_terraform/film_locations_pipeline.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,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" "film_locations" { | ||
project = var.project_id | ||
dataset_id = "san_francisco_film_locations" | ||
table_id = "film_locations" | ||
|
||
description = "san_francisco_film_locationsspc" | ||
|
||
|
||
|
||
|
||
depends_on = [ | ||
google_bigquery_dataset.san_francisco_film_locations | ||
] | ||
} | ||
|
||
output "bigquery_table-film_locations-table_id" { | ||
value = google_bigquery_table.film_locations.table_id | ||
} | ||
|
||
output "bigquery_table-film_locations-id" { | ||
value = google_bigquery_table.film_locations.id | ||
} |
28 changes: 28 additions & 0 deletions
28
datasets/san_francisco_film_locations/_terraform/provider.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,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 | ||
} |
26 changes: 26 additions & 0 deletions
26
datasets/san_francisco_film_locations/_terraform/san_francisco_film_locations_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" "san_francisco_film_locations" { | ||
dataset_id = "san_francisco_film_locations" | ||
project = var.project_id | ||
description = "san_francisco_film_locations" | ||
} | ||
|
||
output "bigquery_dataset-san_francisco_film_locations-dataset_id" { | ||
value = google_bigquery_dataset.san_francisco_film_locations.dataset_id | ||
} |
23 changes: 23 additions & 0 deletions
23
datasets/san_francisco_film_locations/_terraform/variables.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,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" {} | ||
|
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,27 @@ | ||
# 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. | ||
|
||
dataset: | ||
name: san_francisco_film_locations | ||
friendly_name: ~ | ||
description: ~ | ||
dataset_sources: ~ | ||
terms_of_use: ~ | ||
|
||
|
||
resources: | ||
|
||
- type: bigquery_dataset | ||
dataset_id: san_francisco_film_locations | ||
description: san_francisco_film_locations |
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