@@ -407,8 +407,7 @@ async def close(
407407 if (current_state or self ._state ) in TerminalStates :
408408 start = datetime .now ()
409409 while (current_state or self ._state ) != SessionState .CLOSED :
410- elapsed = (datetime .now () - start ).total_seconds ()
411- if elapsed >= SESSION_CLOSE_TIMEOUT_SEC :
410+ if (datetime .now () - start ).total_seconds () >= SESSION_CLOSE_TIMEOUT_SEC :
412411 logger .warning (
413412 f"Session took longer than { SESSION_CLOSE_TIMEOUT_SEC } "
414413 "seconds to close, leaking" ,
@@ -750,7 +749,7 @@ async def send_rpc[R, A](
750749 except Exception as e :
751750 raise RiverException (ERROR_CODE_STREAM_CLOSED , str (e )) from e
752751 match raced :
753- case FinishedA (result ):
752+ case _FinishedA (result ):
754753 if "ok" not in result or not result ["ok" ]:
755754 try :
756755 error = error_deserializer (result ["payload" ])
@@ -761,7 +760,7 @@ async def send_rpc[R, A](
761760 )
762761
763762 return response_deserializer (result ["payload" ])
764- case FinishedB (err ):
763+ case _FinishedB (err ):
765764 raise err
766765 case other :
767766 assert_never (other )
@@ -1423,24 +1422,27 @@ async def _recv_from_ws(
14231422
14241423
14251424@dataclass (frozen = True )
1426- class FinishedA [A ]:
1425+ class _FinishedA [A ]:
14271426 value : A
14281427
14291428
14301429@dataclass (frozen = True )
1431- class FinishedB [B ]:
1430+ class _FinishedB [B ]:
14321431 value : B
14331432
14341433
1435- async def _race2 [A , B ](a : Awaitable [A ], b : Awaitable [B ]) -> FinishedA [A ] | FinishedB [B ]:
1434+ async def _race2 [A , B ](
1435+ a : Awaitable [A ],
1436+ b : Awaitable [B ],
1437+ ) -> _FinishedA [A ] | _FinishedB [B ]:
14361438 _a = asyncio .ensure_future (a )
14371439 _b = asyncio .ensure_future (b )
14381440 await asyncio .wait ([_a , _b ], return_when = asyncio .FIRST_COMPLETED )
14391441
14401442 if _a .done ():
14411443 if err := _a .exception ():
14421444 raise err
1443- return FinishedA (_a .result ())
1445+ return _FinishedA (_a .result ())
14441446 if err := _b .exception ():
14451447 raise err
1446- return FinishedB (_b .result ())
1448+ return _FinishedB (_b .result ())
0 commit comments