quick fix for metcouncil pre-release

need to revisit it later to fix them properly

Author: yueshuaing

network_wrangler/configs/wrangler.py

@@ -135,9 +135,9 @@ class IdGenerationConfig(ConfigItem):
     TRANSIT_SHAPE_ID_SCALAR: int = 1000000
     ROAD_SHAPE_ID_METHOD: Literal["scalar"] = "scalar"
     ROAD_SHAPE_ID_SCALAR: int = 1000
-    ML_LINK_ID_METHOD: Literal["range", "scalar"] = "range"
+    ML_LINK_ID_METHOD: Literal["range", "scalar"] = "scalar"
     ML_LINK_ID_RANGE: tuple[int, int] = (950000, 999999)
-    ML_LINK_ID_SCALAR: int = 15000
+    ML_LINK_ID_SCALAR: int = 2000000
     ML_NODE_ID_METHOD: Literal["range", "scalar"] = "range"
     ML_NODE_ID_RANGE: tuple[int, int] = (950000, 999999)
     ML_NODE_ID_SCALAR: int = 15000

network_wrangler/roadway/links/df_accessors.py

@@ -60,19 +60,19 @@ class LinkOfTypeAccessor:
     def __init__(self, links_df: DataFrame[RoadLinksTable]):
         """LinkOfTypeAccessor for RoadLinksTable."""
         self._links_df = links_df
-        try:
-            links_df.attrs["name"] == "road_links"
-        except AttributeError:
-            WranglerLogger.warning(
-                "`of_type` should only be used on 'road_links' dataframes. \
-                No attr['name'] not found."
-            )
-        except AssertionError:
-            WranglerLogger.warning(
-                f"`of_type` should only be used on 'road_links' dataframes. \
-                Found type: {links_df.attr['name']}"
-            )
-            raise NotLinksError("`of_type` is only available to network_links dataframes.")
+        # try:
+        #     links_df.attrs["name"] == "road_links"
+        # except AttributeError:
+        #     WranglerLogger.warning(
+        #         "`of_type` should only be used on 'road_links' dataframes. \
+        #         No attr['name'] not found."
+        #     )
+        # except AssertionError:
+        #     WranglerLogger.warning(
+        #         f"`of_type` should only be used on 'road_links' dataframes. \
+        #         Found type: {links_df.attr['name']}"
+        #     )
+        #     raise NotLinksError("`of_type` is only available to network_links dataframes.")
 
     @property
     def managed(self):

network_wrangler/roadway/selection.py

@@ -261,7 +261,7 @@ def _perform_selection(self):
         WranglerLogger.info(f"Final selected links: {len(_selected_links_df)}")
         if len(_selected_links_df) < 10:
             WranglerLogger.debug(
-                f"\n{_selected_links_df[_selected_links_df.attrs['display_cols']]}"
+                f"\n{_selected_links_df}"
             )
 
         return _selected_links_df

network_wrangler/scenario.py

@@ -956,7 +956,7 @@ def extract_base_scenario_metadata(base_scenario: dict) -> dict:
     _skip_copy = ["road_net", "transit_net", "config"]
     out_dict = {k: v for k, v in base_scenario.items() if k not in _skip_copy}
     if isinstance(base_scenario.get("road_net"), RoadwayNetwork):
-        nodes_file_path = base_scenario["road_net"].nodes_df.attrs["source_file"]
+        nodes_file_path = base_scenario["road_net"].nodes_df.attrs.get("source_file", None)
         if nodes_file_path is not None:
             out_dict["roadway"] = {
                 "dir": str(Path(nodes_file_path).parent),