ellf-cli 18.0.3__tar.gz → 18.0.6__tar.gz

{ellf_cli-18.0.3/ellf_cli.egg-info → ellf_cli-18.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 18.0.3
+Version: 18.0.6
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-18.0.3 → ellf_cli-18.0.6}/README.md

@@ -215,7 +215,7 @@ List the agents in a project. Uses your default project unless --project is give
 | Argument | Type | Description | Default |
 | --- | --- | --- | --- |
 | `--project` | `str` | Name, slug, or ID of agent's project or the last project if not set | `None` |
-| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'state'] | `['id', 'name', 'state']` |
+| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'state'] | `['id', 'name', 'state']` |
 | `--json` | `bool` | Output the result as JSON | `False` |
 
 #### `ellf agents info`
@@ -227,7 +227,7 @@ Print information about an agent on the cluster
 | `name_or_id` | `Union[str, UUID]` | Name or ID of the agent |  |
 | `--project` | `str` | Name, slug, or ID of agent's project or the last project if not set | `None` |
 | `--cluster` | `str` | Name, slug, or ID of the cluster to search for agent name (or the last cluster if not set) | `None` |
-| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user'] | `None` |
+| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user'] | `None` |
 | `--json` | `bool` | Output the result as JSON | `False` |
 
 #### `ellf agents logs`
@@ -1431,7 +1431,7 @@ List all users in the organization
 
 | Argument | Type | Description | Default |
 | --- | --- | --- | --- |
-| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role'] | `['id', 'name', 'email', 'role']` |
+| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role', 'status'] | `['id', 'name', 'email', 'role']` |
 | `--role` | `str` | Filter by role | `None` |
 | `--include-deactivated` | `bool` | Include deactivated users | `False` |
 | `--json` | `bool` | Output the result as JSON | `False` |
@@ -1505,7 +1505,7 @@ List pending invitations
 
 | Argument | Type | Description | Default |
 | --- | --- | --- | --- |
-| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'role'] | `['id', 'email', 'role', 'claimed']` |
+| `--select` | `list[str]` | Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'created_by_id', 'role'] | `['id', 'email', 'role', 'claimed']` |
 | `--all` | `bool` | Also include invitations that have already been claimed | `False` |
 | `--json` | `bool` | Output the result as JSON | `False` |
 

{ellf_cli-18.0.3 → ellf_cli-18.0.6}/ellf_cli/commands/users.py

@@ -10,6 +10,7 @@ from wasabi import msg
 from ellf_pam_sdk import Client as PamClient
 from ellf_pam_sdk.errors import EllfError
 from ellf_pam_sdk.models import (
+    AnnotatorType,
     InvitationDetail,
     InvitationReading,
     InvitationSummary,
@@ -34,6 +35,16 @@ from ._state import get_auth_state
 UserRoleName = Literal["admin", "developer", "annotator"]
 
 
+# What `users list` shows when nothing is asked for. Named because the command
+# adds to it when deactivated users are in the table, and can only tell that
+# the caller wants the default by comparing against it.
+DEFAULT_SELECT = ["id", "name", "email", "role"]
+
+
+def _status_of(user: Union[UserSummary, UserDetail]) -> str:
+    return "deactivated" if user.deactivated_at else "active"
+
+
 def _role_of(user: Union[UserSummary, UserDetail]) -> str:
     if user.is_org_admin:
         return "admin"
@@ -104,7 +115,7 @@ def _is_assigned(client: PamClient, task_id: UUID, user_id: UUID) -> bool:
     so ``is_added`` on a user row is what actually answers this.
     """
     return any(
-        a.id == user_id and a.is_added and a.annotator_type != "agent"
+        a.id == user_id and a.is_added and a.annotator_type != AnnotatorType.agent
         for a in client.task.users(task_id)
     )
 
@@ -116,7 +127,7 @@ def _is_assigned(client: PamClient, task_id: UUID, user_id: UUID) -> bool:
     select=Arg(
         "--select",
         help=Messages.select.format(
-            opts=builtins.list(UserSummary.model_fields) + ["role"]
+            opts=builtins.list(UserSummary.model_fields) + ["role", "status"]
         ),
     ),
     role=Arg("--role", help=Messages.filter_by.format(filter="role")),
@@ -127,7 +138,7 @@ def _is_assigned(client: PamClient, task_id: UUID, user_id: UUID) -> bool:
     # fmt: on
 )
 def list(
-    select: builtins.list[str] = ["id", "name", "email", "role"],
+    select: builtins.list[str] = DEFAULT_SELECT,
     role: Optional[UserRoleName] = None,
     include_deactivated: bool = False,
     as_json: bool = False,
@@ -137,7 +148,14 @@ def list(
     query = _role_query(role) if role is not None else UserReading()
     query.include_deactivated = include_deactivated
     items = builtins.list(client.user.all(query))
-    rows = [{**u.model_dump(), "role": _role_of(u)} for u in items]
+    rows = [
+        {**u.model_dump(), "role": _role_of(u), "status": _status_of(u)} for u in items
+    ]
+    # The status column earns its place only where the table can hold both
+    # kinds: without the flag every row reads "active", which is a column
+    # saying nothing. A caller who named their own columns keeps them.
+    if include_deactivated and select == DEFAULT_SELECT:
+        select = [*select, "status"]
     print_table_with_select(rows, select=select, as_json=as_json)
     return items
 

{ellf_cli-18.0.3 → ellf_cli-18.0.6}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "18.0.2",
+  "version": "18.0.5",
   "extra_key": "_extra",
   "commands": {
     "actions": {
@@ -1255,9 +1255,9 @@
             "id": "select",
             "option": "--select",
             "short": null,
-            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'state']",
+            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'state']",
             "default": "['id', 'name', 'state']",
-            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'state'] (list[str])",
+            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'state'] (list[str])",
             "action": null,
             "choices": null,
             "has_converter": true,
@@ -1329,9 +1329,9 @@
             "id": "select",
             "option": "--select",
             "short": null,
-            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user']",
+            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user']",
             "default": null,
-            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user'] (list[str])",
+            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'cluster_id', 'name', 'project_id', 'job_type', 'plan', 'cli_command', 'last_execution_started', 'icon', 'recipe_name', 'recipe_title', 'project_name', 'error', 'last_execution_id', 'related_tasks', 'created_by_user'] (list[str])",
             "action": null,
             "choices": null,
             "has_converter": true,
@@ -8401,9 +8401,9 @@
             "id": "select",
             "option": "--select",
             "short": null,
-            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role']",
+            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role', 'status']",
             "default": "['id', 'name', 'email', 'role']",
-            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role'] (list[str])",
+            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'name', 'org_id', 'org_name', 'person_id', 'email', 'avatar_url', 'locale', 'is_org_admin', 'is_org_developer', 'last_cluster_id', 'last_project_id', 'deactivated_at', 'role', 'status'] (list[str])",
             "action": null,
             "choices": null,
             "has_converter": true,
@@ -8801,9 +8801,9 @@
             "id": "select",
             "option": "--select",
             "short": null,
-            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'role']",
+            "orig_help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'created_by_id', 'role']",
             "default": "['id', 'email', 'role', 'claimed']",
-            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'role'] (list[str])",
+            "help": "Comma-separated fields to select and show in output. Available: ['id', 'created', 'updated', 'org_id', 'email', 'claimed', 'vars', 'created_by_id', 'role'] (list[str])",
             "action": null,
             "choices": null,
             "has_converter": true,

ellf_cli-18.0.6/ellf_cli/version/18.0.3_2026-09-13-12-32-46_patch_58e5ce3a-f2a7-4789-b2cd-5cc75c72b6ec

@@ -0,0 +1,3 @@
+18.0.3
+patch
+58e5ce3a-f2a7-4789-b2cd-5cc75c72b6ec

ellf_cli-18.0.6/ellf_cli/version/18.0.4_2026-09-13-12-45-14_patch_b6c79d55-8f85-4f47-a304-df52b122c38c

@@ -0,0 +1,3 @@
+18.0.4
+patch
+b6c79d55-8f85-4f47-a304-df52b122c38c

ellf_cli-18.0.6/ellf_cli/version/18.0.5_2026-09-13-14-11-18_patch_9b111116-5e62-472a-b72c-d1bbafa22c97

@@ -0,0 +1,3 @@
+18.0.5
+patch
+9b111116-5e62-472a-b72c-d1bbafa22c97

{ellf_cli-18.0.3 → ellf_cli-18.0.6/ellf_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ellf-cli
-Version: 18.0.3
+Version: 18.0.6
 Summary: Ellf Command Line Interface
 Home-page: https://prodi.gy
 Author: ExplosionAI GmbH

{ellf_cli-18.0.3 → ellf_cli-18.0.6}/ellf_cli.egg-info/SOURCES.txt

@@ -264,6 +264,9 @@ ellf_cli/version/17.0.207_2026-09-11-15-26-02_major_3f1b3ed7-eaac-41f5-b740-0af3
 ellf_cli/version/18.0.0_2026-09-12-10-01-10_patch_8995783a-a9fa-4c4e-90b3-6386a4c481eb
 ellf_cli/version/18.0.1_2026-09-12-17-33-30_patch_f6ea2c99-a715-4c4d-876a-23ed8c62a83d
 ellf_cli/version/18.0.2_2026-09-13-06-36-33_patch_176bb944-1c49-4dd3-a001-8fce908825a0
+ellf_cli/version/18.0.3_2026-09-13-12-32-46_patch_58e5ce3a-f2a7-4789-b2cd-5cc75c72b6ec
+ellf_cli/version/18.0.4_2026-09-13-12-45-14_patch_b6c79d55-8f85-4f47-a304-df52b122c38c
+ellf_cli/version/18.0.5_2026-09-13-14-11-18_patch_9b111116-5e62-472a-b72c-d1bbafa22c97
 ellf_cli/version/__init__.py
 ellf_cli/version/read_version.py
 tests/test_appdirs.py
@@ -311,4 +314,5 @@ tests/test_ui.py
 tests/test_ui_extras.py
 tests/test_usage_counts.py
 tests/test_users_assign.py
+tests/test_users_list.py
 tests/test_util.py

{ellf_cli-18.0.3 → ellf_cli-18.0.6}/tests/test_users_assign.py

@@ -8,7 +8,12 @@ import pytest
 
 from ellf_cli.commands import users as users_cmd
 from ellf_cli.errors import CLIError
-from ellf_pam_sdk.models import EmailReturning, TaskAnnotator, UserDetail
+from ellf_pam_sdk.models import (
+    AnnotatorType,
+    EmailReturning,
+    TaskAnnotator,
+    UserDetail,
+)
 
 
 def _user(*, admin: bool = False, developer: bool = False) -> UserDetail:
@@ -35,7 +40,7 @@ def _annotator(
     user_id: UUID,
     *,
     is_added: bool = True,
-    annotator_type: str = "user",
+    annotator_type: AnnotatorType = AnnotatorType.user,
 ) -> TaskAnnotator:
     return TaskAnnotator(
         id=user_id,
@@ -205,7 +210,9 @@ def test_unassign_does_not_match_an_agent_row(env):
     `ellf agents unassign`, so a same-id agent row must not stand in for a
     user assignment."""
     user = _user()
-    task_client, _ = env(user, [_annotator(user.id, annotator_type="agent")])
+    task_client, _ = env(
+        user, [_annotator(user.id, annotator_type=AnnotatorType.agent)]
+    )
 
     with pytest.raises(CLIError):
         users_cmd.unassign(user.email, task="ner-task")

ellf_cli-18.0.6/tests/test_users_list.py

@@ -0,0 +1,77 @@
+from datetime import datetime, timezone
+from types import SimpleNamespace
+from typing import Any
+from uuid import uuid4
+
+import pytest
+
+from ellf_cli.commands import users as users_cmd
+from ellf_pam_sdk.models import UserSummary
+
+
+def _user(name: str, *, deactivated: bool = False) -> UserSummary:
+    now = datetime.now(timezone.utc)
+    return UserSummary(
+        id=uuid4(),
+        created=now,
+        updated=now,
+        name=name,
+        org_id=uuid4(),
+        org_name="Explosion",
+        person_id=uuid4(),
+        email=f"{name.lower()}@example.com",
+        avatar_url="",
+        locale="en",
+        is_org_admin=False,
+        is_org_developer=False,
+        deactivated_at=now if deactivated else None,
+    )
+
+
+@pytest.fixture
+def listed(monkeypatch):
+    """Run `users list` against a fixed set of people, and capture the table."""
+    printed: dict[str, Any] = {}
+
+    def _run(users: list[UserSummary], **kwargs: Any) -> dict[str, Any]:
+        auth = SimpleNamespace(
+            client=SimpleNamespace(user=SimpleNamespace(all=lambda _query: users))
+        )
+        monkeypatch.setattr(users_cmd, "get_auth_state", lambda: auth)
+        monkeypatch.setattr(
+            users_cmd,
+            "print_table_with_select",
+            lambda rows, select, as_json: printed.update(rows=rows, select=select),
+        )
+        users_cmd.list(**kwargs)
+        return printed
+
+    return _run
+
+
+def test_listing_deactivated_users_says_which_they_are(listed):
+    """Both kinds are in the table, so a column has to tell them apart."""
+    printed = listed(
+        [_user("Ann"), _user("Bo", deactivated=True)], include_deactivated=True
+    )
+
+    assert printed["select"] == ["id", "name", "email", "role", "status"]
+    assert [row["status"] for row in printed["rows"]] == ["active", "deactivated"]
+
+
+def test_the_default_listing_spends_no_column_on_status(listed):
+    """Without the flag every row is active, and the column says nothing."""
+    printed = listed([_user("Ann")])
+
+    assert printed["select"] == ["id", "name", "email", "role"]
+
+
+def test_chosen_columns_are_left_alone(listed):
+    """Asking for columns is asking for those columns."""
+    printed = listed(
+        [_user("Ann", deactivated=True)],
+        include_deactivated=True,
+        select=["name", "email"],
+    )
+
+    assert printed["select"] == ["name", "email"]