Skip to content

Commit e725abd

Browse files
nreinickenreinicke
authored
Merge pull request #171 from machallboyd/bugfix/cleanup-unused-imports
Cleanup unused imports, sort other imports
2 parents b02b190 + 735498a commit e725abd

File tree

101 files changed

+171
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+171
-222
lines changed

‎nrel/hive/__init__.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,13 @@
2020
"""
2121

2222
import logging
23-
2423
from pathlib import Path
2524

26-
from tqdm import tqdm
27-
2825
from nrel.hive.app import run
2926
from nrel.hive.config import HiveConfig
3027
from nrel.hive.dispatcher import *
31-
from nrel.hive.state.simulation_state.update.update import Update
3228
from nrel.hive.state.simulation_state.update.step_simulation import StepSimulation
29+
from nrel.hive.state.simulation_state.update.update import Update
3330

3431

3532
def package_root() -> Path:

‎nrel/hive/app/hive_cosim.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
from pathlib import Path
33
from typing import Iterable, Tuple, NamedTuple, Optional, TypeVar
44

5-
import pandas as pd
6-
from pandas import DataFrame
75
from tqdm import tqdm
86

97
from nrel.hive.dispatcher.instruction_generator.instruction_generator import InstructionGenerator
10-
from nrel.hive.initialization.load import load_simulation, load_config
118
from nrel.hive.initialization.initialize_simulation import InitFunction
9+
from nrel.hive.initialization.load import load_simulation, load_config
1210
from nrel.hive.model.sim_time import SimTime
1311
from nrel.hive.reporting.handler.vehicle_charge_events_handler import VehicleChargeEventsHandler
1412
from nrel.hive.runner import RunnerPayload
15-
from nrel.hive.util import SimulationStateError
1613

1714
T = TypeVar("T", bound=InstructionGenerator)
1815

‎nrel/hive/app/run.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import pkg_resources
1010
import yaml
1111

12-
from nrel.hive.initialization.load import load_simulation, load_config
13-
from nrel.hive.initialization.initialize_simulation import InitFunction
1412
from nrel.hive.dispatcher.instruction_generator.instruction_generator import InstructionGenerator
13+
from nrel.hive.initialization.initialize_simulation import InitFunction
14+
from nrel.hive.initialization.load import load_simulation, load_config
1515
from nrel.hive.runner.local_simulation_runner import LocalSimulationRunner
1616

1717
if TYPE_CHECKING:

‎nrel/hive/app/run_batch.py

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
import yaml
1212

13-
from nrel.hive.initialization.load import load_config
1413
from nrel.hive.app.run import run_sim
1514
from nrel.hive.util import fs
1615

‎nrel/hive/config/dispatcher_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from typing import NamedTuple, Dict, Union, Tuple, Optional
3+
from typing import NamedTuple, Dict, Tuple, Optional
44

55
from nrel.hive.config.config_builder import ConfigBuilder
66
from nrel.hive.dispatcher.instruction_generator.charging_search_type import ChargingSearchType

‎nrel/hive/config/hive_config.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import os
66
from datetime import datetime
77
from pathlib import Path
8-
from typing import NamedTuple, Dict, Union, Tuple, Optional
8+
from typing import NamedTuple, Dict, Union, Optional
99

1010
import pkg_resources
1111
import yaml

‎nrel/hive/config/input.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import hashlib
44
import logging
55
from pathlib import Path
6-
from typing import NamedTuple, Tuple, Dict, Optional, Union
6+
from typing import NamedTuple, Tuple, Dict, Optional
77

88
from nrel.hive.config.config_builder import ConfigBuilder
99
from nrel.hive.util import fs

‎nrel/hive/config/sim.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from __future__ import annotations
22

3-
from typing import NamedTuple, Dict, Optional, Union, Tuple
3+
from typing import NamedTuple, Dict, Optional, Tuple
44

55
from nrel.hive.config.config_builder import ConfigBuilder
6-
from nrel.hive.model.vehicle.schedules.schedule_type import ScheduleType
76
from nrel.hive.model.sim_time import SimTime
7+
from nrel.hive.model.vehicle.schedules.schedule_type import ScheduleType
88
from nrel.hive.util.units import Seconds
99

1010

‎nrel/hive/dispatcher/forecaster/basic_forecaster.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from __future__ import annotations
2-
from dataclasses import dataclass
32

3+
from dataclasses import dataclass
44
from pathlib import Path
5-
from typing import Tuple, NamedTuple, TYPE_CHECKING
5+
from typing import Tuple, TYPE_CHECKING
66

7-
from nrel.hive.model.sim_time import SimTime
87
from nrel.hive.dispatcher.forecaster.forecast import Forecast, ForecastType
98
from nrel.hive.dispatcher.forecaster.forecaster_interface import ForecasterInterface
9+
from nrel.hive.model.sim_time import SimTime
1010
from nrel.hive.util.iterators import DictReaderStepper
1111

1212
if TYPE_CHECKING:

‎nrel/hive/dispatcher/instruction/instruction_ops.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
from __future__ import annotations
22

3-
from typing import Tuple, Optional, FrozenSet, TYPE_CHECKING
43
import functools as ft
5-
64
import logging
5+
from typing import Tuple, Optional, FrozenSet, TYPE_CHECKING
76

87
from nrel.hive.model.vehicle.trip_phase import TripPhase
98
from nrel.hive.model.vehicle.vehicle import RequestId

‎nrel/hive/dispatcher/instruction/instruction_result.py

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from __future__ import annotations
2+
23
from typing import NamedTuple, TYPE_CHECKING
34

45
if TYPE_CHECKING:

‎nrel/hive/dispatcher/instruction/instructions.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
2-
from dataclasses import dataclass
32

43
import logging
4+
from dataclasses import dataclass
55
from typing import Optional, TYPE_CHECKING, Tuple
66

77
from nrel.hive.dispatcher.instruction.instruction import Instruction

‎nrel/hive/dispatcher/instruction_generator/assignment_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
from __future__ import annotations
22

33
import functools as ft
4+
import logging
45
from typing import Dict, Tuple, Callable, NamedTuple, Optional, TYPE_CHECKING
56

6-
import logging
77
import h3
88
import numpy as np
99
from scipy.optimize import linear_sum_assignment

‎nrel/hive/dispatcher/instruction_generator/charging_fleet_manager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
2-
from dataclasses import dataclass
32

43
import logging
4+
from dataclasses import dataclass
55
from typing import Tuple, TYPE_CHECKING
66

77
from nrel.hive.reporting import instruction_generator_event_ops

‎nrel/hive/dispatcher/instruction_generator/dispatcher.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import annotations
2-
from dataclasses import dataclass
32

4-
import logging
53
import functools as ft
4+
import logging
5+
from dataclasses import dataclass
66
from typing import Tuple, TYPE_CHECKING, Optional
77

88
from nrel.hive.dispatcher.instruction_generator import assignment_ops

‎nrel/hive/dispatcher/instruction_generator/instruction_generator_ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
from nrel.hive.dispatcher.instruction_generator import assignment_ops
1111
from nrel.hive.dispatcher.instruction_generator.charging_search_type import ChargingSearchType
1212
from nrel.hive.model.station.station import Station
13-
from nrel.hive.util.h3_ops import H3Ops
1413
from nrel.hive.util.dict_ops import DictOps
14+
from nrel.hive.util.h3_ops import H3Ops
1515
from nrel.hive.util.units import Kilometers
1616

1717
log = logging.getLogger(__name__)

‎nrel/hive/initialization/initialize_ops.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from __future__ import annotations
22

3-
import yaml
4-
import immutables
53
from typing import TYPE_CHECKING, FrozenSet
64

5+
import immutables
6+
import yaml
7+
78
if TYPE_CHECKING:
89
from nrel.hive.util.typealiases import EntityId, MembershipMap
910

‎nrel/hive/initialization/initialize_simulation.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
)
1616
from nrel.hive.model.base import Base
1717
from nrel.hive.model.energy.charger import build_chargers_table
18+
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
19+
from nrel.hive.model.station.station import Station
20+
from nrel.hive.model.vehicle.mechatronics import build_mechatronics_table
21+
from nrel.hive.model.vehicle.schedules import build_schedules_table
22+
from nrel.hive.model.vehicle.vehicle import Vehicle
1823
from nrel.hive.reporting.handler.eventful_handler import EventfulHandler
1924
from nrel.hive.reporting.handler.instruction_handler import InstructionHandler
2025
from nrel.hive.reporting.handler.stateful_handler import StatefulHandler
2126
from nrel.hive.reporting.handler.stats_handler import StatsHandler
2227
from nrel.hive.reporting.handler.time_step_stats_handler import TimeStepStatsHandler
2328
from nrel.hive.reporting.reporter import Reporter
24-
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
25-
from nrel.hive.model.station.station import Station
26-
from nrel.hive.model.vehicle.mechatronics import build_mechatronics_table
27-
from nrel.hive.model.vehicle.schedules import build_schedules_table
28-
from nrel.hive.model.vehicle.vehicle import Vehicle
2929
from nrel.hive.runner.environment import Environment
3030
from nrel.hive.state.simulation_state import simulation_state_ops
3131
from nrel.hive.state.simulation_state.simulation_state import SimulationState

‎nrel/hive/initialization/initialize_simulation_with_sampling.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
)
1717
from nrel.hive.model.base import Base
1818
from nrel.hive.model.energy.charger import build_chargers_table
19-
from nrel.hive.model.roadnetwork.link import Link
20-
from nrel.hive.model.roadnetwork.geofence import GeoFence
2119
from nrel.hive.model.roadnetwork.haversine_roadnetwork import HaversineRoadNetwork
20+
from nrel.hive.model.roadnetwork.link import Link
2221
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
2322
from nrel.hive.model.station.station import Station
2423
from nrel.hive.model.vehicle.mechatronics import build_mechatronics_table

‎nrel/hive/initialization/load.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,20 @@
66
import yaml
77

88
from nrel.hive.config import HiveConfig
9-
from nrel.hive.reporting import reporter_ops
9+
from nrel.hive.dispatcher.instruction_generator.charging_fleet_manager import ChargingFleetManager
10+
from nrel.hive.dispatcher.instruction_generator.dispatcher import Dispatcher
11+
from nrel.hive.dispatcher.instruction_generator.instruction_generator import InstructionGenerator
1012
from nrel.hive.initialization.initialize_simulation import (
1113
default_init_functions,
1214
osm_init_function,
1315
initialize,
1416
InitFunction,
1517
)
16-
from nrel.hive.dispatcher.instruction_generator.instruction_generator import InstructionGenerator
17-
from nrel.hive.util.fp import throw_on_failure
18+
from nrel.hive.reporting import reporter_ops
1819
from nrel.hive.runner.runner_payload import RunnerPayload
1920
from nrel.hive.state.simulation_state.update.update import Update
20-
from nrel.hive.dispatcher.instruction_generator.charging_fleet_manager import ChargingFleetManager
21-
from nrel.hive.dispatcher.instruction_generator.dispatcher import Dispatcher
2221
from nrel.hive.util import fs
23-
22+
from nrel.hive.util.fp import throw_on_failure
2423

2524
log = logging.getLogger(__name__)
2625

‎nrel/hive/initialization/sample_requests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from typing import Tuple, List
33

44
from nrel.hive.model.request import Request
5+
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
56
from nrel.hive.model.sim_time import SimTime
67
from nrel.hive.runner import Environment
78
from nrel.hive.state.simulation_state.simulation_state import SimulationState
8-
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
99

1010

1111
def default_request_sampler(

‎nrel/hive/initialization/sample_vehicles.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
from returns.result import Result, Failure, Success
77

88
from nrel.hive.model.entity_position import EntityPosition
9+
from nrel.hive.model.membership import Membership
910
from nrel.hive.model.roadnetwork.link import Link
1011
from nrel.hive.model.roadnetwork.osm.osm_roadnetwork import OSMRoadNetwork
1112
from nrel.hive.model.vehicle.vehicle import Vehicle
12-
from nrel.hive.model.membership import Membership
1313
from nrel.hive.runner import Environment
1414
from nrel.hive.state.driver_state.autonomous_driver_state.autonomous_available import (
1515
AutonomousAvailable,

‎nrel/hive/model/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from __future__ import annotations
22

3-
from typing import Optional, Dict, TYPE_CHECKING
43
from dataclasses import dataclass, replace
4+
from typing import Optional, Dict, TYPE_CHECKING
55

66
import h3
77

‎nrel/hive/model/energy/charger/__init__.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from csv import DictReader
22
from pathlib import Path
3-
from typing import Dict
43

54
from immutables import Map
65

‎nrel/hive/model/entity.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from dataclasses import dataclass
55
from typing import Tuple
66

7-
87
from nrel.hive.model.entity_position import EntityPosition
98
from nrel.hive.model.membership import Membership
109
from nrel.hive.util.typealiases import MembershipId

‎nrel/hive/model/passenger.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
from __future__ import annotations
22

33
import functools as ft
4-
from typing import Optional, TYPE_CHECKING
54
from dataclasses import dataclass, replace
5+
from typing import Optional, TYPE_CHECKING
66

77
from nrel.hive.model.membership import Membership
88
from nrel.hive.model.sim_time import SimTime

‎nrel/hive/model/request/request.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
from __future__ import annotations
22

3-
from typing import NamedTuple, Optional, Dict, TYPE_CHECKING
43
from dataclasses import dataclass, replace
4+
from typing import Optional, Dict, TYPE_CHECKING
55

66
import h3
77

88
from nrel.hive.model.entity import Entity
9+
from nrel.hive.model.entity_position import EntityPosition
910
from nrel.hive.model.membership import Membership
1011
from nrel.hive.model.passenger import Passenger, create_passenger_id
11-
from nrel.hive.model.entity_position import EntityPosition
1212
from nrel.hive.model.roadnetwork.roadnetwork import RoadNetwork
1313
from nrel.hive.model.sim_time import SimTime
1414
from nrel.hive.util.exception import TimeParseError

‎nrel/hive/model/roadnetwork/haversine_roadnetwork.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from __future__ import annotations
22

3-
from typing import Tuple, Optional
3+
from typing import Optional
44

5-
from nrel.hive.model.roadnetwork.geofence import GeoFence
5+
import nrel.hive.model.roadnetwork.haversine_link_id_ops as h_ops
66
from nrel.hive.model.entity_position import EntityPosition
7+
from nrel.hive.model.roadnetwork.geofence import GeoFence
78
from nrel.hive.model.roadnetwork.link import Link
89
from nrel.hive.model.roadnetwork.linktraversal import LinkTraversal
910
from nrel.hive.model.roadnetwork.roadnetwork import RoadNetwork
@@ -13,8 +14,6 @@
1314
from nrel.hive.util.typealiases import GeoId, LinkId, H3Resolution
1415
from nrel.hive.util.units import Kilometers
1516

16-
import nrel.hive.model.roadnetwork.haversine_link_id_ops as h_ops
17-
1817

1918
class HaversineRoadNetwork(RoadNetwork):
2019
"""

‎nrel/hive/model/roadnetwork/link_id.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
from nrel.hive.util.typealiases import LinkId
2-
from typing import Optional, Tuple, Any
31
from ast import literal_eval
2+
from typing import Optional, Tuple, Any
3+
4+
from nrel.hive.util.typealiases import LinkId
45

56
NodeId = Any
67

‎nrel/hive/model/roadnetwork/osm/osm_builders.py

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
from typing import TYPE_CHECKING
2-
3-
41
def osm_graph_from_polygon(polygon):
52
"""
63
builds a OSM networkx graph using a shapely polygon and the osmnx package

‎nrel/hive/model/roadnetwork/osm/osm_roadnetwork.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import json
44
import logging
55
from pathlib import Path
6-
from typing import Optional, Union, TYPE_CHECKING
6+
from typing import Optional, Union
77

88
import networkx as nx
99

10-
from nrel.hive.model.roadnetwork.geofence import GeoFence
1110
from nrel.hive.model.entity_position import EntityPosition
1211
from nrel.hive.model.roadnetwork.link import Link
1312
from nrel.hive.model.roadnetwork.link_id import extract_node_ids
@@ -27,7 +26,6 @@
2726
from nrel.hive.util import LinkId
2827
from nrel.hive.util.typealiases import GeoId, H3Resolution
2928
from nrel.hive.util.units import Kmph, Kilometers
30-
from nrel.hive.model.roadnetwork.link_id import extract_node_ids
3129

3230
log = logging.getLogger(__name__)
3331

‎nrel/hive/model/roadnetwork/roadnetwork.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55

66
import h3
77

8-
from nrel.hive.model.roadnetwork.link import Link
9-
from nrel.hive.model.roadnetwork.geofence import GeoFence
108
from nrel.hive.model.entity_position import EntityPosition
9+
from nrel.hive.model.roadnetwork.link import Link
1110
from nrel.hive.model.roadnetwork.route import Route
1211
from nrel.hive.model.sim_time import SimTime
1312
from nrel.hive.util.typealiases import GeoId, H3Resolution, LinkId

0 commit comments

Comments
 (0)