envloop-cli 1.16.0__tar.gz → 1.23.0__tar.gz

{envloop_cli-1.16.0 → envloop_cli-1.23.0}/.gitignore

@@ -9,3 +9,4 @@ dist/
 
 # Local runtime output from offline platform API contract fixtures.
 .envplatform/
+.superpowers/

envloop_cli-1.16.0/README.pypi.md → envloop_cli-1.23.0/PKG-INFO

@@ -1,3 +1,23 @@
+Metadata-Version: 2.5
+Name: envloop-cli
+Version: 1.23.0
+Summary: EnvLoop CLI and Python SDK for jobs, training, checkpoints and inference
+Project-URL: Homepage, https://envloop.ai
+Project-URL: Documentation, https://docs.envloop.ai
+Project-URL: Repository, https://github.com/EnvLoop/envloop-cli
+Project-URL: Issues, https://github.com/EnvLoop/envloop-cli/issues
+Project-URL: Agent instructions, https://docs.envloop.ai/skill.md
+Requires-Python: >=3.12
+Requires-Dist: envloop-cli-experiment==1.23.0
+Provides-Extra: data
+Requires-Dist: envloop-cli-data==1.23.0; extra == 'data'
+Provides-Extra: default
+Provides-Extra: experiment
+Requires-Dist: envloop-cli-experiment==1.23.0; extra == 'experiment'
+Provides-Extra: rsi-loop
+Requires-Dist: envloop-cli-rsi-loop==1.23.0; extra == 'rsi-loop'
+Description-Content-Type: text/markdown
+
 # envloop-cli: EnvLoop CLI and Python SDK
 
 Install the public client to run agent Jobs, inspect Trials, manage training and
@@ -17,14 +37,25 @@ installation alone does not establish those prerequisites. See the
 
 ## Install
 
-Use a Python virtual environment:
+envloop-cli requires Python 3.12 or later; an existing compatible interpreter can
+be reused. The following [uv](https://docs.astral.sh/uv/) example uses Python 3.12:
 
 ```bash
-python -m pip install --upgrade envloop-cli
+uv tool install --python 3.12 envloop-cli
+el --version    # upgrade later with: uv tool upgrade --python 3.12 envloop-cli
 el --help
 ```
 
-The standard installation includes the client dependencies for managed training.
+To use the Python SDK, install the package into a Python 3.12+ virtual environment:
+
+```bash
+uv venv --python 3.12
+uv pip install --upgrade envloop-cli
+# or, with an existing Python 3.12 interpreter:
+python3.12 -m pip install --upgrade envloop-cli
+```
+
+In this source candidate the bare installation and `default` include experiment: Jobs, Trials, training, logs and inference calls. Data resources require `data`; RSI Loop controls require `rsi-loop`. This source change is not a claim that the modular packages have been published.
 Check that the SDK can be imported:
 
 ```bash
@@ -37,6 +68,19 @@ follow the [managed training guide](https://docs.envloop.ai/training/cli-hello-w
 
 Install the client in your Python environment; the platform provides the execution resources.
 
+## Optional features (source candidate)
+
+The current source candidate uses independent feature wheels at version 1.23.0. Matching modular distributions and public ANS core must be released before using this contract from a public index:
+
+```bash
+python -m pip install "envloop-cli[data]"        # Dataset/Data/Runner/Checkpoint/Profile/Recipe
+python -m pip install envloop-cli               # Includes Job/Trial/logs/inference
+python -m pip install "envloop-cli[experiment]"  # Explicit spelling of the default installation
+python -m pip install "envloop-cli[rsi-loop]"    # Existing job run paths; includes experiment
+```
+
+`envloop-cli[default]` equals the bare installation: base plus `envloop-cli-experiment==1.23.0`, delivered as separate wheels. Only base owns the `el`/`envloop` scripts. Feature resources load on access; absent optional features report installation guidance. The default installation uses standard-library verified TLS and system CA configuration, without EnvHub or certifi. The examples below require their corresponding feature packages and an authorized matching platform.
+
 ## Connect
 
 Use an authorized EnvLoop account and project. Browser authorization:
@@ -112,7 +156,7 @@ cleaning up temporary resources.
 
 ## Sandbox jobs
 
-With a matching platform and a published `envhub/base` ANS Runner, submit a
+With a matching platform and a published `envloop/base` ANS Runner, submit a
 Sandbox Job without a Dataset:
 
 ```bash
@@ -122,7 +166,7 @@ el job list --type sandbox
 el job log JOB_ID --follow
 ```
 
-The platform resolves `base` to the registered `envhub/base@main` source ref and
+The platform resolves `base` to the registered `envloop/base@main` source ref and
 freezes its immutable Revision. The Sandbox image defaults to `python:3.11`;
 `--image` accepts an image name, tag or digest. The execution provider is configured
 by the server. Job logs retain the actual captured output and collection metadata.
@@ -178,8 +222,8 @@ Choose a published Runner readable in your project. Save this request as `gpu-ru
 {
   "request_id": "gpu-run-001",
   "trials": [
-    {"name": "first", "spec": {"runner": "envhub/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}},
-    {"name": "second", "spec": {"runner": "envhub/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}}
+    {"name": "first", "spec": {"runner": "envloop/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}},
+    {"name": "second", "spec": {"runner": "envloop/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}}
   ]
 }
 ```
@@ -191,7 +235,7 @@ el job log JOB_ID --follow
 el job result JOB_ID
 ```
 
-Replace `JOB_ID` with the returned value. The example has two independent Trials, each requesting four H100 GPUs: concurrent execution needs eight GPUs. Capacity and budget determine actual concurrency. Startup and execution are billable; check the Runner requirements, project `training.run` permission and [training prices](https://docs.envloop.ai/pricing) first. Reduce the Trial or GPU count when your program supports a smaller first run.
+Replace `JOB_ID` with the returned value. The example has two independent Trials, each requesting four H100 GPUs: concurrent execution needs eight GPUs. Capacity and budget determine actual concurrency. Startup and execution are billable; check the Runner requirements, project `training.run` permission, and applicable prices and balance in your authorized Console account first. Reduce the Trial or GPU count when your program supports a smaller first run. The [usage guide](https://docs.envloop.ai/manage/usage) explains resource observations.
 
 The request file does not depend on GPU shortcut flags. If `el job submit --help` lists both `--trails` and `--gput-type`, you can instead use the shortcuts in [GPU Runner training](https://docs.envloop.ai/training/runner). Choose one submission method to avoid duplicate runs. The SDK accepts the same dictionary through `client.training_jobs.submit(request)`.
 
@@ -226,3 +270,25 @@ with Client.remote() as client:
 Use the exact model returned by the Job. The SDK forwards the payload to the
 Job's `/Inference/decision` API; the approved plugin validates its business fields.
 Availability requires matching platform support and approved content in your project.
+
+## ANS data and verified downloads
+
+`client.data.download_directory(uri, destination)` and `el data download URI --output ./content`
+download a complete registered ANS object directory through EnvHub. Datasets require
+`split="lite"` / `--split lite`; the Dataset version and filenames are preserved. After API
+authorization the SDK uses GET URLs valid for up to five minutes, verifies file size/SHA-256,
+and installs the directory atomically. Matching platform support is required.
+
+A compatible server and an explicitly granted project Key with `envloop:data:read` are required; writes additionally need `envloop:data:write`. Default and older Keys do not gain these permissions. The current login selects the base URL, workspace and project; there is no `--env` flag. After configuring the Key using `el auth config`:
+
+```bash
+el data list --type dataset --json
+el data get DATA_ID --json
+el data download DATA_ID --file FILE_ID --output ./dataset.tgz --resume --json
+```
+
+Unified ANS CRUD supports Dataset, Runner, Recipe and HF model Checkpoint registrations through `el data` and `client.data`. Dataset/Runner/Recipe creation requires a native immutable `--ref`, `--manifest` and exact `--directory`. HF metadata registration uses `el data create --type checkpoint --model namespace/model --revision FULL_COMMIT`; SDK uses `create(kind="checkpoint", model=..., revision=...)`. HF weights are not downloaded, and artifact imports do not establish Model or Job checkpoint provenance.
+
+Success follows native storage and original catalog readback and returns an `ans_` identity. Update publishes an explicit new revision. Delete checks active and unknown dependencies; Runner deletion covers all revisions. Historical bytes and quota usage remain. Commands default to the current login base URL/workspace/project, with no `--env`. Both Data grants and the corresponding resource capabilities are required.
+
+Read methods include `list/get/files/open/download`; `client.recipes.list/get` queries the original Recipe catalog. Downloads verify size/SHA-256 and refuse existing destinations, symlinks and storage redirects. Large payloads use multipart with stable idempotency keys. Staging `pub_` IDs and failure phases support retry; they are not native success. Matching client/server support is required. See the [Data reference](https://docs.envloop.ai/reference/cli#data-commands).

envloop_cli-1.16.0/PKG-INFO → envloop_cli-1.23.0/README.pypi.md

@@ -1,17 +1,3 @@
-Metadata-Version: 2.5
-Name: envloop-cli
-Version: 1.16.0
-Summary: EnvLoop CLI and Python SDK for jobs, training, checkpoints and inference
-Project-URL: Homepage, https://envloop.ai
-Project-URL: Documentation, https://docs.envloop.ai
-Project-URL: Repository, https://github.com/EnvLoop/envloop-cli
-Project-URL: Issues, https://github.com/EnvLoop/envloop-cli/issues
-Project-URL: Agent instructions, https://docs.envloop.ai/skill.md
-Requires-Python: >=3.11
-Requires-Dist: certifi>=2026.10.19
-Requires-Dist: tinker==0.34.0
-Description-Content-Type: text/markdown
-
 # envloop-cli: EnvLoop CLI and Python SDK
 
 Install the public client to run agent Jobs, inspect Trials, manage training and
@@ -31,14 +17,25 @@ installation alone does not establish those prerequisites. See the
 
 ## Install
 
-Use a Python virtual environment:
+envloop-cli requires Python 3.12 or later; an existing compatible interpreter can
+be reused. The following [uv](https://docs.astral.sh/uv/) example uses Python 3.12:
 
 ```bash
-python -m pip install --upgrade envloop-cli
+uv tool install --python 3.12 envloop-cli
+el --version    # upgrade later with: uv tool upgrade --python 3.12 envloop-cli
 el --help
 ```
 
-The standard installation includes the client dependencies for managed training.
+To use the Python SDK, install the package into a Python 3.12+ virtual environment:
+
+```bash
+uv venv --python 3.12
+uv pip install --upgrade envloop-cli
+# or, with an existing Python 3.12 interpreter:
+python3.12 -m pip install --upgrade envloop-cli
+```
+
+In this source candidate the bare installation and `default` include experiment: Jobs, Trials, training, logs and inference calls. Data resources require `data`; RSI Loop controls require `rsi-loop`. This source change is not a claim that the modular packages have been published.
 Check that the SDK can be imported:
 
 ```bash
@@ -51,6 +48,19 @@ follow the [managed training guide](https://docs.envloop.ai/training/cli-hello-w
 
 Install the client in your Python environment; the platform provides the execution resources.
 
+## Optional features (source candidate)
+
+The current source candidate uses independent feature wheels at version 1.23.0. Matching modular distributions and public ANS core must be released before using this contract from a public index:
+
+```bash
+python -m pip install "envloop-cli[data]"        # Dataset/Data/Runner/Checkpoint/Profile/Recipe
+python -m pip install envloop-cli               # Includes Job/Trial/logs/inference
+python -m pip install "envloop-cli[experiment]"  # Explicit spelling of the default installation
+python -m pip install "envloop-cli[rsi-loop]"    # Existing job run paths; includes experiment
+```
+
+`envloop-cli[default]` equals the bare installation: base plus `envloop-cli-experiment==1.23.0`, delivered as separate wheels. Only base owns the `el`/`envloop` scripts. Feature resources load on access; absent optional features report installation guidance. The default installation uses standard-library verified TLS and system CA configuration, without EnvHub or certifi. The examples below require their corresponding feature packages and an authorized matching platform.
+
 ## Connect
 
 Use an authorized EnvLoop account and project. Browser authorization:
@@ -126,7 +136,7 @@ cleaning up temporary resources.
 
 ## Sandbox jobs
 
-With a matching platform and a published `envhub/base` ANS Runner, submit a
+With a matching platform and a published `envloop/base` ANS Runner, submit a
 Sandbox Job without a Dataset:
 
 ```bash
@@ -136,7 +146,7 @@ el job list --type sandbox
 el job log JOB_ID --follow
 ```
 
-The platform resolves `base` to the registered `envhub/base@main` source ref and
+The platform resolves `base` to the registered `envloop/base@main` source ref and
 freezes its immutable Revision. The Sandbox image defaults to `python:3.11`;
 `--image` accepts an image name, tag or digest. The execution provider is configured
 by the server. Job logs retain the actual captured output and collection metadata.
@@ -192,8 +202,8 @@ Choose a published Runner readable in your project. Save this request as `gpu-ru
 {
   "request_id": "gpu-run-001",
   "trials": [
-    {"name": "first", "spec": {"runner": "envhub/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}},
-    {"name": "second", "spec": {"runner": "envhub/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}}
+    {"name": "first", "spec": {"runner": "envloop/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}},
+    {"name": "second", "spec": {"runner": "envloop/bash@FULL_COMMIT", "resources": {"gpu_type": "H100", "gpus": 4}, "timeout_sec": 600}}
   ]
 }
 ```
@@ -205,7 +215,7 @@ el job log JOB_ID --follow
 el job result JOB_ID
 ```
 
-Replace `JOB_ID` with the returned value. The example has two independent Trials, each requesting four H100 GPUs: concurrent execution needs eight GPUs. Capacity and budget determine actual concurrency. Startup and execution are billable; check the Runner requirements, project `training.run` permission and [training prices](https://docs.envloop.ai/pricing) first. Reduce the Trial or GPU count when your program supports a smaller first run.
+Replace `JOB_ID` with the returned value. The example has two independent Trials, each requesting four H100 GPUs: concurrent execution needs eight GPUs. Capacity and budget determine actual concurrency. Startup and execution are billable; check the Runner requirements, project `training.run` permission, and applicable prices and balance in your authorized Console account first. Reduce the Trial or GPU count when your program supports a smaller first run. The [usage guide](https://docs.envloop.ai/manage/usage) explains resource observations.
 
 The request file does not depend on GPU shortcut flags. If `el job submit --help` lists both `--trails` and `--gput-type`, you can instead use the shortcuts in [GPU Runner training](https://docs.envloop.ai/training/runner). Choose one submission method to avoid duplicate runs. The SDK accepts the same dictionary through `client.training_jobs.submit(request)`.
 
@@ -240,3 +250,25 @@ with Client.remote() as client:
 Use the exact model returned by the Job. The SDK forwards the payload to the
 Job's `/Inference/decision` API; the approved plugin validates its business fields.
 Availability requires matching platform support and approved content in your project.
+
+## ANS data and verified downloads
+
+`client.data.download_directory(uri, destination)` and `el data download URI --output ./content`
+download a complete registered ANS object directory through EnvHub. Datasets require
+`split="lite"` / `--split lite`; the Dataset version and filenames are preserved. After API
+authorization the SDK uses GET URLs valid for up to five minutes, verifies file size/SHA-256,
+and installs the directory atomically. Matching platform support is required.
+
+A compatible server and an explicitly granted project Key with `envloop:data:read` are required; writes additionally need `envloop:data:write`. Default and older Keys do not gain these permissions. The current login selects the base URL, workspace and project; there is no `--env` flag. After configuring the Key using `el auth config`:
+
+```bash
+el data list --type dataset --json
+el data get DATA_ID --json
+el data download DATA_ID --file FILE_ID --output ./dataset.tgz --resume --json
+```
+
+Unified ANS CRUD supports Dataset, Runner, Recipe and HF model Checkpoint registrations through `el data` and `client.data`. Dataset/Runner/Recipe creation requires a native immutable `--ref`, `--manifest` and exact `--directory`. HF metadata registration uses `el data create --type checkpoint --model namespace/model --revision FULL_COMMIT`; SDK uses `create(kind="checkpoint", model=..., revision=...)`. HF weights are not downloaded, and artifact imports do not establish Model or Job checkpoint provenance.
+
+Success follows native storage and original catalog readback and returns an `ans_` identity. Update publishes an explicit new revision. Delete checks active and unknown dependencies; Runner deletion covers all revisions. Historical bytes and quota usage remain. Commands default to the current login base URL/workspace/project, with no `--env`. Both Data grants and the corresponding resource capabilities are required.
+
+Read methods include `list/get/files/open/download`; `client.recipes.list/get` queries the original Recipe catalog. Downloads verify size/SHA-256 and refuse existing destinations, symlinks and storage redirects. Large payloads use multipart with stable idempotency keys. Staging `pub_` IDs and failure phases support retry; they are not native success. Matching client/server support is required. See the [Data reference](https://docs.envloop.ai/reference/cli#data-commands).

envloop_cli-1.23.0/envloop/__init__.py

@@ -0,0 +1,13 @@
+"""EnvLoop Python client, with optional functionality loaded on demand."""
+from ._optional import install_legacy_imports
+from .client import Client
+
+install_legacy_imports()
+__all__ = ['Client', 'DecisionClient']
+
+
+def __getattr__(name: str):
+    if name == 'DecisionClient':
+        from ._optional import feature_attribute
+        return feature_attribute('experiment', 'decision', name)
+    raise AttributeError(name)

envloop_cli-1.23.0/envloop/_optional.py

@@ -0,0 +1,185 @@
+"""Lazy, static adapters for independently installed client features.
+
+No feature code is imported when the base client is imported or constructed.
+Legacy module names resolve to their single feature owner on explicit import.
+"""
+import argparse
+import importlib
+import importlib.abc
+import importlib.util
+import sys
+from collections.abc import Sequence
+from importlib.machinery import ModuleSpec
+from types import ModuleType
+from typing import Any, override
+
+FEATURES = {'data': 'envloop_data', 'experiment': 'envloop_experiment', 'rsi-loop': 'envloop_rsi_loop'}
+FEATURE_COMMANDS = {
+    'data': {
+        'dataset': 'Discover datasets, revisions and tasks',
+        'data': 'Manage versioned Data resources and verified file downloads',
+        'runner': 'Discover available Runner revisions',
+        'checkpoint': 'List and download saved training checkpoints',
+        'profile': 'Manage platform runtime profiles',
+    },
+    'experiment': {
+        'job': 'Submit and manage Agent, Sandbox, Train and Inference Jobs',
+        'trail': 'Inspect and control existing trials',
+    },
+}
+
+MODULES: dict[str, str] = {
+    **dict.fromkeys('data data_publications data_upload data_cli profile_updates recipes'.split(), 'data'),
+    **dict.fromkeys('train train_progress train_runner_cli train_log_cli job_logs job_cost inference decision sandbox runtime_params job_spec_cli training'.split(), 'experiment'),
+    **dict.fromkeys('agent_runs rsi_cli'.split(), 'rsi-loop'),
+}
+CLIENTS = {
+    **{name: ('data', 'client') for name in ('ProfileService', 'RunnerService', 'Profiles', 'Runners')},
+    **{name: ('experiment', 'client') for name in ('TaskService', 'RpcService', 'load_task', 'validate_command', 'dataset_selector', 'Tasks', 'runner_selector', 'job_budget', 'Jobs')},
+    **{name: ('base', 'downloads') for name in ('ArtifactError', 'artifact_path')},
+}
+DATA_ENDPOINTS = set('open_download resolve_dataset list_runners profile_path put_profile list_profiles get_profile resolve_profile set_default_profile archive_profile revoke_profile_secret export_profile import_profile open_checkpoint_archive'.split())
+EXPERIMENT_ENDPOINTS = set('submit_job get_job get_job_result get_job_logs list_jobs job_action job_events stop_job list_trials get_task_run get_trial_detail get_trial_training list_trial_metrics list_trial_checkpoints get_task_result get_task_snapshot stop_task list_trial_artifacts open_trial_artifact'.split())
+
+
+class MissingFeatureError(ImportError):
+    """Static installation instructions, without reflecting user input."""
+    code = 'FEATURE_NOT_INSTALLED'
+
+    def __init__(self, feature: str):
+        self.feature = feature
+        super().__init__(f'Install optional functionality with: pip install "envloop-cli[{feature}]"')
+
+
+class CommandExit(Exception):
+    def __init__(self, status: int):
+        self.status = status
+
+
+def available(feature: str):
+    return importlib.util.find_spec(FEATURES[feature]) is not None
+
+
+def feature_module(feature: str, module: str):
+    if not available(feature):
+        raise MissingFeatureError(feature)
+    return importlib.import_module(f'{FEATURES[feature]}.{module}')
+
+
+def feature_attribute(feature: str, module: str, name: str):
+    if name.startswith('__'):
+        raise AttributeError(name)
+    return getattr(feature_module(feature, module), name)
+
+
+def client_attribute(name: str):
+    if name not in CLIENTS:
+        raise AttributeError(name)
+    feature, module = CLIENTS[name]
+    if feature == 'base':
+        return getattr(importlib.import_module(f'envloop.{module}'), name)
+    return feature_attribute(feature, module, name)
+
+
+def endpoint(name: str):
+    if name in DATA_ENDPOINTS:
+        feature = 'data'
+    elif name in EXPERIMENT_ENDPOINTS:
+        feature = 'experiment'
+    else:
+        raise AttributeError(name)
+    # Inspect the class dictionary: static methods retain their descriptor contract.
+    return feature_module(feature, 'http').Endpoints.__dict__[name]
+
+
+def navigation(name: str):
+    if name in {'Datasets', 'Checkpoints', '_checkpoint_matches', '_checkpoint_target', '_verified_checkpoint_file'}:
+        return feature_attribute('data', 'navigation_resources', name)
+    if name in {'Inference', 'InferenceResource'}:
+        return feature_attribute('experiment', 'navigation_resources', name)
+    raise AttributeError(name)
+
+
+def client_resource(client: Any, name: str):
+    server = client._transport
+    if name in {'billing', 'project', 'operations'}:
+        module, cls = ('resources', 'Operations') if name == 'operations' else ('navigation_resources', name.capitalize())
+        return getattr(importlib.import_module(f'envloop.{module}'), cls)(server)
+    if name == 'dashboard':
+        if available('experiment'):
+            return feature_attribute('experiment', 'navigation_resources', 'Dashboard')(client.project, client.jobs, client.train)
+        from .navigation_resources import Dashboard
+        return Dashboard(client.project)
+    if name in {'profiles', 'runners'}:
+        return feature_attribute('data', 'client', name.capitalize())(server)
+    if name in {'data', 'recipes'}:
+        return feature_attribute('data', name, name.capitalize())(server)
+    if name == 'datasets':
+        return navigation('Datasets')(server)
+    if name == 'checkpoints':
+        return feature_attribute('data', 'navigation_resources', 'Checkpoints')(server)
+    if name == 'jobs':
+        return feature_attribute('experiment', 'client', 'Jobs')(server)
+    if name == 'trials':
+        return client.tasks
+    if name == 'tasks':
+        return feature_attribute('experiment', 'client', 'Tasks')(server)
+    if name == 'training_jobs':
+        return client.train
+    if name == 'train':
+        return feature_attribute('experiment', 'train', 'TrainJobs')(server)
+    if name == 'decision':
+        return feature_attribute('experiment', 'decision', 'DecisionClient')(server)
+    if name == 'agent_runs':
+        return feature_attribute('rsi-loop', 'agent_runs', 'AgentRuns')(client.train)
+    if name in {'endpoints', 'adapters'}:
+        return feature_attribute('experiment', 'resources', name.capitalize())(server)
+    if name == 'inference':
+        return navigation('Inference')(server)
+    raise AttributeError(name)
+
+
+def execute_command(args: argparse.Namespace, client: Any, cli: Any):
+    if args.group in {'job', 'trail'}:
+        return getattr(feature_module('experiment', 'cli'), 'execute_' + args.group)(args, client, cli)
+    if args.group == 'profile':
+        return feature_module('data', 'cli').execute_profile(args, client, cli)
+    if args.group in {'data', 'dataset', 'runner', 'checkpoint'}:
+        return feature_module('data', 'resource_cli').execute(args, client)
+    from .resource_cli import execute
+    return execute(args, client)
+
+
+class _LegacyFeatureLoader(importlib.abc.Loader):
+    def __init__(self, feature: str, module: str):
+        self.feature, self.module = feature, module
+
+    @override
+    def create_module(self, spec: ModuleSpec):
+        module = feature_module(self.feature, self.module)
+        self.spec = module.__spec__
+        return module
+
+    @override
+    def exec_module(self, module: ModuleType):
+        # importlib rebinds __spec__ to the legacy alias; restore the feature module's own
+        # spec so its relative imports keep resolving inside the feature package.
+        module.__spec__ = self.spec
+
+
+class _LegacyFeatureFinder(importlib.abc.MetaPathFinder):
+    @override
+    def find_spec(self, fullname: str, path: Sequence[str] | None = None, target: ModuleType | None = None):
+        if not fullname.startswith('envloop.'):
+            return None
+        module = fullname.removeprefix('envloop.')
+        feature = MODULES.get(module)
+        if feature is None:
+            return None
+        loader = _LegacyFeatureLoader(feature, module)
+        return importlib.util.spec_from_loader(fullname, loader, is_package=module == 'training')
+
+
+def install_legacy_imports():
+    if not any(isinstance(finder, _LegacyFeatureFinder) for finder in sys.meta_path):
+        sys.meta_path.append(_LegacyFeatureFinder())

{envloop_cli-1.16.0 → envloop_cli-1.23.0}/envloop/auth_cli.py

@@ -3,13 +3,14 @@ import argparse
 import json
 import os
 import sys
+from typing import Any, cast
 
 from .config import ConfigError, ConfigStore, normalize_url, validate_key
 
 DEFAULT_BASE_URL = "https://api.envloop.ai"
 
 
-def add_auth_commands(groups):
+def add_auth_commands(groups: "argparse._SubParsersAction[argparse.ArgumentParser]") -> None:
     auth = groups.add_parser("auth", help="Configure credentials, inspect status, or remove a saved key")
     commands = auth.add_subparsers(dest="auth_command", required=True)
     login = commands.add_parser("login", help="Open the Clerk sign-in page and authorize CLI/SDK access")
@@ -47,7 +48,7 @@ def add_auth_commands(groups):
     workspace.add_argument("--stdin", action="store_true", help="Read the selected workspace's API key from stdin")
 
 
-def _key_from_input(stdin=False):
+def _key_from_input(stdin: bool = False) -> str:
     if stdin:
         value = sys.stdin.read(515)
         if value.endswith("\r\n"):
@@ -72,7 +73,7 @@ def _masked_key():
     masked[3] &= ~(termios.ECHO | termios.ICANON | termios.ISIG | termios.IEXTEN)
     masked[6][termios.VMIN] = 1
     masked[6][termios.VTIME] = 0
-    characters = []
+    characters: list[str] = []
     try:
         termios.tcsetattr(descriptor, termios.TCSAFLUSH, masked)
         sys.stderr.write("API key: ")
@@ -102,7 +103,7 @@ def _masked_key():
         sys.stderr.flush()
 
 
-def _report(args, store):
+def _report(args: argparse.Namespace, store: ConfigStore):
     saved, configured = store.inspect()
     from .cli import resolve_cli_connection
 
@@ -116,7 +117,7 @@ def _report(args, store):
     }, connection
 
 
-def _verify_key(url, key, workspace_id=None, project_id=None):
+def _verify_key(url: str, key: str, workspace_id: str | None = None, project_id: str | None = None):
     from .http import HttpService, RemoteError
 
     validate_key(key)
@@ -131,10 +132,10 @@ def _verify_key(url, key, workspace_id=None, project_id=None):
                                environment=False).request("GET", "/v1/me")
     except RemoteError as error:
         code = "EDGE_REJECTED" if error.code == "EDGE_REJECTED" else {
-            401: "AUTHENTICATION_REJECTED", 403: "AUTHORIZATION_DENIED"}.get(error.status_code)
+            401: "AUTHENTICATION_REJECTED", 403: "AUTHORIZATION_DENIED"}.get(cast(int, error.status_code))
         if code is None:
             code = error.code if error.status_code is None and error.code in {
-                "NETWORK_ERROR", "INVALID_RESPONSE", "RESPONSE_TOO_LARGE",
+                "NETWORK_ERROR", "REQUEST_TIMEOUT", "RESPONSE_INTERRUPTED", "INVALID_RESPONSE", "RESPONSE_TOO_LARGE",
             } else "HTTP_ERROR"
         raise ConfigError(code) from None
     if not isinstance(response, dict) or response.get("auth_method") != "api_key":
@@ -145,7 +146,7 @@ def _verify_key(url, key, workspace_id=None, project_id=None):
         return _scope(response, project=project_id)
 
 
-def _print(report, as_json=False):
+def _print(report: dict[str, Any], as_json: bool = False) -> None:
     if as_json:
         print(json.dumps(report, ensure_ascii=False))
         return
@@ -160,7 +161,7 @@ def _print(report, as_json=False):
     print(f"Check: {report['check']}")
 
 
-def run_auth(args, parser):
+def run_auth(args: argparse.Namespace, parser: argparse.ArgumentParser):
     store = ConfigStore()
     command = args.auth_command
     if command == "login":
@@ -198,20 +199,19 @@ def run_auth(args, parser):
                     raise ConfigError("API_URL_REQUIRED")
                 if not no_check:
                     scope = _verify_key(url, value, saved.get("workspace_id"), saved.get("project_id"))
+                if scope is not None:
+                    store.configure(url, value, expected_saved=saved, expected_credential=credential, scope=scope)
+                else:
+                    store.update(args.field, value, expected_url=url, expected_saved=saved, expected_credential=credential)
             elif args.field == "api-url":
                 if args.stdin:
                     parser.error("this field does not support --stdin")
                 value = args.value if args.value is not None else DEFAULT_BASE_URL
+                store.update(args.field, value)
             else:
                 if args.value is None or args.stdin:
                     parser.error("this field requires a value and does not support --stdin")
                 value = args.value
-            if args.field == "api-key":
-                if scope is not None:
-                    store.configure(url, value, expected_saved=saved, expected_credential=credential, scope=scope)
-                else:
-                    store.update(args.field, value, expected_url=url, expected_saved=saved, expected_credential=credential)
-            else:
                 store.update(args.field, value)
             if args.field == "api-key":
                 print("Saved. API key check: " + ("not_checked (offline)" if no_check else "authentication_confirmed"))
@@ -282,7 +282,7 @@ def run_auth(args, parser):
 
                 report["check"] = "edge_rejected" if getattr(error, "code", None) == "EDGE_REJECTED" else {
                     401: "authentication_rejected", 403: "authorization_denied"}.get(
-                    getattr(error, "status_code", None), safe_error_code(error))
+                    cast(int, getattr(error, "status_code", None)), safe_error_code(error))
                 _print(report, args.json)
                 print(format_error(error), file=sys.stderr)
                 return 1