Print JSON without additional indentation by default

Because vertical screen space is valuable, compact JSON output
formatting is a better default.

However, it is still possible to pretty-print the JSON as before with
the new --pretty option.

Author: aiman

src/simple_safe/console.py

@@ -72,14 +72,14 @@ def activate_logging():
 
 
 def get_json_data_renderable(
-    data: dict[str, Any], indent: Optional[int] = 2
+    data: dict[str, Any], pretty: bool = False
 ) -> "RenderableType":
     from rich.json import JSON
 
     return JSON.from_data(
         data,
         default=hexbytes_json_encoder,
-        indent=JSON_INDENT_LEVEL,
+        indent=2 if pretty else None,
     )
 
 

src/simple_safe/params.py

@@ -117,6 +117,11 @@ def build_safetx(f: FC) -> FC:
             make_option(chain_id_option_info, cls=optgroup.option),
             safe_version,
             optgroup.option("--safe-nonce", type=int, help="Safe nonce"),
+            click.option(
+                "--pretty",
+                is_flag=True,
+                help="Pretty print EIP-712 message JSON",
+            ),
         ]
     ):
         f = option(f)

src/simple_safe/safe.py

@@ -203,6 +203,7 @@ def build_abi_call(
     function: str,
     operation: int,
     output: Optional[typing.TextIO],
+    pretty: bool,
     rpc: Optional[str],
     safe_address: str,
     safe_nonce: Optional[int],
@@ -238,6 +239,7 @@ def build_abi_call(
             value=value,
             operation=SafeOperation(operation).value,
             output=output,
+            pretty=pretty,
         )
 
 
@@ -256,6 +258,7 @@ def build_custom(
     data: str,
     operation: int,
     output: Optional[typing.TextIO],
+    pretty: bool,
     rpc: Optional[str],
     safe_address: str,
     safe_nonce: Optional[int],
@@ -293,7 +296,7 @@ def build_custom(
         )
         eip712_data = safetx.to_eip712_message(safe)
     output_console = get_output_console(output)
-    output_console.print(get_json_data_renderable(eip712_data))
+    output_console.print(get_json_data_renderable(eip712_data, pretty))
 
 
 @build.command(name="erc20-call")
@@ -314,6 +317,7 @@ def build_erc20_call(
     chain_id: Optional[int],
     function: str,
     output: Optional[typing.TextIO],
+    pretty: bool,
     rpc: Optional[str],
     safe_address: str,
     safe_nonce: Optional[int],
@@ -351,6 +355,7 @@ def build_erc20_call(
             value=value,
             operation=SafeOperation.CALL.value,
             output=output,
+            pretty=pretty,
         )
 
 
@@ -365,6 +370,7 @@ def build_safe_call(
     chain_id: Optional[int],
     function: str,
     output: Optional[typing.TextIO],
+    pretty: bool,
     rpc: Optional[str],
     safe_address: str,
     safe_nonce: Optional[int],
@@ -397,6 +403,7 @@ def build_safe_call(
             value=value,
             operation=SafeOperation.CALL.value,
             output=output,
+            pretty=pretty,
         )
 
 

src/simple_safe/workflows.py

@@ -63,6 +63,7 @@ def build_contract_call_safetx(
     value: str,
     operation: int,
     output: Optional[TextIO],
+    pretty: bool,
 ):
     """Print a SafeTx that represents a contract call."""
     from web3.constants import CHECKSUM_ADDRESSS_ZERO
@@ -91,7 +92,7 @@ def build_contract_call_safetx(
     )
     output_console = get_output_console(output)
     output_console.print(
-        get_json_data_renderable(safetx.to_eip712_message(safe)),
+        get_json_data_renderable(safetx.to_eip712_message(safe), pretty),
     )