solari-e2b-compat 0.2.12__tar.gz → 0.2.13__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/COMPAT.md +7 -4
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/PKG-INFO +1 -1
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/pyproject.toml +1 -1
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/__init__.py +4 -1
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_sandbox.py +8 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_sync.py +4 -1
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_template.py +118 -0
- solari_e2b_compat-0.2.13/solari_e2b/_vendor_user.py +61 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/exceptions.py +11 -0
- solari_e2b_compat-0.2.12/solari_e2b/_vendor_user.py +0 -40
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/.gitignore +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/LICENSE +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/LICENSE-E2B +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/NOTICE +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/README.md +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_box.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_commands.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_config.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_filesystem.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_git.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_loop.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_redact.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_request.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/_volume.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/__init__.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/charts.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/client.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/code_interpreter_async.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/code_interpreter_sync.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/constants.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/exceptions.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/models.py +0 -0
- {solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/models.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# COMPAT.md: E2B Python SDK compatibility (API shapes follow e2b 2.59 and e2b-code-interpreter 2.11)
|
|
2
2
|
|
|
3
|
-
Checked against the current releases (e2b 2.
|
|
3
|
+
Checked against the current releases (e2b 2.64.0, e2b-code-interpreter 2.11.9) on 2026-11-16: the only public names this package lacks are the `WriteData` / `AsyncWriteData` type aliases. 2.63/2.64's `GuestUnresponsiveException`, `TemplatePaginator`, `AsyncTemplatePaginator` and `TemplateInfo` exist.
|
|
4
4
|
|
|
5
5
|
Legend: **OK** works and is tested; **DIFF** works with a behaviour difference (explained); **NO** raises
|
|
6
6
|
`SolariCompatUnsupported` naming the feature. "Live" means `tests/test_live_staging.py` runs it against staging.
|
|
@@ -30,7 +30,7 @@ and the differences that are specific to Python.
|
|
|
30
30
|
| `request_timeout=` | OK. A deadline in seconds on the whole call (`0` removes the limit): `TimeoutException` when it passes. Not set: Solari's own transport limits apply (E2B's default is 60 s). On a streaming start (`commands.run`, `pty.create`) it bounds the start request; `run_code` has no per-call connection to bound, so there it has no effect and `timeout` is the limit. `Template.build` does not apply it either: E2B bounds each request of a build, not the build (the wait has its own cap). |
|
|
31
31
|
| `validate_api_key=` | Accepted: E2B documents it as having no effect. |
|
|
32
32
|
| `debug=True`, `retries=`, `http_version=`, `sandbox_url=`, `logger=` | NO. Raise `SolariCompatUnsupported` (`debug=False` is fine). They configure E2B's own transport and local debug mode. |
|
|
33
|
-
| An unknown option | `TypeError`, as for any Python signature. No call swallows keyword arguments any more. |
|
|
33
|
+
| An unknown option | `TypeError`, as for any Python signature. No call swallows keyword arguments any more. `Sandbox.create(cpu_count=, idempotency_key=)` (E2B 2.64): NO (`SolariCompatUnsupported`). |
|
|
34
34
|
| `api_key=` / `domain=` / `api_url=` on a call of an already connected sandbox | NO when it points elsewhere than the sandbox's own account; pass them to `create` / `connect`. |
|
|
35
35
|
| `timeout=` arguments | Seconds, as in E2B. |
|
|
36
36
|
| `E2B(...)` client, `ApiClient`, `ConnectionConfig`, `VolumeConnectionConfig`, `client` | NO. Real classes (they import, annotate and subclass), construction or use raises. |
|
|
@@ -79,7 +79,7 @@ and the differences that are specific to Python.
|
|
|
79
79
|
| `write` over 32 MiB | One write is one frame on the control channel, so more than 32 MiB raises `InvalidArgumentException` before anything is sent. Get a signed URL with `sandbox.upload_url(path)` and PUT the bytes to it (E2B has no `files.upload`). |
|
|
80
80
|
| `list(path, depth)`, `get_info` | OK, live | Every symlink (also a dangling one) is returned as itself: `type=FileType.SYMLINK`, `symlink_target`, `permissions` like `Lrwxrwxrwx`, and it is not descended into by `depth`. `owner` and `group` are filled in. One extra shell command per listing does this (it needs `/bin/sh`; without it the plain listing is used: links are followed, `owner` / `group` are empty, and a dangling link raises). |
|
|
81
81
|
| `exists`, `make_dir`, `rename`, `remove` | OK, live | |
|
|
82
|
-
| `watch_dir(path, on_event, recursive=)` | DIFF, live | `FilesystemEvent.name` is relative to the watched path.
|
|
82
|
+
| `watch_dir(path, on_event, recursive=)` | DIFF, live | `FilesystemEvent.name` is relative to the watched path. A new file or directory is reported as `create`, as in E2B (the guest's watcher reports creates, writes, removes, renames and mode changes separately); an event type E2B has no name for is reported as `write`. `include_entry=True` adds the entry (best effort: none when the path is already gone). `allow_network_mounts` has no effect (Solari's watcher has no such limit). A watch ends after `timeout` seconds (default 60; 0 disables); `on_exit(None)` is called once, whether it timed out or you called `stop()`. |
|
|
83
83
|
| `user=` on any filesystem call | NO | |
|
|
84
84
|
| Which paths `files.*` can reach | OK, live | Every filesystem call runs as the sandbox user (`user`, or the Daytona/Runloop name), as in E2B: relative paths resolve against `/home/user`, `files.read('/etc/shadow')` and `files.write('/etc/x', ...)` are refused with the guest's `permission denied`, and what you write is owned by `user:user`. This needs a guest image that carries the fix (images built before it keep the old behaviour: `files.*` then ran as root and reached any path); `whoami` and `files.read('/etc/shadow')` tell you which you have. The `user` option on a filesystem call is still NO. |
|
|
85
85
|
|
|
@@ -107,6 +107,8 @@ and the differences that are specific to Python.
|
|
|
107
107
|
| `copy`, `copy_items` (and `force_upload`, `resolve_symlinks`, `gzip`, `Template(file_ignore_patterns=)` that only matter through them) | NO | The Solari gateway does not accept local files in a template build yet (it answers `LocalFilesUnsupported`), so this raises when called instead of failing at build time. Fetch files inside the build with `run_cmd` (`curl`) or `git_clone`. |
|
|
108
108
|
| `set_user`, `set_start_cmd`, `set_ready_cmd`, `add_mcp_server`, dev containers | NO | Solari templates run no start command. Start processes after `Sandbox.create` with `commands.run(..., background=True)`. |
|
|
109
109
|
| `skip_cache()`, `skip_cache=` | OK | Nothing to skip: Solari has no build cache, every build runs every step. |
|
|
110
|
+
| `Template.list(limit=, next_token=)` → `TemplatePaginator`, `AsyncTemplate.list(...)` → `AsyncTemplatePaginator`, of `TemplateInfo` (e2b 2.63+) | OK | The account's sandbox templates (built-ins and your own; desktop templates are left out). `template_id`, `names` (the template name), `build_status` (`READY`, `ERROR` for a failed build, else `BUILDING`), `cpu_count` / `memory_mb` (0 when the gateway does not report them), `created_at` and `is_default` / `public` (true for Solari's built-in templates) come from Solari; `build_id` is the template id (Solari templates have no separate builds), `updated_at` is `created_at`, `envd_version` is `"solari"`, and `disk_size_mb`, `build_count`, `spawn_count` are 0 (Solari does not track them). The gateway returns the whole list at once, so the first page reads it and `next_token` is an offset into it. |
|
|
111
|
+
| `GuestUnresponsiveException` (e2b 2.63+) | DIFF | A `SandboxException`, raised when the gateway answers `GuestUnreachable` (502): the guest's control channel did not answer while the sandbox started or resumed. E2B's cause (a snapshot taken while the guest agent was stuck, fixed with `on_resume="reboot"`) has no Solari counterpart; retry the call. `GuestUnresponsiveException.code` keeps E2B's value. |
|
|
110
112
|
| `Template.build(template, name)`, `build_in_background`, `get_build_status`, `exists`, `alias_exists` | OK, live | `name:latest` is accepted; any other tag, and `tags=`: NO. `min_free_disk_mb=`: NO. `on_build_logs` receives a start entry, the build's own log lines (polled every few seconds from the gateway's build log), and an end entry. `get_build_status(..., logs_offset=)` returns `log_entries` / `logs` from that offset of the gateway's log tail (`stdout` lines are `info`, `stderr` lines `error`); the gateway keeps the newest 5000 lines of a build: `on_build_logs` keeps delivering new lines once that window is full (it finds where it left off), but a line that scrolled out before it was polled is lost, and `logs_offset` counts lines of the current window. A background build delivers only its start entry to `on_build_logs`. If the gateway cannot return the tail from the replica that answers (it keeps it in memory per replica), `log_entries` is empty and a warning says so. `status` is a `TemplateBuildStatus`, `reason` a `BuildStatusReason`. `Template.build` blocks (the `AsyncTemplate` twin is awaitable). |
|
|
111
113
|
| `Template.assign_tags`, `remove_tags`, `get_tags`, `to_json`, `to_dockerfile` | NO | |
|
|
112
114
|
|
|
@@ -125,7 +127,7 @@ and the differences that are specific to Python.
|
|
|
125
127
|
- Tested on Python 3.14; the code avoids syntax newer than 3.9 but only 3.14 is exercised here.
|
|
126
128
|
|
|
127
129
|
## Default user and home directory (matching E2B)
|
|
128
|
-
**Sandboxes run as `user` in `/home/user` on the hosted Solari API, matching E2B's default** (checked on staging and production on 2026-11-03).
|
|
130
|
+
**Sandboxes run as `user` in `/home/user` on the hosted Solari API, matching E2B's default** (checked on staging and production on 2026-11-03). A template built from a container image (Alpine, Ubuntu, any image base), and a gateway or template that predates user support, fall back to root, as below.
|
|
129
131
|
|
|
130
132
|
Here, E2B sandboxes run as `user` in `/home/user`; commands, code and files all start there, and relative paths resolve against it. This package
|
|
131
133
|
asks the gateway for exactly that at create time (`user: "user"`, `cwd: "/home/user"`; the gateway creates the user at first boot with passwordless
|
|
@@ -133,6 +135,7 @@ sudo). Restores from a snapshot keep the snapshot's own user.
|
|
|
133
135
|
- **Gateway that predates `user` / `cwd`** (it answers 400 naming them, or ignores them): the plain create is used and the sandbox runs as **root in
|
|
134
136
|
`/home/root`**, which is what this package did before. Check `whoami` if code depends on it.
|
|
135
137
|
- **Template or snapshot made before user support** (the server answers 400 naming `user` with "the guest predates user support"): the plain create is used, the sandbox runs as **root**, and one warning says so. Rebuild the template to get the vendor user. The default code-interpreter template is named `code-interpreter-v2`, so upgrading this package builds a fresh one on first `Sandbox.create()`; an older `code-interpreter-v1` in your org is left alone and no longer used.
|
|
138
|
+
- **Template built from a container image** (`Template().from_image(...)`, `from_alpine_image()`, `from_ubuntu_image()` and the other image bases; the server answers 400 naming `user` with "not available on a template built from an image"): the guest cannot add `user` to an image's own user database, so the plain create is used and commands run as the image's default user: **root** unless the image sets `USER` (Alpine and most base images do not). One warning names this cause. Rebuilding does not change it; build on `from_base_image()` (Solari's base image) to get `user`. (Checked against the gateway and guest code, 2026-11-16.)
|
|
136
139
|
- Shared isolation is commands and code only and takes no `user` / `cwd`; the compat packages never create shared sandboxes. `commands.run(..., user=)` is passed to the guest per call; `user=` on filesystem calls stays NO. A foreground command on a shared sandbox you connect to runs over REST: its output arrives when the command ends, `envs` are honoured, and the deadline is REST's 1 s to 10 min. `git` (init, add, commit; checked live on a shared sandbox, TS and Python) runs through these commands and works. Background commands, stdin, `user`, files and PTYs stay refused with the gateway's own message.
|
|
137
140
|
|
|
138
141
|
## Snapshots, results and listing (0.2.1)
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: solari-e2b-compat
|
|
3
|
-
Version: 0.2.
|
|
3
|
+
Version: 0.2.13
|
|
4
4
|
Summary: E2B-compatible Python interface (sandboxes and code interpreter) over Solari Sandboxes. Not affiliated with E2B.
|
|
5
5
|
Project-URL: Homepage, https://getsolari.com
|
|
6
6
|
Author: Solari
|
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "solari-e2b-compat"
|
|
7
|
-
version = "0.2.
|
|
7
|
+
version = "0.2.13"
|
|
8
8
|
description = "E2B-compatible Python interface (sandboxes and code interpreter) over Solari Sandboxes. Not affiliated with E2B."
|
|
9
9
|
readme = "README.md"
|
|
10
10
|
requires-python = ">=3.9"
|
|
@@ -17,6 +17,7 @@ from ._sandbox import AsyncSandbox, AsyncSandboxPaginator, AsyncSnapshotPaginato
|
|
|
17
17
|
from ._sync import CommandHandle, Git, Sandbox, SandboxPaginator, SnapshotPaginator, WatchHandle
|
|
18
18
|
from ._template import (
|
|
19
19
|
AsyncTemplate,
|
|
20
|
+
AsyncTemplatePaginator,
|
|
20
21
|
BuildInfo,
|
|
21
22
|
BuildStatusReason,
|
|
22
23
|
CopyItem,
|
|
@@ -30,6 +31,8 @@ from ._template import (
|
|
|
30
31
|
TemplateBuildStatus,
|
|
31
32
|
TemplateBuildStatusResponse,
|
|
32
33
|
TemplateClass,
|
|
34
|
+
TemplateInfo,
|
|
35
|
+
TemplatePaginator,
|
|
33
36
|
TemplateTag,
|
|
34
37
|
TemplateTagInfo,
|
|
35
38
|
default_build_logger,
|
|
@@ -76,4 +79,4 @@ class _UnsupportedModule:
|
|
|
76
79
|
|
|
77
80
|
client = _UnsupportedModule()
|
|
78
81
|
|
|
79
|
-
__version__ = "0.2.
|
|
82
|
+
__version__ = "0.2.13"
|
|
@@ -423,8 +423,16 @@ class AsyncSandbox:
|
|
|
423
423
|
lifecycle: Optional[Dict[str, Any]] = None,
|
|
424
424
|
volume_mounts: Optional[Dict[str, Any]] = None,
|
|
425
425
|
logger: Any = None,
|
|
426
|
+
idempotency_key: Optional[str] = None,
|
|
427
|
+
*,
|
|
428
|
+
cpu_count: Optional[int] = None,
|
|
426
429
|
**opts: Any,
|
|
427
430
|
) -> "AsyncSandbox":
|
|
431
|
+
# E2B 2.64 options Solari has no counterpart for yet: refused by name, never ignored (an unknown keyword is a TypeError).
|
|
432
|
+
if cpu_count is not None:
|
|
433
|
+
raise SolariCompatUnsupported("Sandbox.create option cpu_count", "a Solari sandbox gets its template's CPU count; build a template with the CPU count you want (Template.build cpu_count)")
|
|
434
|
+
if idempotency_key is not None:
|
|
435
|
+
raise SolariCompatUnsupported("Sandbox.create option idempotency_key", "Solari's sandbox create takes no caller-chosen idempotency key")
|
|
428
436
|
if mcp is not None:
|
|
429
437
|
raise SolariCompatUnsupported("mcp", "the E2B MCP gateway has no Solari equivalent")
|
|
430
438
|
hardened = _wants_no_egress(network, allow_internet_access)
|
|
@@ -367,9 +367,12 @@ class Sandbox:
|
|
|
367
367
|
lifecycle: Optional[Dict[str, Any]] = None,
|
|
368
368
|
volume_mounts: Optional[Dict[str, Any]] = None,
|
|
369
369
|
logger: Any = None,
|
|
370
|
+
idempotency_key: Optional[str] = None,
|
|
371
|
+
*,
|
|
372
|
+
cpu_count: Optional[int] = None,
|
|
370
373
|
**opts: Any,
|
|
371
374
|
) -> "Sandbox":
|
|
372
|
-
return cls._wrap(LOOP.run(cls._async_cls.create(template, timeout, metadata, envs, secure, allow_internet_access, mcp, network, iam, lifecycle, volume_mounts, logger, **opts)))
|
|
375
|
+
return cls._wrap(LOOP.run(cls._async_cls.create(template, timeout, metadata, envs, secure, allow_internet_access, mcp, network, iam, lifecycle, volume_mounts, logger, idempotency_key, cpu_count=cpu_count, **opts)))
|
|
373
376
|
|
|
374
377
|
@classmethod
|
|
375
378
|
def list(cls, query: Optional[SandboxQuery] = None, limit: Optional[int] = None, next_token: Optional[str] = None, order: Optional[str] = None, **opts: Any) -> SandboxPaginator:
|
|
@@ -139,6 +139,114 @@ class TemplateTag:
|
|
|
139
139
|
CopyItem = Dict[str, Any]
|
|
140
140
|
|
|
141
141
|
|
|
142
|
+
@dataclass
|
|
143
|
+
class TemplateInfo:
|
|
144
|
+
"""e2b 2.63+ template listing entry, filled from the Solari template list (COMPAT.md says which fields Solari does not
|
|
145
|
+
track)."""
|
|
146
|
+
|
|
147
|
+
template_id: str
|
|
148
|
+
#: Solari templates have no separate builds: the template id.
|
|
149
|
+
build_id: str
|
|
150
|
+
names: List[str]
|
|
151
|
+
#: True for Solari's built-in templates (every account can use them).
|
|
152
|
+
public: bool
|
|
153
|
+
#: True for Solari's built-in templates.
|
|
154
|
+
is_default: bool
|
|
155
|
+
build_status: TemplateBuildStatus
|
|
156
|
+
#: 0 when the gateway does not report it.
|
|
157
|
+
cpu_count: int
|
|
158
|
+
#: 0 when the gateway does not report it.
|
|
159
|
+
memory_mb: int
|
|
160
|
+
#: Not reported by Solari: 0.
|
|
161
|
+
disk_size_mb: int
|
|
162
|
+
envd_version: str
|
|
163
|
+
#: Not tracked by Solari: 0.
|
|
164
|
+
build_count: int
|
|
165
|
+
#: Not tracked by Solari: 0.
|
|
166
|
+
spawn_count: int
|
|
167
|
+
created_at: datetime
|
|
168
|
+
#: Solari does not track updates: the creation time.
|
|
169
|
+
updated_at: datetime
|
|
170
|
+
last_spawned_at: Optional[datetime] = None
|
|
171
|
+
description: Optional[str] = None
|
|
172
|
+
max_cpu_count: Optional[int] = None
|
|
173
|
+
|
|
174
|
+
|
|
175
|
+
def _template_info(v: Dict[str, Any]) -> TemplateInfo:
|
|
176
|
+
raw = v.get("createdAt")
|
|
177
|
+
try:
|
|
178
|
+
created = datetime.fromisoformat(raw.replace("Z", "+00:00")) if isinstance(raw, str) else datetime.fromtimestamp(0, timezone.utc)
|
|
179
|
+
except ValueError:
|
|
180
|
+
created = datetime.fromtimestamp(0, timezone.utc)
|
|
181
|
+
st = v.get("status")
|
|
182
|
+
status = TemplateBuildStatus.READY if st == "ready" else TemplateBuildStatus.ERROR if st == "failed" else TemplateBuildStatus.BUILDING
|
|
183
|
+
builtin = bool(v.get("builtin"))
|
|
184
|
+
return TemplateInfo(
|
|
185
|
+
template_id=v["templateId"], build_id=v["templateId"], names=[v.get("name") or v["templateId"]], public=builtin, is_default=builtin,
|
|
186
|
+
build_status=status, cpu_count=int(v.get("cpu") or 0), memory_mb=int(v.get("memMb") or 0), disk_size_mb=0, envd_version="solari",
|
|
187
|
+
build_count=0, spawn_count=0, created_at=created, updated_at=created,
|
|
188
|
+
)
|
|
189
|
+
|
|
190
|
+
|
|
191
|
+
class AsyncTemplatePaginator:
|
|
192
|
+
"""e2b 2.63+ paginator over the account's sandbox templates (``AsyncTemplate.list()``). The gateway returns the whole list
|
|
193
|
+
at once, so the first page reads it and later pages are cut from it; ``next_token`` is the offset of the next page."""
|
|
194
|
+
|
|
195
|
+
def __init__(self, limit: Optional[int] = None, next_token: Optional[str] = None, **opts: Any) -> None:
|
|
196
|
+
if limit is not None and (isinstance(limit, bool) or not isinstance(limit, int) or limit < 1):
|
|
197
|
+
raise InvalidArgumentException("limit must be a positive integer")
|
|
198
|
+
if next_token is not None and not (isinstance(next_token, str) and next_token.isdigit()):
|
|
199
|
+
raise InvalidArgumentException("next_token must be a token returned by this paginator")
|
|
200
|
+
self._opts = api_opts(opts)
|
|
201
|
+
self._limit = limit or 100
|
|
202
|
+
self._next_token = next_token
|
|
203
|
+
self._has_next = True
|
|
204
|
+
self._all: Optional[List[TemplateInfo]] = None
|
|
205
|
+
|
|
206
|
+
@property
|
|
207
|
+
def has_next(self) -> bool:
|
|
208
|
+
return self._has_next
|
|
209
|
+
|
|
210
|
+
@property
|
|
211
|
+
def next_token(self) -> Optional[str]:
|
|
212
|
+
return self._next_token
|
|
213
|
+
|
|
214
|
+
async def next_items(self, **opts: Any) -> List[TemplateInfo]:
|
|
215
|
+
if not self._has_next:
|
|
216
|
+
raise TemplateException("No more items to fetch")
|
|
217
|
+
o = {**self._opts, **api_opts(opts)}
|
|
218
|
+
if self._all is None:
|
|
219
|
+
conn = resolve_conn(**o)
|
|
220
|
+
try:
|
|
221
|
+
views = await bounded(conn.templates.list(), o.get("request_timeout"))
|
|
222
|
+
except Exception as e: # noqa: BLE001
|
|
223
|
+
raise translate(e) from e
|
|
224
|
+
self._all = [_template_info(v) for v in views if v.get("kind") == "sandbox"]
|
|
225
|
+
start = int(self._next_token) if self._next_token else 0
|
|
226
|
+
page = self._all[start : start + self._limit]
|
|
227
|
+
self._next_token = str(start + self._limit) if start + self._limit < len(self._all) else None
|
|
228
|
+
self._has_next = self._next_token is not None
|
|
229
|
+
return page
|
|
230
|
+
|
|
231
|
+
|
|
232
|
+
class TemplatePaginator:
|
|
233
|
+
"""Blocking ``Template.list()`` pages."""
|
|
234
|
+
|
|
235
|
+
def __init__(self, limit: Optional[int] = None, next_token: Optional[str] = None, **opts: Any) -> None:
|
|
236
|
+
self._t = AsyncTemplatePaginator(limit, next_token, **opts)
|
|
237
|
+
|
|
238
|
+
@property
|
|
239
|
+
def has_next(self) -> bool:
|
|
240
|
+
return self._t.has_next
|
|
241
|
+
|
|
242
|
+
@property
|
|
243
|
+
def next_token(self) -> Optional[str]:
|
|
244
|
+
return self._t.next_token
|
|
245
|
+
|
|
246
|
+
def next_items(self, **opts: Any) -> List[TemplateInfo]:
|
|
247
|
+
return LOOP.run(self._t.next_items(**opts))
|
|
248
|
+
|
|
249
|
+
|
|
142
250
|
q = shlex.quote
|
|
143
251
|
_IMAGES = {
|
|
144
252
|
"from_debian_image": ("debian", "stable"),
|
|
@@ -520,6 +628,11 @@ class AsyncTemplate(TemplateBase):
|
|
|
520
628
|
reason = BuildStatusReason(message=v["error"], log_entries=entries) if v.get("error") else None
|
|
521
629
|
return TemplateBuildStatusResponse(build_id=build_info.build_id, template_id=build_info.template_id, status=status, log_entries=entries, logs=[e.message for e in entries], reason=reason)
|
|
522
630
|
|
|
631
|
+
@classmethod
|
|
632
|
+
def list(cls, *, limit: Optional[int] = None, next_token: Optional[str] = None, **opts: Any) -> AsyncTemplatePaginator:
|
|
633
|
+
"""e2b 2.63+: the account's sandbox templates, page by page."""
|
|
634
|
+
return AsyncTemplatePaginator(limit, next_token, **opts)
|
|
635
|
+
|
|
523
636
|
@classmethod
|
|
524
637
|
async def exists(cls, name: str, **opts: Any) -> bool:
|
|
525
638
|
o = api_opts(opts)
|
|
@@ -558,6 +671,11 @@ class Template(TemplateBase):
|
|
|
558
671
|
def get_build_status(cls, build_info: BuildInfo, logs_offset: Optional[int] = None, **opts: Any) -> TemplateBuildStatusResponse:
|
|
559
672
|
return LOOP.run(AsyncTemplate.get_build_status(build_info, logs_offset, **opts))
|
|
560
673
|
|
|
674
|
+
@classmethod
|
|
675
|
+
def list(cls, *, limit: Optional[int] = None, next_token: Optional[str] = None, **opts: Any) -> TemplatePaginator:
|
|
676
|
+
"""e2b 2.63+: the account's sandbox templates, page by page."""
|
|
677
|
+
return TemplatePaginator(limit, next_token, **opts)
|
|
678
|
+
|
|
561
679
|
@classmethod
|
|
562
680
|
def exists(cls, name: str, **opts: Any) -> bool:
|
|
563
681
|
return LOOP.run(AsyncTemplate.exists(name, **opts))
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"""Create sandboxes that run as E2b's default user (commands, code and files default to its home)."""
|
|
2
|
+
|
|
3
|
+
from __future__ import annotations
|
|
4
|
+
|
|
5
|
+
import re
|
|
6
|
+
import warnings
|
|
7
|
+
from typing import Any
|
|
8
|
+
|
|
9
|
+
from solari_core.errors import GatewayError
|
|
10
|
+
|
|
11
|
+
VENDOR_USER = "user"
|
|
12
|
+
VENDOR_HOME = "/home/user"
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
def _refuses_user_fields(e: BaseException) -> bool:
|
|
16
|
+
return isinstance(e, GatewayError) and e.status == 400 and re.search(r"\b(user|cwd)\b", repr(getattr(e, "body", None)), re.I) is not None
|
|
17
|
+
|
|
18
|
+
def _reason_of(e: BaseException) -> str:
|
|
19
|
+
"""The gateway's reason for refusing ``user`` (its 400 says why), so the warning names the real cause."""
|
|
20
|
+
body = getattr(e, "body", None)
|
|
21
|
+
for s in (getattr(body, "error", None), getattr(body, "message", None), str(e)):
|
|
22
|
+
if isinstance(s, str) and s:
|
|
23
|
+
return s
|
|
24
|
+
return ""
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def root_warning_text(reason: str) -> str:
|
|
28
|
+
"""The warning for a sandbox that runs as root because the gateway would not give it the vendor user, built from the
|
|
29
|
+
gateway's reason. A template built from a container image (Alpine, Ubuntu, any ``FROM`` image) keeps the image's own
|
|
30
|
+
accounts: the guest cannot add a user there, and rebuilding does not change that."""
|
|
31
|
+
head = f"solari-e2b-compat: the sandbox runs as root instead of '{VENDOR_USER}'"
|
|
32
|
+
if re.search(r"built from an image|rootDir", reason, re.I):
|
|
33
|
+
return (
|
|
34
|
+
f"{head} because its template was built from a container image (for example Alpine), and Solari cannot add the "
|
|
35
|
+
f"'{VENDOR_USER}' account to an image's own user database: commands run as the image's default user (root unless the "
|
|
36
|
+
f"image sets USER). Rebuilding the template does not change this; build the template on from_base_image() (Solari's base image) to get '{VENDOR_USER}'."
|
|
37
|
+
)
|
|
38
|
+
if re.search(r"predates user support", reason, re.I):
|
|
39
|
+
return f"{head} because the template or snapshot was made before user support shipped. Rebuild it to get the vendor user."
|
|
40
|
+
if re.search(r"host pool", reason, re.I):
|
|
41
|
+
return f"{head} because this server's host pool cannot run sandboxes as a chosen user yet. Nothing in your template causes this."
|
|
42
|
+
return f"{head} because the server would not create the user" + (f" ({reason})." if reason else ".")
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
def _warn_root(e: BaseException) -> None:
|
|
46
|
+
warnings.warn(root_warning_text(_reason_of(e)), RuntimeWarning, stacklevel=4)
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
async def create_as_vendor_user(solari: Any, **opts: Any) -> Any:
|
|
50
|
+
"""``solari.create(**opts)`` with ``user`` / ``cwd`` set to E2b's defaults. A gateway that predates them (it answers 400
|
|
51
|
+
naming them) gets the plain create, and the sandbox runs as root there (COMPAT.md). Restores from a snapshot keep the
|
|
52
|
+
snapshot's own user and are sent without them."""
|
|
53
|
+
if opts.get("from_snapshot") is not None:
|
|
54
|
+
return await solari.create(**opts)
|
|
55
|
+
try:
|
|
56
|
+
return await solari.create(**opts, user=VENDOR_USER, cwd=VENDOR_HOME)
|
|
57
|
+
except GatewayError as e:
|
|
58
|
+
if not _refuses_user_fields(e):
|
|
59
|
+
raise
|
|
60
|
+
_warn_root(e)
|
|
61
|
+
return await solari.create(**opts)
|
|
@@ -67,6 +67,15 @@ class GitUpstreamException(SandboxException): ...
|
|
|
67
67
|
class TemplateException(SandboxException): ...
|
|
68
68
|
|
|
69
69
|
|
|
70
|
+
class GuestUnresponsiveException(SandboxException):
|
|
71
|
+
"""e2b 2.63+: the sandbox's guest agent did not respond. Raised when the Solari gateway reports ``GuestUnreachable``
|
|
72
|
+
(502): the guest's control channel did not answer while the sandbox started or resumed. Solari has no
|
|
73
|
+
``on_resume="reboot"``; retry the call (the gateway marks the answer retryable)."""
|
|
74
|
+
|
|
75
|
+
#: E2B's API ``error_code`` for this exception, kept so code that compares it still works.
|
|
76
|
+
code = "sandbox_snapshot_guest_agent_unresponsive"
|
|
77
|
+
|
|
78
|
+
|
|
70
79
|
class RateLimitException(SandboxException):
|
|
71
80
|
def __init__(self, *args: object, status_code: Optional[int] = 429) -> None:
|
|
72
81
|
super().__init__(*args, status_code=status_code)
|
|
@@ -156,6 +165,8 @@ def translate(err: BaseException, what: str = "other") -> BaseException:
|
|
|
156
165
|
s = err.status
|
|
157
166
|
if s in (401, 403):
|
|
158
167
|
return AuthenticationException(msg)
|
|
168
|
+
if getattr(err, "code", None) == "GuestUnreachable":
|
|
169
|
+
return _chain(GuestUnresponsiveException(msg, status_code=s), err)
|
|
159
170
|
if s == 404:
|
|
160
171
|
cls = SandboxNotFoundException if what == "sandbox" else FileNotFoundException if what == "file" else NotFoundException
|
|
161
172
|
return _chain(cls(msg, status_code=s), err)
|
|
@@ -1,40 +0,0 @@
|
|
|
1
|
-
"""Create sandboxes that run as E2b's default user (commands, code and files default to its home)."""
|
|
2
|
-
|
|
3
|
-
from __future__ import annotations
|
|
4
|
-
|
|
5
|
-
import re
|
|
6
|
-
import warnings
|
|
7
|
-
from typing import Any
|
|
8
|
-
|
|
9
|
-
from solari_core.errors import GatewayError
|
|
10
|
-
|
|
11
|
-
VENDOR_USER = "user"
|
|
12
|
-
VENDOR_HOME = "/home/user"
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
def _refuses_user_fields(e: BaseException) -> bool:
|
|
16
|
-
return isinstance(e, GatewayError) and e.status == 400 and re.search(r"\b(user|cwd)\b", repr(getattr(e, "body", None)), re.I) is not None
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
def _warn_root() -> None:
|
|
20
|
-
warnings.warn(
|
|
21
|
-
"solari-e2b-compat: the server or this template's image predates user support, so the sandbox runs as root instead of 'user'. "
|
|
22
|
-
"Rebuild templates and snapshots made before user support shipped to get the vendor user.",
|
|
23
|
-
RuntimeWarning,
|
|
24
|
-
stacklevel=4,
|
|
25
|
-
)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
async def create_as_vendor_user(solari: Any, **opts: Any) -> Any:
|
|
29
|
-
"""``solari.create(**opts)`` with ``user`` / ``cwd`` set to E2b's defaults. A gateway that predates them (it answers 400
|
|
30
|
-
naming them) gets the plain create, and the sandbox runs as root there (COMPAT.md). Restores from a snapshot keep the
|
|
31
|
-
snapshot's own user and are sent without them."""
|
|
32
|
-
if opts.get("from_snapshot") is not None:
|
|
33
|
-
return await solari.create(**opts)
|
|
34
|
-
try:
|
|
35
|
-
return await solari.create(**opts, user=VENDOR_USER, cwd=VENDOR_HOME)
|
|
36
|
-
except GatewayError as e:
|
|
37
|
-
if not _refuses_user_fields(e):
|
|
38
|
-
raise
|
|
39
|
-
_warn_root()
|
|
40
|
-
return await solari.create(**opts)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/constants.py
RENAMED
|
File without changes
|
{solari_e2b_compat-0.2.12 → solari_e2b_compat-0.2.13}/solari_e2b/code_interpreter/exceptions.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|