Merge branch 'main' into codex/修复拼写错误和代码问题

Author: jihe520

backend/app/tests/test_e2b.py

@@ -2,19 +2,35 @@
 import asyncio
 import unittest
 
+
 from dotenv import load_dotenv
 
 from app.tools.e2b_interpreter import E2BCodeInterpreter
 from app.utils.common_utils import create_work_dir
-from app.tools.notebook_serializer import NotebookSerializer
+
+try:
+    from dotenv import load_dotenv
+except ModuleNotFoundError:  # Fallback if python-dotenv is not installed
+    def load_dotenv(*args, **kwargs):
+        return None
+
+try:
+    from app.tools.e2b_interpreter import E2BCodeInterpreter
+except ModuleNotFoundError:
+    E2BCodeInterpreter = None
+from app.utils.common_utils import create_task_id, create_work_dir
+
 
 
 class TestE2BCodeInterpreter(unittest.TestCase):
     def setUp(self):
         load_dotenv()
-        self.task_id = "20250312-104132-d3625cab"
-        self.work_dir = create_work_dir(self.task_id)
-        notebook = NotebookSerializer(self.work_dir)
+
+        if E2BCodeInterpreter is None:
+            self.skipTest("e2b_code_interpreter not available")
+        _, dirs = create_work_dir("20250312-104132-d3625cab")
+        notebook = NotebookSerializer(dirs["jupyter"])
+
         self.code_interpreter = E2BCodeInterpreter(
             self.task_id, self.work_dir, notebook
         )

backend/app/tools/base_interpreter.py

@@ -34,7 +34,7 @@ async def _pre_execute_code(self):
         ...
 
     @abc.abstractmethod
-    async def execute_code(self, code: str) -> tuple[str, bool, str, list[str]]:
+    async def execute_code(self, code: str) -> tuple[str, bool, str]:
         """执行一段代码，返回 (输出文本, 是否出错, 错误信息)"""
         ...
 

backend/app/tools/e2b_interpreter.py

@@ -89,7 +89,7 @@ async def _pre_execute_code(self):
         )
         await self.execute_code(init_code)
 
-    async def execute_code(self, code: str) -> tuple[str, bool, str, list[str]]:
+    async def execute_code(self, code: str) -> tuple[str, bool, str]:
         """执行代码并返回结果"""
 
         if not self.sbx:

backend/app/tools/local_interpreter.py

@@ -53,7 +53,7 @@ def _pre_execute_code(self):
         )
         self.execute_code_(init_code)
 
-    async def execute_code(self, code: str) -> tuple[str, bool, str, list[str]]:
+    async def execute_code(self, code: str) -> tuple[str, bool, str]:
         logger.info(f"执行代码: {code}")
         #  添加代码到notebook
         self.notebook_serializer.add_code_cell_to_notebook(code)