nemo-evaluator-launcher 0.1.0rc9__py3-none-any.whl → 0.1.1__py3-none-any.whl

nemo_evaluator_launcher/cli/ls_tasks.py

@@ -14,8 +14,11 @@
 # limitations under the License.
 #
 import json
+from collections import defaultdict
 from dataclasses import dataclass
 
+from simple_parsing import field
+
 from nemo_evaluator_launcher.api.functional import get_tasks_list
 
 
@@ -23,6 +26,12 @@ from nemo_evaluator_launcher.api.functional import get_tasks_list
 class Cmd:
     """List command configuration."""
 
+    json: bool = field(
+        default=False,
+        action="store_true",
+        help="Print output as JSON instead of table format",
+    )
+
     def execute(self) -> None:
         # TODO(dfridman): modify `get_tasks_list` to return a list of dicts in the first place
         data = get_tasks_list()
@@ -31,4 +40,95 @@ class Cmd:
         for task_data in data:
             assert len(task_data) == len(headers)
             supported_benchmarks.append(dict(zip(headers, task_data)))
-        print(json.dumps(supported_benchmarks, indent=2))
+
+        if self.json:
+            print(json.dumps({"tasks": supported_benchmarks}, indent=2))
+        else:
+            self._print_table(supported_benchmarks)
+
+    def _print_table(self, tasks: list[dict]) -> None:
+        """Print tasks grouped by harness and container in table format."""
+        if not tasks:
+            print("No tasks found.")
+            return
+
+        # Group tasks by harness and container
+        grouped = defaultdict(lambda: defaultdict(list))
+        for task in tasks:
+            harness = task["harness"]
+            container = task["container"]
+            grouped[harness][container].append(task)
+
+        # Print grouped tables
+        for i, (harness, containers) in enumerate(grouped.items()):
+            if i > 0:
+                print()  # Extra spacing between harnesses
+
+            for j, (container, container_tasks) in enumerate(containers.items()):
+                if j > 0:
+                    print()  # Spacing between containers
+
+                # Prepare task table first to get column widths
+                task_headers = ["task", "endpoint_type"]
+                rows = []
+                for task in container_tasks:
+                    rows.append([task["task"], task["endpoint_type"]])
+
+                # Sort tasks alphabetically for better readability
+                rows.sort(key=lambda x: x[0])
+
+                # Calculate column widths with some padding
+                widths = [
+                    max(len(task_headers[i]), max(len(str(row[i])) for row in rows)) + 2
+                    for i in range(len(task_headers))
+                ]
+
+                # Calculate minimum table width based on task columns
+                min_table_width = sum(widths) + len(widths) + 1
+
+                # Calculate required width for header content
+                harness_line = f"harness: {harness}"
+                container_line = f"container: {container}"
+                header_content_width = (
+                    max(len(harness_line), len(container_line)) + 4
+                )  # +4 for "| " and " |"
+
+                # Use the larger of the two widths
+                table_width = max(min_table_width, header_content_width)
+
+                # Print combined header with harness and container info
+                print("=" * table_width)
+                print(f"{harness_line}")
+                print(f"{container_line}")
+
+                # Adjust column widths to fill the full table width
+                available_width = table_width
+                # Give more space to the first column (task names can be long)
+                adjusted_widths = [
+                    max(
+                        widths[0], available_width * 2 // 3
+                    ),  # 2/3 of available width for task
+                    0,  # Will be calculated as remainder
+                ]
+                adjusted_widths[1] = (
+                    available_width - adjusted_widths[0]
+                )  # Remainder for endpoint_type
+
+                # Print task table header separator
+                print(" " * table_width)
+                header_row = f"{task_headers[0]:<{adjusted_widths[0]}}{task_headers[1]:<{adjusted_widths[1]}}"
+                print(header_row)
+                print("-" * table_width)
+
+                # Print task rows
+                for row in rows:
+                    data_row = f"{str(row[0]):<{adjusted_widths[0]}}{str(row[1]):<{adjusted_widths[1]}}"
+                    print(data_row)
+
+                print("-" * table_width)
+                # Show task count
+                task_count = len(rows)
+                print(f"  {task_count} task{'s' if task_count != 1 else ''} available")
+                print("=" * table_width)
+
+                print()

nemo_evaluator_launcher/cli/main.py

@@ -70,6 +70,9 @@ def create_parser() -> ArgumentParser:
     ls_parser = subparsers.add_parser(
         "ls", help="List resources", description="List tasks or runs"
     )
+    # Add arguments from `ls tasks` so that they work with `ls` as default alias
+    ls_parser.add_arguments(ls_tasks.Cmd, dest="tasks_alias")
+
     ls_sub = ls_parser.add_subparsers(dest="ls_command", required=False)
 
     # ls tasks (default)
@@ -126,12 +129,10 @@ def main() -> None:
         # Dispatch nested ls subcommands
         if args.ls_command is None or args.ls_command == "tasks":
             # Default to tasks when no subcommand specified
-            if hasattr(args, "tasks"):
-                args.tasks.execute()
+            if hasattr(args, "tasks_alias"):
+                args.tasks_alias.execute()
             else:
-                # Create default tasks command if not specified
-                tasks_cmd = ls_tasks.Cmd()
-                tasks_cmd.execute()
+                args.tasks.execute()
         elif args.ls_command == "runs":
             args.runs.execute()
     elif args.command == "export":

nemo_evaluator_launcher/package_info.py

@@ -16,8 +16,8 @@
 # Below is the _next_ version that will be published, not the currently published one.
 MAJOR = 0
 MINOR = 1
-PATCH = 0
-PRE_RELEASE = "rc9"
+PATCH = 1
+PRE_RELEASE = ""
 
 # Use the following formatting: (major, minor, patch, pre-release)
 VERSION = (MAJOR, MINOR, PATCH, PRE_RELEASE)

{nemo_evaluator_launcher-0.1.0rc9.dist-info → nemo_evaluator_launcher-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nemo-evaluator-launcher
-Version: 0.1.0rc9
+Version: 0.1.1
 Summary: Launcher for the evaluations provided by NeMo Evaluator containers with different runtime backends
 Author: NVIDIA
 Author-email: nemo-toolkit@nvidia.com

{nemo_evaluator_launcher-0.1.0rc9.dist-info → nemo_evaluator_launcher-0.1.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nemo_evaluator_launcher/__init__.py,sha256=2F703fttLaIyMHoVD54rptHMXt4AWnplHDrwWJ3e3PM,1930
-nemo_evaluator_launcher/package_info.py,sha256=KLjWJDLBpMYstxsDlVH-531ITGnE0n3a8uUZjECEtgE,1583
+nemo_evaluator_launcher/package_info.py,sha256=ge5Px1iAlNRX0GGWoCf58FwsJrEYBkZc1DqeCTYgur4,1580
 nemo_evaluator_launcher/api/__init__.py,sha256=U9q_MJK2vRsFaymanhyy0nD1SNAZQZC8oY45RXPX7ac,1024
 nemo_evaluator_launcher/api/functional.py,sha256=DbsM2nwSdUZFtP5Se4aACg4K8EHF0b2xsXX_VgItP8w,26711
 nemo_evaluator_launcher/api/types.py,sha256=RXr_QoKdhejj1T9-HybSjd4KTxJmSv0bE0uLUFtF7Zc,3269
@@ -9,8 +9,8 @@ nemo_evaluator_launcher/cli/export.py,sha256=lROUm4mTM67an0M9OrgoJB3txhebgyi6c9Y
 nemo_evaluator_launcher/cli/info.py,sha256=HUWQiVTyxVWDDkvcT-leosus3aa8Nq0Xl77xSTLqPss,3958
 nemo_evaluator_launcher/cli/kill.py,sha256=AzqD5WachyI1mVIa1D1PgtR0yRo2VQcKSxATOE8OrPQ,1253
 nemo_evaluator_launcher/cli/ls_runs.py,sha256=Ttgj7QR1iUmWwB_QGZwcnu1Z9wMJ2BenZMjFhqD9jwM,3788
-nemo_evaluator_launcher/cli/ls_tasks.py,sha256=acP3BXGMZhM3k6t-Xnp2-E-o2YE7Zzy1cm_feMe2tQQ,1319
-nemo_evaluator_launcher/cli/main.py,sha256=lUOWPZ6c7zVvbcl8QMTLlcp9FGxSN9ko5MZR0_g40lU,4926
+nemo_evaluator_launcher/cli/ls_tasks.py,sha256=TMj78z4ree6uVuwTI2jEDMRuUc-A0tRq2RB-wfHBwds,5223
+nemo_evaluator_launcher/cli/main.py,sha256=JgzHsfalEg1aK_v0h2EuzTIG14JgxLzfixmguW4Zkfg,4976
 nemo_evaluator_launcher/cli/run.py,sha256=X5UIdLy7mIpU-lQm6qBHqPX4IesIUriXg6uNYMz5HI8,5270
 nemo_evaluator_launcher/cli/status.py,sha256=AY8AKIKcBqKgkeRItnzB5Jh5jQS4GvtsVnieL4zASlQ,4138
 nemo_evaluator_launcher/cli/version.py,sha256=puMwIvkmfD3HESjftdTSP6T3Nc8J4cbz8uXWHJcTemY,2030
@@ -49,9 +49,9 @@ nemo_evaluator_launcher/exporters/registry.py,sha256=XsPTv_SBAFjcErO6BJ3OHqs3EvX
 nemo_evaluator_launcher/exporters/utils.py,sha256=uXH4b-Hk7_FQyLOjMRB0b3zK-Ksb2rGlSdc-oECfGHI,24756
 nemo_evaluator_launcher/exporters/wandb.py,sha256=xdaPNw0QM0jZo20UERbViy_vFT-HgbLYzTgmWaev_kk,13430
 nemo_evaluator_launcher/resources/mapping.toml,sha256=uOg4Y-gDXXskbbba2vuwJ5FLJ3W0kSZz7Fap_nJnFQc,11322
-nemo_evaluator_launcher-0.1.0rc9.dist-info/licenses/LICENSE,sha256=DyGb0fqHPZAsd_uXHA0DGcOCqsvrNsImuLC0Ts4s1zI,23413
-nemo_evaluator_launcher-0.1.0rc9.dist-info/METADATA,sha256=yS2uFRw3gyj_Gv6_vizKfEexFBPCNPVQyBLessX2f6k,28717
-nemo_evaluator_launcher-0.1.0rc9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nemo_evaluator_launcher-0.1.0rc9.dist-info/entry_points.txt,sha256=64z1T5GKSB9PW1fCENQuor6X6eqH1rcfg0NQGfKrEy8,130
-nemo_evaluator_launcher-0.1.0rc9.dist-info/top_level.txt,sha256=5PvawNm9TXKqPRjZita1xPOtFiMOipcoRf50FI1iY3s,24
-nemo_evaluator_launcher-0.1.0rc9.dist-info/RECORD,,
+nemo_evaluator_launcher-0.1.1.dist-info/licenses/LICENSE,sha256=DyGb0fqHPZAsd_uXHA0DGcOCqsvrNsImuLC0Ts4s1zI,23413
+nemo_evaluator_launcher-0.1.1.dist-info/METADATA,sha256=O_KXwNWNpchWPgyNyZavb_kKYC7gPK8-b1b3axlztf8,28714
+nemo_evaluator_launcher-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nemo_evaluator_launcher-0.1.1.dist-info/entry_points.txt,sha256=64z1T5GKSB9PW1fCENQuor6X6eqH1rcfg0NQGfKrEy8,130
+nemo_evaluator_launcher-0.1.1.dist-info/top_level.txt,sha256=5PvawNm9TXKqPRjZita1xPOtFiMOipcoRf50FI1iY3s,24
+nemo_evaluator_launcher-0.1.1.dist-info/RECORD,,