yellowstone-fumarole-client 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

yellowstone_fumarole_client/__init__.py

@@ -1,5 +1,7 @@
 import asyncio
 import logging
+from contextlib import suppress
+
 from yellowstone_fumarole_client.grpc_connectivity import (
     FumaroleGrpcConnector,
 )
@@ -279,10 +281,8 @@ class FumaroleClient:
                     except asyncio.CancelledError:
                         pass
                     if exc is not None:
-                        try:
+                        with suppress(asyncio.QueueShutDown):
                             await dragonsmouth_outlet.put(exc)
-                        except asyncio.QueueShutdown:
-                            pass
                 for t in pending:
                     t.cancel()
             finally:
@@ -295,7 +295,7 @@ class FumaroleClient:
             try:
                 while True:
                     update = await dragonsmouth_outlet.get()
-                    if issubclass(type(update), Exception):
+                    if isinstance(update, Exception):
                         raise update
                     yield update
             except (asyncio.CancelledError, asyncio.QueueShutDown):

yellowstone_fumarole_client/error.py

@@ -1,4 +1,4 @@
-from typing import Mapping
+from typing import Any, Mapping
 
 
 class FumaroleClientError(Exception):
@@ -14,6 +14,6 @@ class SubscribeError(FumaroleClientError):
 class DownloadSlotError(SubscribeError):
     """Exception raised for errors in the download slot process."""
     
-    def __init__(self, message: str, ctx: Mapping[str, any]):
+    def __init__(self, message: str, ctx: Mapping[str, Any]):
         super().__init__(message)
-        self.ctx = ctx
+        self.ctx = ctx

yellowstone_fumarole_client/runtime/aio.py

@@ -1,6 +1,9 @@
 # DataPlaneConn
 from abc import abstractmethod, ABC
 import asyncio
+from contextlib import suppress
+from typing import Any
+
 import grpc
 from typing import Literal, Mapping, Optional
 from collections import deque
@@ -16,7 +19,6 @@ from yellowstone_fumarole_proto.geyser_pb2 import (
     SubscribeRequest,
     SubscribeUpdate,
     SubscribeUpdateSlot,
-    CommitmentLevel as ProtoCommitmentLevel,
 )
 from yellowstone_fumarole_proto.fumarole_pb2 import (
     ControlCommand,
@@ -30,7 +32,6 @@ from yellowstone_fumarole_proto.fumarole_pb2_grpc import (
     FumaroleStub,
 )
 from yellowstone_fumarole_client.utils.aio import Interval
-from yellowstone_fumarole_client.grpc_connectivity import FumaroleGrpcConnector
 from yellowstone_fumarole_client.error import SubscribeError, DownloadSlotError
 import logging
 
@@ -66,7 +67,7 @@ class DownloadBlockError:
     """Represents an error that occurred during the download of a block."""
     kind: DownloadBlockErrorKind
     message: str
-    ctx: Mapping[str, any]
+    ctx: Mapping[str, Any]
 
     def into_subscribe_error(self) -> SubscribeError:
         """Convert the error into a SubscribeError."""
@@ -257,14 +258,12 @@ class AsyncioFumeDragonsmouthRuntime:
         else:
             slot = download_result.slot
             err_kind = download_result.err.kind
-            LOGGER.error(f"Download error for slot {slot}: {download_result.err}")  
+            LOGGER.error(f"Download error for slot {slot}: {download_result.err}")
             # If the client queue is disconnected, we don't do anything, next run iteration will close anyway.
             self.is_closed = True
             if err_kind != "OutletDisconnected":
-                try:
+                with suppress(asyncio.QueueShutDown):
                     await self.dragonsmouth_outlet.put(download_result.err.into_subscribe_error())
-                except asyncio.QueueShutDown:
-                    pass
 
     async def _force_commit_offset(self):
         LOGGER.debug(f"Force committing offset {self.sm.committable_offset}")
@@ -479,7 +478,7 @@ class GrpcDownloadBlockTaskRun:
         self.dragonsmouth_oulet = dragonsmouth_oulet
 
     def map_tonic_error_code_to_download_block_error(
-        self, 
+        self,
         e: grpc.aio.AioRpcError
     ) -> DownloadBlockError:
         code = e.code()
@@ -550,6 +549,10 @@ class GrpcDownloadBlockTaskRun:
                                 err=DownloadBlockError(
                                     kind="OutletDisconnected",
                                     message="Outlet disconnected",
+                                    ctx = {
+                                        "slot": self.download_request.slot,
+                                        "block_uid": self.download_request.block_uid,
+                                    }
                                 ),
                             )
                     case "block_shard_download_finish":
@@ -580,5 +583,12 @@ class GrpcDownloadBlockTaskRun:
         return DownloadTaskResult(
             kind="Err",
             slot=self.download_request.slot,
-            err=DownloadBlockError(kind="FailedDownload", message="Failed download"),
+            err=DownloadBlockError(
+                kind="FailedDownload",
+                message="Failed download",
+                ctx={
+                    "slot": self.download_request.slot,
+                    "block_uid": self.download_request.block_uid,
+                },
+            ),
         )

{yellowstone_fumarole_client-0.3.0.dist-info → yellowstone_fumarole_client-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: yellowstone-fumarole-client
-Version: 0.3.0
+Version: 0.3.1
 Summary: Yellowstone Fumarole Python Client
 Home-page: https://github.com/rpcpool/yellowstone-fumarole
 Author: Louis-Vincent

{yellowstone_fumarole_client-0.3.0.dist-info → yellowstone_fumarole_client-0.3.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
-yellowstone_fumarole_client/__init__.py,sha256=Ngm4D8PMKKifrGyjg82XRfdrqOXrjtxLH6sg0YoW6Eg,14128
+yellowstone_fumarole_client/__init__.py,sha256=Pp389GWtT6Br1ia2bJ9Bx--jOMoG_fL18cMg8N3HCvQ,14101
 yellowstone_fumarole_client/config.py,sha256=aclhCPUy6RO-xtXR9w8otmt1RzFZyFnbF28jk115C2g,1394
-yellowstone_fumarole_client/error.py,sha256=TFoy72LyzgHRwx9J7uvurB0jsnnmxbJwJaioSlUpcds,483
+yellowstone_fumarole_client/error.py,sha256=85TJrHXgmFKTDddoLD4G9iexLmDlblfj_xMAwULAJUE,489
 yellowstone_fumarole_client/grpc_connectivity.py,sha256=Sex_x6_Bha0wGD7rRqr-V_slsohX1tDFeiHdqahLJ4Q,6639
 yellowstone_fumarole_client/runtime/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-yellowstone_fumarole_client/runtime/aio.py,sha256=DLdsTv9hwXov4irOTnESYENFwWX6_NpwT8xEj3yZMW4,23143
+yellowstone_fumarole_client/runtime/aio.py,sha256=BdsLllgNj15nNxKdOUqEXP1RW2p8alt3x0iCwrIxFr4,23487
 yellowstone_fumarole_client/runtime/state_machine.py,sha256=eH2ARUOBdBJqk1zs9WLXD1WixqtgZX4bIdDkg1cWttA,12781
 yellowstone_fumarole_client/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 yellowstone_fumarole_client/utils/aio.py,sha256=lm_BNkPiw5CJ6FjDlQUPoCKAqY3eYFAedAJB8mhNbzE,639
@@ -18,6 +18,6 @@ yellowstone_fumarole_proto/geyser_pb2_grpc.py,sha256=JCEz0KM_jg_610HyQI_F1K4kJlR
 yellowstone_fumarole_proto/solana_storage_pb2.py,sha256=LS-P5EPyS0n1pO9_U73rA6SPlbGSTEC2qYhuS3skzA8,8443
 yellowstone_fumarole_proto/solana_storage_pb2.pyi,sha256=HivhoN4VEe_W7kB4lc2Un5AeTAv3xiKR_HLI096qmyA,13040
 yellowstone_fumarole_proto/solana_storage_pb2_grpc.py,sha256=-rb9Dr0HXohIrHrnxukYrmUYl6OCVbkQYh2-pCO6740,895
-yellowstone_fumarole_client-0.3.0.dist-info/METADATA,sha256=lzwP6_lZMW8HXwBgVmNBmXJq3S48CsoOkTcfQ2xsMQ4,4156
-yellowstone_fumarole_client-0.3.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-yellowstone_fumarole_client-0.3.0.dist-info/RECORD,,
+yellowstone_fumarole_client-0.3.1.dist-info/METADATA,sha256=dkCS_F5msc3zh7K3n5pNGQNESrYd07vW_SRJkeB2Wwo,4156
+yellowstone_fumarole_client-0.3.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+yellowstone_fumarole_client-0.3.1.dist-info/RECORD,,