Skip to content

Commit 0447fff

Browse files
committed
Create power distributor Results using keyword arguments
We can't enforce this for now as it is not supported in Pyton 3.8, but ideally we should create power distributor Results using keyword arguments to avoid mistakes and make it more clear what's what. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent be434a9 commit 0447fff

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/frequenz/sdk/actor/power_distributing/power_distributing.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,12 @@ async def run(self) -> None:
271271
request.batteries
272272
)
273273
except KeyError as err:
274-
await user.channel.send(Error(request, str(err)))
274+
await user.channel.send(Error(request=request, msg=str(err)))
275275
continue
276276

277277
if len(pairs_data) == 0:
278278
error_msg = f"No data for the given batteries {str(request.batteries)}"
279-
await user.channel.send(Error(request, str(error_msg)))
279+
await user.channel.send(Error(request=request, msg=str(error_msg)))
280280
continue
281281

282282
try:
@@ -285,7 +285,7 @@ async def run(self) -> None:
285285
)
286286
except ValueError as err:
287287
error_msg = f"Couldn't distribute power, error: {str(err)}"
288-
await user.channel.send(Error(request, str(error_msg)))
288+
await user.channel.send(Error(request=request, msg=str(error_msg)))
289289
continue
290290

291291
distributed_power_value = request.power - distribution.remaining_power
@@ -380,17 +380,17 @@ def _check_request(self, request: Request) -> Optional[Result]:
380380
f"No battery {battery}, available batteries: "
381381
f"{list(self._battery_receivers.keys())}"
382382
)
383-
return Error(request, msg)
383+
return Error(request=request, msg=msg)
384384

385385
if not request.adjust_power:
386386
if request.power < 0:
387387
bound = self._get_lower_bound(request.batteries)
388388
if request.power < bound:
389-
return OutOfBound(request, bound)
389+
return OutOfBound(request=request, bound=bound)
390390
else:
391391
bound = self._get_upper_bound(request.batteries)
392392
if request.power > bound:
393-
return OutOfBound(request, bound)
393+
return OutOfBound(request=request, bound=bound)
394394

395395
return None
396396

@@ -420,7 +420,7 @@ def _remove_duplicated_requests(
420420
# Generators seems to be the fastest
421421
if prev_request.batteries == batteries:
422422
task = asyncio.create_task(
423-
prev_user.channel.send(Ignored(prev_request))
423+
prev_user.channel.send(Ignored(request=prev_request))
424424
)
425425
to_ignore.append(task)
426426
# Use generators as generators seems to be the fastest.
@@ -490,7 +490,7 @@ async def _wait_for_request(self, user: _User) -> None:
490490
"Consider increasing size of the queue."
491491
)
492492
_logger.error(msg)
493-
await user.channel.send(Error(request, str(msg)))
493+
await user.channel.send(Error(request=request, msg=str(msg)))
494494
else:
495495
self._request_queue.put_nowait((request, user))
496496
await asyncio.gather(*tasks)

0 commit comments

Comments
 (0)