abstract-block-dumper 0.0.4__py3-none-any.whl → 0.0.6__py3-none-any.whl

abstract_block_dumper/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.0.4'
-__version_tuple__ = version_tuple = (0, 0, 4)
+__version__ = version = '0.0.6'
+__version_tuple__ = version_tuple = (0, 0, 6)
 
 __commit_id__ = commit_id = None

abstract_block_dumper/v1/decorators.py

@@ -134,24 +134,39 @@ def _celery_task_wrapper(
 
 
 def block_task(
-    condition: Callable[..., bool],
+    func: Callable[..., Any] | None = None,
+    *,
+    condition: Callable[..., bool] | None = None,
     args: list[dict[str, Any]] | None = None,
     backfilling_lookback: int | None = None,
     celery_kwargs: dict[str, Any] | None = None,
 ) -> Callable[..., Any]:
     """
-    Register a block task.
+    Decorator to register a function as a block task.
+
+    Block task is a function that will be executed conditionally on each new block.
+    The condition is a callable that takes the block number and any additional arguments,
+    and returns a boolean indicating whether to execute the task.
 
     Args:
-        condition: Lambda function that determines when to execute
+        func: The function to decorate (used when decorator is applied without parentheses)
+        condition: Lambda function that determines when to execute the task. It should accept
+                   block_number and any additional args as parameters and return a boolean.
+                   Defaults to always True (run on every block).
         args: List of argument dictionaries for multi-execution
         backfilling_lookback: Number of blocks to backfill
         celery_kwargs: Additional Celery task parameters
 
     Examples:
-        @block_task(
-            condition=lambda bn: bn % 100 == 0
-        )
+        @block_task
+        def run_on_every_block(block_number: int):
+            pass
+
+        @block_task()
+        def also_runs_on_every_block(block_number: int):
+            pass
+
+        @block_task(condition=lambda bn: bn % 100 == 0)
         def simple_task(block_number: int):
             pass
 
@@ -165,9 +180,11 @@ def block_task(
             pass
 
     """
+    # Default condition: always run
+    effective_condition = condition if condition is not None else (lambda *_args, **_kwargs: True)
 
-    def decorator(func: Callable[..., Any]) -> Any:
-        if not callable(condition):
+    def decorator(fn: Callable[..., Any]) -> Any:
+        if not callable(effective_condition):
             msg = "condition must be a callable."
             raise TypeError(msg)
 
@@ -179,22 +196,22 @@ def block_task(
 
             This entire wrapper becomes a Celery task.
             """
-            return _celery_task_wrapper(func, block_number, **kwargs)
+            return _celery_task_wrapper(fn, block_number, **kwargs)
 
         # Wrap with celery shared_task
         celery_task = shared_task(
-            name=abd_utils.get_executable_path(func),
+            name=abd_utils.get_executable_path(fn),
             bind=False,
             **celery_kwargs or {},
         )(shared_celery_task)
 
         # Store original function referefence for introspection
-        celery_task._original_func = func  # noqa: SLF001
+        celery_task._original_func = fn  # noqa: SLF001
 
         # Register the Celery task
         task_registry.register_item(
             RegistryItem(
-                condition=condition,
+                condition=effective_condition,
                 function=cast("Task", celery_task),
                 args=args,
                 backfilling_lookback=backfilling_lookback,
@@ -203,4 +220,9 @@ def block_task(
         )
         return celery_task
 
+    # If func is provided, decorator was used without parentheses: @block_task
+    if func is not None:
+        return decorator(func)
+
+    # Otherwise, decorator was used with parentheses: @block_task() or @block_task(condition=...)
     return decorator

{abstract_block_dumper-0.0.4.dist-info → abstract_block_dumper-0.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract-block-dumper
-Version: 0.0.4
+Version: 0.0.6
 Project-URL: Source, https://github.com/bactensor/abstract-block-dumper
 Project-URL: Issue Tracker, https://github.com/bactensor/abstract-block-dumper/issues
 Author-email: Reef Technologies <opensource@reef.pl>
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.11
 Requires-Dist: bittensor>=9.10.1
-Requires-Dist: celery>=5.5.3
+Requires-Dist: celery>=5.3
 Requires-Dist: django<6.0,>=3.2
 Requires-Dist: structlog>=25.4.0
 Description-Content-Type: text/markdown
@@ -104,18 +104,21 @@ In your project's `celery.py` file, add the following to ensure Celery workers c
 
 ```python
 from celery import Celery
-from celery.signals import worker_ready
+from celery.signals import celeryd_init
 from django.conf import settings
 
 app = Celery('your_project')
 app.config_from_object('django.conf:settings', namespace='CELERY')
 app.autodiscover_tasks()
 
-@worker_ready.connect
-def on_worker_ready(**kwargs):
-    """Load block tasks when worker starts."""
+
+
+@celeryd_init.connect
+def on_worker_init(**kwargs) -> None:
+    """Load block tasks when worker initializes."""
     from abstract_block_dumper.v1.celery import setup_celery_tasks
     setup_celery_tasks()
+
 ```
 
 > **Important:** Without this step, Celery workers will not recognize your `@block_task` decorated functions, and you'll see "Received unregistered task" errors.
@@ -154,7 +157,7 @@ from abstract_block_dumper.v1.decorators import block_task
 
 
 # Process every block
-@block_task(condition=lambda bn: True)
+@block_task
 def process_every_block(block_number: int):
     print(f"Processing every block: {block_number}")
 

{abstract_block_dumper-0.0.4.dist-info → abstract_block_dumper-0.0.6.dist-info}/RECORD

@@ -1,5 +1,5 @@
 abstract_block_dumper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-abstract_block_dumper/_version.py,sha256=QlXZ5JTjE_pgpDaeHk0GTExkc75xUZFmd0hA7kGYCJ0,704
+abstract_block_dumper/_version.py,sha256=7MyqQ3iPP2mJruPfRYGCNCq1z7_Nk7c-eyYecYITxsY,704
 abstract_block_dumper/admin.py,sha256=3J3I_QOKFgfMNpTXW-rTQGO_q5Ls6uNuL0FkPVdIsYg,1654
 abstract_block_dumper/apps.py,sha256=DXATdrjsL3T2IletTbKeD6unr8ScLaxg7wz0nAHTAns,215
 abstract_block_dumper/models.py,sha256=MO9824dmHB6xF3PrFE_RERh7whVjQtS4tt6QA0wSbg0,2022
@@ -22,8 +22,8 @@ abstract_block_dumper/migrations/0001_initial.py,sha256=ImPHC3G6kPkq4Xn_4YVAm4La
 abstract_block_dumper/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 abstract_block_dumper/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 abstract_block_dumper/v1/celery.py,sha256=X4IqVs5i6ZpyY7fy1SqMZgsZy4SXP-jK2qG-FYnjU38,1722
-abstract_block_dumper/v1/decorators.py,sha256=i-CVanS-yiBMKCEOLjGmwmopefWePhyMdodlWNIfJFg,7002
+abstract_block_dumper/v1/decorators.py,sha256=SBl8XP9qhKyTdsKaRREW870BZGidEe0C_nmxnwh76lo,8156
 abstract_block_dumper/v1/tasks.py,sha256=u9iMYdDUqzYT3yPrNwZecHnlweZ3yFipV9BcIWHCbus,2647
-abstract_block_dumper-0.0.4.dist-info/METADATA,sha256=wBsIWl5439xp-EYInzV-mQaAKIoa_CDP97FJoeaB-ng,12916
-abstract_block_dumper-0.0.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-abstract_block_dumper-0.0.4.dist-info/RECORD,,
+abstract_block_dumper-0.0.6.dist-info/METADATA,sha256=yXyU72VareEjcSb8A4Tur5hWkgk5k6lBLy9cnqR--kY,12902
+abstract_block_dumper-0.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+abstract_block_dumper-0.0.6.dist-info/RECORD,,