Bump black from 23.12.1 to 24.4.0 (#10)

Bump black from 23.12.1 to 24.4.0 and re-run `black` to have the new
formatting.

Author: camille-bouvy-frequenz

pyproject.toml

@@ -49,9 +49,9 @@ dev-flake8 = [
   "pydoclint == 0.4.1",
   "pydocstyle == 6.3.0",
 ]
-dev-formatting = ["black == 23.12.1", "isort == 5.13.2"]
+dev-formatting = ["black == 24.4.0", "isort == 5.13.2"]
 dev-mkdocs = [
-  "black == 23.12.1",
+  "black == 24.4.0",
   "Markdown==3.6",
   "mike == 2.0.0",
   "mkdocs-gen-files == 0.5.0",

src/frequenz/client/electricity_trading/_client.py

@@ -379,18 +379,18 @@ async def update_gridpool_order(  # pylint: disable=too-many-arguments, too-many
             price=None if price is NO_VALUE else price,  # type: ignore
             quantity=None if quantity is NO_VALUE else quantity,  # type: ignore
             stop_price=None if stop_price is NO_VALUE else stop_price,  # type: ignore
-            peak_price_delta=None
-            if peak_price_delta is NO_VALUE
-            else peak_price_delta,  # type: ignore
-            display_quantity=None
-            if display_quantity is NO_VALUE
-            else display_quantity,  # type: ignore
-            execution_option=None
-            if execution_option is NO_VALUE
-            else execution_option,  # type: ignore
-            valid_until=None
-            if valid_until is NO_VALUE
-            else valid_until,  # type: ignore
+            peak_price_delta=(
+                None if peak_price_delta is NO_VALUE else peak_price_delta  # type: ignore
+            ),
+            display_quantity=(
+                None if display_quantity is NO_VALUE else display_quantity  # type: ignore
+            ),
+            execution_option=(
+                None if execution_option is NO_VALUE else execution_option  # type: ignore
+            ),
+            valid_until=(
+                None if valid_until is NO_VALUE else valid_until  # type: ignore
+            ),
             payload=None if payload is NO_VALUE else payload,  # type: ignore
             tag=None if tag is NO_VALUE else tag,  # type: ignore
         )

src/frequenz/client/electricity_trading/_types.py

@@ -971,21 +971,31 @@ def from_pb(cls, order: electricity_trading_pb2.Order) -> Self:
             side=MarketSide.from_pb(order.side),
             price=Price.from_pb(order.price),
             quantity=Energy.from_pb(order.quantity),
-            stop_price=Price.from_pb(order.stop_price)
-            if order.HasField("stop_price")
-            else None,
-            peak_price_delta=Price.from_pb(order.peak_price_delta)
-            if order.HasField("peak_price_delta")
-            else None,
-            display_quantity=Energy.from_pb(order.display_quantity)
-            if order.HasField("display_quantity")
-            else None,
-            execution_option=OrderExecutionOption.from_pb(order.execution_option)
-            if order.HasField("execution_option")
-            else None,
-            valid_until=order.valid_until.ToDatetime(tzinfo=timezone.utc)
-            if order.HasField("valid_until")
-            else None,
+            stop_price=(
+                Price.from_pb(order.stop_price)
+                if order.HasField("stop_price")
+                else None
+            ),
+            peak_price_delta=(
+                Price.from_pb(order.peak_price_delta)
+                if order.HasField("peak_price_delta")
+                else None
+            ),
+            display_quantity=(
+                Energy.from_pb(order.display_quantity)
+                if order.HasField("display_quantity")
+                else None
+            ),
+            execution_option=(
+                OrderExecutionOption.from_pb(order.execution_option)
+                if order.HasField("execution_option")
+                else None
+            ),
+            valid_until=(
+                order.valid_until.ToDatetime(tzinfo=timezone.utc)
+                if order.HasField("valid_until")
+                else None
+            ),
             payload=json_format.MessageToDict(order.payload) if order.payload else None,
             tag=order.tag if order.tag else None,
         )
@@ -1010,12 +1020,12 @@ def to_pb(self) -> electricity_trading_pb2.Order:
             price=self.price.to_pb(),
             quantity=self.quantity.to_pb(),
             stop_price=self.stop_price.to_pb() if self.stop_price else None,
-            peak_price_delta=self.peak_price_delta.to_pb()
-            if self.peak_price_delta
-            else None,
-            display_quantity=self.display_quantity.to_pb()
-            if self.display_quantity
-            else None,
+            peak_price_delta=(
+                self.peak_price_delta.to_pb() if self.peak_price_delta else None
+            ),
+            display_quantity=(
+                self.display_quantity.to_pb() if self.display_quantity else None
+            ),
             execution_option=(
                 electricity_trading_pb2.OrderExecutionOption.ValueType(
                     self.execution_option.value
@@ -1415,18 +1425,22 @@ def to_pb(self) -> electricity_trading_pb2.GridpoolOrderFilter:
             Protobuf GridpoolOrderFilter corresponding to the object.
         """
         return electricity_trading_pb2.GridpoolOrderFilter(
-            states=[
-                electricity_trading_pb2.OrderState.ValueType(state.value)
-                for state in self.order_states
-            ]
-            if self.order_states
-            else None,
-            side=electricity_trading_pb2.MarketSide.ValueType(self.side.value)
-            if self.side
-            else None,
-            delivery_period=self.delivery_period.to_pb()
-            if self.delivery_period
-            else None,
+            states=(
+                [
+                    electricity_trading_pb2.OrderState.ValueType(state.value)
+                    for state in self.order_states
+                ]
+                if self.order_states
+                else None
+            ),
+            side=(
+                electricity_trading_pb2.MarketSide.ValueType(self.side.value)
+                if self.side
+                else None
+            ),
+            delivery_period=(
+                self.delivery_period.to_pb() if self.delivery_period else None
+            ),
             delivery_area=self.delivery_area.to_pb() if self.delivery_area else None,
             tag=self.tag if self.tag else None,
         )
@@ -1520,14 +1534,16 @@ def to_pb(self) -> electricity_trading_pb2.GridpoolTradeFilter:
             Protobuf GridpoolTradeFilter corresponding to the object.
         """
         return electricity_trading_pb2.GridpoolTradeFilter(
-            states=[TradeState.to_pb(state) for state in self.trade_states]
-            if self.trade_states
-            else None,
+            states=(
+                [TradeState.to_pb(state) for state in self.trade_states]
+                if self.trade_states
+                else None
+            ),
             trade_ids=self.trade_ids if self.trade_ids else None,
             side=MarketSide.to_pb(self.side) if self.side else None,
-            delivery_period=self.delivery_period.to_pb()
-            if self.delivery_period
-            else None,
+            delivery_period=(
+                self.delivery_period.to_pb() if self.delivery_period else None
+            ),
             delivery_area=self.delivery_area.to_pb() if self.delivery_area else None,
         )
 
@@ -1613,21 +1629,23 @@ def to_pb(self) -> electricity_trading_pb2.PublicTradeFilter:
             Protobuf PublicTradeFilter corresponding to the object.
         """
         return electricity_trading_pb2.PublicTradeFilter(
-            states=[
-                electricity_trading_pb2.TradeState.ValueType(state.value)
-                for state in self.states
-            ]
-            if self.states
-            else None,
-            delivery_period=self.delivery_period.to_pb()
-            if self.delivery_period
-            else None,
-            buy_delivery_area=self.buy_delivery_area.to_pb()
-            if self.buy_delivery_area
-            else None,
-            sell_delivery_area=self.sell_delivery_area.to_pb()
-            if self.sell_delivery_area
-            else None,
+            states=(
+                [
+                    electricity_trading_pb2.TradeState.ValueType(state.value)
+                    for state in self.states
+                ]
+                if self.states
+                else None
+            ),
+            delivery_period=(
+                self.delivery_period.to_pb() if self.delivery_period else None
+            ),
+            buy_delivery_area=(
+                self.buy_delivery_area.to_pb() if self.buy_delivery_area else None
+            ),
+            sell_delivery_area=(
+                self.sell_delivery_area.to_pb() if self.sell_delivery_area else None
+            ),
         )
 
 
@@ -1695,30 +1713,46 @@ def from_pb(
             UpdateOrder object corresponding to the protobuf message.
         """
         return cls(
-            price=Price.from_pb(update_order.price)
-            if update_order.HasField("price")
-            else None,
-            quantity=Energy.from_pb(update_order.quantity)
-            if update_order.HasField("quantity")
-            else None,
-            stop_price=Price.from_pb(update_order.stop_price)
-            if update_order.HasField("stop_price")
-            else None,
-            peak_price_delta=Price.from_pb(update_order.peak_price_delta)
-            if update_order.HasField("peak_price_delta")
-            else None,
-            display_quantity=Energy.from_pb(update_order.display_quantity)
-            if update_order.HasField("display_quantity")
-            else None,
-            execution_option=OrderExecutionOption.from_pb(update_order.execution_option)
-            if update_order.HasField("execution_option")
-            else None,
-            valid_until=update_order.valid_until.ToDatetime(tzinfo=timezone.utc)
-            if update_order.HasField("valid_until")
-            else None,
-            payload=json_format.MessageToDict(update_order.payload)
-            if update_order.payload
-            else None,
+            price=(
+                Price.from_pb(update_order.price)
+                if update_order.HasField("price")
+                else None
+            ),
+            quantity=(
+                Energy.from_pb(update_order.quantity)
+                if update_order.HasField("quantity")
+                else None
+            ),
+            stop_price=(
+                Price.from_pb(update_order.stop_price)
+                if update_order.HasField("stop_price")
+                else None
+            ),
+            peak_price_delta=(
+                Price.from_pb(update_order.peak_price_delta)
+                if update_order.HasField("peak_price_delta")
+                else None
+            ),
+            display_quantity=(
+                Energy.from_pb(update_order.display_quantity)
+                if update_order.HasField("display_quantity")
+                else None
+            ),
+            execution_option=(
+                OrderExecutionOption.from_pb(update_order.execution_option)
+                if update_order.HasField("execution_option")
+                else None
+            ),
+            valid_until=(
+                update_order.valid_until.ToDatetime(tzinfo=timezone.utc)
+                if update_order.HasField("valid_until")
+                else None
+            ),
+            payload=(
+                json_format.MessageToDict(update_order.payload)
+                if update_order.payload
+                else None
+            ),
             tag=update_order.tag if update_order.HasField("tag") else None,
         )
 
@@ -1737,12 +1771,12 @@ def to_pb(self) -> electricity_trading_pb2.UpdateGridpoolOrderRequest.UpdateOrde
             price=self.price.to_pb() if self.price else None,
             quantity=self.quantity.to_pb() if self.quantity else None,
             stop_price=self.stop_price.to_pb() if self.stop_price else None,
-            peak_price_delta=self.peak_price_delta.to_pb()
-            if self.peak_price_delta
-            else None,
-            display_quantity=self.display_quantity.to_pb()
-            if self.display_quantity
-            else None,
+            peak_price_delta=(
+                self.peak_price_delta.to_pb() if self.peak_price_delta else None
+            ),
+            display_quantity=(
+                self.display_quantity.to_pb() if self.display_quantity else None
+            ),
             execution_option=(
                 electricity_trading_pb2.OrderExecutionOption.ValueType(
                     self.execution_option.value