Skip to content

Format DL cmd exceptions. #16939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Format DL cmd exceptions. #16939

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe6af24
Format DL cmd exceptions.
fchirica Nov 28, 2023
df69176
Try mypy.
fchirica Nov 28, 2023
1e5542f
mypy.
fchirica Nov 28, 2023
a1b47b1
Lint.
fchirica Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 53 additions & 42 deletions chia/cmds/data_funcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import json
from decimal import Decimal
from pathlib import Path
from typing import Any, AsyncIterator, Dict, List, Optional, Tuple
from typing import Any, AsyncIterator, Awaitable, Callable, Dict, List, Optional, Tuple

from chia.cmds.cmds_util import get_any_service_client
from chia.cmds.units import units
Expand All @@ -28,6 +28,20 @@ async def get_client(
yield client, _


def run_with_error_handling(client: DataLayerRpcClient, method_name: str) -> Callable[..., Awaitable[None]]:
async def wrapper(*args: Any, **kwargs: Any) -> None:
try:
command_func = getattr(client, method_name)
res = await command_func(*args, **kwargs)
print(json.dumps(res, indent=4, sort_keys=True))
except ValueError as e:
json_str = json.dumps(e.args[0], indent=4)
json_str = json_str.replace("\\n", "\n").replace("\\\\", "\\").replace("\\\n", "\n")
print(f"An error occurred: {json_str}")

return wrapper


async def wallet_log_in_cmd(
rpc_port: Optional[int],
fingerprint: int,
Expand All @@ -45,8 +59,8 @@ async def create_data_store_cmd(
) -> None:
final_fee = None if fee is None else uint64(int(Decimal(fee) * units["chia"]))
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.create_data_store(fee=final_fee, verbose=verbose)
print(json.dumps(res, indent=4, sort_keys=True))
create_data_store = run_with_error_handling(client, "create_data_store")
await create_data_store(fee=final_fee, verbose=verbose)


async def get_value_cmd(
Expand All @@ -60,8 +74,8 @@ async def get_value_cmd(
key_bytes = hexstr_to_bytes(key)
root_hash_bytes = None if root_hash is None else bytes32.from_hexstr(root_hash)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_value(store_id=store_id_bytes, key=key_bytes, root_hash=root_hash_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_value = run_with_error_handling(client, "get_value")
await get_value(store_id=store_id_bytes, key=key_bytes, root_hash=root_hash_bytes)


async def update_data_store_cmd(
Expand All @@ -74,8 +88,8 @@ async def update_data_store_cmd(
store_id_bytes = bytes32.from_hexstr(store_id)
final_fee = None if fee is None else uint64(int(Decimal(fee) * units["chia"]))
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.update_data_store(store_id=store_id_bytes, changelist=changelist, fee=final_fee)
print(json.dumps(res, indent=4, sort_keys=True))
update_data_store = run_with_error_handling(client, "update_data_store")
await update_data_store(store_id=store_id_bytes, changelist=changelist, fee=final_fee)


async def get_keys_cmd(
Expand All @@ -87,8 +101,8 @@ async def get_keys_cmd(
store_id_bytes = bytes32.from_hexstr(store_id)
root_hash_bytes = None if root_hash is None else bytes32.from_hexstr(root_hash)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_keys(store_id=store_id_bytes, root_hash=root_hash_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_keys = run_with_error_handling(client, "get_keys")
await get_keys(store_id=store_id_bytes, root_hash=root_hash_bytes)


async def get_keys_values_cmd(
Expand All @@ -100,8 +114,8 @@ async def get_keys_values_cmd(
store_id_bytes = bytes32.from_hexstr(store_id)
root_hash_bytes = None if root_hash is None else bytes32.from_hexstr(root_hash)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_keys_values(store_id=store_id_bytes, root_hash=root_hash_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_keys_values = run_with_error_handling(client, "get_keys_values")
await get_keys_values(store_id=store_id_bytes, root_hash=root_hash_bytes)


async def get_root_cmd(
Expand All @@ -111,8 +125,8 @@ async def get_root_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_root(store_id=store_id_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_root = run_with_error_handling(client, "get_root")
await get_root(store_id=store_id_bytes)


async def subscribe_cmd(
Expand All @@ -123,8 +137,8 @@ async def subscribe_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.subscribe(store_id=store_id_bytes, urls=urls)
print(json.dumps(res, indent=4, sort_keys=True))
subscribe = run_with_error_handling(client, "subscribe")
await subscribe(store_id=store_id_bytes, urls=urls)


async def unsubscribe_cmd(
Expand All @@ -135,8 +149,8 @@ async def unsubscribe_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.unsubscribe(store_id=store_id_bytes, retain=retain)
print(json.dumps(res, indent=4, sort_keys=True))
unsubscribe = run_with_error_handling(client, "unsubscribe")
await unsubscribe(store_id=store_id_bytes, retain=retain)


async def remove_subscriptions_cmd(
Expand All @@ -147,8 +161,8 @@ async def remove_subscriptions_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.remove_subscriptions(store_id=store_id_bytes, urls=urls)
print(json.dumps(res, indent=4, sort_keys=True))
remove_subscriptions = run_with_error_handling(client, "remove_subscriptions")
await remove_subscriptions(store_id=store_id_bytes, urls=urls)


async def get_kv_diff_cmd(
Expand All @@ -162,8 +176,8 @@ async def get_kv_diff_cmd(
hash_1_bytes = bytes32.from_hexstr(hash_1)
hash_2_bytes = bytes32.from_hexstr(hash_2)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_kv_diff(store_id=store_id_bytes, hash_1=hash_1_bytes, hash_2=hash_2_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_kv_diff = run_with_error_handling(client, "get_kv_diff")
await get_kv_diff(store_id=store_id_bytes, hash_1=hash_1_bytes, hash_2=hash_2_bytes)


async def get_root_history_cmd(
Expand All @@ -173,8 +187,8 @@ async def get_root_history_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_root_history(store_id=store_id_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_root_history = run_with_error_handling(client, "get_root_history")
await get_root_history(store_id=store_id_bytes)


async def add_missing_files_cmd(
Expand All @@ -185,12 +199,12 @@ async def add_missing_files_cmd(
fingerprint: Optional[int],
) -> None:
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.add_missing_files(
add_missing_files = run_with_error_handling(client, "add_missing_files")
await add_missing_files(
store_ids=(None if ids is None else [bytes32.from_hexstr(id) for id in ids]),
overwrite=overwrite,
foldername=foldername,
)
print(json.dumps(res, indent=4, sort_keys=True))


async def add_mirror_cmd(
Expand All @@ -204,13 +218,13 @@ async def add_mirror_cmd(
store_id_bytes = bytes32.from_hexstr(store_id)
final_fee = None if fee is None else uint64(int(Decimal(fee) * units["chia"]))
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.add_mirror(
add_mirror = run_with_error_handling(client, "add_mirror")
await add_mirror(
store_id=store_id_bytes,
urls=urls,
amount=amount,
fee=final_fee,
)
print(json.dumps(res, indent=4, sort_keys=True))


async def delete_mirror_cmd(
Expand All @@ -222,11 +236,8 @@ async def delete_mirror_cmd(
coin_id_bytes = bytes32.from_hexstr(coin_id)
final_fee = None if fee is None else uint64(int(Decimal(fee) * units["chia"]))
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.delete_mirror(
coin_id=coin_id_bytes,
fee=final_fee,
)
print(json.dumps(res, indent=4, sort_keys=True))
delete_mirror = run_with_error_handling(client, "delete_mirror")
await delete_mirror(coin_id=coin_id_bytes, fee=final_fee)


async def get_mirrors_cmd(
Expand All @@ -236,26 +247,26 @@ async def get_mirrors_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_mirrors(store_id=store_id_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_mirrors = run_with_error_handling(client, "get_mirrors")
await get_mirrors(store_id=store_id_bytes)


async def get_subscriptions_cmd(
rpc_port: Optional[int],
fingerprint: Optional[int],
) -> None:
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_subscriptions()
print(json.dumps(res, indent=4, sort_keys=True))
get_subscriptions = run_with_error_handling(client, "get_subscriptions")
await get_subscriptions()


async def get_owned_stores_cmd(
rpc_port: Optional[int],
fingerprint: Optional[int],
) -> None:
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_owned_stores()
print(json.dumps(res, indent=4, sort_keys=True))
get_owned_stores = run_with_error_handling(client, "get_owned_stores")
await get_owned_stores()


async def get_sync_status_cmd(
Expand All @@ -265,14 +276,14 @@ async def get_sync_status_cmd(
) -> None:
store_id_bytes = bytes32.from_hexstr(store_id)
async with get_client(rpc_port=rpc_port, fingerprint=fingerprint) as (client, _):
res = await client.get_sync_status(store_id=store_id_bytes)
print(json.dumps(res, indent=4, sort_keys=True))
get_sync_status = run_with_error_handling(client, "get_sync_status")
await get_sync_status(store_id=store_id_bytes)


async def check_plugins_cmd(rpc_port: Optional[int]) -> None:
async with get_client(rpc_port=rpc_port) as (client, _):
res = await client.check_plugins()
print(json.dumps(res, indent=4, sort_keys=True))
check_plugins = run_with_error_handling(client, "check_plugins")
await check_plugins()


async def clear_pending_roots(
Expand Down