diff --git a/cli.py b/cli.py index f752f44..597039a 100644 --- a/cli.py +++ b/cli.py @@ -13,6 +13,7 @@ from mev_inspect.inspector import MEVInspector from mev_inspect.prices import fetch_prices, fetch_prices_range from mev_inspect.queue.broker import connect_broker from mev_inspect.queue.tasks import export_block_task, inspect_many_blocks_task +from mev_inspect.s3_export import export_block RPC_URL_ENV = "RPC_URL" @@ -134,13 +135,21 @@ def fetch_all_prices(): @cli.command() @click.argument("block_number", type=int) -def s3_export(block_number: int): +def enqueue_s3_export(block_number: int): broker = connect_broker() export_actor = dramatiq.actor(export_block_task, broker=broker) - logger.info(f"Sending block {block_number} for export") + logger.info(f"Sending block {block_number} export to queue") export_actor.send(block_number) +@cli.command() +@click.argument("block_number", type=int) +def s3_export(block_number: int): + inspect_db_session = get_inspect_session() + logger.info(f"Exporting {block_number}") + export_block(inspect_db_session, block_number) + + @cli.command() @click.argument("after", type=click.DateTime(formats=["%Y-%m-%d", "%m-%d-%Y"])) @click.argument("before", type=click.DateTime(formats=["%Y-%m-%d", "%m-%d-%Y"])) diff --git a/mev b/mev index 65a3556..372da57 100755 --- a/mev +++ b/mev @@ -94,12 +94,17 @@ case "$1" in exit 1 esac ;; - s3-export) - after_block_number=$2 - before_block_number=$3 + enqueue-s3-export) + block_number=$2 - echo "Exporting from $after_block_number to $before_block_number" - kubectl exec -ti deploy/mev-inspect -- poetry run s3-export $after_block_number $before_block_number + echo "Sending $block_number export to queue" + kubectl exec -ti deploy/mev-inspect -- poetry run enqueue-s3-export $block_number + ;; + s3-export) + block_number=$2 + + echo "Exporting $block_number" + kubectl exec -ti deploy/mev-inspect -- poetry run s3-export $block_number ;; exec) shift diff --git a/pyproject.toml b/pyproject.toml index 9b42e0f..e673d39 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -42,6 +42,7 @@ fetch-block = 'cli:fetch_block_command' fetch-all-prices = 'cli:fetch_all_prices' fetch-range = 'cli:fetch_range' s3-export = 'cli:s3_export' +enqueue-s3-export = 'cli:enqueue_s3_export' [tool.black] exclude = '''