Fix linting issues and update dependencies

- Fix pylint warnings (too-many-arguments, exception chaining)
- Fix import ordering per isort/black
- Remove unused imports in tests
- Update grpcio dependency to >= 1.74.0 (required by API)
- Use git reference for frequenz-api-marketmetering until released
- Add type: ignore comments for grpc stub type issues

Signed-off-by: Mathias L. Baumann <[email protected]>

Author: Marenz

pyproject.toml

@@ -39,9 +39,9 @@ classifiers = [
 requires-python = ">= 3.11, < 4"
 dependencies = [
   "typing-extensions >= 4.13.0, < 5",
-  "frequenz-api-market-metering >= 0.1.0, < 1",
+  "frequenz-api-marketmetering @ git+https://github.com/frequenz-io/frequenz-api-market-metering[email protected]",
   "frequenz-client-base >= 0.11.0, < 0.12.0",
-  "grpcio >= 1.72.1, < 2",
+  "grpcio >= 1.74.0, < 2",
 ]
 dynamic = ["version"]
 
@@ -72,7 +72,7 @@ dev-mkdocs = [
   "mike == 2.1.3",
   "mkdocs-gen-files == 0.5.0",
   "mkdocs-literate-nav == 0.6.2",
-  "frequenz-api-market-metering >= 0.1.0, < 1",
+  "frequenz-api-marketmetering @ git+https://github.com/frequenz-io/frequenz-api-market-metering[email protected]",
   "mkdocs-macros-plugin == 1.4.1",
   "mkdocs-material == 9.6.23",
   "mkdocstrings[python] == 0.30.1",
@@ -91,7 +91,7 @@ dev-pylint = [
   "pylint == 3.3.9",
   # For checking the noxfile, docs/ script, and tests
   "frequenz-client-marketmetering[cli,dev-mkdocs,dev-noxfile,dev-pytest]",
-  "frequenz-api-market-metering >= 0.1.0, < 1",
+  "frequenz-api-marketmetering @ git+https://github.com/frequenz-io/frequenz-api-market-metering[email protected]",
 ]
 dev-pytest = [
   "pytest == 8.4.2",

src/frequenz/client/marketmetering/__main__.py

@@ -5,6 +5,7 @@
 
 import asyncio
 import os
+import shlex
 from datetime import datetime, timezone
 from pprint import pformat
 from typing import Any
@@ -52,7 +53,8 @@ def print_series(series: MarketLocationSeries, raw: bool = False) -> None:
     )
     click.echo(f"  {click.style('Direction:', fg='cyan')} {series.direction.name}")
     click.echo(
-        f"  {click.style('Metric:', fg='cyan')} {series.metric_type.name} [{series.metric_unit.name}]"
+        f"  {click.style('Metric:', fg='cyan')} "
+        f"{series.metric_type.name} [{series.metric_unit.name}]"
     )
     click.echo(f"  {click.style('Resolution:', fg='cyan')} {series.resolution.name}")
 
@@ -168,20 +170,20 @@ def parse_market_location(value: str) -> MarketLocationRef:
 
     try:
         enterprise_id = int(parts[0])
-    except ValueError:
-        raise click.BadParameter(f"Invalid enterprise_id: {parts[0]}")
+    except ValueError as exc:
+        raise click.BadParameter(f"Invalid enterprise_id: {parts[0]}") from exc
 
     location_id = parts[1]
 
     try:
         id_type = MarketLocationIdType[parts[2].upper()]
-    except KeyError:
+    except KeyError as exc:
         valid_types = ", ".join(
             t.name for t in MarketLocationIdType if t.name != "UNSPECIFIED"
         )
         raise click.BadParameter(
             f"Invalid location type: {parts[2]}. Valid types: {valid_types}"
-        )
+        ) from exc
 
     return MarketLocationRef(
         enterprise_id=enterprise_id,
@@ -245,6 +247,7 @@ def convert(
     type=click.Choice([r.name for r in TimeResolution if r.name != "UNSPECIFIED"]),
     help="Resampling resolution",
 )
+# pylint: disable=too-many-arguments,too-many-positional-arguments
 async def stream_cmd(
     ctx: click.Context,
     market_locations: tuple[MarketLocationRef, ...],
@@ -262,6 +265,15 @@ async def stream_cmd(
         42:DE01234567890:MALO_ID
 
     Valid types: MALO_ID, MPAN, ESI_ID, NMI, OTHER
+
+    Args:
+        ctx: Click context with client and options.
+        market_locations: Market location references to stream.
+        direction: Energy flow directions (IMPORT/EXPORT).
+        metric: Metric types to request.
+        start_time: Optional start time for historical data.
+        end_time: Optional end time.
+        resolution: Optional resampling resolution.
     """
     client: MarketMeteringApiClient = ctx.obj["client"]
     raw: bool = ctx.obj["raw"]
@@ -326,8 +338,6 @@ async def display_help() -> None:
         {command: None for command in user_commands}
     )
 
-    import shlex
-
     while True:
         with patch_stdout():
             try:

src/frequenz/client/marketmetering/_client.py

@@ -6,24 +6,22 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
-from typing import AsyncIterator, Awaitable, cast
+from typing import AsyncIterator, cast
 
 from frequenz.api.common.v1alpha8.types.interval_pb2 import Interval as PBInterval
 from frequenz.api.marketmetering.v1alpha1 import marketmetering_pb2 as pb
 from frequenz.api.marketmetering.v1alpha1 import marketmetering_pb2_grpc
+from google.protobuf.timestamp_pb2 import Timestamp
+
+from frequenz import channels
 from frequenz.client.base.channel import ChannelOptions, SslOptions
 from frequenz.client.base.client import BaseApiClient
 from frequenz.client.base.exception import ClientNotConnected
 from frequenz.client.base.retry import LinearBackoff
 from frequenz.client.base.streaming import GrpcStreamBroadcaster
-from google.protobuf.timestamp_pb2 import Timestamp
-
-from frequenz import channels
 
 from .types import (
     EnergyFlowDirection,
-    MarketLocationId,
-    MarketLocationIdType,
     MarketLocationRef,
     MarketLocationSeries,
     MetricType,
@@ -92,6 +90,7 @@ class MarketMeteringApiClient(
         ```
     """
 
+    # pylint: disable=too-many-arguments
     def __init__(
         self,
         *,
@@ -114,7 +113,7 @@ def __init__(
         """
         super().__init__(
             server_url,
-            marketmetering_pb2_grpc.MarketMeteringServiceStub,
+            marketmetering_pb2_grpc.MarketMeteringServiceStub,  # type: ignore[arg-type]
             connect=connect,
             channel_defaults=ChannelOptions(
                 port=DEFAULT_PORT,
@@ -158,6 +157,7 @@ def stub(self) -> marketmetering_pb2_grpc.MarketMeteringServiceAsyncStub:
         # actually exist to the eyes of the interpreter.
         return self._stub  # type: ignore
 
+    # pylint: disable=too-many-arguments
     async def stream_samples(
         self,
         *,
@@ -237,6 +237,7 @@ async def stream_samples(
             for series_pb in response.series:
                 yield MarketLocationSeries.from_protobuf(series_pb)
 
+    # pylint: disable=too-many-arguments
     def stream(
         self,
         *,
@@ -284,6 +285,7 @@ def stream(
             resampling=resampling,
         ).new_receiver()
 
+    # pylint: disable=too-many-arguments
     def _get_stream(
         self,
         *,

src/frequenz/client/marketmetering/types.py

@@ -8,9 +8,8 @@
 from enum import Enum
 from typing import Self
 
-from google.protobuf.timestamp_pb2 import Timestamp
-
 from frequenz.api.marketmetering.v1alpha1 import marketmetering_pb2 as pb
+from google.protobuf.timestamp_pb2 import Timestamp
 
 
 class MarketArea(Enum):
@@ -446,7 +445,7 @@ def to_protobuf(self) -> pb.ResamplingOptions:
             The protobuf representation.
         """
         return pb.ResamplingOptions(
-            resolution=self.resolution.value if self.resolution else 0,
+            resolution=self.resolution.value if self.resolution else 0,  # type: ignore[arg-type]
             downsampling_method=self.downsampling_method.value,
         )
 

tests/test_marketmetering.py

@@ -3,20 +3,16 @@
 
 """Tests for the Market Metering client."""
 
-from datetime import datetime, timezone
-from unittest.mock import AsyncMock, MagicMock, patch
-
-import pytest
+from datetime import timedelta
 
 from frequenz.client.marketmetering.types import (
     DataQuality,
+    DownsamplingMethod,
     EnergyFlowDirection,
     MarketArea,
     MarketLocationId,
     MarketLocationIdType,
     MarketLocationRef,
-    MarketLocationSample,
-    MarketLocationSeries,
     MetricType,
     MetricUnit,
     ResamplingMethod,
@@ -42,8 +38,6 @@ def test_market_location_id_type_enum(self) -> None:
 
     def test_time_resolution_to_timedelta(self) -> None:
         """Test TimeResolution.to_timedelta."""
-        from datetime import timedelta
-
         assert TimeResolution.MIN_15.to_timedelta() == timedelta(minutes=15)
         assert TimeResolution.MIN_60.to_timedelta() == timedelta(hours=1)
         assert TimeResolution.DAY_1.to_timedelta() == timedelta(days=1)
@@ -115,8 +109,6 @@ def test_default_resampling_options(self) -> None:
         """Test default ResamplingOptions."""
         options = ResamplingOptions()
         assert options.resolution is None
-        from frequenz.client.marketmetering.types import DownsamplingMethod
-
         assert options.downsampling_method == DownsamplingMethod.MEAN
 
     def test_resampling_options_with_resolution(self) -> None: