shared_utils to calitp_data_analysis for quarterly_performance_objective/

Author: tiffanychu90

quarterly_performance_objective/A1_scheduled_route_level_df.py

@@ -13,7 +13,8 @@
 from loguru import logger
 from typing import Literal
 
-from shared_utils import geography_utils, utils
+from calitp_data_analysis import geography_utils, utils
+from shared_utils import portfolio_utils
 from bus_service_utils import create_parallel_corridors
 from segment_speed_utils import helpers, gtfs_schedule_wrangling
 from update_vars import (BUS_SERVICE_GCS, COMPILED_CACHED_GCS,
@@ -72,7 +73,7 @@ def aggregate_trip_service_to_route_level(
         get_pandas = True
     )
 
-    route_service_hours = geography_utils.aggregate_by_geography(
+    route_service_hours = portfolio_utils.aggregate_by_geography(
         trips,
         group_cols = route_cols,
         sum_cols = ["service_hours"]

quarterly_performance_objective/A2_generate_routes_on_shn_data.py

@@ -9,7 +9,7 @@
 from loguru import logger
 
 from bus_service_utils import create_parallel_corridors
-from shared_utils import geography_utils
+from calitp_data_analysis import geography_utils
 from update_vars import (BUS_SERVICE_GCS,
                          ANALYSIS_DATE, VERSION)
 

quarterly_performance_objective/A3_categorize_routes.py

@@ -9,7 +9,7 @@
 
 from loguru import logger
 
-from shared_utils import geography_utils, utils
+from calitp_data_analysis import geography_utils, utils
 from update_vars import (BUS_SERVICE_GCS, 
                          ANALYSIS_DATE, VERSION)
 

quarterly_performance_objective/B2_route_service_hours_delay.py

@@ -12,7 +12,8 @@
 from update_vars import (BUS_SERVICE_GCS, COMPILED_CACHED_GCS, 
                         ANALYSIS_DATE, VERSION
                         )
-from shared_utils import geography_utils, utils
+from shared_utils import portfolio_utils
+from calitp_data_analysis import utils
 
 def calculate_route_level_delays(selected_date: str, 
                                  route_cols: list) -> pd.DataFrame:
@@ -28,7 +29,7 @@ def calculate_route_level_delays(selected_date: str,
     delay_df2 = delay_df.drop_duplicates(
         subset=route_cols + ["trip_id"])
 
-    route_delay = geography_utils.aggregate_by_geography(
+    route_delay = portfolio_utils.aggregate_by_geography(
         delay_df2, 
         group_cols = route_cols,
         sum_cols = ["delay_seconds"]

quarterly_performance_objective/C1_report_metrics.py

@@ -11,7 +11,7 @@
 
 from typing import Literal
 
-from shared_utils import geography_utils
+from shared_utils import portfolio_utils
 
 catalog = intake.open_catalog("*.yml")
 
@@ -22,7 +22,7 @@ def aggregate_calculate_percent_and_average(
     """
     Create columns with pct values. 
     """
-    agg_df = geography_utils.aggregate_by_geography(
+    agg_df = portfolio_utils.aggregate_by_geography(
         df, 
         group_cols = group_cols,
         sum_cols = sum_cols,

quarterly_performance_objective/C2_report_charts.py

@@ -3,8 +3,8 @@
 
 from typing import List, Literal
 
-from shared_utils import styleguide
-from shared_utils import calitp_color_palette as cp
+from calitp_data_analysis import styleguide
+from calitp_data_analysis import calitp_color_palette as cp
 
 def base_bar(df: pd.DataFrame, x_col: str) -> alt.Chart:
     chart = (alt.Chart(df)

quarterly_performance_objective/check-route-categories.ipynb

@@ -337,7 +337,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.10.5"
+   "version": "3.9.13"
   }
  },
  "nbformat": 4,

quarterly_performance_objective/current_quarter_report.ipynb

@@ -46,9 +46,9 @@
     "import C1_report_metrics as report_metrics\n",
     "import C2_report_charts as report_charts\n",
     "from update_vars import BUS_SERVICE_GCS, CURRENT_QUARTER, ANALYSIS_DATE\n",
-    "from shared_utils import geography_utils, portfolio_utils, rt_dates\n",
-    "from shared_utils import calitp_color_palette as cp\n",
-    "from shared_utils import styleguide\n",
+    "from shared_utils import portfolio_utils, rt_dates\n",
+    "from calitp_data_analysis import calitp_color_palette as cp\n",
+    "from calitp_data_analysis import styleguide\n",
     "\n",
     "hq_catalog = intake.open_catalog(\"../high_quality_transit_areas/*.yml\")"
    ]
@@ -114,7 +114,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "all_hours = geography_utils.aggregate_by_geography(\n",
+    "all_hours = portfolio_utils.aggregate_by_geography(\n",
     "    summary.assign(category=\"All\"),\n",
     "    group_cols = [\"category\"],\n",
     "    sum_cols = [\"unique_route\", \"service_hours\"]\n",

quarterly_performance_objective/download_trips_v2_backfill.py

@@ -15,7 +15,8 @@
 from loguru import logger
 
 from shared_utils import (gtfs_utils_v2, gtfs_utils, 
-                          rt_dates, utils, geography_utils)
+                          rt_dates)
+from calitp_data_analysis import utils, geography_utils
 from update_vars import COMPILED_CACHED_GCS
 
 def scheduled_operators(analysis_date: str):

quarterly_performance_objective/historical_report.ipynb

@@ -38,9 +38,9 @@
     "import pandas as pd\n",
     "\n",
     "import C1_report_metrics as report_metrics\n",
-    "from shared_utils import rt_dates, geography_utils\n",
-    "from shared_utils import calitp_color_palette as cp\n",
-    "from shared_utils import styleguide\n",
+    "from shared_utils import rt_dates, portfolio_utils\n",
+    "from calitp_data_analysis import calitp_color_palette as cp\n",
+    "from calitp_data_analysis import styleguide\n",
     "from bus_service_utils import chart_utils"
    ]
   },
@@ -72,7 +72,7 @@
     "\n",
     "    group_cols = [\"year_quarter\", \"service_date\", \"year\", \"quarter\"]\n",
     "\n",
-    "    all_routes = geography_utils.aggregate_by_geography(\n",
+    "    all_routes = portfolio_utils.aggregate_by_geography(\n",
     "        df[df.variable.isin(var_list)],\n",
     "        group_cols + [\"variable\"],\n",
     "        sum_cols = [\"value\"]\n",