1313from frequenz .channels import Receiver , Sender
1414
1515from ..._internal ._asyncio import cancel_and_await
16- from ...actor import ComponentMetricRequest , _channel_registry , _power_managing
16+ from ...actor ._channel_registry import ChannelRegistry
17+ from ...actor ._data_sourcing ._component_metric_request import ComponentMetricRequest
18+ from ...actor ._power_managing ._base_classes import Proposal , ReportRequest
1719from ...actor .power_distributing ._component_status import ComponentPoolStatus
1820from ...microgrid import connection_manager
1921from ...microgrid .component import ComponentCategory
@@ -36,11 +38,11 @@ class BatteryPoolReferenceStore: # pylint: disable=too-many-instance-attributes
3638
3739 def __init__ ( # pylint: disable=too-many-arguments
3840 self ,
39- channel_registry : _channel_registry . ChannelRegistry ,
41+ channel_registry : ChannelRegistry ,
4042 resampler_subscription_sender : Sender [ComponentMetricRequest ],
4143 batteries_status_receiver : Receiver [ComponentPoolStatus ],
42- power_manager_requests_sender : Sender [_power_managing . Proposal ],
43- power_manager_bounds_subscription_sender : Sender [_power_managing . ReportRequest ],
44+ power_manager_requests_sender : Sender [Proposal ],
45+ power_manager_bounds_subscription_sender : Sender [ReportRequest ],
4446 min_update_interval : timedelta ,
4547 batteries_id : Set [int ] | None = None ,
4648 ) -> None :
@@ -91,18 +93,18 @@ def __init__( # pylint: disable=too-many-arguments
9193 self ._min_update_interval : timedelta = min_update_interval
9294
9395 self ._power_manager_requests_sender : Sender [
94- _power_managing . Proposal
96+ Proposal
9597 ] = power_manager_requests_sender
9698
9799 self ._power_manager_bounds_subscription_sender : Sender [
98- _power_managing . ReportRequest
100+ ReportRequest
99101 ] = power_manager_bounds_subscription_sender
100102
101103 self ._active_methods : dict [str , MetricAggregator [Any ]] = {}
102104 self ._power_bounds_subs : dict [str , asyncio .Task [None ]] = {}
103105 self ._namespace : str = f"battery-pool-{ self ._batteries } -{ uuid .uuid4 ()} "
104106 self ._power_distributing_namespace : str = f"power-distributor-{ self ._namespace } "
105- self ._channel_registry : _channel_registry . ChannelRegistry = channel_registry
107+ self ._channel_registry : ChannelRegistry = channel_registry
106108 self ._formula_pool : FormulaEnginePool = FormulaEnginePool (
107109 self ._namespace ,
108110 self ._channel_registry ,
0 commit comments