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

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: envloop-cli
-Version: 1.23.0
+Version: 1.24.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
@@ -8,12 +8,12 @@ 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
+Requires-Dist: envloop-cli-experiment==1.24.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'
+Requires-Dist: envloop-cli-experiment==1.24.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-1.23.0 → envloop_cli-1.24.0}/envloop/cli_errors.py

@@ -17,7 +17,7 @@ from collections.abc import Iterable
 from datetime import datetime
 from typing import Any, cast
 
-from .http import RemoteError
+from .http import GATEWAY_TIMEOUT_STATUSES, RemoteError
 
 _MESSAGES: dict[str, str] = {}
 
@@ -54,6 +54,7 @@ _register("RATE_LIMITED RATE_LIMIT_EXCEEDED TOO_MANY_REQUESTS", "The API rate li
 _register("SERVICE_UNAVAILABLE INTERNAL_SERVER_ERROR EXECUTOR_UNAVAILABLE PROVIDER_UNAVAILABLE LOG_STORAGE_UNAVAILABLE", "The service is unavailable or encountered an internal error.")
 _register("INTERNAL_ERROR", "The command encountered an unexpected error.")
 _register("NETWORK_ERROR", "A connection to the API or download service could not be completed.")
+_register("SOURCE_UNAVAILABLE", "The API gateway did not get a valid answer from the service, for example because it stopped waiting. A write may still have been processed: read the Job or resource before retrying it.")
 _register("REQUEST_TIMEOUT", "The API did not answer before the client timeout. The request may still have been processed: read the Job or resource before retrying a write.")
 _register("RESPONSE_INTERRUPTED", "The connection closed before the API finished answering; the service may have failed or restarted. The request may have been processed: read the Job or resource before retrying a write, and report the time if it repeats.")
 _register("INVALID_RESPONSE RESPONSE_TOO_LARGE INVALID_LOG_PAGE INVALID_PAGINATION TRAIN_JOB_CURSOR_REPEATED", "The service returned an invalid or unsupported response.")
@@ -114,6 +115,8 @@ _register("INVALID_RSI_REQUEST INVALID_STEER INVALID_DIRECTIVE", "The RSI servic
 _register("RSI_CONFLICT RSI_RUN_NOT_ACTIVE", "The run id exists, the run is not in a state that allows this action, or no loop machine is free.")
 _register("RSI_CONTROL_UNCONFIGURED RSI_CONTROL_UNAVAILABLE RSI_CONTROL_TIMEOUT", "The RSI loop service is not available through this platform right now.")
 
+_register("UNSUPPORTED_ADAPTER_SOURCE", 'Register a training checkpoint with {"serving_profile": "NAME", "source": {"type": "train_checkpoint", "tinker_path": "envloop://..."}}. '
+          "List serving profiles with `el job serving-profile list` and checkpoint paths with `el checkpoint list`.")
 _register("JOB_ACTION_UNSUPPORTED", "This Job type does not support the requested action.")
 _register("INFERENCE_ROUTE_RETIRED", "The global inference route has been retired.")
 
@@ -209,6 +212,9 @@ def _http_message(status: int | None) -> str:
         return _MESSAGES["INVALID_REQUEST"]
     if status == 429:
         return _MESSAGES["RATE_LIMITED"]
+    if status in GATEWAY_TIMEOUT_STATUSES:
+        return ("The API gateway stopped waiting for the service. The request may still have been processed: "
+                "read the Job or resource before retrying a write.")
     if status is not None and status >= 500:
         return _MESSAGES["SERVICE_UNAVAILABLE"]
     return _MESSAGES["HTTP_ERROR"]
@@ -294,7 +300,9 @@ def format_error(error: BaseException) -> str:
     extra: dict[str, Any] = {"hint": remote.hint, "details": remote.details, "request_id": remote.request_id} if remote else {}
     if remote and remote.message:
         # Local text only adds guidance for codes the CLI documents.
-        guidance = local if code in _MESSAGES and code != "HTTP_ERROR" and local != remote.message else None
+        # A gateway timeout always adds that the request may have been processed.
+        documented = (code in _MESSAGES and code != "HTTP_ERROR") or status in GATEWAY_TIMEOUT_STATUSES
+        guidance = local if documented and local != remote.message else None
         rendered = error_block(code, remote.message, status=status, guidance=guidance, **extra)
     else:
         rendered = error_block(code, local, status=status, **extra)

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/envloop/cli_output.py

@@ -59,15 +59,31 @@ def next_page(args: argparse.Namespace, cursor: object, program: str) -> str:
     return "Next page: " + shlex.join(command)
 
 
+# Empty-list text names the listed resource, not the command group (`job adapter list` lists adapters).
+EMPTY_RESOURCES = {
+    ('job', 'adapter'): 'adapters', ('job', 'serving-profile'): 'serving profiles',
+    ('trail',): 'trails', ('trail', 'artifact'): 'artifacts',
+    ('dataset',): 'datasets', ('dataset', 'revision'): 'dataset revisions', ('dataset', 'task'): 'dataset tasks',
+    ('data',): 'resources', ('data', 'files'): 'files',
+    ('billing', 'usage'): 'usage records', ('billing', 'ledger'): 'ledger entries', ('billing', 'price'): 'prices',
+    ('member',): 'members', ('member', 'candidate'): 'member candidates',
+    ('setting', 'registry'): 'registry credentials',
+}
+
+
+def empty_message(args: argparse.Namespace) -> str:
+    path = getattr(args, '_command_path', [args.group, 'list'])
+    resource = EMPTY_RESOURCES.get(tuple(path[:-1] if path[-1:] == ['list'] else path))
+    return f'No {resource or args.group} found.'
+
+
 def generic_layout(items: list[dict[str, Any]], args: argparse.Namespace, layouts: dict[str, tuple[str, ...]]) -> tuple[tuple[str, ...], Callable[[dict[str, Any]], tuple[object, ...]], str]:
     fields = tuple(field for field in layouts.get(args.group, ()) if any(field in item for item in items))
     fields = fields or tuple(dict.fromkeys(key for item in items for key in item))[:6]
     headers = tuple(field.replace('_', ' ').upper() for field in fields)
     render: Callable[[dict[str, Any]], tuple[object, ...]] = lambda item: tuple(timestamp(item.get(field)) if field.endswith('_at') or field == 'at'
                                 else item.get(field) for field in fields)
-    empty = ('No registry credentials found.' if args.group == 'setting'
-             else f'No {getattr(args, "resource", args.group)} found.')
-    return headers, render, empty
+    return headers, render, empty_message(args)
 
 
 def list_output(result: Any, args: argparse.Namespace, program: str) -> str:

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/envloop/client.py

@@ -33,9 +33,10 @@ class Client:
         raise RuntimeError(INTERACTIVE_TRAINING_REMOVED)
 
     @classmethod
-    def remote(cls, api_url: str | None = None, *, timeout: float = 30, api_key: str | None = None, workspace_id: str | None = None, project_id: str | None = None, config: bool = True):
+    def remote(cls, api_url: str | None = None, *, timeout: float = 90, api_key: str | None = None, workspace_id: str | None = None, project_id: str | None = None, config: bool = True):
         from .http import HttpService
 
+        # The default matches http.DEFAULT_TIMEOUT_SEC (longer than the hosted proxy's 60 s wait).
         return cls(HttpService(api_url, timeout, api_key=api_key, workspace_id=workspace_id, project_id=project_id, config=config))
 
     @classmethod

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/envloop/http.py

@@ -63,6 +63,12 @@ def retry_after_seconds(value: str | None) -> float | None:
         return None
 
 
+# The hosted API proxy waits up to 60 s for the platform. Wait longer by default so a slow answer, or the
+# proxy's own gateway timeout, reaches the caller instead of a client-side timeout. Explicit values are kept.
+DEFAULT_TIMEOUT_SEC = 90.0
+# The proxy or edge stopped waiting while the platform was still working: the request may have been processed.
+GATEWAY_TIMEOUT_STATUSES = frozenset({504, 524})
+
 # Transport failures that are not an HTTP answer. A request that was sent and then timed out or lost its
 # response may still have been processed, unlike one that never connected.
 TRANSIENT_CODES = frozenset({"NETWORK_ERROR", "REQUEST_TIMEOUT", "RESPONSE_INTERRUPTED"})
@@ -213,7 +219,7 @@ def encode_json(body: Any) -> bytes:
 
 
 class HttpService:
-    def __init__(self, base_url: str | None = None, timeout: float = 30, *, api_key: str | None = None, workspace_id: str | None = None, project_id: str | None = None, config: bool = True, environment: bool = True):
+    def __init__(self, base_url: str | None = None, timeout: float = DEFAULT_TIMEOUT_SEC, *, api_key: str | None = None, workspace_id: str | None = None, project_id: str | None = None, config: bool = True, environment: bool = True):
         from .config import require_remote, resolve_connection
 
         connection = resolve_connection(base_url, api_key, workspace_id, project_id, config=config, environment=environment)

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/envloop/navigation_resources.py

@@ -33,7 +33,14 @@ class Billing:
         start, end = billing_timestamp(start), billing_timestamp(end)
         if datetime.fromisoformat(end) <= datetime.fromisoformat(start):
             raise ValueError('billing end must be after start')
-        return self.transport.request('GET', query('/v1/billing/usage', start=start, end=end, group_by=group_by))
+        # Workspace usage needs a human billing grant. An API key reads its own project's usage on the
+        # project route, which takes the same window and grouping.
+        identity = self.transport.request('GET', '/v1/me')
+        identity = identity if isinstance(identity, dict) else {}
+        project = identity.get('project_id') or (identity.get('project') or {}).get('project_id')
+        path = (f'/v1/projects/{quote(project, safe="")}/billing/usage'
+                if identity.get('auth_method') == 'api_key' and isinstance(project, str) and project else '/v1/billing/usage')
+        return self.transport.request('GET', query(path, start=start, end=end, group_by=group_by))
 
     def ledger(self, *, limit: int = 25):
         return self.transport.request('GET', query('/v1/billing/ledger', limit=limit))

{envloop_cli-1.23.0 → envloop_cli-1.24.0}/pyproject.toml

@@ -1,15 +1,15 @@
 [project]
 name = "envloop-cli"
-version = "1.23.0"
+version = "1.24.0"
 description = "EnvLoop CLI and Python SDK for jobs, training, checkpoints and inference"
 requires-python = ">=3.12"
 readme = "README.pypi.md"
-dependencies = ["envloop-cli-experiment==1.23.0"]
+dependencies = ["envloop-cli-experiment==1.24.0"]
 
 [project.optional-dependencies]
 default = []
 data = ["envloop-cli-data==1.23.0"]
-experiment = ["envloop-cli-experiment==1.23.0"]
+experiment = ["envloop-cli-experiment==1.24.0"]
 rsi-loop = ["envloop-cli-rsi-loop==1.23.0"]
 
 [project.scripts]
@@ -24,7 +24,7 @@ Issues = "https://github.com/EnvLoop/envloop-cli/issues"
 "Agent instructions" = "https://docs.envloop.ai/skill.md"
 
 [dependency-groups]
-dev = ["ruff==0.16.10", "pre-commit>=4.6,<5", "pytest>=8", "envloop-cli-data==1.23.0", "envloop-cli-experiment==1.23.0", "envloop-cli-rsi-loop==1.23.0", "pyrefly==1.4.0"]
+dev = ["ruff==0.16.10", "pre-commit>=4.6,<5", "pytest>=8", "envloop-cli-data==1.23.0", "envloop-cli-experiment==1.24.0", "envloop-cli-rsi-loop==1.23.0", "pyrefly==1.4.0"]
 
 [build-system]
 requires = ["hatchling"]