Merge remote-tracking branch 'origin/feat-executor-v3' into feat-appwrite-router

2026-05-26 13:51:13 +00:00 · 2023-02-14 12:18:39 +00:00
parent eea635fe4b d2ffa3e7c6
commit fef5082253
15 changed files with 499 additions and 182 deletions
@@ -785,6 +785,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('resourceId'),
                'type' => Database::VAR_STRING,
@@ -2223,6 +2234,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deployment'),
                'type' => Database::VAR_STRING,
@@ -2256,6 +2278,17 @@ $collections = [
                'array' => true,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('scheduleInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('scheduleId'),
                'type' => Database::VAR_STRING,
@@ -2311,6 +2344,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('version'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 8,
+                'signed' => true,
+                'required' => false,
+                'default' => 'v3',
+                'array' => false,
+                'filters' => [],
+            ],
        ],
        'indexes' => [
            [
@@ -2370,6 +2414,17 @@ $collections = [
        '$id' => ID::custom('deployments'),
        'name' => 'Deployments',
        'attributes' => [
+            [
+                '$id' => ID::custom('resourceInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('resourceId'),
                'type' => Database::VAR_STRING,
@@ -2392,6 +2447,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('buildInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('buildId'),
                'type' => Database::VAR_STRING,
@@ -2572,6 +2638,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => 'deploymentInternalId',
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentId'),
                'type' => Database::VAR_STRING,
@@ -2688,6 +2765,17 @@ $collections = [
        '$id' => ID::custom('executions'),
        'name' => 'Executions',
        'attributes' => [
+            [
+                '$id' => ID::custom('functionInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('functionId'),
                'type' => Database::VAR_STRING,
@@ -2699,6 +2787,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('deploymentInternalId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
            [
                '$id' => ID::custom('deploymentId'),
                'type' => Database::VAR_STRING,
@@ -2733,7 +2832,7 @@ $collections = [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('response'),
+                '$id' => ID::custom('body'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => 1000000,
@@ -2744,7 +2843,7 @@ $collections = [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('stderr'),
+                '$id' => ID::custom('errors'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => 1000000,
@@ -2755,7 +2854,7 @@ $collections = [
                'filters' => [],
            ],
            [
-                '$id' => ID::custom('stdout'),
+                '$id' => ID::custom('logs'),
                'type' => Database::VAR_STRING,
                'format' => '',
                'size' => 1000000,
@@ -2776,6 +2875,17 @@ $collections = [
                'array' => false,
                'filters' => [],
            ],
+            [
+                '$id' => ID::custom('headers'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => 16384,
+                'signed' => true,
+                'required' => false,
+                'default' => [],
+                'array' => false,
+                'filters' => ['json'],
+            ],
            [
                '$id' => ID::custom('duration'),
                'type' => Database::VAR_FLOAT,
@@ -7,7 +7,7 @@
 use Utopia\App;
 use Appwrite\Runtimes\Runtimes;

-$runtimes = new Runtimes('v2');
+$runtimes = new Runtimes('v3');

 $allowList = empty(App::getEnv('_APP_FUNCTIONS_RUNTIMES')) ? [] : \explode(',', App::getEnv('_APP_FUNCTIONS_RUNTIMES'));

@@ -13,6 +13,7 @@ use Utopia\Database\ID;
 use Utopia\Database\Permission;
 use Utopia\Database\Role;
 use Utopia\Database\Validator\UID;
+use Utopia\Validator\Assoc;
 use Appwrite\Usage\Stats;
 use Utopia\Storage\Device;
 use Utopia\Storage\Validator\File;
@@ -81,12 +82,14 @@ App::post('/v1/functions')
            'enabled' => $enabled,
            'name' => $name,
            'runtime' => $runtime,
+            'deploymentInternalId' => '',
            'deployment' => '',
            'events' => $events,
            'schedule' => $schedule,
            'scheduleUpdatedAt' => DateTime::now(),
            'timeout' => $timeout,
-            'search' => implode(' ', [$functionId, $name, $runtime])
+            'search' => implode(' ', [$functionId, $name, $runtime]),
+            'version' => 'v3'
        ]));

        $schedule = Authorization::skip(
@@ -102,6 +105,7 @@ App::post('/v1/functions')
        );

        $function->setAttribute('scheduleId', $schedule->getId());
+        $function->setAttribute('scheduleInternalId', $schedule->getInternalId());
        $dbForProject->updateDocument('functions', $function->getId(), $function);

        $eventsInstance->setParam('functionId', $function->getId());
@@ -534,6 +538,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
        }

        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
+            'deploymentInternalId' => $deployment->getInternalId(),
            'deployment' => $deployment->getId()
        ])));

@@ -740,6 +745,7 @@ App::post('/v1/functions/:functionId/deployments')
                        Permission::update(Role::any()),
                        Permission::delete(Role::any()),
                    ],
+                    'resourceInternalId' => $function->getInternalId(),
                    'resourceId' => $function->getId(),
                    'resourceType' => 'functions',
                    'entrypoint' => $entrypoint,
@@ -770,6 +776,7 @@ App::post('/v1/functions/:functionId/deployments')
                        Permission::update(Role::any()),
                        Permission::delete(Role::any()),
                    ],
+                    'resourceInternalId' => $function->getInternalId(),
                    'resourceId' => $function->getId(),
                    'resourceType' => 'functions',
                    'entrypoint' => $entrypoint,
@@ -967,6 +974,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
        if ($function->getAttribute('deployment') === $deployment->getId()) { // Reset function deployment
            $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
                'deployment' => '',
+                'deploymentInternalId' => '',
            ])));
        }

@@ -1056,8 +1064,11 @@ App::post('/v1/functions/:functionId/executions')
    ->label('abuse-limit', APP_LIMIT_WRITE_RATE_DEFAULT)
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('data', '', new Text(8192), 'String of custom data to send to function.', true)
+    ->param('body', '', new Text(8192), 'HTTP body of execution. Default value is empty string.', true)
    ->param('async', false, new Boolean(), 'Execute code in the background. Default value is false.', true)
+    ->param('path', '/', new Text(2048), 'HTTP path of execution. Default value is /', true)
+    ->param('method', 'GET', new Whitelist([ 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS' ], true), 'HTTP method of execution. Default value is GET.', true)
+    ->param('headers', [], new Assoc(), 'HTP headers of execution. Defaults to empty.', true)
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
@@ -1066,7 +1077,7 @@ App::post('/v1/functions/:functionId/executions')
    ->inject('usage')
    ->inject('mode')
    ->inject('queueForFunctions')
-    ->action(function (string $functionId, string $data, bool $async, Response $response, Document $project, Database $dbForProject, Document $user, Event $events, Stats $usage, string $mode, Func $queueForFunctions) {
+    ->action(function (string $functionId, string $body, bool $async, string $path, string $method, array $headers, Response $response, Document $project, Database $dbForProject, Document $user, Event $events, Stats $usage, string $mode, Func $queueForFunctions) {

        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));

@@ -1116,13 +1127,17 @@ App::post('/v1/functions/:functionId/executions')
        $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', new Document([
            '$id' => $executionId,
            '$permissions' => !$user->isEmpty() ? [Permission::read(Role::user($user->getId()))] : [],
+            'functionInternalId' => $function->getInternalId(),
            'functionId' => $function->getId(),
+            'deploymentInternalId' => $deployment->getInternalId(),
            'deploymentId' => $deployment->getId(),
            'trigger' => 'http', // http / schedule / event
            'status' => $async ? 'waiting' : 'processing', // waiting / processing / completed / failed
            'statusCode' => 0,
-            'response' => '',
-            'stderr' => '',
+            'body' => '',
+            'headers' => [],
+            'errors' => '',
+            'logs' => '',
            'duration' => 0.0,
            'search' => implode(' ', [$functionId, $executionId]),
        ])));
@@ -1158,7 +1173,10 @@ App::post('/v1/functions/:functionId/executions')
                ->setType('http')
                ->setExecution($execution)
                ->setFunction($function)
-                ->setData($data)
+                ->setBody($body)
+                ->setHeaders($headers)
+                ->setPath($path)
+                ->setMethod($method)
                ->setJWT($jwt)
                ->setProject($project)
                ->setUser($user)
@@ -1193,20 +1211,26 @@ App::post('/v1/functions/:functionId/executions')
            $executionResponse = $executor->createExecution(
                projectId: $project->getId(),
                deploymentId: $deployment->getId(),
-                payload: $data,
+                version: $function->getAttribute('version'),
+                body: $body,
                variables: $vars,
                timeout: $function->getAttribute('timeout', 0),
                image: $runtime['image'],
-                source: $build->getAttribute('path', ''),
+                source: $deployment->getAttribute('path', ''),
                entrypoint: $deployment->getAttribute('entrypoint', ''),
+                path: $path,
+                method: $method,
+                headers: $headers,
            );

            /** Update execution status */
-            $execution->setAttribute('status', $executionResponse['status']);
+            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
+            $execution->setAttribute('status', $status);
            $execution->setAttribute('statusCode', $executionResponse['statusCode']);
-            $execution->setAttribute('response', $executionResponse['response']);
-            $execution->setAttribute('stdout', $executionResponse['stdout']);
-            $execution->setAttribute('stderr', $executionResponse['stderr']);
+            $execution->setAttribute('headers', $executionResponse['headers']);
+            $execution->setAttribute('body', $executionResponse['body']);
+            $execution->setAttribute('logs', $executionResponse['logs']);
+            $execution->setAttribute('errors', $executionResponse['errors']);
            $execution->setAttribute('duration', $executionResponse['duration']);
        } catch (\Throwable $th) {
            $interval = (new \DateTime())->diff(new \DateTime($execution->getCreatedAt()));
@@ -1214,7 +1238,7 @@ App::post('/v1/functions/:functionId/executions')
                ->setAttribute('duration', (float)$interval->format('%s.%f'))
                ->setAttribute('status', 'failed')
                ->setAttribute('statusCode', $th->getCode())
-                ->setAttribute('stderr', $th->getMessage());
+                ->setAttribute('errors', $th->getMessage());
            Console::error($th->getMessage());
        }

@@ -1232,8 +1256,8 @@ App::post('/v1/functions/:functionId/executions')
        $isAppUser = Auth::isAppUser($roles);

        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('stdout', '');
-            $execution->setAttribute('stderr', '');
+            $execution->setAttribute('logs', '');
+            $execution->setAttribute('errors', '');
        }

        $response
@@ -1302,8 +1326,8 @@ App::get('/v1/functions/:functionId/executions')
        $isAppUser = Auth::isAppUser($roles);
        if (!$isPrivilegedUser && !$isAppUser) {
            $results = array_map(function ($execution) {
-                $execution->setAttribute('stdout', '');
-                $execution->setAttribute('stderr', '');
+                $execution->setAttribute('logs', '');
+                $execution->setAttribute('errors', '');
                return $execution;
            }, $results);
        }
@@ -1354,8 +1378,8 @@ App::get('/v1/functions/:functionId/executions/:executionId')
        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
        $isAppUser = Auth::isAppUser($roles);
        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('stdout', '');
-            $execution->setAttribute('stderr', '');
+            $execution->setAttribute('logs', '');
+            $execution->setAttribute('errors', '');
        }

        $response->dynamic($execution, Response::MODEL_EXECUTION);
@@ -97,6 +97,7 @@ class BuildsV1 extends Worker
                '$id' => $buildId,
                '$permissions' => [],
                'startTime' => $startTime,
+                'deploymentInternalId' => $deployment->getInternalId(),
                'deploymentId' => $deployment->getId(),
                'status' => 'processing',
                'path' => '',
@@ -108,7 +109,8 @@ class BuildsV1 extends Worker
                'stderr' => '',
                'duration' => 0
            ]));
-            $deployment->setAttribute('buildId', $buildId);
+            $deployment->setAttribute('buildId', $build->getId());
+            $deployment->setAttribute('buildInternalId', $build->getInternalId());
            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
        } else {
            $build = $dbForProject->getDocument('builds', $buildId);
@@ -173,6 +175,7 @@ class BuildsV1 extends Worker
                projectId: $project->getId(),
                deploymentId: $deployment->getId(),
                source: $source,
+                version: $function->getAttribute('version'),
                image: $runtime['image'],
                remove: true,
                entrypoint: $deployment->getAttribute('entrypoint'),
@@ -189,7 +192,7 @@ class BuildsV1 extends Worker
            /** Update the build document */
            $build->setAttribute('startTime', DateTime::format((new \DateTime())->setTimestamp($response['startTime'])));
            $build->setAttribute('duration', \intval($response['duration']));
-            $build->setAttribute('status', $response['status']);
+            $build->setAttribute('status', 'ready');
            $build->setAttribute('path', $response['path']);
            $build->setAttribute('size', $response['size']);
            $build->setAttribute('stderr', $response['stderr']);
@@ -204,6 +207,7 @@ class BuildsV1 extends Worker

            /** Set auto deploy */
            if ($deployment->getAttribute('activate') === true) {
+                $function->setAttribute('deploymentInternalId', $deployment->getInternalId());
                $function->setAttribute('deployment', $deployment->getId());
                $function = $dbForProject->updateDocument('functions', $function->getId(), $function);
            }
@@ -34,6 +34,9 @@ Server::setResource('execute', function () {
        Document $function,
        string $trigger,
        string $data = null,
+        string $path,
+        string $method,
+        array $headers,
        ?Document $user = null,
        string $jwt = null,
        string $event = null,
@@ -86,8 +89,10 @@ Server::setResource('execute', function () {
                'trigger' => $trigger,
                'status' => 'waiting',
                'statusCode' => 0,
-                'response' => '',
-                'stderr' => '',
+                'body' => '',
+                'headers' => [],
+                'errors' => '',
+                'logs' => '',
                'duration' => 0.0,
                'search' => implode(' ', [$functionId, $executionId]),
            ]));
@@ -129,21 +134,28 @@ Server::setResource('execute', function () {
            $executionResponse = $client->createExecution(
                projectId: $project->getId(),
                deploymentId: $deploymentId,
-                payload: $vars['APPWRITE_FUNCTION_DATA'] ?? '',
+                version: $function->getAttribute('version'),
+                body: $vars['APPWRITE_FUNCTION_DATA'] ?? '',
                variables: $vars,
                timeout: $function->getAttribute('timeout', 0),
                image: $runtime['image'],
-                source: $build->getAttribute('path', ''),
+                source: $deployment->getAttribute('path', ''),
                entrypoint: $deployment->getAttribute('entrypoint', ''),
+                path: $path,
+                method: $method,
+                headers: $headers,
            );

+            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
+
            /** Update execution status */
            $execution
-                ->setAttribute('status', $executionResponse['status'])
+                ->setAttribute('status', $status)
                ->setAttribute('statusCode', $executionResponse['statusCode'])
-                ->setAttribute('response', $executionResponse['response'])
-                ->setAttribute('stdout', $executionResponse['stdout'])
-                ->setAttribute('stderr', $executionResponse['stderr'])
+                ->setAttribute('headers', $executionResponse['headers'])
+                ->setAttribute('body', $executionResponse['body'])
+                ->setAttribute('logs', $executionResponse['logs'])
+                ->setAttribute('errors', $executionResponse['errors'])
                ->setAttribute('duration', $executionResponse['duration']);
        } catch (\Throwable $th) {
            $interval = (new \DateTime())->diff(new \DateTime($execution->getCreatedAt()));
@@ -151,7 +163,7 @@ Server::setResource('execute', function () {
                ->setAttribute('duration', (float)$interval->format('%s.%f'))
                ->setAttribute('status', 'failed')
                ->setAttribute('statusCode', $th->getCode())
-                ->setAttribute('stderr', $th->getMessage());
+                ->setAttribute('errors', $th->getMessage());

            Console::error($th->getTraceAsString());
            Console::error($th->getFile());
@@ -209,7 +221,8 @@ Server::setResource('execute', function () {
            $usage
                ->setParam('projectId', $project->getId())
                ->setParam('projectInternalId', $project->getInternalId())
-                ->setParam('functionId', $function->getId()) // TODO: We should use functionInternalId in usage stats
+                ->setParam('functionId', $function->getId())
+                ->setParam('functionInternalId', $function->getInternalId())
                ->setParam('executions.{scope}.compute', 1)
                ->setParam('executionStatus', $execution->getAttribute('status', ''))
                ->setParam('executionTime', $execution->getAttribute('duration'))
@@ -280,7 +293,10 @@ $server->job()
                        user: $user,
                        data: null,
                        executionId: null,
-                        jwt: null
+                        jwt: null,
+                        path: $payload['path'],
+                        method: $payload['method'],
+                        headers: $payload['headers'],
                    );
                    Console::success('Triggered function: ' . $events[0]);
                }
@@ -309,6 +325,9 @@ $server->job()
                    user: $user,
                    jwt: $jwt,
                    statsd: $statsd,
+                    path: $payload['path'],
+                    method: $payload['method'],
+                    headers: $payload['headers'],
                );
                break;
            case 'schedule':
@@ -325,6 +344,9 @@ $server->job()
                    user: null,
                    jwt: null,
                    statsd: $statsd,
+                    path: $payload['path'],
+                    method: $payload['method'],
+                    headers: $payload['headers'],
                );
                break;
        }
@@ -801,20 +801,21 @@
                "issues": "https://github.com/influxdata/influxdb-php/issues",
                "source": "https://github.com/influxdata/influxdb-php/tree/1.15.2"
            },
+            "abandoned": true,
            "time": "2020-12-26T17:45:17+00:00"
        },
        {
            "name": "laravel/pint",
-            "version": "v1.2.0",
+            "version": "v1.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/laravel/pint.git",
-                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86"
+                "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/1d276e4c803397a26cc337df908f55c2a4e90d86",
-                "reference": "1d276e4c803397a26cc337df908f55c2a4e90d86",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/e60e2112ee779ce60f253695b273d1646a17d6f1",
+                "reference": "e60e2112ee779ce60f253695b273d1646a17d6f1",
                "shasum": ""
            },
            "require": {
@@ -826,10 +827,10 @@
            },
            "require-dev": {
                "friendsofphp/php-cs-fixer": "^3.11.0",
-                "illuminate/view": "^9.27",
-                "laravel-zero/framework": "^9.1.3",
-                "mockery/mockery": "^1.5.0",
-                "nunomaduro/larastan": "^2.2",
+                "illuminate/view": "^9.32.0",
+                "laravel-zero/framework": "^9.2.0",
+                "mockery/mockery": "^1.5.1",
+                "nunomaduro/larastan": "^2.2.0",
                "nunomaduro/termwind": "^1.14.0",
                "pestphp/pest": "^1.22.1"
            },
@@ -867,7 +868,7 @@
                "issues": "https://github.com/laravel/pint/issues",
                "source": "https://github.com/laravel/pint"
            },
-            "time": "2022-09-13T15:07:15+00:00"
+            "time": "2022-11-29T16:25:20+00:00"
        },
        {
            "name": "matomo/device-detector",
@@ -1461,16 +1462,16 @@
        },
        {
            "name": "symfony/deprecation-contracts",
-            "version": "v3.1.1",
+            "version": "v3.2.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918"
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
-                "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3",
+                "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3",
                "shasum": ""
            },
            "require": {
@@ -1479,7 +1480,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "3.1-dev"
+                    "dev-main": "3.3-dev"
                },
                "thanks": {
                    "name": "symfony/contracts",
@@ -1508,7 +1509,7 @@
            "description": "A generic function and convention to trigger deprecation notices",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0"
            },
            "funding": [
                {
@@ -1524,7 +1525,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-02-25T11:15:52+00:00"
+            "time": "2022-11-25T10:21:52+00:00"
        },
        {
            "name": "utopia-php/abuse",
@@ -2139,22 +2140,23 @@
        },
        {
            "name": "utopia-php/logger",
-            "version": "0.3.0",
+            "version": "0.3.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/logger.git",
-                "reference": "079656cb5169ca9600861eda0b6819199e3d4a57"
+                "reference": "de623f1ec1c672c795d113dd25c5bf212f7ef4fc"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/logger/zipball/079656cb5169ca9600861eda0b6819199e3d4a57",
-                "reference": "079656cb5169ca9600861eda0b6819199e3d4a57",
+                "url": "https://api.github.com/repos/utopia-php/logger/zipball/de623f1ec1c672c795d113dd25c5bf212f7ef4fc",
+                "reference": "de623f1ec1c672c795d113dd25c5bf212f7ef4fc",
                "shasum": ""
            },
            "require": {
                "php": ">=8.0"
            },
            "require-dev": {
+                "phpstan/phpstan": "1.9.x-dev",
                "phpunit/phpunit": "^9.3",
                "vimeo/psalm": "4.0.1"
            },
@@ -2168,20 +2170,6 @@
            "license": [
                "MIT"
            ],
-            "authors": [
-                {
-                    "name": "Eldad Fux",
-                    "email": "eldad@appwrite.io"
-                },
-                {
-                    "name": "Matej Bačo",
-                    "email": "matej@appwrite.io"
-                },
-                {
-                    "name": "Christy Jacob",
-                    "email": "christy@appwrite.io"
-                }
-            ],
            "description": "Utopia Logger library is simple and lite library for logging information, such as errors or warnings. This library is aiming to be as simple and easy to learn and use.",
            "keywords": [
                "appsignal",
@@ -2199,22 +2187,22 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/logger/issues",
-                "source": "https://github.com/utopia-php/logger/tree/0.3.0"
+                "source": "https://github.com/utopia-php/logger/tree/0.3.1"
            },
-            "time": "2022-03-18T10:56:57+00:00"
+            "time": "2023-02-10T15:52:50+00:00"
        },
        {
            "name": "utopia-php/messaging",
-            "version": "0.1.0",
+            "version": "0.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/messaging.git",
-                "reference": "501272fad666f06bec8f130076862e7981a73f8c"
+                "reference": "a75d66ddd59b834ab500a4878a2c084e6572604a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/501272fad666f06bec8f130076862e7981a73f8c",
-                "reference": "501272fad666f06bec8f130076862e7981a73f8c",
+                "url": "https://api.github.com/repos/utopia-php/messaging/zipball/a75d66ddd59b834ab500a4878a2c084e6572604a",
+                "reference": "a75d66ddd59b834ab500a4878a2c084e6572604a",
                "shasum": ""
            },
            "require": {
@@ -2222,9 +2210,9 @@
                "php": ">=8.0.0"
            },
            "require-dev": {
+                "laravel/pint": "^1.2",
                "phpmailer/phpmailer": "6.6.*",
-                "phpunit/phpunit": "9.5.*",
-                "squizlabs/php_codesniffer": "^3.6"
+                "phpunit/phpunit": "9.5.*"
            },
            "type": "library",
            "autoload": {
@@ -2236,12 +2224,6 @@
            "license": [
                "MIT"
            ],
-            "authors": [
-                {
-                    "name": "Jake Barnby",
-                    "email": "jake@appwrite.io"
-                }
-            ],
            "description": "A simple, light and advanced PHP messaging library",
            "keywords": [
                "library",
@@ -2253,9 +2235,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/messaging/issues",
-                "source": "https://github.com/utopia-php/messaging/tree/0.1.0"
+                "source": "https://github.com/utopia-php/messaging/tree/0.1.1"
            },
-            "time": "2022-09-29T11:22:48+00:00"
+            "time": "2023-02-07T05:42:46+00:00"
        },
        {
            "name": "utopia-php/orchestration",
@@ -2574,16 +2556,16 @@
        },
        {
            "name": "utopia-php/storage",
-            "version": "0.13.0",
+            "version": "0.13.2",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/storage.git",
-                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3"
+                "reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/storage/zipball/f34c010e4f8394a6b4aff70b6de55041d9a145d3",
-                "reference": "f34c010e4f8394a6b4aff70b6de55041d9a145d3",
+                "url": "https://api.github.com/repos/utopia-php/storage/zipball/ad1c00f24ca56e73888acc2af3deee4919b1194b",
+                "reference": "ad1c00f24ca56e73888acc2af3deee4919b1194b",
                "shasum": ""
            },
            "require": {
@@ -2623,9 +2605,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/storage/issues",
-                "source": "https://github.com/utopia-php/storage/tree/0.13.0"
+                "source": "https://github.com/utopia-php/storage/tree/0.13.2"
            },
-            "time": "2022-11-17T15:10:18+00:00"
+            "time": "2022-12-20T11:11:35+00:00"
        },
        {
            "name": "utopia-php/swoole",
@@ -2905,30 +2887,30 @@
        },
        {
            "name": "doctrine/instantiator",
-            "version": "1.4.1",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
-                "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/0a0fa9780f5d4e507415a065172d26a98d02047b",
+                "reference": "0a0fa9780f5d4e507415a065172d26a98d02047b",
                "shasum": ""
            },
            "require": {
                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^9",
+                "doctrine/coding-standard": "^9 || ^11",
                "ext-pdo": "*",
                "ext-phar": "*",
                "phpbench/phpbench": "^0.16 || ^1",
                "phpstan/phpstan": "^1.4",
                "phpstan/phpstan-phpunit": "^1",
                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "vimeo/psalm": "^4.22"
+                "vimeo/psalm": "^4.30 || ^5.4"
            },
            "type": "library",
            "autoload": {
@@ -2955,7 +2937,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.1"
+                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
            },
            "funding": [
                {
@@ -2971,20 +2953,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-03T08:28:38+00:00"
+            "time": "2022-12-30T00:15:36+00:00"
        },
        {
            "name": "matthiasmullie/minify",
-            "version": "1.3.69",
+            "version": "1.3.70",
            "source": {
                "type": "git",
                "url": "https://github.com/matthiasmullie/minify.git",
-                "reference": "a61c949cccd086808063611ef9698eabe42ef22f"
+                "reference": "2807d9f9bece6877577ad44acb5c801bb3ae536b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/a61c949cccd086808063611ef9698eabe42ef22f",
-                "reference": "a61c949cccd086808063611ef9698eabe42ef22f",
+                "url": "https://api.github.com/repos/matthiasmullie/minify/zipball/2807d9f9bece6877577ad44acb5c801bb3ae536b",
+                "reference": "2807d9f9bece6877577ad44acb5c801bb3ae536b",
                "shasum": ""
            },
            "require": {
@@ -2993,9 +2975,10 @@
                "php": ">=5.3.0"
            },
            "require-dev": {
-                "friendsofphp/php-cs-fixer": "~2.0",
-                "matthiasmullie/scrapbook": "dev-master",
-                "phpunit/phpunit": ">=4.8"
+                "friendsofphp/php-cs-fixer": ">=2.0",
+                "matthiasmullie/scrapbook": ">=1.3",
+                "phpunit/phpunit": ">=4.8",
+                "squizlabs/php_codesniffer": ">=3.0"
            },
            "suggest": {
                "psr/cache-implementation": "Cache implementation to use with Minify::cache"
@@ -3018,12 +3001,12 @@
                {
                    "name": "Matthias Mullie",
                    "email": "minify@mullie.eu",
-                    "homepage": "http://www.mullie.eu",
+                    "homepage": "https://www.mullie.eu",
                    "role": "Developer"
                }
            ],
            "description": "CSS & JavaScript minifier, in PHP. Removes whitespace, strips comments, combines files (incl. @import statements and small assets in CSS files), and optimizes/shortens a few common programming patterns.",
-            "homepage": "http://www.minifier.org",
+            "homepage": "https://github.com/matthiasmullie/minify",
            "keywords": [
                "JS",
                "css",
@@ -3033,7 +3016,7 @@
            ],
            "support": {
                "issues": "https://github.com/matthiasmullie/minify/issues",
-                "source": "https://github.com/matthiasmullie/minify/tree/1.3.69"
+                "source": "https://github.com/matthiasmullie/minify/tree/1.3.70"
            },
            "funding": [
                {
@@ -3041,7 +3024,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-08-01T09:00:18+00:00"
+            "time": "2022-12-09T12:56:44+00:00"
        },
        {
            "name": "matthiasmullie/path-converter",
@@ -3157,16 +3140,16 @@
        },
        {
            "name": "nikic/php-parser",
-            "version": "v4.15.2",
+            "version": "v4.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
-                "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/570e980a201d8ed0236b0a62ddf2c9cbb2034039",
+                "reference": "570e980a201d8ed0236b0a62ddf2c9cbb2034039",
                "shasum": ""
            },
            "require": {
@@ -3207,9 +3190,9 @@
            ],
            "support": {
                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.3"
            },
-            "time": "2022-11-12T15:38:23+00:00"
+            "time": "2023-01-16T22:05:37+00:00"
        },
        {
            "name": "phar-io/manifest",
@@ -3489,27 +3472,28 @@
        },
        {
            "name": "phpspec/prophecy",
-            "version": "v1.15.0",
+            "version": "v1.17.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+                "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
-                "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/15873c65b207b07765dbc3c95d20fdf4a320cbe2",
+                "reference": "15873c65b207b07765dbc3c95d20fdf4a320cbe2",
                "shasum": ""
            },
            "require": {
-                "doctrine/instantiator": "^1.2",
-                "php": "^7.2 || ~8.0, <8.2",
+                "doctrine/instantiator": "^1.2 || ^2.0",
+                "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*",
                "phpdocumentor/reflection-docblock": "^5.2",
                "sebastian/comparator": "^3.0 || ^4.0",
                "sebastian/recursion-context": "^3.0 || ^4.0"
            },
            "require-dev": {
                "phpspec/phpspec": "^6.0 || ^7.0",
+                "phpstan/phpstan": "^1.9",
                "phpunit/phpunit": "^8.0 || ^9.0"
            },
            "type": "library",
@@ -3550,22 +3534,22 @@
            ],
            "support": {
                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+                "source": "https://github.com/phpspec/prophecy/tree/v1.17.0"
            },
-            "time": "2021-12-08T12:19:24+00:00"
+            "time": "2023-02-02T15:41:36+00:00"
        },
        {
            "name": "phpunit/php-code-coverage",
-            "version": "9.2.19",
+            "version": "9.2.24",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559"
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559",
-                "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2cf940ebc6355a9d430462811b5aaa308b174bed",
+                "reference": "2cf940ebc6355a9d430462811b5aaa308b174bed",
                "shasum": ""
            },
            "require": {
@@ -3621,7 +3605,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.24"
            },
            "funding": [
                {
@@ -3629,7 +3613,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-11-18T07:47:47+00:00"
+            "time": "2023-01-26T08:26:55+00:00"
        },
        {
            "name": "phpunit/php-file-iterator",
@@ -4341,16 +4325,16 @@
        },
        {
            "name": "sebastian/environment",
-            "version": "5.1.4",
+            "version": "5.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7"
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7",
-                "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
                "shasum": ""
            },
            "require": {
@@ -4392,7 +4376,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
            },
            "funding": [
                {
@@ -4400,7 +4384,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-04-03T09:37:03+00:00"
+            "time": "2023-02-03T06:03:51+00:00"
        },
        {
            "name": "sebastian/exporter",
@@ -4714,16 +4698,16 @@
        },
        {
            "name": "sebastian/recursion-context",
-            "version": "4.0.4",
+            "version": "4.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172"
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172",
-                "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
+                "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1",
                "shasum": ""
            },
            "require": {
@@ -4762,10 +4746,10 @@
                }
            ],
            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
            "support": {
                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5"
            },
            "funding": [
                {
@@ -4773,7 +4757,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-10-26T13:17:30+00:00"
+            "time": "2023-02-03T06:07:39+00:00"
        },
        {
            "name": "sebastian/resource-operations",
@@ -4832,16 +4816,16 @@
        },
        {
            "name": "sebastian/type",
-            "version": "3.2.0",
+            "version": "3.2.1",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/type.git",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e"
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
-                "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
                "shasum": ""
            },
            "require": {
@@ -4876,7 +4860,7 @@
            "homepage": "https://github.com/sebastianbergmann/type",
            "support": {
                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
            },
            "funding": [
                {
@@ -4884,7 +4868,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-09-12T14:47:03+00:00"
+            "time": "2023-02-03T06:13:03+00:00"
        },
        {
            "name": "sebastian/version",
@@ -5303,16 +5287,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.4.3",
+            "version": "v3.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
-                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3ffcf4b7d890770466da3b2666f82ac054e7ec72",
+                "reference": "3ffcf4b7d890770466da3b2666f82ac054e7ec72",
                "shasum": ""
            },
            "require": {
@@ -5327,7 +5311,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "3.5-dev"
                }
            },
            "autoload": {
@@ -5363,7 +5347,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.4.3"
+                "source": "https://github.com/twigphp/Twig/tree/v3.5.0"
            },
            "funding": [
                {
@@ -5375,7 +5359,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-09-28T08:42:51+00:00"
+            "time": "2022-12-27T12:28:18+00:00"
        }
    ],
    "aliases": [],
@@ -5404,5 +5388,5 @@
    "platform-overrides": {
        "php": "8.0"
    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
@@ -662,7 +662,7 @@ services:
    hostname: exc1
    <<: *x-logging
    stop_signal: SIGINT
-    image: openruntimes/executor:0.2.0
+    image: meldiron/executor:0.3.0
    networks:
      - appwrite
      - runtimes
@@ -10,7 +10,10 @@ class Func extends Event
 {
    protected string $jwt = '';
    protected string $type = '';
-    protected string $data = '';
+    protected string $body = '';
+    protected string $path = '';
+    protected string $method = '';
+    protected array $headers = [];
    protected ?Document $function = null;
    protected ?Document $execution = null;

@@ -89,14 +92,53 @@ class Func extends Event
    }

    /**
-     * Sets custom data for the function event.
+     * Sets custom body for the function event.
     *
-     * @param string $data
+     * @param string $body
     * @return self
     */
-    public function setData(string $data): self
+    public function setBody(string $body): self
    {
-        $this->data = $data;
+        $this->body = $body;
+
+        return $this;
+    }
+
+    /**
+     * Sets custom method for the function event.
+     *
+     * @param string $method
+     * @return self
+     */
+    public function setMethod(string $method): self
+    {
+        $this->method = $method;
+
+        return $this;
+    }
+
+    /**
+     * Sets custom path for the function event.
+     *
+     * @param string $path
+     * @return self
+     */
+    public function setPath(string $path): self
+    {
+        $this->path = $path;
+
+        return $this;
+    }
+
+    /**
+     * Sets custom headers for the function event.
+     *
+     * @param string $headers
+     * @return self
+     */
+    public function setHeaders(array $headers): self
+    {
+        $this->headers = $headers;

        return $this;
    }
@@ -155,7 +197,10 @@ class Func extends Event
            'jwt' => $this->jwt,
            'payload' => $this->payload,
            'events' => $events,
-            'data' => $this->data,
+            'body' => $this->body,
+            'path' => $this->path,
+            'headers' => $this->headers,
+            'method' => $this->method,
        ]);
    }

@@ -90,12 +90,90 @@ class V17 extends Migration

                    try {
                        /**
-                         * Create 'size'
+                         * Create 'deploymentInternalId' attribute
                         */
-                        $this->createAttributeFromCollection($this->projectDB, $id, 'size');
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
                        $this->projectDB->deleteCachedCollection($id);
                    } catch (\Throwable $th) {
-                        Console::warning("'size' from {$id}: {$th->getMessage()}");
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'schedules':
+                    try {
+                        /**
+                         * Create 'resourceInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'resourceInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'functions':
+                    try {
+                        /**
+                         * Create 'deploymentInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'scheduleInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'scheduleInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'scheduleInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'deployments':
+                    try {
+                        /**
+                         * Create 'resourceInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'resourceInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'resourceInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'buildInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'buildInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'buildInternalId' from {$id}: {$th->getMessage()}");
+                    }
+                    break;
+
+                case 'executions':
+                    try {
+                        /**
+                         * Create 'functionInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'functionInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'functionInternalId' from {$id}: {$th->getMessage()}");
+                    }
+
+                    try {
+                        /**
+                         * Create 'deploymentInternalId' attribute
+                         */
+                        $this->createAttributeFromCollection($this->projectDB, $id, 'deploymentInternalId');
+                        $this->projectDB->deleteCachedCollection($id);
+                    } catch (\Throwable $th) {
+                        Console::warning("'deploymentInternalId' from {$id}: {$th->getMessage()}");
                    }
                    break;
                default:
@@ -61,6 +61,7 @@ use Appwrite\Utopia\Response\Model\Platform;
 use Appwrite\Utopia\Response\Model\Project;
 use Appwrite\Utopia\Response\Model\Rule;
 use Appwrite\Utopia\Response\Model\Deployment;
+use Appwrite\Utopia\Response\Model\Headers;
 use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Webhook;
 use Appwrite\Utopia\Response\Model\Preferences;
@@ -187,6 +188,7 @@ class Response extends SwooleResponse
    public const MODEL_BUILD = 'build';
    public const MODEL_BUILD_LIST = 'buildList';  // Not used anywhere yet
    public const MODEL_FUNC_PERMISSIONS = 'funcPermissions';
+    public const MODEL_HEADERS = 'headers';

    // Project
    public const MODEL_PROJECT = 'project';
@@ -341,6 +343,7 @@ class Response extends SwooleResponse
            ->setModel(new UsageFunctions())
            ->setModel(new UsageFunction())
            ->setModel(new UsageProject())
+            ->setModel(new Headers())
            // Verification
            // Recovery
            // Tests (keep last)
@@ -60,19 +60,25 @@ class Execution extends Model
                'default' => 0,
                'example' => 0,
            ])
-            ->addRule('response', [
+            ->addRule('body', [
                'type' => self::TYPE_STRING,
                'description' => 'The script response output string. Logs the last 4,000 characters of the execution response output.',
                'default' => '',
                'example' => '',
            ])
-            ->addRule('stdout', [
+            ->addRule('headers', [
+                'type' => Response::MODEL_HEADERS,
+                'description' => 'Response headers as a key-value object',
+                'default' => new \stdClass(),
+                'example' => ['x-internal-timezone' => 'UTC'],
+            ])
+            ->addRule('logs', [
                'type' => self::TYPE_STRING,
                'description' => 'The script stdout output string. Logs the last 4,000 characters of the execution stdout output. This will return an empty string unless the response is returned using an API key or as part of a webhook payload.',
                'default' => '',
                'example' => '',
            ])
-            ->addRule('stderr', [
+            ->addRule('errors', [
                'type' => self::TYPE_STRING,
                'description' => 'The script stderr output string. Logs the last 4,000 characters of the execution stderr output. This will return an empty string unless the response is returned using an API key or as part of a webhook payload.',
                'default' => '',
@@ -0,0 +1,28 @@
+<?php
+
+namespace Appwrite\Utopia\Response\Model;
+
+use Appwrite\Utopia\Response;
+
+class Headers extends Any
+{
+    /**
+     * Get Name
+     *
+     * @return string
+     */
+    public function getName(): string
+    {
+        return 'Headers';
+    }
+
+    /**
+     * Get Type
+     *
+     * @return string
+     */
+    public function getType(): string
+    {
+        return Response::MODEL_HEADERS;
+    }
+}
@@ -64,6 +64,7 @@ class Executor
        string $projectId,
        string $source,
        string $image,
+        string $version,
        bool $remove = false,
        string $entrypoint = '',
        string $workdir = '',
@@ -73,7 +74,7 @@ class Executor
    ) {
        $runtimeId = "$projectId-$deploymentId";
        $route = "/runtimes";
-        $headers = [ 'x-opr-runtime-id' => $runtimeId ];
+        $reqHeaders = [ 'x-opr-runtime-id' => $runtimeId ];
        $params = [
            'runtimeId' => $runtimeId,
            'source' => $source,
@@ -86,11 +87,12 @@ class Executor
            'commands' => $commands,
            'cpus' => $this->cpus,
            'memory' => $this->memory,
+            'version' => $version,
        ];

        $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);

-        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $timeout);
+        $response = $this->call(self::METHOD_POST, $route, $reqHeaders, $params, true, $timeout);

        $status = $response['headers']['status-code'];
        if ($status >= 400) {
@@ -118,32 +120,40 @@ class Executor
    public function createExecution(
        string $projectId,
        string $deploymentId,
-        string $payload,
+        string $body,
        array $variables,
        int $timeout,
        string $image,
        string $source,
        string $entrypoint,
+        string $version,
+        string $path,
+        string $method,
+        array $headers,
    ) {
        $runtimeId = "$projectId-$deploymentId";
        $route = '/runtimes/' . $runtimeId . '/execution';
-        $headers = [ 'x-opr-runtime-id' => $runtimeId ];
+        $reqHeaders = [ 'x-opr-runtime-id' => $runtimeId ];
        $params = [
            'runtimeId' => $runtimeId,
            'variables' => $variables,
-            'payload' => $payload,
+            'body' => $body,
            'timeout' => $timeout,
+            'path' => $path,
+            'method' => $method,
+            'headers' => $headers,

            'image' => $image,
            'source' => $source,
            'entrypoint' => $entrypoint,
            'cpus' => $this->cpus,
            'memory' => $this->memory,
+            'version' => $version,
        ];

        $timeout  = (int) App::getEnv('_APP_FUNCTIONS_BUILD_TIMEOUT', 900);

-        $response = $this->call(self::METHOD_POST, $route, $headers, $params, true, $timeout);
+        $response = $this->call(self::METHOD_POST, $route, $reqHeaders, $params, true, $timeout);

        $status = $response['headers']['status-code'];
        if ($status >= 400) {
@@ -590,8 +590,8 @@ class FunctionsCustomClientTest extends Scope
        $this->assertNotEmpty($output['APPWRITE_FUNCTION_JWT']);
        $this->assertEquals($projectId, $output['APPWRITE_FUNCTION_PROJECT_ID']);
        // Client should never see logs and errors
-        $this->assertEmpty($execution['body']['stdout']);
-        $this->assertEmpty($execution['body']['stderr']);
+        $this->assertEmpty($execution['body']['logs']);
+        $this->assertEmpty($execution['body']['errors']);

        // Cleanup : Delete function
        $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
@@ -611,7 +611,8 @@ class FunctionsCustomServerTest extends Scope
        $this->assertEquals('waiting', $execution['body']['status']);
        $this->assertEquals(0, $execution['body']['statusCode']);
        $this->assertEquals('', $execution['body']['response']);
-        $this->assertEquals('', $execution['body']['stderr']);
+        $this->assertEquals('', $execution['body']['errors']);
+        $this->assertEquals('', $execution['body']['logs']);
        $this->assertEquals(0, $execution['body']['duration']);

        sleep(10);
@@ -634,7 +635,8 @@ class FunctionsCustomServerTest extends Scope
        $this->assertStringContainsString('PHP', $execution['body']['response']);
        $this->assertStringContainsString('8.0', $execution['body']['response']);
        $this->assertStringContainsString('êä', $execution['body']['response']); // tests unknown utf-8 chars
-        $this->assertEquals('', $execution['body']['stderr']);
+        $this->assertEquals('', $execution['body']['errors']);
+        $this->assertEquals('', $execution['body']['logs']);
        $this->assertLessThan(1.500, $execution['body']['duration']);

        /**
@@ -917,7 +919,8 @@ class FunctionsCustomServerTest extends Scope
        $this->assertLessThan(6, $executions['body']['executions'][0]['duration']);
        $this->assertGreaterThan(4, $executions['body']['executions'][0]['duration']);
        $this->assertEquals($executions['body']['executions'][0]['response'], '');
-        $this->assertEquals($executions['body']['executions'][0]['stderr'], 'An internal curl error has occurred within the executor! Error Msg: Operation timed out');
+        $this->assertEquals($executions['body']['executions'][0]['logs'], '');
+        $this->assertEquals($executions['body']['executions'][0]['errors'], 'An internal curl error has occurred within the executor! Error Msg: Operation timed out');

        // Cleanup : Delete function
        $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [