Update shared_vis_python_exe.py

shared_vis_python_exe.py

@@ -204,82 +204,144 @@ class PythonExecutor:
     def process_generation_to_code(self, gens: str):
         return [g.split("\n") for g in gens]
 
-    def execute(
-        self,
-        code,
-        messages,
-        get_answer_from_stdout=True,
-        runtime_class=None,
-        # run_time_instance=None,
-        answer_symbol=None,
-        answer_expr=None,
-        # 移除 timeout_length 参数
-    ) -> Tuple[Union[str, Dict[str, Any]], str]:
-        # print("dome")
-        # try:
-        # 在每个进程中创建新的运行时实例
-        print(runtime_class)
-        # runtime = runtime_class(messages)
-        runtime = self.persistent_runtime
+    # def execute(
+    #     self,
+    #     code,
+    #     messages,
+    #     get_answer_from_stdout=True,
+    #     runtime_class=None,
+    #     # run_time_instance=None,
+    #     answer_symbol=None,
+    #     answer_expr=None,
+    #     # 移除 timeout_length 参数
+    # ) -> Tuple[Union[str, Dict[str, Any]], str]:
+    #     # print("dome")
+    #     # try:
+    #     # 在每个进程中创建新的运行时实例
+    #     print(runtime_class)
+    #     # runtime = runtime_class(messages)
+    #     runtime = self.persistent_runtime
+        
+    #     if get_answer_from_stdout:
+    #         program_io = io.StringIO()
+    #         with redirect_stdout(program_io):
+    #             # 移除 timeout 调用
+    #             runtime.exec_code("\n".join(code))
+    #         program_io.seek(0)
+    #         result = program_io.read()
+    #     elif answer_symbol:
+    #         # 移除 timeout 调用
+    #         runtime.exec_code("\n".join(code))
+    #         result = runtime._global_vars.get(answer_symbol, "")
+    #     elif answer_expr:
+    #         # 移除 timeout 调用
+    #         runtime.exec_code("\n".join(code))
+    #         # 移除 timeout 调用
+    #         result = runtime.eval_code(answer_expr)
+    #     else:
+    #         if len(code) > 1:
+    #             # 移除 timeout 调用
+    #             runtime.exec_code("\n".join(code[:-1]))
+    #             # 移除 timeout 调用
+    #             result = runtime.eval_code(code[-1])
+    #         else:
+    #             # 移除 timeout 调用
+    #             runtime.exec_code("\n".join(code))
+    #             result = ""
+        
+    #     # 检查是否有捕获的图像
+    #     captured_figures = runtime._global_vars.get("_captured_figures", [])
+    #     if captured_figures:
+    #         # 如果有文本输出和图像，将它们组合
+    #         if result:
+    #             result = {
+    #                 'text': result,
+    #                 'images': captured_figures
+    #             }
+    #         else:
+    #             result = {'images': captured_figures}
+    #     else:
+    #         if result:
+    #             result = {
+    #                 'text': result,
+    #             }
+            
+        
+    #     report = "Done"
+    #     # except Exception as e:
+    #     #     result = ""
+    #     #     report = f"Error: {str(e)}\n{traceback.format_exc()}"
         
+    #     # 确保结果可序列化
+    #     try:
+    #         pickle.dumps(result)
+    #     except Exception as e:
+    #         result = f"Result serialization error: {str(e)}"
+    #         report = f"Serialization Error: {str(e)}"
+            
+    #     return result, report
+
+def execute(
+    self,
+    code,
+    messages,
+    get_answer_from_stdout=True,
+    runtime_class=None,
+    answer_symbol=None,
+    answer_expr=None,
+) -> Tuple[Union[str, Dict[str, Any]], str]:
+    print(runtime_class)
+    runtime = self.persistent_runtime
+
+    try:
         if get_answer_from_stdout:
             program_io = io.StringIO()
             with redirect_stdout(program_io):
-                # 移除 timeout 调用
                 runtime.exec_code("\n".join(code))
             program_io.seek(0)
             result = program_io.read()
         elif answer_symbol:
-            # 移除 timeout 调用
             runtime.exec_code("\n".join(code))
             result = runtime._global_vars.get(answer_symbol, "")
         elif answer_expr:
-            # 移除 timeout 调用
             runtime.exec_code("\n".join(code))
-            # 移除 timeout 调用
             result = runtime.eval_code(answer_expr)
         else:
             if len(code) > 1:
-                # 移除 timeout 调用
                 runtime.exec_code("\n".join(code[:-1]))
-                # 移除 timeout 调用
                 result = runtime.eval_code(code[-1])
             else:
-                # 移除 timeout 调用
                 runtime.exec_code("\n".join(code))
                 result = ""
-        
-        # 检查是否有捕获的图像
+
+        # Check for captured figures
         captured_figures = runtime._global_vars.get("_captured_figures", [])
         if captured_figures:
-            # 如果有文本输出和图像，将它们组合
-            if result:
-                result = {
-                    'text': result,
-                    'images': captured_figures
-                }
-            else:
-                result = {'images': captured_figures}
+            result = {
+                'text': result,
+                'images': captured_figures
+            } if result else {'images': captured_figures}
         else:
-            if result:
-                result = {
-                    'text': result,
-                }
-            
-        
+            result = {'text': result} if result else {}
+
         report = "Done"
-        # except Exception as e:
-        #     result = ""
-        #     report = f"Error: {str(e)}\n{traceback.format_exc()}"
-        
-        # 确保结果可序列化
-        try:
-            pickle.dumps(result)
-        except Exception as e:
-            result = f"Result serialization error: {str(e)}"
-            report = f"Serialization Error: {str(e)}"
-            
-        return result, report
+
+    except Exception as e:
+        result = {
+            'error': str(e),
+            'traceback': traceback.format_exc()
+        }
+        report = f"Error: {str(e)}\n{traceback.format_exc()}"
+
+    # Ensure result is serializable
+    try:
+        pickle.dumps(result)
+    except Exception as e:
+        result = f"Result serialization error: {str(e)}"
+        report = f"Serialization Error: {str(e)}"
+
+    return result, report
+
 
     
     def apply(self, code, messages):