feat: auto pull image

Author: martvaha

README.md

@@ -10,7 +10,8 @@ A FastAPI-based code interpreter service that provides code execution and file m
 ## Features
 
 - Easy deployment with single docker compose file
-- 
+- Code execution in Docker container sandbox
+- File upload and download
 - Multi-user support
 - RESTful API with OpenAPI documentation
 
@@ -22,7 +23,7 @@ A FastAPI-based code interpreter service that provides code execution and file m
 
 Run the project with docker compose using `docker compose -f compose.prod.yml up`
 
-It's possible to overwrite the default environment variables defined in ./app/shared/config.py by creating a `.env` file in the root directory.
+It's possible to overwrite the default environment variables defined in [./app/shared/config.py](./app/shared/config.py) by creating a `.env` file in the root directory.
 By default the project will create two directories in the root directory: `./config` and `./uploads`.
 
 `config` directory will hold the sqlite database and temp uploaded files.

app/main.py

@@ -11,6 +11,7 @@
 from .services.database import db_manager
 from .services.cleanup import cleanup_service
 from .utils.logging import setup_logging, RequestLoggingMiddleware
+from .services.docker_executor import docker_executor
 
 
 @asynccontextmanager
@@ -23,6 +24,9 @@ async def lifespan(app: FastAPI):
     # Initialize database
     await db_manager.initialize()
 
+    # Initialize Docker executor
+    await docker_executor.initialize()
+    
     # Start cleanup service
     await cleanup_service.start()
 
@@ -34,6 +38,7 @@ async def lifespan(app: FastAPI):
     # Cleanup
     logger.info("Shutting down application")
     await cleanup_service.stop()
+    await docker_executor.close()
     await db_manager.close()
 
 

app/services/docker_executor.py

@@ -9,15 +9,15 @@
 from ..shared.config import get_settings
 from .database import db_manager
 from app.utils.generate_id import generate_id
-
+from app.shared.const import UPLOAD_PATH
 settings = get_settings()
 
 
 class FileManager:
     """Manages file operations for code interpreter sessions."""
 
     def __init__(self):
-        self.upload_path = Path("/app/uploads")
+        self.upload_path = UPLOAD_PATH
         self.upload_path.mkdir(parents=True, exist_ok=True)
         self._mime = magic.Magic(mime=True)
 

app/services/file_manager.py

@@ -12,7 +12,7 @@ class Settings(BaseSettings):
 
     # Configuration
     HOST_PATH: Path = (
-        None  # This is used to fully qualify relative paths for Docker code execution container volume mounts
+        "."  # This is used to fully qualify relative paths for Docker code execution container volume mounts
     )
     HOST_CONFIG_PATH: Path = Path("config")  # Base directory for configuration files
     LOG_LEVEL: str = "INFO"  # Log level for logging
@@ -32,7 +32,42 @@ def CONFIG_PATH_ABS(self) -> Path:
 
     # File management
     FILE_MAX_UPLOAD_SIZE: int = 10 * 1024 * 1024  # 10MB
-    FILE_ALLOWED_EXTENSIONS: Set[str] = {"py", "txt", "json", "csv", "ipynb", "xlsx", "yml", "yaml", "md"}
+    FILE_ALLOWED_EXTENSIONS: Set[str] = {
+        # Programming languages
+        "py",
+        "c",
+        "cpp",
+        "java",
+        "php",
+        "rb",
+        "js",
+        "ts",
+        # Documents
+        "txt",
+        "md",
+        "html",
+        "css",
+        "tex",
+        "json",
+        "csv",
+        "xml",
+        "docx",
+        "xlsx",
+        "pptx",
+        "pdf",
+        # Data formats
+        "ipynb",
+        "yml",
+        "yaml",
+        # Archives
+        "zip",
+        "tar",
+        # Images
+        "jpg",
+        "jpeg",
+        "png",
+        "gif",
+    }
 
     HOST_FILE_UPLOAD_PATH: Path = Path("uploads")  # Base directory for uploaded files
 
@@ -49,6 +84,8 @@ def HOST_FILE_UPLOAD_PATH_ABS(self) -> Path:
     CLEANUP_RUN_INTERVAL: int = 3600  # How often to run the cleanup in seconds
     CLEANUP_FILE_MAX_AGE: int = 86400  # How old files can be before they are deleted in seconds
 
+    PYTHON_CONTAINER_IMAGE: str = "jupyter/scipy-notebook:latest"
+
 
 @lru_cache()
 def get_settings() -> Settings:

app/shared/config.py

@@ -1,5 +1,9 @@
 from pathlib import Path
+import os
 
+# Get the current working directory or use environment variable if set
+HOST_PATH = Path(os.environ.get("HOST_PATH", os.getcwd()))
 
-UPLOAD_PATH = Path('/app/uploads')
-CONFIG_PATH = Path('/app/config')
+# Use relative paths that will be resolved at runtime
+UPLOAD_PATH = Path("uploads")
+CONFIG_PATH = Path("config")

app/shared/const.py

@@ -1,5 +1,8 @@
 import os
 from pathlib import Path
+
+from app.shared.const import CONFIG_PATH
+
 os.environ["HOST_PATH"] = str(Path.cwd())
 
 import pytest
@@ -10,15 +13,17 @@
 
 
 logger.remove()
-logger.add("logs/test.log")
-
+logs_path = Path("logs/test.log")
+logs_path.parent.mkdir(exist_ok=True, parents=True)
+# logs_path.unlink(missing_ok=True)
+logger.add(logs_path)
 
 
 @pytest.fixture(autouse=True)
 async def init_db():
     """Initialize the database before running tests."""
     # Ensure the data directory exists
-    Path("data").mkdir(exist_ok=True)
+    Path(CONFIG_PATH).mkdir(exist_ok=True, parents=True)
 
     # Initialize the database
     await db_manager.initialize()
@@ -27,7 +32,7 @@ async def init_db():
 
     # Cleanup after tests
     try:
-        Path("data/files.db").unlink(missing_ok=True)
+        (CONFIG_PATH / "test_database.db").unlink(missing_ok=True)
     except Exception as e:
         print(f"Failed to cleanup database: {e}")
 

tests/conftest.py

@@ -1,5 +1,7 @@
+import pytest
 from fastapi.testclient import TestClient
 from app.main import app
+from app.services.docker_executor import docker_executor
 
 client = TestClient(app)
 
@@ -35,7 +37,7 @@ def test_code_execution_error():
     result = response.json()
     assert result["run"]["status"] == "error"
     assert "ZeroDivisionError" in result["run"]["stderr"]
-    assert result["run"]["stdout"] == ""
+    assert result["run"]["stdout"] == "Empty. Make sure to explicitly print the results"
     assert isinstance(result["files"], list)
 
 def test_syntax_error():
@@ -51,4 +53,60 @@ def test_syntax_error():
     assert response.status_code == 200
     result = response.json()
     assert result["run"]["status"] == "error"
-    assert "SyntaxError" in result["run"]["stderr"] 
+    assert "SyntaxError" in result["run"]["stderr"]
+    assert result["run"]["stdout"] == "Empty. Make sure to explicitly print the results"
+    assert isinstance(result["files"], list)
+
+# Create a fixture for the Docker executor
+@pytest.fixture(scope="function")
+async def docker_exec():
+    """Initialize and clean up the Docker executor."""
+    # Initialize Docker executor
+    await docker_executor.initialize()
+    yield docker_executor
+    # Clean up Docker executor
+    await docker_executor.close()
+
+def test_multiple_sequential_requests(docker_exec):
+    """Test executing multiple code requests in sequence to verify event loop handling."""
+    # First request
+    response1 = client.post(
+        "/v1/execute",
+        json={
+            "code": "print('First request')",
+            "lang": "py"
+        }
+    )
+    
+    assert response1.status_code == 200
+    result1 = response1.json()
+    assert result1["run"]["status"] == "ok"
+    assert "First request" in result1["run"]["stdout"]
+    
+    # Second request
+    response2 = client.post(
+        "/v1/execute",
+        json={
+            "code": "print('Second request')",
+            "lang": "py"
+        }
+    )
+    
+    assert response2.status_code == 200
+    result2 = response2.json()
+    assert result2["run"]["status"] == "ok"
+    assert "Second request" in result2["run"]["stdout"]
+    
+    # Third request
+    response3 = client.post(
+        "/v1/execute",
+        json={
+            "code": "print('Third request')",
+            "lang": "py"
+        }
+    )
+    
+    assert response3.status_code == 200
+    result3 = response3.json()
+    assert result3["run"]["status"] == "ok"
+    assert "Third request" in result3["run"]["stdout"]