From 63e55afea8d4bece08d168d277e6b3a50ef6060e Mon Sep 17 00:00:00 2001 From: Vasu Chitte Date: Thu, 9 Sep 2021 13:07:09 +0000 Subject: [PATCH 1/5] branch clean up --- datasets/bls/_terraform/bls_dataset.tf | 35 --------- datasets/bls/_terraform/cpsaat18_pipeline.tf | 36 --------- datasets/bls/_terraform/provider.tf | 28 ------- datasets/bls/_terraform/variables.tf | 23 ------ datasets/bls/cpsaat18/cpsaat18_dag.py | 67 ---------------- datasets/bls/cpsaat18/pipeline.yaml | 81 -------------------- datasets/bls/dataset.yaml | 37 --------- 7 files changed, 307 deletions(-) delete mode 100644 datasets/bls/_terraform/bls_dataset.tf delete mode 100644 datasets/bls/_terraform/cpsaat18_pipeline.tf delete mode 100644 datasets/bls/_terraform/provider.tf delete mode 100644 datasets/bls/_terraform/variables.tf delete mode 100644 datasets/bls/cpsaat18/cpsaat18_dag.py delete mode 100644 datasets/bls/cpsaat18/pipeline.yaml delete mode 100644 datasets/bls/dataset.yaml diff --git a/datasets/bls/_terraform/bls_dataset.tf b/datasets/bls/_terraform/bls_dataset.tf deleted file mode 100644 index aa67382d2..000000000 --- a/datasets/bls/_terraform/bls_dataset.tf +++ /dev/null @@ -1,35 +0,0 @@ -/** - * 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" "bls" { - dataset_id = "bls" - project = var.project_id - description = "Overview: This dataset includes economic statistics on inflation, prices, unemployment, and pay \u0026 benefits provided by the Bureau of Labor Statistics (BLS).\n\nUpdate frequency: Monthly\n\nDataset source: U.S. Bureau of Labor Statistics\n\nTerms of use: This dataset is publicly available for anyone to use under the following terms provided by the Dataset Source -\u00a0http://www.data.gov/privacy-policy#data_policy\u00a0- and is provided \"AS IS\" without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the dataset.\n\nSee the GCP Marketplace listing for more details and sample queries: https://console.cloud.google.com/marketplace/details/bls-public-data/bureau-of-labor-statistics" -} - -output "bigquery_dataset-bls-dataset_id" { - value = google_bigquery_dataset.bls.dataset_id -} - -resource "google_storage_bucket" "bls" { - name = "${var.bucket_name_prefix}-bls" - force_destroy = true -} - -output "storage_bucket-bls-name" { - value = google_storage_bucket.bls.name -} diff --git a/datasets/bls/_terraform/cpsaat18_pipeline.tf b/datasets/bls/_terraform/cpsaat18_pipeline.tf deleted file mode 100644 index ee26b2c32..000000000 --- a/datasets/bls/_terraform/cpsaat18_pipeline.tf +++ /dev/null @@ -1,36 +0,0 @@ -/** - * 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" "cpsaat18" { - project = var.project_id - dataset_id = "bls" - table_id = "cpsaat18" - - description = "Current population survey 18: Employed persons by detailed industry, sex, race, and Hispanic or Latino ethnicity" - - depends_on = [ - google_bigquery_dataset.bls - ] -} - -output "bigquery_table-cpsaat18-table_id" { - value = google_bigquery_table.cpsaat18.table_id -} - -output "bigquery_table-cpsaat18-id" { - value = google_bigquery_table.cpsaat18.id -} diff --git a/datasets/bls/_terraform/provider.tf b/datasets/bls/_terraform/provider.tf deleted file mode 100644 index 23ab87dcd..000000000 --- a/datasets/bls/_terraform/provider.tf +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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 -} diff --git a/datasets/bls/_terraform/variables.tf b/datasets/bls/_terraform/variables.tf deleted file mode 100644 index c3ec7c506..000000000 --- a/datasets/bls/_terraform/variables.tf +++ /dev/null @@ -1,23 +0,0 @@ -/** - * 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" {} - diff --git a/datasets/bls/cpsaat18/cpsaat18_dag.py b/datasets/bls/cpsaat18/cpsaat18_dag.py deleted file mode 100644 index 3a655fa7d..000000000 --- a/datasets/bls/cpsaat18/cpsaat18_dag.py +++ /dev/null @@ -1,67 +0,0 @@ -# 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. - - -from airflow import DAG -from airflow.contrib.operators import gcs_to_bq - -default_args = { - "owner": "Google", - "depends_on_past": False, - "start_date": "2021-06-23", -} - - -with DAG( - dag_id="bls.cpsaat18", - default_args=default_args, - max_active_runs=1, - schedule_interval="@yearly", - catchup=False, - default_view="graph", -) as dag: - - # Task to load the CPSAAT18 data to the BigQuery table - load_csv_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator( - task_id="load_csv_to_bq", - bucket="{{ var.json.bls.source_bucket }}", - source_objects=["cpsaat18/*.csv"], - source_format="CSV", - destination_project_dataset_table="bls.cpsaat18", - skip_leading_rows=1, - write_disposition="WRITE_TRUNCATE", - schema_fields=[ - {"name": "year", "type": "integer", "nullable": False}, - {"name": "sector", "type": "string", "nullable": False}, - {"name": "subsector", "type": "string", "nullable": True}, - {"name": "industry_group", "type": "string", "nullable": True}, - {"name": "industry", "type": "string", "nullable": True}, - { - "name": "total_employed_in_thousands", - "type": "integer", - "nullable": True, - }, - {"name": "percent_women", "type": "float", "nullable": True}, - {"name": "percent_white", "type": "float", "nullable": True}, - { - "name": "percent_black_or_african_american", - "type": "float", - "nullable": True, - }, - {"name": "percent_asian", "type": "float", "nullable": True}, - {"name": "percent_hispanic_or_latino", "type": "float", "nullable": True}, - ], - ) - - load_csv_to_bq diff --git a/datasets/bls/cpsaat18/pipeline.yaml b/datasets/bls/cpsaat18/pipeline.yaml deleted file mode 100644 index 69645d018..000000000 --- a/datasets/bls/cpsaat18/pipeline.yaml +++ /dev/null @@ -1,81 +0,0 @@ -# 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. - ---- -resources: - - type: bigquery_table - table_id: cpsaat18 - description: "Current population survey 18: Employed persons by detailed industry, sex, race, and Hispanic or Latino ethnicity" - -dag: - airflow_version: 1 - initialize: - dag_id: cpsaat18 - default_args: - owner: "Google" - depends_on_past: False - start_date: '2021-06-23' - max_active_runs: 1 - schedule_interval: "@yearly" - catchup: False - default_view: graph - - tasks: - - operator: "GoogleCloudStorageToBigQueryOperator" - description: "Task to load the CPSAAT18 data to the BigQuery table" - args: - task_id: "load_csv_to_bq" - bucket: "{{ var.json.bls.source_bucket }}" - source_objects: ["cpsaat18/*.csv"] - source_format: "CSV" - destination_project_dataset_table: "bls.cpsaat18" - skip_leading_rows: 1 - write_disposition: "WRITE_TRUNCATE" - schema_fields: - - name: "year" - type: "integer" - nullable: false - - name: "sector" - type: "string" - nullable: false - - name: "subsector" - type: "string" - nullable: true - - name: "industry_group" - type: "string" - nullable: true - - name: "industry" - type: "string" - nullable: true - - name: "total_employed_in_thousands" - type: "integer" - nullable: true - - name: "percent_women" - type: "float" - nullable: true - - name: "percent_white" - type: "float" - nullable: true - - name: "percent_black_or_african_american" - type: "float" - nullable: true - - name: "percent_asian" - type: "float" - nullable: true - - name: "percent_hispanic_or_latino" - type: "float" - nullable: true - - graph_paths: - - "load_csv_to_bq" diff --git a/datasets/bls/dataset.yaml b/datasets/bls/dataset.yaml deleted file mode 100644 index c2326d5b1..000000000 --- a/datasets/bls/dataset.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# 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: bls - friendly_name: ~ - description: ~ - dataset_sources: ~ - terms_of_use: ~ - - -resources: - - type: bigquery_dataset - dataset_id: bls - description: |- - Overview: This dataset includes economic statistics on inflation, prices, unemployment, and pay & benefits provided by the Bureau of Labor Statistics (BLS). - - Update frequency: Monthly - - Dataset source: U.S. Bureau of Labor Statistics - - Terms of use: This dataset is publicly available for anyone to use under the following terms provided by the Dataset Source - http://www.data.gov/privacy-policy#data_policy - and is provided "AS IS" without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the dataset. - - See the GCP Marketplace listing for more details and sample queries: https://console.cloud.google.com/marketplace/details/bls-public-data/bureau-of-labor-statistics - - type: storage_bucket - name: bls From e9a58bea0d5bcec96ca92baa28559ca1fb1c5fc7 Mon Sep 17 00:00:00 2001 From: Vasu Chitte Date: Mon, 13 Sep 2021 15:43:17 +0000 Subject: [PATCH 2/5] chore: cleanup --- datasets/bls/_terraform/bls_dataset.tf | 35 +++++++++ datasets/bls/_terraform/cpsaat18_pipeline.tf | 36 +++++++++ datasets/bls/_terraform/provider.tf | 28 +++++++ datasets/bls/_terraform/variables.tf | 23 ++++++ datasets/bls/cpsaat18/cpsaat18_dag.py | 67 ++++++++++++++++ datasets/bls/cpsaat18/pipeline.yaml | 81 ++++++++++++++++++++ datasets/bls/dataset.yaml | 37 +++++++++ 7 files changed, 307 insertions(+) create mode 100644 datasets/bls/_terraform/bls_dataset.tf create mode 100644 datasets/bls/_terraform/cpsaat18_pipeline.tf create mode 100644 datasets/bls/_terraform/provider.tf create mode 100644 datasets/bls/_terraform/variables.tf create mode 100644 datasets/bls/cpsaat18/cpsaat18_dag.py create mode 100644 datasets/bls/cpsaat18/pipeline.yaml create mode 100644 datasets/bls/dataset.yaml diff --git a/datasets/bls/_terraform/bls_dataset.tf b/datasets/bls/_terraform/bls_dataset.tf new file mode 100644 index 000000000..aa67382d2 --- /dev/null +++ b/datasets/bls/_terraform/bls_dataset.tf @@ -0,0 +1,35 @@ +/** + * 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" "bls" { + dataset_id = "bls" + project = var.project_id + description = "Overview: This dataset includes economic statistics on inflation, prices, unemployment, and pay \u0026 benefits provided by the Bureau of Labor Statistics (BLS).\n\nUpdate frequency: Monthly\n\nDataset source: U.S. Bureau of Labor Statistics\n\nTerms of use: This dataset is publicly available for anyone to use under the following terms provided by the Dataset Source -\u00a0http://www.data.gov/privacy-policy#data_policy\u00a0- and is provided \"AS IS\" without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the dataset.\n\nSee the GCP Marketplace listing for more details and sample queries: https://console.cloud.google.com/marketplace/details/bls-public-data/bureau-of-labor-statistics" +} + +output "bigquery_dataset-bls-dataset_id" { + value = google_bigquery_dataset.bls.dataset_id +} + +resource "google_storage_bucket" "bls" { + name = "${var.bucket_name_prefix}-bls" + force_destroy = true +} + +output "storage_bucket-bls-name" { + value = google_storage_bucket.bls.name +} diff --git a/datasets/bls/_terraform/cpsaat18_pipeline.tf b/datasets/bls/_terraform/cpsaat18_pipeline.tf new file mode 100644 index 000000000..ee26b2c32 --- /dev/null +++ b/datasets/bls/_terraform/cpsaat18_pipeline.tf @@ -0,0 +1,36 @@ +/** + * 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" "cpsaat18" { + project = var.project_id + dataset_id = "bls" + table_id = "cpsaat18" + + description = "Current population survey 18: Employed persons by detailed industry, sex, race, and Hispanic or Latino ethnicity" + + depends_on = [ + google_bigquery_dataset.bls + ] +} + +output "bigquery_table-cpsaat18-table_id" { + value = google_bigquery_table.cpsaat18.table_id +} + +output "bigquery_table-cpsaat18-id" { + value = google_bigquery_table.cpsaat18.id +} diff --git a/datasets/bls/_terraform/provider.tf b/datasets/bls/_terraform/provider.tf new file mode 100644 index 000000000..23ab87dcd --- /dev/null +++ b/datasets/bls/_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 +} diff --git a/datasets/bls/_terraform/variables.tf b/datasets/bls/_terraform/variables.tf new file mode 100644 index 000000000..c3ec7c506 --- /dev/null +++ b/datasets/bls/_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" {} + diff --git a/datasets/bls/cpsaat18/cpsaat18_dag.py b/datasets/bls/cpsaat18/cpsaat18_dag.py new file mode 100644 index 000000000..3a655fa7d --- /dev/null +++ b/datasets/bls/cpsaat18/cpsaat18_dag.py @@ -0,0 +1,67 @@ +# 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. + + +from airflow import DAG +from airflow.contrib.operators import gcs_to_bq + +default_args = { + "owner": "Google", + "depends_on_past": False, + "start_date": "2021-06-23", +} + + +with DAG( + dag_id="bls.cpsaat18", + default_args=default_args, + max_active_runs=1, + schedule_interval="@yearly", + catchup=False, + default_view="graph", +) as dag: + + # Task to load the CPSAAT18 data to the BigQuery table + load_csv_to_bq = gcs_to_bq.GoogleCloudStorageToBigQueryOperator( + task_id="load_csv_to_bq", + bucket="{{ var.json.bls.source_bucket }}", + source_objects=["cpsaat18/*.csv"], + source_format="CSV", + destination_project_dataset_table="bls.cpsaat18", + skip_leading_rows=1, + write_disposition="WRITE_TRUNCATE", + schema_fields=[ + {"name": "year", "type": "integer", "nullable": False}, + {"name": "sector", "type": "string", "nullable": False}, + {"name": "subsector", "type": "string", "nullable": True}, + {"name": "industry_group", "type": "string", "nullable": True}, + {"name": "industry", "type": "string", "nullable": True}, + { + "name": "total_employed_in_thousands", + "type": "integer", + "nullable": True, + }, + {"name": "percent_women", "type": "float", "nullable": True}, + {"name": "percent_white", "type": "float", "nullable": True}, + { + "name": "percent_black_or_african_american", + "type": "float", + "nullable": True, + }, + {"name": "percent_asian", "type": "float", "nullable": True}, + {"name": "percent_hispanic_or_latino", "type": "float", "nullable": True}, + ], + ) + + load_csv_to_bq diff --git a/datasets/bls/cpsaat18/pipeline.yaml b/datasets/bls/cpsaat18/pipeline.yaml new file mode 100644 index 000000000..69645d018 --- /dev/null +++ b/datasets/bls/cpsaat18/pipeline.yaml @@ -0,0 +1,81 @@ +# 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. + +--- +resources: + - type: bigquery_table + table_id: cpsaat18 + description: "Current population survey 18: Employed persons by detailed industry, sex, race, and Hispanic or Latino ethnicity" + +dag: + airflow_version: 1 + initialize: + dag_id: cpsaat18 + default_args: + owner: "Google" + depends_on_past: False + start_date: '2021-06-23' + max_active_runs: 1 + schedule_interval: "@yearly" + catchup: False + default_view: graph + + tasks: + - operator: "GoogleCloudStorageToBigQueryOperator" + description: "Task to load the CPSAAT18 data to the BigQuery table" + args: + task_id: "load_csv_to_bq" + bucket: "{{ var.json.bls.source_bucket }}" + source_objects: ["cpsaat18/*.csv"] + source_format: "CSV" + destination_project_dataset_table: "bls.cpsaat18" + skip_leading_rows: 1 + write_disposition: "WRITE_TRUNCATE" + schema_fields: + - name: "year" + type: "integer" + nullable: false + - name: "sector" + type: "string" + nullable: false + - name: "subsector" + type: "string" + nullable: true + - name: "industry_group" + type: "string" + nullable: true + - name: "industry" + type: "string" + nullable: true + - name: "total_employed_in_thousands" + type: "integer" + nullable: true + - name: "percent_women" + type: "float" + nullable: true + - name: "percent_white" + type: "float" + nullable: true + - name: "percent_black_or_african_american" + type: "float" + nullable: true + - name: "percent_asian" + type: "float" + nullable: true + - name: "percent_hispanic_or_latino" + type: "float" + nullable: true + + graph_paths: + - "load_csv_to_bq" diff --git a/datasets/bls/dataset.yaml b/datasets/bls/dataset.yaml new file mode 100644 index 000000000..c2326d5b1 --- /dev/null +++ b/datasets/bls/dataset.yaml @@ -0,0 +1,37 @@ +# 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: bls + friendly_name: ~ + description: ~ + dataset_sources: ~ + terms_of_use: ~ + + +resources: + - type: bigquery_dataset + dataset_id: bls + description: |- + Overview: This dataset includes economic statistics on inflation, prices, unemployment, and pay & benefits provided by the Bureau of Labor Statistics (BLS). + + Update frequency: Monthly + + Dataset source: U.S. Bureau of Labor Statistics + + Terms of use: This dataset is publicly available for anyone to use under the following terms provided by the Dataset Source - http://www.data.gov/privacy-policy#data_policy - and is provided "AS IS" without any warranty, express or implied, from Google. Google disclaims all liability for any damages, direct or indirect, resulting from the use of the dataset. + + See the GCP Marketplace listing for more details and sample queries: https://console.cloud.google.com/marketplace/details/bls-public-data/bureau-of-labor-statistics + - type: storage_bucket + name: bls From b278500f7556c7e94a1bb1dc0fa2e2e26aeffb7a Mon Sep 17 00:00:00 2001 From: Dipannita Banerjee Date: Sat, 2 Oct 2021 13:42:10 +0000 Subject: [PATCH 3/5] feat: Onboard Austin Waste Dataset --- .../_images/run_csv_transform_kub/Dockerfile | 38 ++++++ .../run_csv_transform_kub/csv_transform.py | 121 +++++++++++++++++ .../run_csv_transform_kub/requirements.txt | 3 + .../_terraform/austin_waste_dataset.tf | 26 ++++ datasets/austin_waste/_terraform/provider.tf | 28 ++++ datasets/austin_waste/_terraform/variables.tf | 23 ++++ .../waste_and_diversion_pipeline.tf | 39 ++++++ datasets/austin_waste/dataset.yaml | 58 ++++++++ .../waste_and_diversion/pipeline.yaml | 125 ++++++++++++++++++ .../waste_and_diversion_dag.py | 78 +++++++++++ 10 files changed, 539 insertions(+) create mode 100644 datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile create mode 100644 datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py create mode 100644 datasets/austin_waste/_images/run_csv_transform_kub/requirements.txt create mode 100644 datasets/austin_waste/_terraform/austin_waste_dataset.tf create mode 100644 datasets/austin_waste/_terraform/provider.tf create mode 100644 datasets/austin_waste/_terraform/variables.tf create mode 100644 datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf create mode 100644 datasets/austin_waste/dataset.yaml create mode 100644 datasets/austin_waste/waste_and_diversion/pipeline.yaml create mode 100644 datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile b/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile new file mode 100644 index 000000000..85af90570 --- /dev/null +++ b/datasets/austin_waste/_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"] diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py new file mode 100644 index 000000000..38639e08f --- /dev/null +++ b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py @@ -0,0 +1,121 @@ +# 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 json +import logging +import os +import pathlib +import typing +from datetime import datetime + +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, +) -> None: + + 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) + df = pd.read_csv(str(source_file)) + + logging.info(f"Transforming.. {source_file}") + rename_headers(df, rename_mappings) + date_convert(df) + + 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("..Done!") + + 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) + + +def rename_headers(df: pd.DataFrame, rename_mappings: dict) -> None: + df = df.rename(columns=rename_mappings, inplace=True) + + +def convert_dt_format(dt_str: str) -> str: + if dt_str is None or len(dt_str) == 0: + return dt_str + else: + if len(dt_str) == 10: + return datetime.strptime(dt_str, "%m/%d/%Y").strftime("%Y-%m-%d") + else: + return datetime.strptime(dt_str, "%m/%d/%Y %H:%M:%S %p").strftime( + "%Y-%m-%d %H:%M:%S" + ) + + +def date_convert(df: pd.DataFrame) -> None: + dt_cols = ["report_date", "load_time"] + + for dt_col in dt_cols: + df[dt_col] = df[dt_col].apply(convert_dt_format) + + +def save_to_new_file(df, file_path): + 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"]), + ) diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/requirements.txt b/datasets/austin_waste/_images/run_csv_transform_kub/requirements.txt new file mode 100644 index 000000000..f36704793 --- /dev/null +++ b/datasets/austin_waste/_images/run_csv_transform_kub/requirements.txt @@ -0,0 +1,3 @@ +requests +pandas +google-cloud-storage diff --git a/datasets/austin_waste/_terraform/austin_waste_dataset.tf b/datasets/austin_waste/_terraform/austin_waste_dataset.tf new file mode 100644 index 000000000..b32f8587a --- /dev/null +++ b/datasets/austin_waste/_terraform/austin_waste_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_waste" { + dataset_id = "austin_waste" + project = var.project_id + description = "austin waste and diversion" +} + +output "bigquery_dataset-austin_waste-dataset_id" { + value = google_bigquery_dataset.austin_waste.dataset_id +} diff --git a/datasets/austin_waste/_terraform/provider.tf b/datasets/austin_waste/_terraform/provider.tf new file mode 100644 index 000000000..23ab87dcd --- /dev/null +++ b/datasets/austin_waste/_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 +} diff --git a/datasets/austin_waste/_terraform/variables.tf b/datasets/austin_waste/_terraform/variables.tf new file mode 100644 index 000000000..c3ec7c506 --- /dev/null +++ b/datasets/austin_waste/_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" {} + diff --git a/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf b/datasets/austin_waste/_terraform/waste_and_diversion_pipeline.tf new file mode 100644 index 000000000..b8a8a8784 --- /dev/null +++ b/datasets/austin_waste/_terraform/waste_and_diversion_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" "waste_and_diversion" { + project = var.project_id + dataset_id = "austin_waste" + table_id = "waste_and_diversion" + + description = "Austin waste and diversion" + + + + + depends_on = [ + google_bigquery_dataset.austin_waste + ] +} + +output "bigquery_table-waste_and_diversion-table_id" { + value = google_bigquery_table.waste_and_diversion.table_id +} + +output "bigquery_table-waste_and_diversion-id" { + value = google_bigquery_table.waste_and_diversion.id +} diff --git a/datasets/austin_waste/dataset.yaml b/datasets/austin_waste/dataset.yaml new file mode 100644 index 000000000..4b9d1e17a --- /dev/null +++ b/datasets/austin_waste/dataset.yaml @@ -0,0 +1,58 @@ +# 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: + # The `dataset` block includes properties for your dataset that will be shown + # to users of your data on the Google Cloud website. + + # Must be exactly the same name as the folder name your dataset.yaml is in. + name: austin_waste + + # A friendly, human-readable name of the dataset + friendly_name: austin waste and diversion + + # A short, descriptive summary of the dataset. + description: austin-based datasets + + # A list of sources the dataset is derived from, using the YAML list syntax. + dataset_sources: ~ + + # A list of terms and conditions that users of the dataset should agree on, + # using the YAML list syntax. + terms_of_use: ~ + + +resources: + # A list of Google Cloud resources needed by your dataset. In principle, all + # pipelines under a dataset should be able to share these resources. + # + # The currently supported resources are shown below. Use only the resources + # you need, and delete the rest as needed by your pipeline. + # + # We will keep adding to the list below to support more Google Cloud resources + # over time. If a resource you need isn't supported, please file an issue on + # the repository. + + - type: bigquery_dataset + # Google BigQuery dataset to namespace all tables managed by this folder + # + # Required Properties: + # dataset_id + # + # Optional Properties: + # friendly_name (A user-friendly name of the dataset) + # description (A user-friendly description of the dataset) + # location (The geographic location where the dataset should reside) + dataset_id: austin_waste + description: austin waste and diversion diff --git a/datasets/austin_waste/waste_and_diversion/pipeline.yaml b/datasets/austin_waste/waste_and_diversion/pipeline.yaml new file mode 100644 index 000000000..93cb2daf3 --- /dev/null +++ b/datasets/austin_waste/waste_and_diversion/pipeline.yaml @@ -0,0 +1,125 @@ +# 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. + +--- +resources: + + - type: bigquery_table + # Required Properties: + table_id: waste_and_diversion + + # Description of the table + description: "Austin waste and diversion" + +dag: + airflow_version: 1 + initialize: + dag_id: waste_and_diversion + default_args: + owner: "Google" + + # When set to True, keeps a task from getting triggered if the previous schedule for the task hasn’t succeeded + depends_on_past: False + start_date: '2021-03-01' + max_active_runs: 1 + schedule_interval: "@daily" # run once a week at Sunday 12am + catchup: False + default_view: graph + + tasks: + + - operator: "KubernetesPodOperator" + + # Task description + description: "Run CSV transform within kubernetes pod" + + args: + + task_id: "austin_waste_transform_csv" + + startup_timeout_seconds: 600 + + # The name of the pod in which the task will run. This will be used (plus a random suffix) to generate a pod id + name: "austin_waste" + + # The namespace to run within Kubernetes. Always set its value to "default" because we follow the guideline that KubernetesPodOperator will only be used for very light workloads, i.e. use the Cloud Composer environment's resources without starving other pipelines. + namespace: "default" + + image_pull_policy: "Always" + + # Docker images will be built and pushed to GCR by default whenever the `scripts/generate_dag.py` is run. To skip building and pushing images, use the optional `--skip-builds` flag. + image: "{{ var.json.austin_waste.container_registry.run_csv_transform_kub }}" + + # Set the environment variables you need initialized in the container. Use these as input variables for the script your container is expected to perform. + env_vars: + SOURCE_URL: "https://data.austintexas.gov/api/views/mbnu-4wq9/rows.csv" + SOURCE_FILE: "files/data.csv" + TARGET_FILE: "files/data_output.csv" + TARGET_GCS_BUCKET: "{{ var.json.shared.composer_bucket }}" + TARGET_GCS_PATH: "data/austin_waste/waste_and_diversion/data_output.csv" + CSV_HEADERS: >- + [ "load_id", "report_date", "load_type", "load_time", "load_weight", "dropoff_site", "route_type", "route_number"] + RENAME_MAPPINGS: >- + {"Load ID": "load_id","Report Date": "report_date","Load Type": "load_type","Load Time": "load_time","Load Weight": "load_weight","Dropoff Site": "dropoff_site","Route Type": "route_type","Route Number": "route_number"} + # Set resource limits for the pod here. For resource units in Kubernetes, see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes + resources: + limit_memory: "4G" + limit_cpu: "2" + + - operator: "GoogleCloudStorageToBigQueryOperator" + description: "Task to load CSV data to a BigQuery table" + + args: + task_id: "load_austin_waste_and_diversion_to_bq" + + + bucket: "{{ var.json.shared.composer_bucket }}" + + + source_objects: ["data/austin_waste/waste_and_diversion/data_output.csv"] + source_format: "CSV" + destination_project_dataset_table: "austin_waste.waste_and_diversion" + + skip_leading_rows: 1 + + write_disposition: "WRITE_TRUNCATE" + + schema_fields: + - name: "load_id" + type: "INTEGER" + mode: "NULLABLE" + - name: "report_date" + type: "DATE" + mode: "NULLABLE" + - name: "load_type" + type: "STRING" + mode: "NULLABLE" + - name: "load_time" + type: "TIMESTAMP" + mode: "NULLABLE" + - name: "load_weight" + type: "FLOAT" + mode: "NULLABLE" + - name: "dropoff_site" + type: "STRING" + mode: "NULLABLE" + - name: "route_type" + type: "STRING" + mode: "NULLABLE" + - name: "route_number" + type: "STRING" + mode: "NULLABLE" + + graph_paths: + - "austin_waste_transform_csv >> load_austin_waste_and_diversion_to_bq" diff --git a/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py b/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py new file mode 100644 index 000000000..fc45a478c --- /dev/null +++ b/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py @@ -0,0 +1,78 @@ +# 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. + + +from airflow import DAG +from airflow.contrib.operators import gcs_to_bq, kubernetes_pod_operator + +default_args = { + "owner": "Google", + "depends_on_past": False, + "start_date": "2021-03-01", +} + + +with DAG( + dag_id="austin_waste.waste_and_diversion", + default_args=default_args, + max_active_runs=1, + schedule_interval="@daily", + catchup=False, + default_view="graph", +) as dag: + + # Run CSV transform within kubernetes pod + austin_waste_transform_csv = kubernetes_pod_operator.KubernetesPodOperator( + task_id="austin_waste_transform_csv", + startup_timeout_seconds=600, + name="austin_waste", + namespace="default", + image_pull_policy="Always", + image="{{ var.json.austin_waste.container_registry.run_csv_transform_kub }}", + env_vars={ + "SOURCE_URL": "https://data.austintexas.gov/api/views/mbnu-4wq9/rows.csv", + "SOURCE_FILE": "files/data.csv", + "TARGET_FILE": "files/data_output.csv", + "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}", + "TARGET_GCS_PATH": "data/austin_waste/waste_and_diversion/data_output.csv", + "CSV_HEADERS": '[ "load_id", "report_date", "load_type", "load_time", "load_weight", "dropoff_site", "route_type", "route_number"]', + "RENAME_MAPPINGS": '{"Load ID": "load_id","Report Date": "report_date","Load Type": "load_type","Load Time": "load_time","Load Weight": "load_weight","Dropoff Site": "dropoff_site","Route Type": "route_type","Route Number": "route_number"}', + }, + resources={"limit_memory": "4G", "limit_cpu": "2"}, + ) + + # Task to load CSV data to a BigQuery table + load_austin_waste_and_diversion_to_bq = ( + gcs_to_bq.GoogleCloudStorageToBigQueryOperator( + task_id="load_austin_waste_and_diversion_to_bq", + bucket="{{ var.json.shared.composer_bucket }}", + source_objects=["data/austin_waste/waste_and_diversion/data_output.csv"], + source_format="CSV", + destination_project_dataset_table="austin_waste.waste_and_diversion", + skip_leading_rows=1, + write_disposition="WRITE_TRUNCATE", + schema_fields=[ + {"name": "load_id", "type": "INTEGER", "mode": "NULLABLE"}, + {"name": "report_date", "type": "DATE", "mode": "NULLABLE"}, + {"name": "load_type", "type": "STRING", "mode": "NULLABLE"}, + {"name": "load_time", "type": "TIMESTAMP", "mode": "NULLABLE"}, + {"name": "load_weight", "type": "FLOAT", "mode": "NULLABLE"}, + {"name": "dropoff_site", "type": "STRING", "mode": "NULLABLE"}, + {"name": "route_type", "type": "STRING", "mode": "NULLABLE"}, + {"name": "route_number", "type": "STRING", "mode": "NULLABLE"}, + ], + ) + ) + + austin_waste_transform_csv >> load_austin_waste_and_diversion_to_bq From 6b6d139300e387bf9bccc552931f047f3df13bda Mon Sep 17 00:00:00 2001 From: Dipannita Banerjee Date: Thu, 7 Oct 2021 15:11:00 +0000 Subject: [PATCH 4/5] fix: code cleanup as per coding standard --- .../_images/run_csv_transform_kub/Dockerfile | 1 - .../run_csv_transform_kub/csv_transform.py | 6 ++- datasets/austin_waste/dataset.yaml | 32 --------------- .../waste_and_diversion/pipeline.yaml | 39 +++---------------- .../waste_and_diversion_dag.py | 6 +-- 5 files changed, 13 insertions(+), 71 deletions(-) diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile b/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile index 85af90570..7265a1b71 100644 --- a/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile +++ b/datasets/austin_waste/_images/run_csv_transform_kub/Dockerfile @@ -13,7 +13,6 @@ # 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 diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py index 38639e08f..724131fc2 100644 --- a/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py +++ b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py @@ -43,6 +43,8 @@ def main( df = pd.read_csv(str(source_file)) logging.info(f"Transforming.. {source_file}") + + logging.info("Transform: Renaming headers..") rename_headers(df, rename_mappings) date_convert(df) @@ -67,7 +69,9 @@ def rename_headers(df: pd.DataFrame, rename_mappings: dict) -> None: def convert_dt_format(dt_str: str) -> str: - if dt_str is None or len(dt_str) == 0: + # Old format: MM/dd/yyyy hh:mm:ss aa + # New format: yyyy-MM-dd HH:mm:ss + if not dt_str: return dt_str else: if len(dt_str) == 10: diff --git a/datasets/austin_waste/dataset.yaml b/datasets/austin_waste/dataset.yaml index 4b9d1e17a..e05786346 100644 --- a/datasets/austin_waste/dataset.yaml +++ b/datasets/austin_waste/dataset.yaml @@ -13,46 +13,14 @@ # limitations under the License. dataset: - # The `dataset` block includes properties for your dataset that will be shown - # to users of your data on the Google Cloud website. - - # Must be exactly the same name as the folder name your dataset.yaml is in. name: austin_waste - - # A friendly, human-readable name of the dataset friendly_name: austin waste and diversion - - # A short, descriptive summary of the dataset. description: austin-based datasets - - # A list of sources the dataset is derived from, using the YAML list syntax. dataset_sources: ~ - - # A list of terms and conditions that users of the dataset should agree on, - # using the YAML list syntax. terms_of_use: ~ resources: - # A list of Google Cloud resources needed by your dataset. In principle, all - # pipelines under a dataset should be able to share these resources. - # - # The currently supported resources are shown below. Use only the resources - # you need, and delete the rest as needed by your pipeline. - # - # We will keep adding to the list below to support more Google Cloud resources - # over time. If a resource you need isn't supported, please file an issue on - # the repository. - - type: bigquery_dataset - # Google BigQuery dataset to namespace all tables managed by this folder - # - # Required Properties: - # dataset_id - # - # Optional Properties: - # friendly_name (A user-friendly name of the dataset) - # description (A user-friendly description of the dataset) - # location (The geographic location where the dataset should reside) dataset_id: austin_waste description: austin waste and diversion diff --git a/datasets/austin_waste/waste_and_diversion/pipeline.yaml b/datasets/austin_waste/waste_and_diversion/pipeline.yaml index 93cb2daf3..e3f57c770 100644 --- a/datasets/austin_waste/waste_and_diversion/pipeline.yaml +++ b/datasets/austin_waste/waste_and_diversion/pipeline.yaml @@ -16,10 +16,7 @@ resources: - type: bigquery_table - # Required Properties: table_id: waste_and_diversion - - # Description of the table description: "Austin waste and diversion" dag: @@ -28,71 +25,45 @@ dag: dag_id: waste_and_diversion default_args: owner: "Google" - - # When set to True, keeps a task from getting triggered if the previous schedule for the task hasn’t succeeded depends_on_past: False start_date: '2021-03-01' max_active_runs: 1 - schedule_interval: "@daily" # run once a week at Sunday 12am + schedule_interval: "@daily" catchup: False default_view: graph - tasks: - - operator: "KubernetesPodOperator" - - # Task description description: "Run CSV transform within kubernetes pod" - args: - task_id: "austin_waste_transform_csv" - startup_timeout_seconds: 600 - - # The name of the pod in which the task will run. This will be used (plus a random suffix) to generate a pod id name: "austin_waste" - - # The namespace to run within Kubernetes. Always set its value to "default" because we follow the guideline that KubernetesPodOperator will only be used for very light workloads, i.e. use the Cloud Composer environment's resources without starving other pipelines. namespace: "default" - image_pull_policy: "Always" - - # Docker images will be built and pushed to GCR by default whenever the `scripts/generate_dag.py` is run. To skip building and pushing images, use the optional `--skip-builds` flag. image: "{{ var.json.austin_waste.container_registry.run_csv_transform_kub }}" - - # Set the environment variables you need initialized in the container. Use these as input variables for the script your container is expected to perform. env_vars: SOURCE_URL: "https://data.austintexas.gov/api/views/mbnu-4wq9/rows.csv" SOURCE_FILE: "files/data.csv" TARGET_FILE: "files/data_output.csv" - TARGET_GCS_BUCKET: "{{ var.json.shared.composer_bucket }}" + TARGET_GCS_BUCKET: "{{ var.value.composer_bucket }}" TARGET_GCS_PATH: "data/austin_waste/waste_and_diversion/data_output.csv" CSV_HEADERS: >- [ "load_id", "report_date", "load_type", "load_time", "load_weight", "dropoff_site", "route_type", "route_number"] RENAME_MAPPINGS: >- {"Load ID": "load_id","Report Date": "report_date","Load Type": "load_type","Load Time": "load_time","Load Weight": "load_weight","Dropoff Site": "dropoff_site","Route Type": "route_type","Route Number": "route_number"} - # Set resource limits for the pod here. For resource units in Kubernetes, see https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#resource-units-in-kubernetes resources: - limit_memory: "4G" - limit_cpu: "2" + limit_memory: "2G" + limit_cpu: "1" - operator: "GoogleCloudStorageToBigQueryOperator" description: "Task to load CSV data to a BigQuery table" - args: task_id: "load_austin_waste_and_diversion_to_bq" - - - bucket: "{{ var.json.shared.composer_bucket }}" - - + bucket: "{{ var.value.composer_bucket }}" source_objects: ["data/austin_waste/waste_and_diversion/data_output.csv"] source_format: "CSV" destination_project_dataset_table: "austin_waste.waste_and_diversion" - skip_leading_rows: 1 - write_disposition: "WRITE_TRUNCATE" schema_fields: diff --git a/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py b/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py index fc45a478c..1b7dd9a2b 100644 --- a/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py +++ b/datasets/austin_waste/waste_and_diversion/waste_and_diversion_dag.py @@ -44,19 +44,19 @@ "SOURCE_URL": "https://data.austintexas.gov/api/views/mbnu-4wq9/rows.csv", "SOURCE_FILE": "files/data.csv", "TARGET_FILE": "files/data_output.csv", - "TARGET_GCS_BUCKET": "{{ var.json.shared.composer_bucket }}", + "TARGET_GCS_BUCKET": "{{ var.value.composer_bucket }}", "TARGET_GCS_PATH": "data/austin_waste/waste_and_diversion/data_output.csv", "CSV_HEADERS": '[ "load_id", "report_date", "load_type", "load_time", "load_weight", "dropoff_site", "route_type", "route_number"]', "RENAME_MAPPINGS": '{"Load ID": "load_id","Report Date": "report_date","Load Type": "load_type","Load Time": "load_time","Load Weight": "load_weight","Dropoff Site": "dropoff_site","Route Type": "route_type","Route Number": "route_number"}', }, - resources={"limit_memory": "4G", "limit_cpu": "2"}, + resources={"limit_memory": "2G", "limit_cpu": "1"}, ) # Task to load CSV data to a BigQuery table load_austin_waste_and_diversion_to_bq = ( gcs_to_bq.GoogleCloudStorageToBigQueryOperator( task_id="load_austin_waste_and_diversion_to_bq", - bucket="{{ var.json.shared.composer_bucket }}", + bucket="{{ var.value.composer_bucket }}", source_objects=["data/austin_waste/waste_and_diversion/data_output.csv"], source_format="CSV", destination_project_dataset_table="austin_waste.waste_and_diversion", From 766c0fdf1516961b55a691b585b1a7942eaf54dd Mon Sep 17 00:00:00 2001 From: Dipannita Banerjee Date: Wed, 27 Oct 2021 06:17:47 +0000 Subject: [PATCH 5/5] fix: converting date format code --- .../run_csv_transform_kub/csv_transform.py | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py index 724131fc2..ebffd8dc0 100644 --- a/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py +++ b/datasets/austin_waste/_images/run_csv_transform_kub/csv_transform.py @@ -44,9 +44,18 @@ def main( logging.info(f"Transforming.. {source_file}") - logging.info("Transform: Renaming headers..") + logging.info("Transform: Renaming headers...") rename_headers(df, rename_mappings) - date_convert(df) + + logging.info("Transform: Converting the date format...") + df["report_date"] = df["report_date"].apply( + lambda x: datetime.strptime(x, "%m/%d/%Y").strftime("%Y-%m-%d") + ) + df["load_time"] = df["load_time"].apply( + lambda x: datetime.strptime(x, "%m/%d/%Y %H:%M:%S %p").strftime( + "%Y-%m-%d %H:%M:%S" + ) + ) logging.info("Transform: Reordering headers..") df = df[headers] @@ -68,27 +77,6 @@ def rename_headers(df: pd.DataFrame, rename_mappings: dict) -> None: df = 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 not dt_str: - return dt_str - else: - if len(dt_str) == 10: - return datetime.strptime(dt_str, "%m/%d/%Y").strftime("%Y-%m-%d") - else: - return datetime.strptime(dt_str, "%m/%d/%Y %H:%M:%S %p").strftime( - "%Y-%m-%d %H:%M:%S" - ) - - -def date_convert(df: pd.DataFrame) -> None: - dt_cols = ["report_date", "load_time"] - - for dt_col in dt_cols: - df[dt_col] = df[dt_col].apply(convert_dt_format) - - def save_to_new_file(df, file_path): df.to_csv(file_path, index=False)