@

Author: blast-hardcheese

src/replit_river/rpc.py

@@ -2,6 +2,7 @@
 import logging
 from collections.abc import AsyncIterable, AsyncIterator
 from typing import (
+    Annotated,
     Any,
     Awaitable,
     Callable,
@@ -93,7 +94,7 @@ class PropagationContext(BaseModel):
 class TransportMessage(BaseModel):
     id: str
     # from_ is used instead of from because from is a reserved keyword in Python
-    from_: str = Field(..., alias="from")
+    from_: Annotated[str, Field(alias="from")]
     to: str
     seq: int
     ack: int

src/replit_river/v2/client_transport.py

@@ -246,7 +246,7 @@ async def websocket_closed_callback() -> None:
         try:
             await send_transport_message(
                 TransportMessage(
-                    from_=self.transport_id,  # type: ignore
+                    from_=self._transport_id,
                     to=self._server_id,
                     streamId=stream_id,
                     controlFlags=0,

src/replit_river/v2/session.py

@@ -193,7 +193,7 @@ async def send_message(
         msg = TransportMessage(
             streamId=stream_id,
             id=nanoid.generate(),
-            from_=self._transport_id,  # type: ignore
+            from_=self._transport_id,
             to=self._to_id,
             seq=self.seq,
             ack=self.ack,
@@ -202,6 +202,7 @@ async def send_message(
             serviceName=service_name,
             procedureName=procedure_name,
         )
+
         if span:
             with use_span(span):
                 trace_propagator.inject(msg, None, trace_setter)