Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Templates SDK: simplify exports (#898)

Mish Ushakov79d4ce34e26f
diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.ts
index f5265af21..5d50c26c1 100644
--- a/packages/js-sdk/src/index.ts
+++ b/packages/js-sdk/src/index.ts
@@ -59,15 +59,14 @@ export { Sandbox }
import { Sandbox } from './sandbox'
export default Sandbox
+export { BuildError, FileUploadError } from './template/errors'
+
export {
- Template,
- type TemplateClass,
- type TemplateBase,
- BuildError,
- FileUploadError,
waitForPort,
waitForURL,
waitForProcess,
waitForFile,
waitForTimeout,
-} from './template'
+} from './template/readycmd'
+
+export { Template, type TemplateClass, type TemplateBase } from './template'
diff --git a/packages/js-sdk/src/template/index.ts b/packages/js-sdk/src/template/index.ts
index d3c05f2d3..7af6ccc98 100644
--- a/packages/js-sdk/src/template/index.ts
+++ b/packages/js-sdk/src/template/index.ts
@@ -583,11 +583,3 @@ Template.toJSON = TemplateBase.toJSON
Template.toDockerfile = TemplateBase.toDockerfile
export type TemplateClass = TemplateBuilder | TemplateFinal
-export { BuildError, FileUploadError } from './errors'
-export {
- waitForFile,
- waitForURL,
- waitForPort,
- waitForProcess,
- waitForTimeout,
-} from './readycmd'
diff --git a/packages/python-sdk/e2b/__init__.py b/packages/python-sdk/e2b/__init__.py
index 6bcbfde62..5ea7ca785 100644
--- a/packages/python-sdk/e2b/__init__.py
+++ b/packages/python-sdk/e2b/__init__.py
@@ -69,13 +69,13 @@ from .sandbox_async.filesystem.watch_handle import AsyncWatchHandle
from .sandbox_async.commands.command_handle import AsyncCommandHandle
from .sandbox_sync.paginator import SandboxPaginator
-from .template import (
- Template,
- AsyncTemplate,
- TemplateBase,
- TemplateClass,
- BuildException,
- FileUploadException,
+from .template.main import TemplateBase, TemplateClass
+
+from .template_sync.main import Template
+from .template_async.main import AsyncTemplate
+
+from .template.exceptions import BuildException, FileUploadException
+from .template.readycmd import (
wait_for_file,
wait_for_url,
wait_for_port,
diff --git a/packages/python-sdk/e2b/template/__init__.py b/packages/python-sdk/e2b/template/__init__.py
deleted file mode 100644
index fc6c3e918..000000000
--- a/packages/python-sdk/e2b/template/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-from e2b.template.main import TemplateBase, TemplateClass
-from e2b.template.exceptions import BuildException, FileUploadException
-from e2b.template.readycmd import (
- wait_for_file,
- wait_for_url,
- wait_for_port,
- wait_for_process,
- wait_for_timeout,
-)
-from e2b.template_sync import Template
-from e2b.template_async import AsyncTemplate
-
-__all__ = [
- "Template",
- "AsyncTemplate",
- "TemplateBase",
- "TemplateClass",
- "BuildException",
- "FileUploadException",
- "wait_for_port",
- "wait_for_url",
- "wait_for_process",
- "wait_for_file",
- "wait_for_timeout",
-]
diff --git a/packages/python-sdk/e2b/template_async/__init__.py b/packages/python-sdk/e2b/template_async/__init__.py
deleted file mode 100644
index f81153ec3..000000000
--- a/packages/python-sdk/e2b/template_async/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from e2b.template_async.main import AsyncTemplate
-
-__all__ = ["AsyncTemplate"]
diff --git a/packages/python-sdk/e2b/template_async/main.py b/packages/python-sdk/e2b/template_async/main.py
index 211f566d1..8a02e56f6 100644
--- a/packages/python-sdk/e2b/template_async/main.py
+++ b/packages/python-sdk/e2b/template_async/main.py
@@ -1,6 +1,6 @@
from typing import Callable, Optional
-from e2b.template import TemplateBase, TemplateClass
+from e2b.template.main import TemplateBase, TemplateClass
import os
from datetime import datetime
diff --git a/packages/python-sdk/e2b/template_sync/__init__.py b/packages/python-sdk/e2b/template_sync/__init__.py
deleted file mode 100644
index d639762ce..000000000
--- a/packages/python-sdk/e2b/template_sync/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from e2b.template_sync.main import Template
-
-__all__ = ["Template"]
diff --git a/packages/python-sdk/e2b/template_sync/main.py b/packages/python-sdk/e2b/template_sync/main.py
index cbe78c22d..7d69d960a 100644
--- a/packages/python-sdk/e2b/template_sync/main.py
+++ b/packages/python-sdk/e2b/template_sync/main.py
@@ -1,6 +1,6 @@
from typing import Callable, Optional
-from e2b.template import TemplateBase, TemplateClass
+from e2b.template.main import TemplateBase, TemplateClass
from e2b.template.types import LogEntry
import os