refactor: execution handling to use Executor class instead of Runner

app/controllers.php

@@ -4,6 +4,7 @@
 
 use OpenRuntimes\Executor\Exception;
 use OpenRuntimes\Executor\BodyMultipart;
+use OpenRuntimes\Executor\Executor;
 use OpenRuntimes\Executor\Runner\Adapter as Runner;
 use Utopia\Logger\Log;
 use Utopia\System\System;
@@ -166,7 +167,7 @@
     ->inject('response')
     ->inject('request')
     ->inject('log')
-    ->inject('runner')
+    ->inject('executor')
     ->action(
         function (
             string $runtimeId,
@@ -188,7 +189,7 @@ function (
             Response $response,
             Request $request,
             Log $log,
-            Runner $runner
+            Executor $executor
         ) {
             // Extra parsers and validators to support both JSON and multipart
             $intParams = ['timeout', 'memory'];
@@ -241,7 +242,7 @@ function (
 
             $variables = array_map(fn ($v) => strval($v), $variables);
 
-            $execution = $runner->createExecution(
+            $execution = $executor->createExecution(
                 $runtimeId,
                 $payload,
                 $path,

app/http.php

@@ -1,5 +1,7 @@
 <?php
 
+use OpenRuntimes\Executor\Executor;
+
 if (file_exists(__DIR__ . '/../vendor/autoload.php')) {
     require_once __DIR__ . '/../vendor/autoload.php';
 }
@@ -30,9 +32,12 @@
         Http::getEnv('OPR_EXECUTOR_DOCKER_HUB_PASSWORD', '')
     ));
     $networks = explode(',', Http::getEnv('OPR_EXECUTOR_NETWORK') ?: 'openruntimes-runtimes');
+
     $runner = new Docker($orchestration, $networks);
+    $executor = new Executor($runner);
 
     Http::setResource('runner', fn () => $runner);
+    Http::setResource('executor', fn () => $executor);
 
     $payloadSize = 22 * (1024 * 1024);
     $settings = [

src/Executor/Executor.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace OpenRuntimes\Executor;
+
+use OpenRuntimes\Executor\Runner\Adapter as Runner;
+use Utopia\Logger\Log;
+
+class Executor
+{
+    public function __construct(
+        private readonly Runner $runner,
+    ) {
+    }
+
+    public function createExecution(
+        string $runtimeId,
+        ?string $payload,
+        string $path,
+        string $method,
+        mixed $headers,
+        int $timeout,
+        string $image,
+        string $source,
+        string $entrypoint,
+        mixed $variables,
+        float $cpus,
+        int $memory,
+        string $version,
+        string $runtimeEntrypoint,
+        bool $logging,
+        string $restartPolicy,
+        Log $log,
+        string $region = '',
+    ): mixed {
+        return $this->runner->createExecution(
+            $runtimeId,
+            $payload,
+            $path,
+            $method,
+            $headers,
+            $timeout,
+            $image,
+            $source,
+            $entrypoint,
+            $variables,
+            $cpus,
+            $memory,
+            $version,
+            $runtimeEntrypoint,
+            $logging,
+            $restartPolicy,
+            $log,
+            $region,
+        );
+    }
+}