Code interpreter response format + grooming

oracles/oracle.py

@@ -103,8 +103,8 @@ async def _call_function(function_call: FunctionCall, semaphore: Semaphore):
                     python_interpreter_result = await python_interpreter_use_case.execute(
                         formatted_input
                     )
-                    response = python_interpreter_result.stdout
-                    error_message = python_interpreter_result.stderr
+                    response = python_interpreter_result.output
+                    error_message = python_interpreter_result.error
                 else:
                     response = ""
                     error_message = f"Unknown function '{function_call.function_type}'"

oracles/src/domain/tools/code_interpreter/entities.py

@@ -3,6 +3,6 @@
 
 @dataclass
 class PythonInterpreterResult:
-    stdout: str
-    stderr: str
+    output: str
+    error: str
     exit_code: int

oracles/src/domain/tools/code_interpreter/python_interpreter_use_case.py

@@ -1,12 +1,12 @@
 import re
+import json
 import base64
 import aiohttp
 import settings
-from typing import Optional
 from src.domain.tools.code_interpreter.entities import PythonInterpreterResult
 
 
-async def _interpret_code(code: str) -> Optional[PythonInterpreterResult]:
+async def _interpret_code(code: str) -> PythonInterpreterResult:
     try:
         async with aiohttp.ClientSession() as session:
             async with session.post(
@@ -23,21 +23,16 @@ async def _interpret_code(code: str) -> Optional[PythonInterpreterResult]:
             ) as response:
                 response.raise_for_status()
                 data = await response.json()
+                stdout = base64.b64decode(data["stdoutBasesixtyfour"]).decode() if data["stdoutBasesixtyfour"] else ""
+                stderr = base64.b64decode(data["stderrBasesixtyfour"]).decode() if data["stderrBasesixtyfour"] else ""
+                output = json.dumps({"stdout": stdout, "stderr": stderr})
                 return PythonInterpreterResult(
-                    stdout=(
-                        base64.b64decode(data["stdoutBasesixtyfour"]).decode()
-                        if data["stdoutBasesixtyfour"]
-                        else ""
-                    ),
-                    stderr=(
-                        base64.b64decode(data["stderrBasesixtyfour"]).decode()
-                        if data["stderrBasesixtyfour"]
-                        else ""
-                    ),
+                    output=output,
+                    error="",
                     exit_code=data["exitCode"],
                 )
     except Exception as e:
-        return PythonInterpreterResult(stdout="", stderr=str(e), exit_code=1)
+        return PythonInterpreterResult(output="", error=str(e), exit_code=1)
 
 
 async def _strip_markdown_code(md_string: str) -> str:
@@ -46,7 +41,7 @@ async def _strip_markdown_code(md_string: str) -> str:
     return stripped_string
 
 
-async def execute(code: str) -> Optional[PythonInterpreterResult]:
+async def execute(code: str) -> PythonInterpreterResult:
     clean_code = await _strip_markdown_code(code)
     return await _interpret_code(clean_code)