terralab-cli 3.1.8__tar.gz → 3.2.0__tar.gz

{terralab_cli-3.1.8 → terralab_cli-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: terralab-cli
-Version: 3.1.8
+Version: 3.2.0
 Summary: Command line interface for interacting with the Terra Scientific Pipelines Service, or Teaspoons.
 License-File: LICENSE
 Author: Terra Scientific Services

{terralab_cli-3.1.8 → terralab_cli-3.2.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "terralab-cli"
 # version is auto-incremented. do not edit.
-version = "3.1.8"
+version = "3.2.0"
 description = "Command line interface for interacting with the Terra Scientific Pipelines Service, or Teaspoons."
 authors = ["Terra Scientific Services <teaspoons-developers@broadinstitute.org>"]
 readme = "README.md"

{terralab_cli-3.1.8 → terralab_cli-3.2.0}/terralab/commands/pipeline_runs_commands.py

@@ -1,6 +1,7 @@
 # commands/pipeline_runs_commands.py
 
 import logging
+from typing import Any
 import uuid
 
 import click
@@ -15,6 +16,7 @@ from terralab.log import (
 )
 from terralab.logic import pipeline_runs_logic, pipelines_logic
 from terralab.utils import (
+    convert_file_size_to_human_readable,
     handle_api_exceptions,
     process_inputs_to_dict,
     validate_job_id,
@@ -117,7 +119,8 @@ def details(job_id: str) -> None:
 
     LOGGER.info(indented("Inputs:"))
     for input_name, input_value in response.pipeline_run_report.user_inputs.items():
-        LOGGER.info(indented(f"{input_name}: {input_value}", n_spaces=4))
+        LOGGER.info(indented(f"{input_name}:", n_spaces=4))
+        LOGGER.info(indented(input_value, n_spaces=6))
 
     if response.pipeline_run_report.input_size:
         LOGGER.info(
@@ -141,6 +144,7 @@ def details(job_id: str) -> None:
         LOGGER.info(indented(f"Quota Consumed: {quota_consumed}"))
 
     if response.job_report.status == SUCCEEDED_KEY:
+        display_outputs(response.pipeline_run_report.outputs)
         LOGGER.info(
             indented(
                 f"File Download Expiration: {format_timestamp(response.pipeline_run_report.output_expiration_date, timestamp_format)}"
@@ -148,6 +152,32 @@ def details(job_id: str) -> None:
         )
 
 
+def display_outputs(outputs: dict[str, dict[str, Any]] | None) -> None:
+    if not outputs:
+        return
+    LOGGER.info(indented("Outputs:"))
+    for (
+        output_name,
+        output_value,
+    ) in outputs.items():
+        if "metadata" in output_value and "sizeInBytes" in output_value["metadata"]:
+            output_size_string = f"({convert_file_size_to_human_readable(output_value['metadata']['sizeInBytes'])})"
+        else:
+            output_size_string = ""
+        LOGGER.info(
+            indented(
+                f"{output_name}:",
+                n_spaces=4,
+            )
+        )
+        LOGGER.info(
+            indented(
+                f"{output_value['value']} {output_size_string}",
+                n_spaces=6,
+            )
+        )
+
+
 @jobs.command(name="list", short_help="List your jobs")
 @click.option(
     "--num_results",

{terralab_cli-3.1.8 → terralab_cli-3.2.0}/terralab/logic/pipeline_runs_logic.py

@@ -82,7 +82,7 @@ def get_pipeline_run_status(job_id: uuid.UUID) -> AsyncPipelineRunResponseV2:
 
     with ClientWrapper() as api_client:
         pipeline_runs_client = PipelineRunsApi(api_client=api_client)
-        return pipeline_runs_client.get_pipeline_run_result_v2(str(job_id))
+        return pipeline_runs_client.get_pipeline_run_result_v3(str(job_id))
 
 
 def get_pipeline_run_output_signed_urls(

{terralab_cli-3.1.8 → terralab_cli-3.2.0}/terralab/utils.py

@@ -3,6 +3,7 @@
 import datetime
 import json
 import logging
+import math
 import os
 import uuid
 from concurrent.futures import ThreadPoolExecutor
@@ -165,6 +166,17 @@ def validate_file_size(file_path: str) -> str | None:
     return None
 
 
+def convert_file_size_to_human_readable(size_bytes: int) -> str:
+    """Convert a file size in bytes to a human-readable string with appropriate units."""
+    if size_bytes == 0:
+        return "0 B"
+    size_name = ("B", "KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB")
+    i = int(math.floor(math.log(size_bytes, 1024)))
+    p = math.pow(1024, i)
+    s = round(size_bytes / p, 1) if p > 1 else size_bytes
+    return "%s %s" % (s, size_name[i])
+
+
 ## upload and download methods
 PROGRESS_BAR_FORMAT = "{desc}: {percentage:3.0f}%|{bar}| {n_fmt}/{total_fmt} [elapsed: {elapsed} ETA: {remaining} ({rate_fmt}{postfix})]"