updated monthly_ridership script to new warehouse table. ran make fil…

…es. deployed report and portfolio site
cal-itp · Dec 10, 2024 · 875e101 · 875e101
1 parent 323bbed
commit 875e101
Show file tree

Hide file tree

Showing 30 changed files with 194 additions and 179 deletions.
diff --git a/ntd/explore_new_dim_monthly_ridership.ipynb b/ntd/explore_new_dim_monthly_ridership.ipynb
diff --git a/ntd/monthly_ridership_by_rtpa.py b/ntd/monthly_ridership_by_rtpa.py
@@ -126,8 +126,11 @@ def save_rtpa_outputs(
 
         (df[df["RTPA"] == i]
          .sort_values("ntd_id")
-         #got error from excel not recognizing timezone, made list to include dropping "ts" column
-         .drop(columns = ["_merge","ts"])
+         #got error from excel not recognizing timezone, made list to include dropping "execution_ts" column
+         .drop(columns = [
+             "_merge",
+             "execution_ts"
+         ])
          #cleaning column names
          .rename(columns=lambda x: x.replace("_"," ").title().strip())
          #rename columns
@@ -184,7 +187,11 @@ def produce_ntd_monthly_ridership_by_rtpa(
     merge in crosswalk, checks for unmerged rows, then creates new columns for full Mode and TOS name.
     
     """
-    full_upt = (tbls.mart_ntd.dim_monthly_ntd_ridership_with_adjustments() >> collect()).rename(columns = {"mode_type_of_service_status": "Status"})
+    full_upt = (tbls.mart_ntd.dim_monthly_ridership_with_adjustments() >> collect()).rename(
+        columns = {
+            "mode_type_of_service_status": "Status",
+            "primary_uza_name":"uza_name"
+        })
 
     full_upt = full_upt[full_upt.agency.notna()].reset_index(drop=True)
 

diff --git a/ntd/ntd_dates.py b/ntd/ntd_dates.py
@@ -25,7 +25,8 @@ def get_public_filename(monthyear_string: str) -> str:
 
 DATES = {
     # key is month of NTD data
-    # value is the month_updated in the url we're downloading from
+    # value is the month_updated in the url we're downloading from (2 months ahead from key)
+    # ex oct data is reported in december, so (oct20XX:"20XX-12")
     "oct2023": "2023-12",
     "nov2023": "2024-01",
     "dec2023": "2024-02",
@@ -36,6 +37,7 @@ def get_public_filename(monthyear_string: str) -> str:
     "may2024": "2024-07",
     "jun2024": "2024-08",
     "jul2024": "2024-09",
-    "aug2024": "2024-08",
-    "sep2024": "2024-09"
+    "aug2024": "2024-10",
+    "sep2024": "2024-11",
+    "oct2024": "2024-12"
 }
diff --git a/ntd/update_vars.py b/ntd/update_vars.py
@@ -4,15 +4,15 @@
 
 GCS_FILE_PATH = "gs://calitp-analytics-data/data-analyses/ntd/"
 
-current_month = "sep2024"
+current_month = "oct2024"
 YEAR, MONTH = ntd_dates.parse_monthyear_string(current_month)
 PUBLIC_FILENAME = ntd_dates.get_public_filename(current_month)
 MONTH_CREATED = ntd_dates.DATES[current_month]
 
 # Check this url each month
 # https://www.transit.dot.gov/ntd/data-product/monthly-module-adjusted-data-release
 # Depending on if they fixed the Excel, there may be an additional suffix
-suffix = "_241101"
+suffix = "_241202"
 FULL_URL = (
     "https://www.transit.dot.gov/sites/fta.dot.gov/files/"
     f"{MONTH_CREATED}/{MONTH}%20{YEAR}%20"

diff --git a/...mmission/00__monthly_ridership_report__rtpa_alpine-county-transportation-commission.ipynb b/...mmission/00__monthly_ridership_report__rtpa_alpine-county-transportation-commission.ipynb
diff --git a/...ernments/00__monthly_ridership_report__rtpa_butte-county-association-of-governments.ipynb b/...ernments/00__monthly_ridership_report__rtpa_butte-county-association-of-governments.ipynb
diff --git a/...ssion/00__monthly_ridership_report__rtpa_el-dorado-county-transportation-commission.ipynb b/...ssion/00__monthly_ridership_report__rtpa_el-dorado-county-transportation-commission.ipynb
diff --git a/...governments/00__monthly_ridership_report__rtpa_fresno-county-council-of-governments.ipynb b/...governments/00__monthly_ridership_report__rtpa_fresno-county-council-of-governments.ipynb
diff --git a/...ission/00__monthly_ridership_report__rtpa_imperial-county-transportation-commission.ipynb b/...ission/00__monthly_ridership_report__rtpa_imperial-county-transportation-commission.ipynb
diff --git a/...uncil-of-governments/00__monthly_ridership_report__rtpa_kern-council-of-governments.ipynb b/...uncil-of-governments/00__monthly_ridership_report__rtpa_kern-council-of-governments.ipynb
diff --git a/...ernments/00__monthly_ridership_report__rtpa_kings-county-association-of-governments.ipynb b/...ernments/00__monthly_ridership_report__rtpa_kings-county-association-of-governments.ipynb
diff --git a/...hly_ridership_report__rtpa_los-angeles-county-metropolitan-transportation-authority.ipynb b/...hly_ridership_report__rtpa_los-angeles-county-metropolitan-transportation-authority.ipynb
diff --git a/...rnments/00__monthly_ridership_report__rtpa_merced-county-association-of-governments.ipynb b/...rnments/00__monthly_ridership_report__rtpa_merced-county-association-of-governments.ipynb
diff --git a/...ommission/00__monthly_ridership_report__rtpa_metropolitan-transportation-commission.ipynb b/...ommission/00__monthly_ridership_report__rtpa_metropolitan-transportation-commission.ipynb
diff --git a/...authority/00__monthly_ridership_report__rtpa_orange-county-transportation-authority.ipynb b/...authority/00__monthly_ridership_report__rtpa_orange-county-transportation-authority.ipynb
diff --git a/...ncy/00__monthly_ridership_report__rtpa_placer-county-transportation-planning-agency.ipynb b/...ncy/00__monthly_ridership_report__rtpa_placer-county-transportation-planning-agency.ipynb
diff --git a/...ssion/00__monthly_ridership_report__rtpa_riverside-county-transportation-commission.ipynb b/...ssion/00__monthly_ridership_report__rtpa_riverside-county-transportation-commission.ipynb
diff --git a/...vernments/00__monthly_ridership_report__rtpa_sacramento-area-council-of-governments.ipynb b/...vernments/00__monthly_ridership_report__rtpa_sacramento-area-council-of-governments.ipynb
diff --git a/...y/00__monthly_ridership_report__rtpa_san-bernardino-county-transportation-authority.ipynb b/...y/00__monthly_ridership_report__rtpa_san-bernardino-county-transportation-authority.ipynb
diff --git a/...governments/00__monthly_ridership_report__rtpa_san-diego-association-of-governments.ipynb b/...governments/00__monthly_ridership_report__rtpa_san-diego-association-of-governments.ipynb
diff --git a/...f-governments/00__monthly_ridership_report__rtpa_san-joaquin-council-of-governments.ipynb b/...f-governments/00__monthly_ridership_report__rtpa_san-joaquin-council-of-governments.ipynb
diff --git a/...vernments/00__monthly_ridership_report__rtpa_san-luis-obispo-council-of-governments.ipynb b/...vernments/00__monthly_ridership_report__rtpa_san-luis-obispo-council-of-governments.ipynb
diff --git a/.../00__monthly_ridership_report__rtpa_santa-barbara-county-association-of-governments.ipynb b/.../00__monthly_ridership_report__rtpa_santa-barbara-county-association-of-governments.ipynb
diff --git a/...sion/00__monthly_ridership_report__rtpa_santa-cruz-county-transportation-commission.ipynb b/...sion/00__monthly_ridership_report__rtpa_santa-cruz-county-transportation-commission.ipynb
diff --git a/...ion-agency/00__monthly_ridership_report__rtpa_shasta-regional-transportation-agency.ipynb b/...ion-agency/00__monthly_ridership_report__rtpa_shasta-regional-transportation-agency.ipynb
diff --git a/...of-governments/00__monthly_ridership_report__rtpa_stanislaus-council-of-governments.ipynb b/...of-governments/00__monthly_ridership_report__rtpa_stanislaus-council-of-governments.ipynb
diff --git a/...l-planning-agency/00__monthly_ridership_report__rtpa_tahoe-regional-planning-agency.ipynb b/...l-planning-agency/00__monthly_ridership_report__rtpa_tahoe-regional-planning-agency.ipynb
diff --git a/...county/00__monthly_ridership_report__rtpa_transportation-agency-for-monterey-county.ipynb b/...county/00__monthly_ridership_report__rtpa_transportation-agency-for-monterey-county.ipynb
diff --git a/...rnments/00__monthly_ridership_report__rtpa_tulare-county-association-of-governments.ipynb b/...rnments/00__monthly_ridership_report__rtpa_tulare-county-association-of-governments.ipynb
diff --git a/...mission/00__monthly_ridership_report__rtpa_ventura-county-transportation-commission.ipynb b/...mission/00__monthly_ridership_report__rtpa_ventura-county-transportation-commission.ipynb