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

yellowstone_fumarole_client/__init__.py

@@ -33,6 +33,7 @@ from yellowstone_fumarole_proto.fumarole_pb2 import (
     CreateConsumerGroupResponse,
 )
 from yellowstone_fumarole_proto.fumarole_pb2_grpc import FumaroleStub
+from yellowstone_fumarole_client.error import SubscribeError
 import grpc
 
 from yellowstone_fumarole_client import config
@@ -54,6 +55,7 @@ DEFAULT_COMMIT_INTERVAL = 5.0  # seconds
 DEFAULT_MAX_SLOT_DOWNLOAD_ATTEMPT = 3
 DEFAULT_CONCURRENT_DOWNLOAD_LIMIT_PER_TCP = 10
 
+LOGGER = logging.getLogger(__name__)
 # Error classes
 
 
@@ -262,18 +264,30 @@ class FumaroleClient:
             max_concurrent_download=config.concurrent_download_limit,
         )
 
-        async def rt_run(rt):
-            async with rt as rt:
-                await rt.run()
-
-        rt_task = asyncio.create_task(rt_run(rt))
-
+        rt_task = asyncio.create_task(rt.run())
+        rt_task.set_name("rt_task")
+        control_plane_src_task.set_name("control_plane_src_task")
         async def fumarole_overseer():
-            done, pending = await asyncio.wait(
-                [rt_task, control_plane_src_task], return_when=asyncio.FIRST_COMPLETED
-            )
-            for t in pending:
-                t.cancel()
+            try:
+                done, pending = await asyncio.wait(
+                    [rt_task, control_plane_src_task], return_when=asyncio.FIRST_COMPLETED
+                )
+                for t in done:
+                    try:
+                        exc = t.exception()
+                        LOGGER.error(f"Fumarole task '{t.get_name()}' failed: {exc}")
+                    except asyncio.CancelledError:
+                        pass
+                    if exc is not None:
+                        try:
+                            await dragonsmouth_outlet.put(exc)
+                        except asyncio.QueueShutdown:
+                            pass
+                for t in pending:
+                    t.cancel()
+            finally:
+                await rt.aclose()
+
 
         fumarole_handle = asyncio.create_task(fumarole_overseer())
 
@@ -281,6 +295,8 @@ class FumaroleClient:
             try:
                 while True:
                     update = await dragonsmouth_outlet.get()
+                    if issubclass(type(update), Exception):
+                        raise update
                     yield update
             except (asyncio.CancelledError, asyncio.QueueShutDown):
                 pass

yellowstone_fumarole_client/error.py

@@ -0,0 +1,19 @@
+from typing import Mapping
+
+
+class FumaroleClientError(Exception):
+    """Base class for all Fumarole-related exceptions."""
+    pass
+
+
+class SubscribeError(FumaroleClientError):
+    """Base class for all errors related to subscription."""
+    pass
+
+
+class DownloadSlotError(SubscribeError):
+    """Exception raised for errors in the download slot process."""
+    
+    def __init__(self, message: str, ctx: Mapping[str, any]):
+        super().__init__(message)
+        self.ctx = ctx

yellowstone_fumarole_client/runtime/aio.py

@@ -2,7 +2,7 @@
 from abc import abstractmethod, ABC
 import asyncio
 import grpc
-from typing import Optional
+from typing import Literal, Mapping, Optional
 from collections import deque
 from dataclasses import dataclass
 import time
@@ -31,6 +31,7 @@ from yellowstone_fumarole_proto.fumarole_pb2_grpc import (
 )
 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
 
 
@@ -51,13 +52,28 @@ class CompletedDownloadBlockTask:
     total_event_downloaded: int
 
 
+DownloadBlockErrorKind = Literal[
+    "Disconnected",
+    "OutletDisconnected",
+    "BlockShardNotFound",
+    "FailedDownload",
+    "Fatal",
+    "SessionDeprecated"
+]
+
 @dataclass
 class DownloadBlockError:
     """Represents an error that occurred during the download of a block."""
-
-    kind: str  # 'Disconnected', 'OutletDisconnected', 'BlockShardNotFound', 'FailedDownload', 'Fatal'
+    kind: DownloadBlockErrorKind
     message: str
+    ctx: Mapping[str, any]
 
+    def into_subscribe_error(self) -> SubscribeError:
+        """Convert the error into a SubscribeError."""
+        return DownloadSlotError(
+            f"{self.kind}: {self.message}",
+            ctx=self.ctx
+        )
 
 @dataclass
 class DownloadTaskResult:
@@ -133,10 +149,14 @@ class AsyncioFumeDragonsmouthRuntime:
         self.commit_interval = commit_interval
         self.gc_interval = gc_interval
         self.max_concurrent_download = max_concurrent_download
+        self.poll_hist_inflight = False
+        self.commit_offset_inflight = False
 
         # holds metadata about the download task
         self.download_tasks = dict()
         self.inflight_tasks = dict()
+        self.successful_download_cnt = 0
+        self.is_closed = False
 
     async def __aenter__(self):
         return self
@@ -167,10 +187,12 @@ class AsyncioFumeDragonsmouthRuntime:
 
         match response_field:
             case "poll_hist":
+                self.poll_hist_inflight = False
                 poll_hist = control_response.poll_hist
                 LOGGER.debug(f"Received poll history {len(poll_hist.events)} events")
                 self.sm.queue_blockchain_event(poll_hist.events)
             case "commit_offset":
+                self.commit_offset_inflight = False
                 commit_offset = control_response.commit_offset
                 LOGGER.debug(f"Received commit offset: {commit_offset}")
                 self.sm.update_committed_offset(commit_offset.offset)
@@ -181,9 +203,12 @@ class AsyncioFumeDragonsmouthRuntime:
 
     async def poll_history_if_needed(self):
         """Poll the history if the state machine needs new events."""
+        if self.poll_hist_inflight:
+            return
         if self.sm.need_new_blockchain_events():
             cmd = self._build_poll_history_cmd(self.sm.committable_offset)
             await self.control_plane_tx.put(cmd)
+            self.poll_hist_inflight = True
 
     def commitment_level(self):
         """Gets the commitment level from the subscribe request."""
@@ -220,18 +245,26 @@ class AsyncioFumeDragonsmouthRuntime:
             self.inflight_tasks[download_task] = DOWNLOAD_TASK_TYPE_MARKER
             LOGGER.debug(f"Scheduling download task for slot {download_request.slot}")
 
-    def _handle_download_result(self, download_result: DownloadTaskResult):
+    async def _handle_download_result(self, download_result: DownloadTaskResult):
         """Handles the result of a download task."""
         if download_result.kind == "Ok":
+            self.successful_download_cnt += 1
             completed = download_result.completed
             LOGGER.debug(
-                f"Download completed for slot {completed.slot}, shard {completed.shard_idx}, {completed.total_event_downloaded} total events"
+                f"Download({self.successful_download_cnt}) completed for slot {completed.slot}, shard {completed.shard_idx}, {completed.total_event_downloaded} total events"
             )
             self.sm.make_slot_download_progress(completed.slot, completed.shard_idx)
         else:
             slot = download_result.slot
-            err = download_result.err
-            raise RuntimeError(f"Failed to download slot {slot}: {err.message}")
+            err_kind = download_result.err.kind
+            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:
+                    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}")
@@ -241,9 +274,12 @@ class AsyncioFumeDragonsmouthRuntime:
 
     async def _commit_offset(self):
         self.last_commit = time.time()
+        if self.commit_offset_inflight:
+            return
         if self.sm.last_committed_offset < self.sm.committable_offset:
             LOGGER.debug(f"Committing offset {self.sm.committable_offset}")
             await self._force_commit_offset()
+            self.commit_offset_inflight = True
 
     async def _drain_slot_status(self):
         """Drains the slot status from the state machine and sends updates to the Dragonsmouth outlet."""
@@ -318,7 +354,7 @@ class AsyncioFumeDragonsmouthRuntime:
             ): COMMIT_TICK_TYPE_MARKER,
         }
 
-        while self.inflight_tasks:
+        while self.inflight_tasks and not self.is_closed:
             ticks += 1
             LOGGER.debug(f"Runtime loop tick")
             if ticks % self.gc_interval == 0:
@@ -360,7 +396,7 @@ class AsyncioFumeDragonsmouthRuntime:
                 elif sigcode == DOWNLOAD_TASK_TYPE_MARKER:
                     LOGGER.debug("Download task result received")
                     assert self.download_tasks.pop(t)
-                    self._handle_download_result(result)
+                    await self._handle_download_result(result)
                 elif sigcode == COMMIT_TICK_TYPE_MARKER:
                     LOGGER.debug("Commit tick reached")
                     await self._commit_offset()
@@ -372,10 +408,7 @@ class AsyncioFumeDragonsmouthRuntime:
                     raise RuntimeError(f"Unexpected task name: {sigcode}")
 
             await self._drain_slot_status()
-
         await self.aclose()
-        LOGGER.debug("Fumarole runtime exiting")
-
 
 # DownloadTaskRunnerChannels
 @dataclass
@@ -446,15 +479,21 @@ class GrpcDownloadBlockTaskRun:
         self.dragonsmouth_oulet = dragonsmouth_oulet
 
     def map_tonic_error_code_to_download_block_error(
-        self, e: grpc.aio.AioRpcError
+        self, 
+        e: grpc.aio.AioRpcError
     ) -> DownloadBlockError:
         code = e.code()
+        ctx = {
+            "grpc_status_code": code,
+            "slot": self.download_request.slot,
+            "block_uid": self.download_request.block_uid,
+        }
         if code == grpc.StatusCode.NOT_FOUND:
             return DownloadBlockError(
-                kind="BlockShardNotFound", message="Block shard not found"
+                kind="BlockShardNotFound", message="Block shard not found", ctx=ctx,
             )
         elif code == grpc.StatusCode.UNAVAILABLE:
-            return DownloadBlockError(kind="Disconnected", message="Disconnected")
+            return DownloadBlockError(kind="Disconnected", message="Disconnected", ctx=ctx)
         elif code in (
             grpc.StatusCode.INTERNAL,
             grpc.StatusCode.ABORTED,
@@ -464,11 +503,13 @@ class GrpcDownloadBlockTaskRun:
             grpc.StatusCode.CANCELLED,
             grpc.StatusCode.DEADLINE_EXCEEDED,
         ):
-            return DownloadBlockError(kind="FailedDownload", message="Failed download")
+            return DownloadBlockError(kind="FailedDownload", message="Failed download", ctx=ctx)
         elif code == grpc.StatusCode.INVALID_ARGUMENT:
             raise ValueError("Invalid argument")
+        elif code == grpc.StatusCode.FAILED_PRECONDITION:
+            return DownloadBlockError(kind="SessionDeprecated", message="Session is deprecated", ctx=ctx)
         else:
-            return DownloadBlockError(kind="Fatal", message=f"Unknown error: {code}")
+            return DownloadBlockError(kind="Fatal", message=f"Unknown error: {code}", ctx=ctx)
 
     async def run(self) -> DownloadTaskResult:
         request = DownloadBlockShard(
@@ -525,13 +566,15 @@ class GrpcDownloadBlockTaskRun:
                             ),
                         )
                     case unknown:
-                        raise RuntimeError("Unexpected response kind: {unknown}")
+                        raise RuntimeError(f"Unexpected response kind: {unknown}")
+
         except grpc.aio.AioRpcError as e:
-            LOGGER.error(f"Download block error: {e}")
+            e2 = self.map_tonic_error_code_to_download_block_error(e)
+            LOGGER.error(f"Download block error: {e}, {e2}")
             return DownloadTaskResult(
                 kind="Err",
                 slot=self.download_request.slot,
-                err=self.map_tonic_error_code_to_download_block_error(e),
+                err=e2,
             )
 
         return DownloadTaskResult(

yellowstone_fumarole_client/runtime/state_machine.py

@@ -322,4 +322,6 @@ class FumaroleSM:
 
     def need_new_blockchain_events(self) -> bool:
         """Check if new blockchain events are needed."""
-        return not self.slot_status_update_queue and not self.blocked_slot_status_update
+        MINIMUM_UNPROCESSED_BLOCKCHAIN_EVENT = 10
+        return len(self.unprocessed_blockchain_event) < MINIMUM_UNPROCESSED_BLOCKCHAIN_EVENT \
+            or (not self.slot_status_update_queue and not self.blocked_slot_status_update)

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

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

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

@@ -1,9 +1,10 @@
-yellowstone_fumarole_client/__init__.py,sha256=QIfks8mTmyOywbGLG4ZMXrp4LDBNq5s_SV_1P0PKH6E,13351
+yellowstone_fumarole_client/__init__.py,sha256=Ngm4D8PMKKifrGyjg82XRfdrqOXrjtxLH6sg0YoW6Eg,14128
 yellowstone_fumarole_client/config.py,sha256=aclhCPUy6RO-xtXR9w8otmt1RzFZyFnbF28jk115C2g,1394
+yellowstone_fumarole_client/error.py,sha256=TFoy72LyzgHRwx9J7uvurB0jsnnmxbJwJaioSlUpcds,483
 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=hbp6v4QUTQClMZ0C0xREAlOMkFOSuKas2nwaGN1NbMw,21370
-yellowstone_fumarole_client/runtime/state_machine.py,sha256=d4blPv62UcqZ0HigRK2IXTd_8MeRrRjhclDVpE0PMnQ,12634
+yellowstone_fumarole_client/runtime/aio.py,sha256=DLdsTv9hwXov4irOTnESYENFwWX6_NpwT8xEj3yZMW4,23143
+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
 yellowstone_fumarole_client/utils/collections.py,sha256=NgXpepuRZKsUy0x1XW9pSjztIrlG7LUyMsETagfPgL0,989
@@ -17,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.2.1.dist-info/METADATA,sha256=eljSi7uqcB_c7FOS-oJdcrPJZPMZgyc-hZzuL3NDAc8,4156
-yellowstone_fumarole_client-0.2.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-yellowstone_fumarole_client-0.2.1.dist-info/RECORD,,
+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,,