Skip to content

Commit 22bd512

Browse files
author
tiffanychu90
committed
shared_utils to calitp_data_analysis for rt_segment_speeds/
1 parent 3da3ae3 commit 22bd512

24 files changed

+46
-46
lines changed

‎rt_segment_speeds/00_diagnose_segments.ipynb

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"import geopandas as gpd\n",
2424
"from siuba import *\n",
2525
"\n",
26-
"import shared_utils\n",
26+
"from shared_utils import rt_dates\n",
2727
"\n",
2828
"import gcsfs\n",
2929
"fs = gcsfs.GCSFileSystem()"
@@ -36,7 +36,7 @@
3636
"metadata": {},
3737
"outputs": [],
3838
"source": [
39-
"analysis_date = shared_utils.rt_dates.DATES['jan2023']"
39+
"analysis_date = rt_dates.DATES['jan2023']"
4040
]
4141
},
4242
{
@@ -792,7 +792,7 @@
792792
"import geopandas as gpd\n",
793793
"from siuba import *\n",
794794
"\n",
795-
"import shared_utils\n",
795+
"from shared_utils import gtfs_utils_v2\n",
796796
"\n",
797797
"import os\n",
798798
"os.environ[\"CALITP_BQ_MAX_BYTES\"] = str(1_000_000_000_000) ## 1TB?"
@@ -818,7 +818,7 @@
818818
}
819819
],
820820
"source": [
821-
"shared_utils.gtfs_utils_v2?"
821+
"gtfs_utils_v2?"
822822
]
823823
},
824824
{
@@ -828,7 +828,7 @@
828828
"metadata": {},
829829
"outputs": [],
830830
"source": [
831-
"from calitp.tables import tbls"
831+
"from calitp_data_analysis.tables import tbls"
832832
]
833833
},
834834
{
@@ -1812,7 +1812,7 @@
18121812
}
18131813
],
18141814
"source": [
1815-
"kings = shared_utils.gtfs_utils_v2.schedule_daily_feed_to_organization(selected_date = '2023-02-07') >> filter(_.name.str.contains(\"Kings\"))\n",
1815+
"kings = gtfs_utils_v2.schedule_daily_feed_to_organization(selected_date = '2023-02-07') >> filter(_.name.str.contains(\"Kings\"))\n",
18161816
"kings"
18171817
]
18181818
},
@@ -1872,7 +1872,7 @@
18721872
}
18731873
],
18741874
"source": [
1875-
"shared_utils.gtfs_utils_v2.get_trips(selected_date= '2023-02-07', operator_feeds=kings.feed_key.to_list()) "
1875+
"gtfs_utils_v2.get_trips(selected_date= '2023-02-07', operator_feeds=kings.feed_key.to_list()) "
18761876
]
18771877
}
18781878
],

‎rt_segment_speeds/04_threshold_exploratory_v1.ipynb

+3-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"import geopandas as gpd\n",
3333
"import numpy as np\n",
3434
"import pandas as pd\n",
35-
"from calitp.sql import to_snakecase"
35+
"from calitp_data_analysis.sql import to_snakecase"
3636
]
3737
},
3838
{
@@ -44,8 +44,8 @@
4444
},
4545
"outputs": [],
4646
"source": [
47-
"from shared_utils import calitp_color_palette as cp\n",
48-
"from shared_utils import geography_utils, styleguide, utils"
47+
"from calitp_data_analysis import calitp_color_palette as cp\n",
48+
"from calitp_data_analysis import geography_utils, styleguide, utils"
4949
]
5050
},
5151
{

‎rt_segment_speeds/10_long_trips.ipynb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"import altair as alt\n",
3030
"\n",
3131
"import pandas as pd\n",
32-
"from shared_utils import calitp_color_palette as cp"
32+
"from calitp_data_analysis import calitp_color_palette as cp"
3333
]
3434
},
3535
{

‎rt_segment_speeds/11_tiger.ipynb

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"from dask import compute, delayed\n",
4949
"from segment_speed_utils import helpers\n",
5050
"from segment_speed_utils.project_vars import analysis_date\n",
51-
"from shared_utils import dask_utils, geography_utils, utils\n",
51+
"from shared_utils import dask_utils\n",
52+
"from calitp_data_analysis import geography_utils, utils\n",
5253
"\n",
5354
"GCS_FILE_PATH = \"gs://calitp-analytics-data/data-analyses/\"\n",
5455
"SHARED_GCS = f\"{GCS_FILE_PATH}shared_data/\""

‎rt_segment_speeds/13_organization_name.ipynb

-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"from calitp_data_analysis.tables import tbls\n",
3535
"from siuba import *\n",
3636
"\n",
37-
"from shared_utils import gtfs_utils_v2, portfolio_utils, utils\n",
3837
"from segment_speed_utils import helpers\n",
3938
"from segment_speed_utils.project_vars import SEGMENT_GCS, analysis_date"
4039
]

‎rt_segment_speeds/14_eric_explore_compare.ipynb

+7-7
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"import os\n",
1111
"os.environ[\"CALITP_BQ_MAX_BYTES\"] = str(800_000_000_000)\n",
1212
"os.environ['USE_PYGEOS'] = '0'\n",
13-
"import shared_utils\n",
1413
"\n",
1514
"from calitp_data_analysis.tables import tbls\n",
1615
"import calitp_data_analysis.magics\n",
17-
"from calitp_data.storage import get_fs\n",
16+
"from calitp_data_infra.storage import get_fs\n",
17+
"from shared_utils import rt_utils\n",
1818
"\n",
1919
"from siuba import *\n",
2020
"import pandas as pd\n",
@@ -364,7 +364,7 @@
364364
}
365365
],
366366
"source": [
367-
"shared_utils.rt_utils.get_speedmaps_ix_df?"
367+
"rt_utils.get_speedmaps_ix_df?"
368368
]
369369
},
370370
{
@@ -494,7 +494,7 @@
494494
}
495495
],
496496
"source": [
497-
"shared_utils.rt_utils.get_speedmaps_ix_df(analysis_date) >> filter(_.organization_name.str.contains('Santa')) >> head(5)"
497+
"rt_utils.get_speedmaps_ix_df(analysis_date) >> filter(_.organization_name.str.contains('Santa')) >> head(5)"
498498
]
499499
},
500500
{
@@ -662,7 +662,7 @@
662662
"metadata": {},
663663
"outputs": [],
664664
"source": [
665-
"from shared_utils.rt_utils import try_parallel, arrowize_by_frequency, ZERO_THIRTY_COLORSCALE, SPEEDMAP_LEGEND_URL"
665+
"from rt_utils import try_parallel, arrowize_by_frequency, ZERO_THIRTY_COLORSCALE, SPEEDMAP_LEGEND_URL"
666666
]
667667
},
668668
{
@@ -881,7 +881,7 @@
881881
}
882882
],
883883
"source": [
884-
"shared_utils.rt_utils.set_state_export(segments_samo)"
884+
"rt_utils.set_state_export(segments_samo)"
885885
]
886886
},
887887
{
@@ -929,7 +929,7 @@
929929
}
930930
],
931931
"source": [
932-
"shared_utils.rt_utils.set_state_export(segments_samo, cmap=ZERO_THIRTY_COLORSCALE, legend_url=SPEEDMAP_LEGEND_URL,\n",
932+
"rt_utils.set_state_export(segments_samo, cmap=ZERO_THIRTY_COLORSCALE, legend_url=SPEEDMAP_LEGEND_URL,\n",
933933
" map_type='speedmap', color_col='p20_mph', filename='samo_segments_test')"
934934
]
935935
},

‎rt_segment_speeds/19_meters_threshold.ipynb

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
" analysis_date,\n",
2020
")\n",
2121
"from scripts import (A1_sjoin_vp_segments, A2_valid_vehicle_positions,B2_avg_speeds_by_segment)\n",
22-
"from shared_utils import geography_utils\n",
2322
"import _threshold_utils as threshold_utils\n",
2423
"import _rt_scheduled_utils as rt_scheduled_utils\n",
2524
"CONFIG_PATH = './scripts/config.yml'\n",

‎rt_segment_speeds/_rt_scheduled_utils.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
import numpy as np
21
import pandas as pd
32
import dask.dataframe as dd
4-
import datetime
53

64
import _threshold_utils as threshold_utils
75
from segment_speed_utils import helpers, sched_rt_utils
86
from segment_speed_utils.project_vars import SEGMENT_GCS, RT_SCHED_GCS, analysis_date
97

108
# Graphs
119
import altair as alt
12-
from shared_utils import calitp_color_palette as cp
10+
from calitp_data_analysis import calitp_color_palette as cp
1311
alt.data_transformers.enable('default', max_rows=None)
1412

1513
import gcsfs

‎rt_segment_speeds/_threshold_utils.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
from calitp_data_analysis.sql import to_snakecase
55

66
import altair as alt
7-
from shared_utils import calitp_color_palette as cp
8-
from shared_utils import geography_utils, rt_utils, styleguide, utils
7+
from calitp_data_analysis import calitp_color_palette as cp
98

109
import intake
1110
catalog = intake.open_catalog("./catalog_threshold.yml")

‎rt_segment_speeds/scripts/A1_sjoin_vp_segments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from loguru import logger
1717

18-
from shared_utils.geography_utils import WGS84
18+
from calitp_data_analysis.geography_utils import WGS84
1919
from segment_speed_utils import helpers
2020
from segment_speed_utils.project_vars import (analysis_date, SEGMENT_GCS,
2121
CONFIG_PATH, PROJECT_CRS)

‎rt_segment_speeds/scripts/A2_sjoin_postprocessing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from loguru import logger
2121

22-
from shared_utils.geography_utils import WGS84
22+
from calitp_data_analysis.geography_utils import WGS84
2323
from segment_speed_utils import helpers, segment_calcs, wrangle_shapes
2424
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
2525
PROJECT_CRS, CONFIG_PATH)

‎rt_segment_speeds/scripts/B1_speeds_by_segment_trip.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
from loguru import logger
1717

18-
from shared_utils import geography_utils
18+
from calitp_data_analysis import geography_utils
1919
from segment_speed_utils import helpers, segment_calcs, wrangle_shapes
2020
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
2121
PROJECT_CRS, CONFIG_PATH)

‎rt_segment_speeds/scripts/B2_avg_speeds_by_segment.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from segment_speed_utils import helpers, sched_rt_utils
1212
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
1313
CONFIG_PATH)
14-
from shared_utils import utils, geography_utils
14+
from calitp_data_analysis import utils, geography_utils
1515

1616

1717
def calculate_avg_speeds(

‎rt_segment_speeds/scripts/B3_export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pandas as pd
1313

1414
from shared_utils import schedule_rt_utils, utils
15-
from shared_utils.geography_utils import WGS84
15+
from calitp_data_analysis.geography_utils import WGS84
1616
from segment_speed_utils import helpers
1717
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
1818
CONFIG_PATH)

‎rt_segment_speeds/scripts/C3_trip_route_speed.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
import pandas as pd
1414

1515
from shared_utils.rt_utils import MPH_PER_MPS
16-
from shared_utils.geography_utils import WGS84
17-
from shared_utils import utils, portfolio_utils, schedule_rt_utils
16+
from calitp_data_analysis.geography_utils import WGS84
17+
from calitp_data_analysis import utils
18+
from shared_utils import portfolio_utils, schedule_rt_utils
1819
from segment_speed_utils import helpers, sched_rt_utils, wrangle_shapes
1920
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
2021
PROJECT_CRS)

‎rt_segment_speeds/scripts/concatenate_stop_segments.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
import geopandas as gpd
99
import pandas as pd
1010

11-
from shared_utils import utils, portfolio_utils
12-
from shared_utils.geography_utils import WGS84
11+
from calitp_data_analysis import utils
12+
from calitp_data_analysis.geography_utils import WGS84
13+
from shared_utils import portfolio_utils
1314
from segment_speed_utils import helpers, sched_rt_utils, wrangle_shapes
1415
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
1516
CONFIG_PATH)

‎rt_segment_speeds/scripts/cut_normal_stop_segments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from dask import delayed, compute
1616
from loguru import logger
1717

18-
from shared_utils import utils
18+
from calitp_data_analysis import utils
1919
from segment_speed_utils import array_utils, helpers, wrangle_shapes
2020
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,
2121
PROJECT_CRS, CONFIG_PATH)

‎rt_segment_speeds/scripts/cut_road_segments.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
fs = gcsfs.GCSFileSystem()
77
import dask.dataframe as dd
88
import dask_geopandas as dg
9-
import geopandas
109
import geopandas as gpd
1110
import pandas as pd
1211
from calitp_data_analysis.sql import to_snakecase
1312
from dask import compute, delayed
1413
from segment_speed_utils import helpers
1514
from segment_speed_utils.project_vars import analysis_date
16-
from shared_utils import dask_utils, geography_utils, utils
15+
from calitp_data_analysis import geography_utils, utils
16+
from shared_utils import dask_utils
1717

1818
GCS_FILE_PATH = "gs://calitp-analytics-data/data-analyses/"
1919
SHARED_GCS = f"{GCS_FILE_PATH}shared_data/"

‎rt_segment_speeds/scripts/cut_route_segments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
from loguru import logger
2525

26-
from shared_utils import geography_utils, utils
26+
from calitp_data_analysis import geography_utils, utils
2727
from segment_speed_utils import (gtfs_schedule_wrangling, helpers,
2828
sched_rt_utils, wrangle_shapes)
2929
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,

‎rt_segment_speeds/scripts/cut_special_stop_segments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from loguru import logger
1212

1313
import cut_normal_stop_segments
14-
from shared_utils import utils
14+
from calitp_data_analysis import utils
1515
from segment_speed_utils import (array_utils, helpers,
1616
wrangle_shapes)
1717
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,

‎rt_segment_speeds/scripts/download_all_roads.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
#pip install esridump
44
import geopandas as gpd
5-
from calitp_data_analysis import get_fs
6-
from shared_utils import utils
5+
from calitp_data_infra.storage import get_fs
6+
from calitp_data_analysis import utils
77

88
fs = get_fs()
99
GCS_FILE_PATH = "gs://calitp-analytics-data/data-analyses/shared_data/"

‎rt_segment_speeds/scripts/ingest_ca_roads.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import fsspec
2121
import geopandas as gpd
2222

23-
from shared_utils import utils
23+
from calitp_data_analysis import utils
2424

2525
GCS_FILE_PATH = "gs://calitp-analytics-data/data-analyses/shared_data/"
2626

‎rt_segment_speeds/scripts/prep_stop_segments.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from loguru import logger
3232
from typing import Union
3333

34-
from shared_utils import utils
34+
from calitp_data_analysis import utils
3535
from segment_speed_utils import (helpers, gtfs_schedule_wrangling,
3636
wrangle_shapes)
3737
from segment_speed_utils.project_vars import (SEGMENT_GCS, analysis_date,

‎rt_segment_speeds/segment_speed_utils/helpers.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414
import yaml
1515

1616
from typing import Literal, Union
17-
from segment_speed_utils.project_vars import SEGMENT_GCS, COMPILED_CACHED_VIEWS, PROJECT_CRS
18-
from shared_utils import utils
17+
from segment_speed_utils.project_vars import (SEGMENT_GCS,
18+
COMPILED_CACHED_VIEWS,
19+
PROJECT_CRS)
20+
from calitp_data_analysis import utils
1921

2022
fs = gcsfs.GCSFileSystem()
2123

0 commit comments

Comments
 (0)