From 98f0c9482d87d995eaa230ce13147ba59d8d2043 Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Sat, 17 May 2025 12:36:39 +0200 Subject: [PATCH 1/6] e2b ijavascript kernel --- template/test.Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/template/test.Dockerfile b/template/test.Dockerfile index f9302081..600194ff 100644 --- a/template/test.Dockerfile +++ b/template/test.Dockerfile @@ -23,13 +23,9 @@ COPY ./template/requirements.txt requirements.txt RUN pip install --no-cache-dir -r requirements.txt && ipython kernel install --name "python3" --user # Javascript Kernel -RUN npm install -g --unsafe-perm ijavascript +RUN npm install -g --unsafe-perm git+https://github.com/e2b-dev/ijavascript.git RUN ijsinstall --install=global -## TypeScript compiler -RUN npm install -g @swc/cli @swc/core -COPY ./template/.ts.swcrc $SERVER_PATH/.ts.swcrc - # Deno Kernel COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno RUN chmod +x /usr/bin/deno From 4bfd050e53ac064f93ae83ec5aabbd6e0d96df2c Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Sat, 17 May 2025 12:37:07 +0200 Subject: [PATCH 2/6] removed compiler step --- template/.ts.swcrc | 15 --------------- template/server/messaging.py | 26 -------------------------- 2 files changed, 41 deletions(-) delete mode 100644 template/.ts.swcrc diff --git a/template/.ts.swcrc b/template/.ts.swcrc deleted file mode 100644 index cf7cb8d3..00000000 --- a/template/.ts.swcrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "$schema": "https://swc.rs/schema.json", - "jsc": { - "parser": { - "syntax": "typescript" - } - }, - "module": { - "type": "commonjs" - }, - "env": { - "targets": "node 20" - }, - "isModule": false -} diff --git a/template/server/messaging.py b/template/server/messaging.py index d2894d92..9fe4e081 100644 --- a/template/server/messaging.py +++ b/template/server/messaging.py @@ -199,32 +199,6 @@ async def execute( + code ) - if self.language == "typescript": - logger.info("Compiling TypeScript: %s", code) - - # call SWC to compile the typescript code - try: - compile_result = subprocess.run("swc --config-file .ts.swcrc --filename index.ts".split(), input=code.encode(), capture_output=True) - - if compile_result.returncode != 0: - logger.error("Error during TypeScript compilation: %s", compile_result.stderr.decode()) - yield Error( - name="TypeScriptCompilerError", - value=compile_result.stderr.decode(), - traceback="", - ) - return - - code = compile_result.stdout.decode() - except Exception as e: - logger.error("Error starting SWC process: %s", e) - yield Error( - name="TypeScriptCompilerError", - value=str(e), - traceback="", - ) - return - logger.info(code) request = self._get_execute_request(message_id, code, False) From 589e3ca34888d5bfc1b2a18597422541df7edd6c Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Tue, 20 May 2025 13:45:37 +0200 Subject: [PATCH 3/6] e2b ijavascript --- template/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/Dockerfile b/template/Dockerfile index 199a5cb0..43f9c1d2 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -28,7 +28,7 @@ RUN R -e "install.packages('IRkernel', repos='https://cloud.r-project.org')" RUN R -e "IRkernel::installspec(user = FALSE, name = 'r', displayname = 'R')" # Javascript Kernel -RUN npm install -g --unsafe-perm ijavascript +RUN npm install -g --unsafe-perm git+https://github.com/e2b-dev/ijavascript.git RUN ijsinstall --install=global ## TypeScript compiler From 853419b1e4e6b8e5d383d2ebbf8667c080bcb1bf Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Wed, 28 May 2025 12:04:55 +0200 Subject: [PATCH 4/6] removed ts compiler from dockerfile --- template/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/template/Dockerfile b/template/Dockerfile index 43f9c1d2..de40b1c1 100644 --- a/template/Dockerfile +++ b/template/Dockerfile @@ -31,10 +31,6 @@ RUN R -e "IRkernel::installspec(user = FALSE, name = 'r', displayname = 'R')" RUN npm install -g --unsafe-perm git+https://github.com/e2b-dev/ijavascript.git RUN ijsinstall --install=global -## TypeScript compiler -RUN npm install -g @swc/cli @swc/core -COPY .ts.swcrc $SERVER_PATH/.ts.swcrc - # Deno Kernel COPY --from=denoland/deno:bin-2.0.4 /deno /usr/bin/deno RUN chmod +x /usr/bin/deno From b825289aff7af17edd7fbfb7a5835fd82b59c238 Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Wed, 28 May 2025 14:47:41 +0200 Subject: [PATCH 5/6] removed tests that should no longer be failing --- js/tests/defaultKernels.test.ts | 7 ------- python/tests/async/test_async_default_kernels.py | 8 -------- python/tests/sync/test_default_kernels.py | 5 ----- 3 files changed, 20 deletions(-) diff --git a/js/tests/defaultKernels.test.ts b/js/tests/defaultKernels.test.ts index 5750644a..41bc245b 100644 --- a/js/tests/defaultKernels.test.ts +++ b/js/tests/defaultKernels.test.ts @@ -16,10 +16,3 @@ sandboxTest('test ts kernel', async ({ sandbox }) => { ) expect(output.logs.stdout).toEqual(['Hello World!\n']) }) - -sandboxTest('test ts kernel errors', async ({ sandbox }) => { - const output = await sandbox.runCode('import x from "module";', { - language: 'typescript', - }) - expect(output.error?.name).toEqual('TypeScriptCompilerError') -}) diff --git a/python/tests/async/test_async_default_kernels.py b/python/tests/async/test_async_default_kernels.py index 83f92746..88df4a94 100644 --- a/python/tests/async/test_async_default_kernels.py +++ b/python/tests/async/test_async_default_kernels.py @@ -13,11 +13,3 @@ async def test_ts_kernel(async_sandbox: AsyncSandbox): "const message: string = 'Hello, World!'; console.log(message);", language="ts" ) assert execution.logs.stdout == ["Hello, World!\n"] - - -async def test_ts_kernel_errors(async_sandbox: AsyncSandbox): - execution = await async_sandbox.run_code( - "import x from 'module';", language="ts" - ) - assert execution.error is not None - assert execution.error.name == "TypeScriptCompilerError" diff --git a/python/tests/sync/test_default_kernels.py b/python/tests/sync/test_default_kernels.py index 0695defd..71abadfc 100644 --- a/python/tests/sync/test_default_kernels.py +++ b/python/tests/sync/test_default_kernels.py @@ -25,8 +25,3 @@ def test_ts_kernel(sandbox: Sandbox): execution = sandbox.run_code("const message: string = 'Hello, World!'; console.log(message)", language="ts") assert execution.logs.stdout == ["Hello, World!\n"] - -def test_ts_kernel_errors(sandbox: Sandbox): - execution = sandbox.run_code("import x from 'module';", language="ts") - assert execution.error is not None - assert execution.error.name == "TypeScriptCompilerError" From d02588c4bf8b26703cfdcb29aad872e40f68dd29 Mon Sep 17 00:00:00 2001 From: Mish <10400064+mishushakov@users.noreply.github.com> Date: Wed, 28 May 2025 14:50:28 +0200 Subject: [PATCH 6/6] added changeset --- .changeset/breezy-bananas-lay.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/breezy-bananas-lay.md diff --git a/.changeset/breezy-bananas-lay.md b/.changeset/breezy-bananas-lay.md new file mode 100644 index 00000000..c7d185b0 --- /dev/null +++ b/.changeset/breezy-bananas-lay.md @@ -0,0 +1,5 @@ +--- +'@e2b/code-interpreter-template': patch +--- + +updated ijavascript kernel in the template