agentscope-runtime 1.0.4__py3-none-any.whl → 1.0.4a1__py3-none-any.whl

agentscope_runtime/sandbox/box/shared/routers/generic.py

@@ -2,7 +2,7 @@
 import io
 import sys
 import logging
-import asyncio
+import subprocess
 import traceback
 from contextlib import redirect_stderr, redirect_stdout
 
@@ -44,33 +44,26 @@ async def run_ipython_cell(
         stdout_buf = io.StringIO()
         stderr_buf = io.StringIO()
 
-        def thread_target():
-            with redirect_stdout(stdout_buf), redirect_stderr(stderr_buf):
-                preprocessing_exc_tuple = None
-                try:
-                    transformed_cell = ipy.transform_cell(code)
-                except Exception:
-                    transformed_cell = code
-                    preprocessing_exc_tuple = sys.exc_info()
-
-                if transformed_cell is None:
-                    raise HTTPException(
-                        status_code=500,
-                        detail=(
-                            "IPython cell transformation failed: "
-                            "transformed_cell is None."
-                        ),
-                    )
-
-                asyncio.run(
-                    ipy.run_cell_async(
-                        code,
-                        transformed_cell=transformed_cell,
-                        preprocessing_exc_tuple=preprocessing_exc_tuple,
-                    ),
+        with redirect_stdout(stdout_buf), redirect_stderr(stderr_buf):
+            preprocessing_exc_tuple = None
+            try:
+                transformed_cell = ipy.transform_cell(code)
+            except Exception:
+                transformed_cell = code
+                preprocessing_exc_tuple = sys.exc_info()
+
+            if transformed_cell is None:
+                raise HTTPException(
+                    status_code=500,
+                    detail="IPython cell transformation failed: "
+                    "transformed_cell is None.",
                 )
 
-        await asyncio.to_thread(thread_target)
+            await ipy.run_cell_async(
+                code,
+                transformed_cell=transformed_cell,
+                preprocessing_exc_tuple=preprocessing_exc_tuple,
+            )
 
         stdout_content = stdout_buf.getvalue()
         stderr_content = stderr_buf.getvalue()
@@ -135,16 +128,16 @@ async def run_shell_command(
         if not command:
             raise HTTPException(status_code=400, detail="Command is required.")
 
-        proc = await asyncio.create_subprocess_shell(
+        result = subprocess.run(
             command,
-            stdout=asyncio.subprocess.PIPE,
-            stderr=asyncio.subprocess.PIPE,
+            shell=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=False,
         )
-
-        stdout_bytes, stderr_bytes = await proc.communicate()
-
-        stdout_content = stdout_bytes.decode()
-        stderr_content = stderr_bytes.decode()
+        stdout_content = result.stdout
+        stderr_content = result.stderr
 
         content_list = []
 
@@ -168,7 +161,7 @@ async def run_shell_command(
             content_list.append(
                 TextContent(
                     type="text",
-                    text=str(proc.returncode),
+                    text=str(result.returncode),
                     description="returncode",
                 ),
             )
@@ -180,7 +173,7 @@ async def run_shell_command(
                     + "\n"
                     + stderr_content
                     + "\n"
-                    + str(proc.returncode),
+                    + str(result.returncode),
                     description="output",
                 ),
             )

agentscope_runtime/sandbox/client/__init__.py

@@ -1,10 +1,5 @@
 # -*- coding: utf-8 -*-
 from .http_client import SandboxHttpClient
 from .training_client import TrainingSandboxClient
-from .async_http_client import SandboxHttpAsyncClient
 
-__all__ = [
-    "SandboxHttpClient",
-    "SandboxHttpAsyncClient",
-    "TrainingSandboxClient",
-]
+__all__ = ["SandboxHttpClient", "TrainingSandboxClient"]