fixup! feat(platform): add 'for_organization' to list all runs of an org

Author: akunft

src/aignostics/application/_cli.py

@@ -19,6 +19,7 @@
     DEFAULT_GPU_TYPE,
     DEFAULT_MAX_GPUS_PER_SLIDE,
     DEFAULT_NODE_ACQUISITION_TIMEOUT_MINUTES,
+    ForbiddenException,
     NotFoundException,
     RunState,
 )
@@ -872,6 +873,13 @@ def run_list(  # noqa: PLR0913, PLR0917
     ] = None,
     query: Annotated[str | None, typer.Option(help="Optional query string to filter runs by note OR tags.")] = None,
     note_case_insensitive: Annotated[bool, typer.Option(help="Make note regex search case-insensitive.")] = True,
+    for_organization: Annotated[
+        str | None,
+        typer.Option(
+            "--for-organization",
+            help="Organization ID to list all runs for. Lists runs from all users in the organization.",
+        ),
+    ] = None,
     format: Annotated[  # noqa: A002
         str,
         typer.Option(help="Output format: 'text' (default) or 'json'"),
@@ -885,6 +893,7 @@ def run_list(  # noqa: PLR0913, PLR0917
             note_regex=note_regex,
             note_query_case_insensitive=note_case_insensitive,
             query=query,
+            for_organization=for_organization,
         )
         if len(runs) == 0:
             if format == "json":
@@ -894,6 +903,8 @@ def run_list(  # noqa: PLR0913, PLR0917
                     message = f"You did not yet create a run matching tags: {tags!r}."
                 elif note_regex:
                     message = f"You did not yet create a run matching note pattern: {note_regex!r}."
+                elif for_organization:
+                    message = f"No runs found for organization '{for_organization}'."
                 else:
                     message = "You did not yet create a run."
                 logger.warning(message)
@@ -908,6 +919,11 @@ def run_list(  # noqa: PLR0913, PLR0917
                 message = f"Listed '{len(runs)}' run(s)."
                 console.print(message, style="info")
             logger.debug(f"Listed '{len(runs)}' run(s).")
+    except ForbiddenException:
+        message = "Access denied: you are not authorized to list runs."
+        logger.warning(message)
+        console.print(f"[error]Error:[/error] {message}")
+        sys.exit(2)
     except Exception as e:
         logger.exception("Failed to list runs")
         console.print(f"[error]Error:[/error] Failed to list runs: {e}")

src/aignostics/application/_service.py

@@ -23,6 +23,7 @@
     ApplicationSummary,
     ApplicationVersion,
     Client,
+    ForbiddenException,
     InputArtifact,
     InputItem,
     NotFoundException,
@@ -533,6 +534,7 @@ def application_runs_static(  # noqa: PLR0913, PLR0917
         tags: set[str] | None = None,
         query: str | None = None,
         limit: int | None = None,
+        for_organization: str | None = None,
     ) -> list[dict[str, Any]]:
         """Get a list of all application runs, static variant.
 
@@ -551,6 +553,8 @@ def application_runs_static(  # noqa: PLR0913, PLR0917
                 If None, no filtering is applied. Cannot be used together with custom_metadata, note_regex, or tags.
                 Performs a union search: matches runs where the query appears in the note OR matches any tag.
             limit (int | None): The maximum number of runs to retrieve. If None, all runs are retrieved.
+            for_organization (str | None): If set, returns all runs triggered by users of the specified
+                organization. If None, only the runs of the current user are returned.
 
         Returns:
             list[RunData]: A list of all application runs.
@@ -587,6 +591,7 @@ def application_runs_static(  # noqa: PLR0913, PLR0917
                 tags=tags,
                 query=query,
                 limit=limit,
+                for_organization=for_organization,
             )
         ]
 
@@ -601,6 +606,7 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
         tags: set[str] | None = None,
         query: str | None = None,
         limit: int | None = None,
+        for_organization: str | None = None,
     ) -> list[RunData]:
         """Get a list of all application runs.
 
@@ -619,12 +625,15 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
                 If None, no filtering is applied. Cannot be used together with custom_metadata, note_regex, or tags.
                 Performs a union search: matches runs where the query appears in the note OR matches any tag.
             limit (int | None): The maximum number of runs to retrieve. If None, all runs are retrieved.
+            for_organization (str | None): If set, returns all runs triggered by users of the specified
+                organization. If None, only the runs of the current user are returned.
 
         Returns:
             list[RunData]: A list of all application runs.
 
         Raises:
             ValueError: If query is used together with custom_metadata, note_regex, or tags.
+            ForbiddenException: If the user is not authorized to list runs for the specified organization.
             RuntimeError: If the application run list cannot be retrieved.
         """
         # Validate that query is not used with other metadata filters
@@ -658,6 +667,7 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
                     custom_metadata=custom_metadata_note,
                     sort="-submitted_at",
                     page_size=page_size,
+                    for_organization=for_organization,
                 )
                 for run in note_run_iterator:
                     if has_output and run.output == RunOutput.NONE:
@@ -677,6 +687,7 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
                     custom_metadata=custom_metadata_tags,
                     sort="-submitted_at",
                     page_size=page_size,
+                    for_organization=for_organization,
                 )
                 for run in tag_run_iterator:
                     if has_output and run.output == RunOutput.NONE:
@@ -727,6 +738,7 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
                 custom_metadata=custom_metadata,
                 sort="-submitted_at",
                 page_size=page_size,
+                for_organization=for_organization,
             )
             for run in run_iterator:
                 if has_output and run.output == RunOutput.NONE:
@@ -766,6 +778,8 @@ def application_runs(  # noqa: C901, PLR0912, PLR0913, PLR0914, PLR0915, PLR0917
                 if limit is not None and len(runs) >= limit:
                     break
             return runs
+        except ForbiddenException:
+            raise
         except Exception as e:
             message = f"Failed to retrieve application runs: {e}"
             logger.exception(message)

src/aignostics/platform/__init__.py

@@ -10,7 +10,7 @@
 Higher level abstractions are provided in the application module.
 """
 
-from aignx.codegen.exceptions import ApiException, NotFoundException
+from aignx.codegen.exceptions import ApiException, ForbiddenException, NotFoundException
 from aignx.codegen.models import ApplicationReadResponse as Application
 from aignx.codegen.models import ApplicationReadShortResponse as ApplicationSummary
 from aignx.codegen.models import InputArtifact as InputArtifactData
@@ -147,6 +147,7 @@
     "ApplicationSummary",
     "ApplicationVersion",
     "Client",
+    "ForbiddenException",
     "InputArtifact",
     "InputArtifactData",
     "InputItem",

tests/aignostics/application/cli_test.py

@@ -807,6 +807,47 @@ def test_cli_run_list_verbose_limit_1(runner: CliRunner, record_property) -> Non
     assert displayed_count == 1, f"Expected listed count to be == 1, but got {displayed_count}"
 
 
+@pytest.mark.unit
+def test_cli_run_list_for_organization(runner: CliRunner) -> None:
+    """Check run list command passes --for-organization to service and shows org-specific empty message."""
+    with patch.object(ApplicationService, "application_runs", return_value=[]) as mock_method:
+        result = runner.invoke(cli, ["application", "run", "list", "--for-organization", "org-123"])
+        assert result.exit_code == 0
+        mock_method.assert_called_once()
+        assert mock_method.call_args[1]["for_organization"] == "org-123"
+        output = normalize_output(result.stdout)
+        assert "No runs found for organization 'org-123'" in output
+
+
+@pytest.mark.unit
+def test_cli_run_list_forbidden_with_organization(runner: CliRunner) -> None:
+    """Check ForbiddenException with --for-organization shows org-specific access denied message."""
+    from aignx.codegen.exceptions import ForbiddenException
+
+    with patch.object(
+        ApplicationService, "application_runs", side_effect=ForbiddenException(status=403, reason="Forbidden")
+    ):
+        result = runner.invoke(cli, ["application", "run", "list", "--for-organization", "secret-org"])
+        assert result.exit_code == 2
+        output = normalize_output(result.stdout)
+        assert "Access denied" in output
+        assert "secret-org" in output
+
+
+@pytest.mark.unit
+def test_cli_run_list_forbidden_without_organization(runner: CliRunner) -> None:
+    """Check ForbiddenException without --for-organization shows generic access denied message."""
+    from aignx.codegen.exceptions import ForbiddenException
+
+    with patch.object(
+        ApplicationService, "application_runs", side_effect=ForbiddenException(status=403, reason="Forbidden")
+    ):
+        result = runner.invoke(cli, ["application", "run", "list"])
+        assert result.exit_code == 2
+        output = normalize_output(result.stdout)
+        assert "Access denied: you are not authorized to list runs." in output
+
+
 # TODO(Andreas): This previously failed as invalid run id. Is it expected this now calls the API?
 @pytest.mark.e2e
 @pytest.mark.timeout(timeout=60)