ellf-cli 5.0.9__tar.gz → 5.0.18__tar.gz

{ellf_cli-5.0.9/ellf_cli.egg-info → ellf_cli-5.0.18}/PKG-INFO

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

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/about.json

@@ -1,7 +1,7 @@
 {
   "title": "Ellf CLI",
   "name": "ellf-cli",
-  "version": "5.0.9",
+  "version": "5.0.18",
   "summary": "Ellf Command Line Interface",
   "uri": "https://prodi.gy",
   "prog": "ellf",

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/auth.py

@@ -145,6 +145,9 @@ class AuthState(Protocol):
     @property
     def org_id(self) -> UUID: ...
 
+    @property
+    def user_id(self) -> UUID: ...
+
     @property
     def pam_host(self) -> str: ...
 
@@ -269,6 +272,21 @@ class AuthStateImpl:
             self._org_id = orgs[0].id
         return self._org_id
 
+    @property
+    def user_id(self) -> UUID:
+        """Extract the current user's UUID from the PAM api token.
+
+        Decoded from the JWT's ``uid`` claim (set by pam.tokens.encode_pam_token).
+        Reading from the token avoids a /v1/user/read round-trip for the
+        common case where a caller just wants to associate state with the
+        current user — e.g. persisting last_cluster_id after `clusters use`.
+        """
+        token = self.get_api_token()
+        uid = token.header.get("uid")
+        if uid is None:
+            raise EllfError(message="PAM token missing uid claim")
+        return UUID(uid)
+
     @property
     def pam_host(self) -> str:
         return self.pam_url.netloc

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/commands/clusters.py

@@ -33,6 +33,7 @@ from ..ui import print_info_table, print_mutation_result, print_table_with_selec
 from ..util import URL
 from ._cluster_select import select_cluster
 from ._state import get_auth_state, get_root_cfg, get_saved_settings
+from .general import persist_last_active_context
 
 
 def uuid7() -> uuid.UUID:
@@ -156,6 +157,9 @@ def use(
     settings.update("cluster_id", chosen.id)
     settings.save(get_root_cfg().saved_settings_path)
     auth.set_active_cluster(chosen.id, broker_url)
+    # Mirror to the user's PAM record so the web app — and other CLI
+    # sessions — see the same active cluster after an org switch.
+    persist_last_active_context(auth, last_cluster_id=chosen.id)
     print_mutation_result(
         {
             "status": "ok",

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/commands/config.py

@@ -16,7 +16,8 @@ from ..query import (
 )
 from ..ui import print_mutation_result
 from ..util import URL
-from ._state import get_root_cfg, get_saved_settings
+from ._state import get_auth_state, get_root_cfg, get_saved_settings
+from .general import persist_last_active_context
 
 
 @cli.subcommand(
@@ -53,6 +54,9 @@ def project(name_or_id: Union[str, UUID], as_json: bool = False) -> UUID:
     settings = get_saved_settings()
     settings.update("project", project_id)
     settings.save(root_cfg.saved_settings_path)
+    # Mirror to the user's PAM record so the web app — and other CLI
+    # sessions — see the same active project after an org switch.
+    persist_last_active_context(get_auth_state(), last_project_id=project_id)
     print_mutation_result(
         {"status": "ok", "project_id": str(project_id)},
         Messages.T019.format(noun="project", name=project_id),

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/commands/general.py

@@ -114,9 +114,36 @@ def _select_and_persist_cluster(
     settings.update("cluster_id", chosen.id)
     settings.save(get_root_cfg().saved_settings_path)
     auth.set_active_cluster(chosen.id, broker_url)
+    persist_last_active_context(auth, last_cluster_id=chosen.id)
     return chosen.id
 
 
+def persist_last_active_context(
+    auth: AuthState,
+    *,
+    last_cluster_id: Optional[UUID] = None,
+    last_project_id: Optional[UUID] = None,
+) -> None:
+    """Mirror local cluster/project state into the user's PAM record.
+
+    The web app reads ``User.last_cluster_id`` / ``last_project_id`` to
+    restore context after org switches, and the CLI persists here so a
+    web session that follows a ``clusters use`` lands on the same
+    cluster.
+    """
+    from ellf_pam_sdk.models import UserUpdating
+
+    if last_cluster_id is None and last_project_id is None:
+        return
+    auth.client.user.update(
+        UserUpdating(
+            id=auth.user_id,
+            last_cluster_id=last_cluster_id,
+            last_project_id=last_project_id,
+        )
+    )
+
+
 @cli.command("info", field=Arg(help=Messages.select_field))
 def info(field: Optional[Literal["config-dir", "code", "defaults"]] = None) -> Any:
     """Print information about the CLI"""

{ellf_cli-5.0.9 → ellf_cli-5.0.18}/ellf_cli/ellf.json

@@ -1,7 +1,7 @@
 {
   "prog": "ellf",
   "help": "Ellf Command Line Interface.",
-  "version": "5.0.8",
+  "version": "5.0.17",
   "extra_key": "_extra",
   "commands": {
     "actions": {
@@ -217,7 +217,7 @@
           "orig_type": "bool"
         }
       ],
-      "description": "\n    Log in to your Ellf account. You normally don't need to call this\n    manually. It will automatically authenticate when needed.\n    ",
+      "description": "\nLog in to your Ellf account. You normally don't need to call this\nmanually. It will automatically authenticate when needed.\n",
       "allow_extra": false,
       "parent": null,
       "is_placeholder": false
@@ -270,7 +270,7 @@
           "orig_type": "Literal[api, cluster, id, ci]"
         }
       ],
-      "description": "\n    Return an auth token for the current user\n    ",
+      "description": "\nReturn an auth token for the current user\n",
       "allow_extra": false,
       "parent": null,
       "is_placeholder": false
@@ -346,7 +346,7 @@
           "orig_type": "list[Literal[tasks, actions, assets, datasets, paths]]"
         }
       ],
-      "description": "\n    Save the state of the current app JSON file. If an assets directory is\n    provided, assets will be downloaded and referenced in the JSON accordingly.\n    ",
+      "description": "\nSave the state of the current app JSON file. If an assets directory is\nprovided, assets will be downloaded and referenced in the JSON accordingly.\n",
       "allow_extra": false,
       "parent": null,
       "is_placeholder": false
@@ -381,7 +381,7 @@
           "orig_type": "bool"
         }
       ],
-      "description": "\n    Populate Ellf with data for projects, tasks, actions, assets and paths.\n    ",
+      "description": "\nPopulate Ellf with data for projects, tasks, actions, assets and paths.\n",
       "allow_extra": false,
       "parent": null,
       "is_placeholder": false
@@ -458,7 +458,7 @@
             "orig_type": "List[str]"
           }
         ],
-        "description": "\n    Create a new action. The available action recipes are fetched from your\n    cluster and are added as dynamic subcommands. You can see more details\n    and available arguments by calling the subcommand with --help, e.g. create\n    [name] --help\n    ",
+        "description": "\nCreate a new action. The available action recipes are fetched from your\ncluster and are added as dynamic subcommands. You can see more details\nand available arguments by calling the subcommand with --help, e.g. create\n[name] --help\n",
         "allow_extra": true,
         "parent": "actions",
         "is_placeholder": false
@@ -493,7 +493,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    List the actions on the cluster. By default, this includes their ID, name\n    and current state, e.g. created or completed\n    ",
+        "description": "\nList the actions on the cluster. By default, this includes their ID, name\nand current state, e.g. created or completed\n",
         "allow_extra": false,
         "parent": "actions",
         "is_placeholder": false
@@ -939,7 +939,7 @@
             "orig_type": "List[str]"
           }
         ],
-        "description": "\n    Create a new agent. The available agent recipes are fetched from your\n    cluster and are added as dynamic subcommands. You can see more details\n    and available arguments by calling the subcommand with --help, e.g. create\n    [name] --help\n    ",
+        "description": "\nCreate a new agent. The available agent recipes are fetched from your\ncluster and are added as dynamic subcommands. You can see more details\nand available arguments by calling the subcommand with --help, e.g. create\n[name] --help\n",
         "allow_extra": true,
         "parent": "agents",
         "is_placeholder": false
@@ -1048,7 +1048,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    List the agents on the cluster. By default, this includes their ID, name\n    and current state, e.g. created or completed\n    ",
+        "description": "\nList the agents on the cluster. By default, this includes their ID, name\nand current state, e.g. created or completed\n",
         "allow_extra": false,
         "parent": "agents",
         "is_placeholder": false
@@ -1542,7 +1542,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    Get detailed info for an asset uploaded to the cluster and registered\n    with Ellf\n    ",
+        "description": "\nGet detailed info for an asset uploaded to the cluster and registered\nwith Ellf\n",
         "allow_extra": false,
         "parent": "assets",
         "is_placeholder": false
@@ -1642,7 +1642,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    Create an asset on the cluster and register it with Ellf. Assets\n    point to files or directories you control. The Ellf server only has\n    a reference to them. This command doesn't transfer any data. See `ellf files`\n    for utilities to transfer files to and from your cluster\n    ",
+        "description": "\nCreate an asset on the cluster and register it with Ellf. Assets\npoint to files or directories you control. The Ellf server only has\na reference to them. This command doesn't transfer any data. See `ellf files`\nfor utilities to transfer files to and from your cluster\n",
         "allow_extra": false,
         "parent": "assets",
         "is_placeholder": false
@@ -1713,7 +1713,7 @@
       "import": {
         "name": "import",
         "args": [],
-        "description": "Read a serialised FileSecrets blob from stdin and write it to\n    the local secrets file.\n\n    Counterpart to ``ellf auth push``. Existing local auth state is\n    overwritten; the file is written 0600 by FileSecrets.save.\n    ",
+        "description": "Read a serialised FileSecrets blob from stdin and write it to\nthe local secrets file.\n\nCounterpart to ``ellf auth push``. Existing local auth state is\noverwritten; the file is written 0600 by FileSecrets.save.\n",
         "allow_extra": false,
         "parent": "auth",
         "is_placeholder": false
@@ -1748,7 +1748,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "Push local auth state to a remote machine via SSH.\n\n    Reads the local FileSecrets, JSON-serialises it, and pipes it to\n    ``<remote_ellf> auth import`` over an SSH connection to *host*.\n    Authentication is delegated to ssh \u2014 anything in your ssh config\n    (host aliases, ProxyJump, key-based auth) just works.\n\n    The pushed blob includes id_token, api_token, and any cached\n    broker_tokens. id_token expiry is dictated by the issuer (typically\n    ~1h), so this is a \"give the remote a usable session\" operation,\n    not a permanent provisioning. Re-run when the token expires.\n    ",
+        "description": "Push local auth state to a remote machine via SSH.\n\nReads the local FileSecrets, JSON-serialises it, and pipes it to\n``<remote_ellf> auth import`` over an SSH connection to *host*.\nAuthentication is delegated to ssh \u2014 anything in your ssh config\n(host aliases, ProxyJump, key-based auth) just works.\n\nThe pushed blob includes id_token, api_token, and any cached\nbroker_tokens. id_token expiry is dictated by the issuer (typically\n~1h), so this is a \"give the remote a usable session\" operation,\nnot a permanent provisioning. Re-run when the token expires.\n",
         "allow_extra": false,
         "parent": "auth",
         "is_placeholder": false
@@ -1820,7 +1820,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "Switch the active cluster.\n\n    Looks up the cluster by name or ID via PAM. With no argument and\n    multiple clusters available, prompts interactively in a TTY.\n    ",
+        "description": "Switch the active cluster.\n\nLooks up the cluster by name or ID via PAM. With no argument and\nmultiple clusters available, prompts interactively in a TTY.\n",
         "allow_extra": false,
         "parent": "clusters",
         "is_placeholder": false
@@ -1951,7 +1951,7 @@
             "orig_type": "Union[str, UUID]"
           }
         ],
-        "description": "\n    Delete a cluster from PAM. This only removes PAM's record\n    of it. The cluster itself will continue to exist - you need\n    to shut it down separately.\n    ",
+        "description": "\nDelete a cluster from PAM. This only removes PAM's record\nof it. The cluster itself will continue to exist - you need\nto shut it down separately.\n",
         "allow_extra": false,
         "parent": "clusters",
         "is_placeholder": false
@@ -2038,7 +2038,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "Check the health of a cluster deployment.\n\n    Runs CLI-side connectivity checks against the cluster and PAM.\n    Use --deep (or supply --s3-bucket / --nfs-path / --recipe) to also\n    trigger cluster-side deployment checks via the broker's /v1/check\n    endpoints (K8s API, NFS, S3, recipe execution, DB).\n    ",
+        "description": "Check the health of a cluster deployment.\n\nRuns CLI-side connectivity checks against the cluster and PAM.\nUse --deep (or supply --s3-bucket / --nfs-path / --recipe) to also\ntrigger cluster-side deployment checks via the broker's /v1/check\nendpoints (K8s API, NFS, S3, recipe execution, DB).\n",
         "allow_extra": false,
         "parent": "clusters",
         "is_placeholder": false
@@ -2121,7 +2121,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "Rotate the cluster RSA keypair.\n\n    Generates a new keypair, updates the cluster record in PAM with the\n    new public key, patches the K8s secret with the new private key,\n    and restarts the cluster deployment.\n    ",
+        "description": "Rotate the cluster RSA keypair.\n\nGenerates a new keypair, updates the cluster record in PAM with the\nnew public key, patches the K8s secret with the new private key,\nand restarts the cluster deployment.\n",
         "allow_extra": false,
         "parent": "clusters",
         "is_placeholder": false
@@ -2871,7 +2871,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "Export all the examples from a dataset and save it in the designated file as\n    JSONL (newline-delimited JSON).\n    ",
+        "description": "Export all the examples from a dataset and save it in the designated file as\nJSONL (newline-delimited JSON).\n",
         "allow_extra": false,
         "parent": "datasets",
         "is_placeholder": false
@@ -3306,7 +3306,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "Deploy or upgrade the Ellf Helm chart.\n\n    Creates the namespace, image pull secret, cluster keypair secret,\n    then runs helm upgrade --install with the provided values.\n    ",
+        "description": "Deploy or upgrade the Ellf Helm chart.\n\nCreates the namespace, image pull secret, cluster keypair secret,\nthen runs helm upgrade --install with the provided values.\n",
         "allow_extra": false,
         "parent": "infra",
         "is_placeholder": false
@@ -3550,7 +3550,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "Install cluster infrastructure prerequisites (Traefik, cert-manager).\n\n    These operations are idempotent and safe to re-run.\n    ",
+        "description": "Install cluster infrastructure prerequisites (Traefik, cert-manager).\n\nThese operations are idempotent and safe to re-run.\n",
         "allow_extra": false,
         "parent": "infra",
         "is_placeholder": false
@@ -3833,7 +3833,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "Manage TLS certificates for local cluster access.\n\n    Use --self-signed when you have direct kubectl access to the cluster.\n    Use --setup HOST to do everything from your laptop over SSH.\n    Use --trust HOST to fetch and install an existing CA from a remote cluster.\n    ",
+        "description": "Manage TLS certificates for local cluster access.\n\nUse --self-signed when you have direct kubectl access to the cluster.\nUse --setup HOST to do everything from your laptop over SSH.\nUse --trust HOST to fetch and install an existing CA from a remote cluster.\n",
         "allow_extra": false,
         "parent": "infra",
         "is_placeholder": false
@@ -3857,7 +3857,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "\n    Run a job directly on the cluster from a YAML spec file, bypassing PAM.\n    ",
+        "description": "\nRun a job directly on the cluster from a YAML spec file, bypassing PAM.\n",
         "allow_extra": false,
         "parent": "jobs",
         "is_placeholder": false
@@ -4935,7 +4935,7 @@
             "orig_type": "str"
           }
         ],
-        "description": "\n    Upload and advertise a recipes package from your Python environment.\n    ",
+        "description": "\nUpload and advertise a recipes package from your Python environment.\n",
         "allow_extra": false,
         "parent": "publish",
         "is_placeholder": false
@@ -5048,7 +5048,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    Transfer data to the cluster, and advertise it to Ellf.\n\n    These steps can also be done separately. See `ellf files` to transfer\n    data to the cluster without creating an Asset record for it, and\n    `ellf assets create` to create an Asset without transfer.\n    ",
+        "description": "\nTransfer data to the cluster, and advertise it to Ellf.\n\nThese steps can also be done separately. See `ellf files` to transfer\ndata to the cluster without creating an Asset record for it, and\n`ellf assets create` to create an Asset without transfer.\n",
         "allow_extra": false,
         "parent": "publish",
         "is_placeholder": false
@@ -5721,7 +5721,7 @@
             "orig_type": "List[str]"
           }
         ],
-        "description": "\n    Create a new task. The available task recipes are fetched from your\n    cluster and are added as dynamic subcommands. You can see more details\n    and available arguments by calling the subcommand with --help, e.g. create\n    [name] --help\n    ",
+        "description": "\nCreate a new task. The available task recipes are fetched from your\ncluster and are added as dynamic subcommands. You can see more details\nand available arguments by calling the subcommand with --help, e.g. create\n[name] --help\n",
         "allow_extra": true,
         "parent": "tasks",
         "is_placeholder": false
@@ -5756,7 +5756,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "\n    List the tasks on the cluster. By default, this includes their ID, name\n    and current state, e.g. created or completed\n    ",
+        "description": "\nList the tasks on the cluster. By default, this includes their ID, name\nand current state, e.g. created or completed\n",
         "allow_extra": false,
         "parent": "tasks",
         "is_placeholder": false
@@ -6187,7 +6187,7 @@
             "orig_type": "bool"
           }
         ],
-        "description": "Fetch a batch of questions from a running annotation task.\n\n    Mirrors the web app: asks the broker for a Prodigy login token, then talks\n    to the task pod directly via its public task_url. Note that requesting a\n    batch reserves those questions for this CLI's session \u2014 they will not be\n    handed to other annotators until they are answered or another session\n    runs out of work and steals them.\n    ",
+        "description": "Fetch a batch of questions from a running annotation task.\n\nMirrors the web app: asks the broker for a Prodigy login token, then talks\nto the task pod directly via its public task_url. Note that requesting a\nbatch reserves those questions for this CLI's session \u2014 they will not be\nhanded to other annotators until they are answered or another session\nruns out of work and steals them.\n",
         "allow_extra": false,
         "parent": "tasks",
         "is_placeholder": false

{ellf_cli-5.0.9 → ellf_cli-5.0.18/ellf_cli.egg-info}/PKG-INFO

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