Change internal presense of the Grid, eliminating _grid (#747)

This is the follow-up PR to PR #707.

src/frequenz/sdk/microgrid/__init__.py

@@ -123,6 +123,7 @@
 """  # noqa: D205, D400
 
 from ..actor import ResamplerConfig
+from ..timeseries.grid import initialize as initialize_grid
 from . import _data_pipeline, client, component, connection_manager, fuse
 from ._data_pipeline import (
     battery_pool,
@@ -131,7 +132,6 @@
     grid,
     logical_meter,
 )
-from ._grid import initialize as initialize_grid
 
 
 async def initialize(host: str, port: int, resampler_config: ResamplerConfig) -> None:

src/frequenz/sdk/microgrid/_data_pipeline.py

@@ -21,9 +21,9 @@
 from ..actor._actor import Actor
 from ..microgrid.component import Component
 from ..timeseries._grid_frequency import GridFrequency
+from ..timeseries.grid import Grid
+from ..timeseries.grid import get as get_grid
 from . import connection_manager
-from ._grid import Grid
-from ._grid import get as get_grid
 from .component import ComponentCategory
 
 _logger = logging.getLogger(__name__)

src/frequenz/sdk/microgrid/_grid.py → src/frequenz/sdk/timeseries/grid.py

@@ -11,9 +11,9 @@
 from collections.abc import Iterable
 from dataclasses import dataclass
 
-from .component import Component
-from .component._component import ComponentCategory
-from .fuse import Fuse
+from ..microgrid.component import Component
+from ..microgrid.component._component import ComponentCategory
+from ..microgrid.fuse import Fuse
 
 
 @dataclass(frozen=True)

tests/microgrid/test_grid.py

@@ -3,10 +3,10 @@
 
 """Tests for the `Grid` module."""
 
-from frequenz.sdk.microgrid import _grid
 from frequenz.sdk.microgrid.component import Component, ComponentCategory, GridMetadata
 from frequenz.sdk.microgrid.fuse import Fuse
 from frequenz.sdk.timeseries import Current
+from frequenz.sdk.timeseries import grid as _grid
 
 
 async def test_grid_1() -> None: