From 62173b8f611d02912c5d3a5c8757de7d9b829aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 20 Nov 2025 13:56:54 +0100 Subject: [PATCH 1/6] WIP: Separate specifications --- app/config/collections/projects.php | 26 ++++- app/controllers/general.php | 2 +- .../Functions/Http/Executions/Create.php | 2 +- .../Functions/Http/Functions/Create.php | 16 +++- .../Functions/Http/Functions/Update.php | 39 +++++--- .../Modules/Functions/Workers/Builds.php | 4 +- .../Modules/Sites/Http/Sites/Create.php | 17 +++- .../Modules/Sites/Http/Sites/Update.php | 40 +++++--- src/Appwrite/Platform/Workers/Functions.php | 2 +- src/Appwrite/Utopia/Response/Model/Func.php | 10 +- src/Appwrite/Utopia/Response/Model/Site.php | 11 ++- tests/e2e/General/UsageTest.php | 3 +- .../Functions/FunctionsCustomServerTest.php | 83 ++++++++++++---- .../Services/Sites/SitesCustomServerTest.php | 96 +++++++++++++++++-- 14 files changed, 282 insertions(+), 69 deletions(-) diff --git a/app/config/collections/projects.php b/app/config/collections/projects.php index dae0337dc9..3cdf383f02 100644 --- a/app/config/collections/projects.php +++ b/app/config/collections/projects.php @@ -767,7 +767,18 @@ return [ ], [ 'array' => false, - '$id' => ID::custom('specification'), + '$id' => ID::custom('buildSpecification'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => false, + 'required' => false, + 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, + 'filters' => [], + ], + [ + 'array' => false, + '$id' => ID::custom('runtimeSpecification'), 'type' => Database::VAR_STRING, 'format' => '', 'size' => 128, @@ -1191,7 +1202,18 @@ return [ ], [ 'array' => false, - '$id' => ID::custom('specification'), + '$id' => ID::custom('buildSpecification'), + 'type' => Database::VAR_STRING, + 'format' => '', + 'size' => 128, + 'signed' => false, + 'required' => false, + 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, + 'filters' => [], + ], + [ + 'array' => false, + '$id' => ID::custom('runtimeSpecification'), 'type' => Database::VAR_STRING, 'format' => '', 'size' => 128, diff --git a/app/controllers/general.php b/app/controllers/general.php index e0435cd499..84dde40683 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -305,7 +305,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw }; $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []); - $spec = Config::getParam('specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; + $spec = Config::getParam('specifications')[$resource->getAttribute('runtimeSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; $runtime = match ($type) { 'function' => $runtimes[$resource->getAttribute('runtime')] ?? null, diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php index a699c0f097..15fbbf08de 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php @@ -164,7 +164,7 @@ class Create extends Base $version = $function->getAttribute('version', 'v2'); $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []); - $spec = Config::getParam('specifications')[$function->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; + $spec = Config::getParam('specifications')[$function->getAttribute('runtimeSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null; diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php index ec2a4baac5..be840287db 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php @@ -93,12 +93,18 @@ class Create extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true) - ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), System::getEnv('_APP_COMPUTE_CPUS', 0), System::getEnv('_APP_COMPUTE_MEMORY', 0) - ), 'Runtime specification for the function and builds.', true, ['plan']) + ), 'Build specification for the function deployments.', true, ['plan']) + ->param('runtimeSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + $plan, + Config::getParam('specifications', []), + System::getEnv('_APP_COMPUTE_CPUS', 0), + System::getEnv('_APP_COMPUTE_MEMORY', 0) + ), 'Runtime specification for the function executions.', true, ['plan']) ->param('templateRepository', '', new Text(128, 0), 'Repository name of the template.', true, deprecated: true) ->param('templateOwner', '', new Text(128, 0), 'The name of the owner of the template.', true, deprecated: true) ->param('templateRootDirectory', '', new Text(128, 0), 'Path to function code in the template repo.', true, deprecated: true) @@ -136,7 +142,8 @@ class Create extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - string $specification, + string $buildSpecification, + string $runtimeSpecification, string $templateRepository, string $templateOwner, string $templateRootDirectory, @@ -231,7 +238,8 @@ class Create extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'specification' => $specification + 'buildSpecification' => $buildSpecification, + 'runtimeSpecification' => $runtimeSpecification, ])); } catch (DuplicateException) { throw new Exception(Exception::FUNCTION_ALREADY_EXISTS); diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php index 318c2a2032..e7a19cb9fd 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php @@ -89,12 +89,18 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the function', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the function? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to function code in the linked repo.', true) - ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), System::getEnv('_APP_COMPUTE_CPUS', 0), System::getEnv('_APP_COMPUTE_MEMORY', 0) - ), 'Runtime specification for the function and builds.', true, ['plan']) + ), 'Build specification for the function deployments.', true, ['plan']) + ->param('runtimeSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + $plan, + Config::getParam('specifications', []), + System::getEnv('_APP_COMPUTE_CPUS', 0), + System::getEnv('_APP_COMPUTE_MEMORY', 0) + ), 'Runtime specification for the function executions.', true, ['plan']) ->inject('request') ->inject('response') ->inject('dbForProject') @@ -125,7 +131,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - string $specification, + string $buildSpecification, + string $runtimeSpecification, Request $request, Response $response, Database $dbForProject, @@ -235,13 +242,22 @@ class Update extends Base } // Enforce Cold Start if spec limits change. - if ($function->getAttribute('specification') !== $specification && !empty($function->getAttribute('deploymentId'))) { - try { - $executor->deleteRuntime($project->getId(), $function->getAttribute('deploymentId')); - } catch (\Throwable $th) { - // Don't throw if the deployment doesn't exist - if ($th->getCode() !== 404) { - throw $th; + if (!empty($function->getAttribute('deploymentId'))) { + $specsChanged = false; + if ($function->getAttribute('runtimeSpecification') !== $runtimeSpecification) { + $specsChanged = true; + } elseif ($function->getAttribute('buildbuildSpecification') !== $buildSpecification) { + $specsChanged = true; + } + + if ($specsChanged) { + try { + $executor->deleteRuntime($project->getId(), $function->getAttribute('deploymentId')); + } catch (\Throwable $th) { + // Don't throw if the deployment doesn't exist + if ($th->getCode() !== 404) { + throw $th; + } } } } @@ -267,7 +283,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'specification' => $specification, + 'buildSpecification' => $buildSpecification, + 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$functionId, $name, $runtime]), ]))); diff --git a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php index 22b302f26e..5b6e81aaa1 100644 --- a/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php +++ b/src/Appwrite/Platform/Modules/Functions/Workers/Builds.php @@ -252,7 +252,7 @@ class Builds extends Action $version = $this->getVersion($resource); $runtime = $this->getRuntime($resource, $version); - $spec = Config::getParam('specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; + $spec = Config::getParam('specifications')[$resource->getAttribute('buildSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; if ($resource->getCollection() === 'functions' && \is_null($runtime)) { throw new \Exception('Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported'); @@ -1354,7 +1354,7 @@ class Builds extends Action protected function sendUsage(Document $resource, Document $deployment, Document $project, StatsUsage $queue): void { - $spec = Config::getParam('specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; + $spec = Config::getParam('specifications')[$resource->getAttribute('buildSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; switch ($deployment->getAttribute('status')) { case 'ready': diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php index a1633b8eba..0fec56efee 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php @@ -78,12 +78,19 @@ class Create extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true) - ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), System::getEnv('_APP_COMPUTE_CPUS', 0), System::getEnv('_APP_COMPUTE_MEMORY', 0) - ), 'Framework specification for the site and builds.', true, ['plan']) + ), 'Build specification for the site deployments.', true, ['plan']) + ->param('runtimeSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + $plan, + Config::getParam('specifications', []), + System::getEnv('_APP_COMPUTE_CPUS', 0), + System::getEnv('_APP_COMPUTE_MEMORY', 0) + ), 'Runtime specification for the function SSR executions.', true, ['plan']) + // TODO: Request filter ->inject('response') ->inject('dbForProject') ->inject('project') @@ -110,7 +117,8 @@ class Create extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - string $specification, + string $buildSpecification, + string $runtimeSpecification, Response $response, Database $dbForProject, Document $project, @@ -161,7 +169,8 @@ class Create extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'specification' => $specification, + 'buildSpecification' => $buildSpecification, + 'runtimeSpecification' => $runtimeSpecification, 'buildRuntime' => $buildRuntime, 'adapter' => $adapter, ])); diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php index 72ec04a2a5..734c78385a 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php @@ -82,12 +82,18 @@ class Update extends Base ->param('providerBranch', '', new Text(128, 0), 'Production branch for the repo linked to the site.', true) ->param('providerSilentMode', false, new Boolean(), 'Is the VCS (Version Control System) connection in silent mode for the repo linked to the site? In silent mode, comments will not be made on commits and pull requests.', true) ->param('providerRootDirectory', '', new Text(128, 0), 'Path to site code in the linked repo.', true) - ->param('specification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + ->param('buildSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( $plan, Config::getParam('specifications', []), System::getEnv('_APP_COMPUTE_CPUS', 0), System::getEnv('_APP_COMPUTE_MEMORY', 0) - ), 'Framework specification for the site and builds.', true, ['plan']) + ), 'Build specification for the site deployments.', true, ['plan']) + ->param('runtimeSpecification', fn (array $plan) => $this->getDefaultSpecification($plan), fn (array $plan) => new Specification( + $plan, + Config::getParam('specifications', []), + System::getEnv('_APP_COMPUTE_CPUS', 0), + System::getEnv('_APP_COMPUTE_MEMORY', 0) + ), 'Runtime specification for the function SSR executions.', true, ['plan']) ->inject('request') ->inject('response') ->inject('dbForProject') @@ -118,7 +124,8 @@ class Update extends Base string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, - string $specification, + string $buildSpecification, + string $runtimeSpecification, Request $request, Response $response, Database $dbForProject, @@ -233,14 +240,22 @@ class Update extends Base $live = false; } - // Enforce Cold Start if spec limits change. - if ($site->getAttribute('specification') !== $specification && !empty($site->getAttribute('deploymentId'))) { - try { - $executor->deleteRuntime($project->getId(), $site->getAttribute('deploymentId')); - } catch (\Throwable $th) { - // Don't throw if the deployment doesn't exist - if ($th->getCode() !== 404) { - throw $th; + if (!empty($site->getAttribute('deploymentId'))) { + $specsChanged = false; + if ($site->getAttribute('runtimeSpecification') !== $runtimeSpecification) { + $specsChanged = true; + } elseif ($site->getAttribute('buildbuildSpecification') !== $buildSpecification) { + $specsChanged = true; + } + + if ($specsChanged) { + try { + $executor->deleteRuntime($project->getId(), $site->getAttribute('deploymentId')); + } catch (\Throwable $th) { + // Don't throw if the deployment doesn't exist + if ($th->getCode() !== 404) { + throw $th; + } } } } @@ -263,7 +278,8 @@ class Update extends Base 'providerBranch' => $providerBranch, 'providerRootDirectory' => $providerRootDirectory, 'providerSilentMode' => $providerSilentMode, - 'specification' => $specification, + 'buildSpecification' => $buildSpecification, + 'runtimeSpecification' => $runtimeSpecification, 'search' => implode(' ', [$siteId, $name, $framework]), 'buildRuntime' => $buildRuntime, 'adapter' => $adapter, diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php index df1833ad33..00319a72aa 100644 --- a/src/Appwrite/Platform/Workers/Functions.php +++ b/src/Appwrite/Platform/Workers/Functions.php @@ -356,7 +356,7 @@ class Functions extends Action $user ??= new Document(); $functionId = $function->getId(); $deploymentId = $function->getAttribute('deploymentId', ''); - $spec = Config::getParam('specifications')[$function->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; + $spec = Config::getParam('specifications')[$function->getAttribute('runtimeSpecification', APP_COMPUTE_SPECIFICATION_DEFAULT)]; $log->addTag('deploymentId', $deploymentId); diff --git a/src/Appwrite/Utopia/Response/Model/Func.php b/src/Appwrite/Utopia/Response/Model/Func.php index e33d7663fd..0d7e80849d 100644 --- a/src/Appwrite/Utopia/Response/Model/Func.php +++ b/src/Appwrite/Utopia/Response/Model/Func.php @@ -176,9 +176,15 @@ class Func extends Model 'default' => false, 'example' => false, ]) - ->addRule('specification', [ + ->addRule('buildSpecification', [ 'type' => self::TYPE_STRING, - 'description' => 'Machine specification for builds and executions.', + 'description' => 'Machine specification for deployment builds.', + 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, + 'example' => APP_COMPUTE_SPECIFICATION_DEFAULT, + ]) + ->addRule('runtimeSpecification', [ + 'type' => self::TYPE_STRING, + 'description' => 'Machine specification for executions.', 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, 'example' => APP_COMPUTE_SPECIFICATION_DEFAULT, ]) diff --git a/src/Appwrite/Utopia/Response/Model/Site.php b/src/Appwrite/Utopia/Response/Model/Site.php index e6e205909b..8e46cd9043 100644 --- a/src/Appwrite/Utopia/Response/Model/Site.php +++ b/src/Appwrite/Utopia/Response/Model/Site.php @@ -161,12 +161,19 @@ class Site extends Model 'default' => false, 'example' => false, ]) - ->addRule('specification', [ + ->addRule('buildSpecification', [ 'type' => self::TYPE_STRING, - 'description' => 'Machine specification for builds and executions.', + 'description' => 'Machine specification for deployment builds.', 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, 'example' => APP_COMPUTE_SPECIFICATION_DEFAULT, ]) + ->addRule('runtimeSpecification', [ + 'type' => self::TYPE_STRING, + 'description' => 'Machine specification for SSR executions.', + 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, + 'example' => APP_COMPUTE_SPECIFICATION_DEFAULT, + ]) + // TODO: Response filter ->addRule('buildRuntime', [ 'type' => self::TYPE_STRING, 'description' => 'Site build runtime.', diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php index dc49d27aea..0c93669198 100644 --- a/tests/e2e/General/UsageTest.php +++ b/tests/e2e/General/UsageTest.php @@ -939,7 +939,8 @@ class UsageTest extends Scope ], 'schedule' => '0 0 1 1 *', 'timeout' => 10, - 'specification' => Specification::S_8VCPU_8GB + 'buildSpecification' => Specification::S_8VCPU_8GB, + 'runtimeSpecification' => Specification::S_8VCPU_8GB, // TODO: Test with different value to ensure it's use correctly ] ); diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php index 8cc986b072..d60737be09 100644 --- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php +++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php @@ -36,14 +36,17 @@ class FunctionsCustomServerTest extends Scope 'functionId' => ID::unique(), 'name' => 'Specs function', 'runtime' => 'node-22', - 'specification' => $specifications['body']['specifications'][0]['slug'] + 'buildSpecification' => $specifications['body']['specifications'][0]['slug'], + 'runtimeSpecification' => $specifications['body']['specifications'][1]['slug'], ]); $this->assertEquals(201, $function['headers']['status-code']); - $this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['specification']); + $this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']); + $this->assertEquals($specifications['body']['specifications'][1]['slug'], $function['body']['runtimeSpecification']); $function = $this->getFunction($function['body']['$id']); $this->assertEquals(200, $function['headers']['status-code']); - $this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['specification']); + $this->assertEquals($specifications['body']['specifications'][0]['slug'], $function['body']['buildSpecification']); + $this->assertEquals($specifications['body']['specifications'][1]['slug'], $function['body']['runtimeSpecification']); $this->cleanupFunction($function['body']['$id']); @@ -51,7 +54,15 @@ class FunctionsCustomServerTest extends Scope 'functionId' => ID::unique(), 'name' => 'Specs function', 'runtime' => 'node-22', - 'specification' => 'cheap-please' + 'buildSpecification' => 'cheap-please' + ]); + $this->assertEquals(400, $function['headers']['status-code']); + + $function = $this->createFunction([ + 'functionId' => ID::unique(), + 'name' => 'Specs function', + 'runtime' => 'node-22', + 'runtimeSpecification' => 'cheap-please' ]); $this->assertEquals(400, $function['headers']['status-code']); } @@ -1364,12 +1375,12 @@ class FunctionsCustomServerTest extends Scope 'timeout' => 15, 'runtime' => 'node-22', 'entrypoint' => 'index.js', - 'specification' => Specification::S_1VCPU_1GB, + 'runtimeSpecification' => Specification::S_1VCPU_1GB, ]); $this->assertEquals(200, $function['headers']['status-code']); $this->assertNotEmpty($function['body']['$id']); - $this->assertEquals(Specification::S_1VCPU_1GB, $function['body']['specification']); + $this->assertEquals(Specification::S_1VCPU_1GB, $function['body']['runtimeSpecification']); // Verify the updated specs $execution = $this->createExecution($data['functionId']); @@ -1398,12 +1409,12 @@ class FunctionsCustomServerTest extends Scope 'timeout' => 15, 'runtime' => 'node-22', 'entrypoint' => 'index.js', - 'specification' => Specification::S_1VCPU_512MB, + 'runtimeSpecification' => Specification::S_1VCPU_512MB, ]); $this->assertEquals(200, $function['headers']['status-code']); $this->assertNotEmpty($function['body']['$id']); - $this->assertEquals(Specification::S_1VCPU_512MB, $function['body']['specification']); + $this->assertEquals(Specification::S_1VCPU_512MB, $function['body']['runtimeSpecification']); // Verify the updated specs $execution = $this->createExecution($data['functionId']); @@ -1428,11 +1439,29 @@ class FunctionsCustomServerTest extends Scope 'timeout' => 15, 'runtime' => 'node-22', 'entrypoint' => 'index.js', - 'specification' => 's-2vcpu-512mb', // Invalid specification + 'buildSpecification' => 's-2vcpu-512mb', // Invalid specification ]); $this->assertEquals(400, $function['headers']['status-code']); - $this->assertStringStartsWith('Invalid `specification` param: Specification must be one of:', $function['body']['message']); + $this->assertStringStartsWith('Invalid `buildSpecification` param: Specification must be one of:', $function['body']['message']); + + $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders()), [ + 'name' => 'Test1', + 'events' => [ + 'users.*.update.name', + 'users.*.update.email', + ], + 'timeout' => 15, + 'runtime' => 'node-22', + 'entrypoint' => 'index.js', + 'runtimeSpecification' => 's-2vcpu-512mb', // Invalid specification + ]); + + $this->assertEquals(400, $function['headers']['status-code']); + $this->assertStringStartsWith('Invalid `runtimeSpecification` param: Specification must be one of:', $function['body']['message']); return $data; } @@ -2015,6 +2044,8 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals(201, $response['headers']['status-code']); $this->assertArrayNotHasKey('scopes', $response['body']); $this->assertArrayNotHasKey('specification', $response['body']); + $this->assertArrayNotHasKey('buildSpecification', $response['body']); + $this->assertArrayNotHasKey('runtimeSpecification', $response['body']); // get function with 1.5.0 response format header $function = $this->client->call(Client::METHOD_GET, '/functions/' . $response['body']['$id'], array_merge([ @@ -2025,13 +2056,31 @@ class FunctionsCustomServerTest extends Scope $this->assertEquals(200, $function['headers']['status-code']); $this->assertArrayNotHasKey('scopes', $function['body']); + $this->assertArrayNotHasKey('buildSpecification', $function['body']); + $this->assertArrayNotHasKey('runtimeSpecification', $function['body']); $this->assertArrayNotHasKey('specification', $function['body']); - $function = $this->getFunction($function['body']['$id']); + // get function with 1.8.0 response format header + $function = $this->client->call(Client::METHOD_GET, '/functions/' . $response['body']['$id'], array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-response-format' => '1.8.0', // add response format header + ], $this->getHeaders())); $this->assertEquals(200, $function['headers']['status-code']); $this->assertArrayHasKey('scopes', $function['body']); $this->assertArrayHasKey('specification', $function['body']); + $this->assertArrayNotHasKey('buildSpecification', $function['body']); + $this->assertArrayNotHasKey('runtimeSpecification', $function['body']); + + // get function with latest version + $function = $this->getFunction($function['body']['$id']); + + $this->assertEquals(200, $function['headers']['status-code']); + $this->assertArrayHasKey('scopes', $function['body']); + $this->assertArrayNotHasKey('specification', $function['body']); + $this->assertArrayHasKey('buildSpecification', $function['body']); + $this->assertArrayHasKey('runtimeSpecification', $function['body']); $functionId = $function['body']['$id'] ?? ''; $this->cleanupFunction($functionId); @@ -2181,15 +2230,17 @@ class FunctionsCustomServerTest extends Scope 'entrypoint' => 'index.js', 'logging' => false, 'execute' => ['any'], - 'specification' => Specification::S_2VCPU_2GB, + 'buildSpecification' => Specification::S_2VCPU_2GB, + 'runtimeSpecification' => Specification::S_1VCPU_1GB, 'commands' => 'echo $APPWRITE_FUNCTION_MEMORY:$APPWRITE_FUNCTION_CPUS', ]); $this->assertEquals(201, $function['headers']['status-code']); - $this->assertEquals(Specification::S_2VCPU_2GB, $function['body']['specification']); + $this->assertEquals(Specification::S_2VCPU_2GB, $function['body']['buildSpecification']); + $this->assertEquals(Specification::S_1VCPU_1GB, $function['body']['runtimeSpecification']); $this->assertNotEmpty($function['body']['$id']); - $functionId = $functionId = $function['body']['$id'] ?? ''; + $functionId = $function['body']['$id'] ?? ''; $deploymentId = $this->setupDeployment($functionId, [ 'code' => $this->packageFunction('basic'), @@ -2208,8 +2259,8 @@ class FunctionsCustomServerTest extends Scope $this->assertNotEmpty($execution['body']['$id']); $executionResponse = json_decode($execution['body']['responseBody'], true); - $this->assertEquals('2048', $executionResponse['APPWRITE_FUNCTION_MEMORY']); - $this->assertEquals('2', $executionResponse['APPWRITE_FUNCTION_CPUS']); + $this->assertEquals('1024', $executionResponse['APPWRITE_FUNCTION_MEMORY']); + $this->assertEquals('1', $executionResponse['APPWRITE_FUNCTION_CPUS']); $this->cleanupFunction($functionId); } diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index 8c03ec7649..a2ffed5e1a 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -38,14 +38,17 @@ class SitesCustomServerTest extends Scope 'framework' => 'other', 'name' => 'Specs site', 'siteId' => ID::unique(), - 'specification' => $specifications['body']['specifications'][0]['slug'] + 'buildSpecification' => $specifications['body']['specifications'][0]['slug'], + 'runtimeSpecification' => $specifications['body']['specifications'][1]['slug'], ]); $this->assertEquals(201, $site['headers']['status-code']); - $this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['specification']); + $this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']); + $this->assertEquals($specifications['body']['specifications'][1]['slug'], $site['body']['runtimeSpecification']); $site = $this->getSite($site['body']['$id']); $this->assertEquals(200, $site['headers']['status-code']); - $this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['specification']); + $this->assertEquals($specifications['body']['specifications'][0]['slug'], $site['body']['buildSpecification']); + $this->assertEquals($specifications['body']['specifications'][1]['slug'], $site['body']['runtimeSpecification']); $this->cleanupSite($site['body']['$id']); @@ -54,7 +57,16 @@ class SitesCustomServerTest extends Scope 'framework' => 'other', 'name' => 'Specs site', 'siteId' => ID::unique(), - 'specification' => 'cheap-please' + 'buildSpecification' => 'cheap-please' + ]); + $this->assertEquals(400, $site['headers']['status-code']); + + $site = $this->createSite([ + 'buildRuntime' => 'node-22', + 'framework' => 'other', + 'name' => 'Specs site', + 'siteId' => ID::unique(), + 'runtimeSpecification' => 'cheap-please' ]); $this->assertEquals(400, $site['headers']['status-code']); } @@ -1287,12 +1299,12 @@ class SitesCustomServerTest extends Scope 'providerBranch' => 'main', 'providerRootDirectory' => './', '$id' => $siteId, - 'specification' => Specification::S_1VCPU_1GB, + 'runtimeSpecification' => Specification::S_1VCPU_1GB, ]); $this->assertEquals(200, $site['headers']['status-code']); $this->assertNotEmpty($site['body']['$id']); - $this->assertEquals(Specification::S_1VCPU_1GB, $site['body']['specification']); + $this->assertEquals(Specification::S_1VCPU_1GB, $site['body']['runtimeSpecification']); // Change the specs to 1vcpu 512mb $site = $this->updateSite([ @@ -1304,12 +1316,12 @@ class SitesCustomServerTest extends Scope 'providerBranch' => 'main', 'providerRootDirectory' => './', '$id' => $siteId, - 'specification' => Specification::S_1VCPU_512MB, + 'runtimeSpecification' => Specification::S_1VCPU_512MB, ]); $this->assertEquals(200, $site['headers']['status-code']); $this->assertNotEmpty($site['body']['$id']); - $this->assertEquals(Specification::S_1VCPU_512MB, $site['body']['specification']); + $this->assertEquals(Specification::S_1VCPU_512MB, $site['body']['runtimeSpecification']); /** * Test for FAILURE @@ -1324,11 +1336,26 @@ class SitesCustomServerTest extends Scope 'providerBranch' => 'main', 'providerRootDirectory' => './', '$id' => $siteId, - 'specification' => 's-2vcpu-512mb', // Invalid specification + 'buildSpecification' => 's-2vcpu-512mb', // Invalid specification ]); $this->assertEquals(400, $site['headers']['status-code']); - $this->assertStringStartsWith('Invalid `specification` param: Specification must be one of:', $site['body']['message']); + $this->assertStringStartsWith('Invalid `buildSpecification` param: Specification must be one of:', $site['body']['message']); + + $site = $this->updateSite([ + 'buildRuntime' => 'node-22', + 'fallbackFile' => '', + 'framework' => 'other', + 'name' => 'Test Site', + 'outputDirectory' => './', + 'providerBranch' => 'main', + 'providerRootDirectory' => './', + '$id' => $siteId, + 'runtimeSpecification' => 's-2vcpu-512mb', // Invalid specification + ]); + + $this->assertEquals(400, $site['headers']['status-code']); + $this->assertStringStartsWith('Invalid `runtimeSpecification` param: Specification must be one of:', $site['body']['message']); $this->cleanupSite($siteId); } @@ -2939,4 +2966,53 @@ class SitesCustomServerTest extends Scope $this->cleanupSite($siteId); } + + public function testSiteSpecifications() + { + // Check if the site specifications are correctly set in builds + $site = $this->createSite([ + 'siteId' => ID::unique(), + 'name' => 'Astro site', + 'framework' => 'astro', + 'adapter' => 'ssr', + 'buildRuntime' => 'node-22', + 'outputDirectory' => './dist', + 'buildCommand' => 'npm run build', + 'installCommand' => 'npm install', + 'fallbackFile' => '', + 'buildSpecification' => Specification::S_2VCPU_2GB, + 'runtimeSpecification' => Specification::S_1VCPU_1GB, + 'commands' => 'echo $APPWRITE_FUNCTION_MEMORY:$APPWRITE_FUNCTION_CPUS', + ]); + + $this->assertEquals(201, $site['headers']['status-code']); + $this->assertEquals(Specification::S_2VCPU_2GB, $site['body']['buildSpecification']); + $this->assertEquals(Specification::S_1VCPU_1GB, $site['body']['runtimeSpecification']); + $this->assertNotEmpty($site['body']['$id']); + + $siteId = $site['body']['$id'] ?? ''; + + $deploymentId = $this->setupDeployment($siteId, [ + 'code' => $this->packageSite('astro'), + 'activate' => true + ]); + + $this->assertEventually(function () use ($siteId, $deploymentId) { + $deployment = $this->getDeployment($siteId, $deploymentId); + $this->assertTrue(str_contains($deployment['body']['buildLogs'], '2048:2')); + }, 10000, 500); + + // Check if the function specifications are correctly set in executions + // TODO: Finish + $execution = $this->createExecution($functionId); + + $this->assertEquals(201, $execution['headers']['status-code']); + $this->assertNotEmpty($execution['body']['$id']); + + $executionResponse = json_decode($execution['body']['responseBody'], true); + $this->assertEquals('1024', $executionResponse['APPWRITE_FUNCTION_MEMORY']); + $this->assertEquals('1', $executionResponse['APPWRITE_FUNCTION_CPUS']); + + $this->cleanupSite($siteId); + } } From 63f6840d1be86a8e7d3a5fc953deba51dcdf136a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 20 Nov 2025 17:39:19 +0100 Subject: [PATCH 2/6] Finish implementation, update tests --- app/controllers/general.php | 8 +++ .../Modules/Sites/Http/Sites/Create.php | 1 - src/Appwrite/Utopia/Request/Filters/V21.php | 19 ++++++- src/Appwrite/Utopia/Response/Filters/V21.php | 51 +++++++++++++++++++ src/Appwrite/Utopia/Response/Model/Site.php | 1 - .../Services/Sites/SitesCustomServerTest.php | 24 +++++---- .../resources/sites/astro/src/pages/specs.js | 13 +++++ 7 files changed, 103 insertions(+), 14 deletions(-) create mode 100644 src/Appwrite/Utopia/Response/Filters/V21.php create mode 100644 tests/resources/sites/astro/src/pages/specs.js diff --git a/app/controllers/general.php b/app/controllers/general.php index 84dde40683..709229241e 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -29,6 +29,8 @@ use Appwrite\Utopia\Response\Filters\V16 as ResponseV16; use Appwrite\Utopia\Response\Filters\V17 as ResponseV17; use Appwrite\Utopia\Response\Filters\V18 as ResponseV18; use Appwrite\Utopia\Response\Filters\V19 as ResponseV19; +use Appwrite\Utopia\Response\Filters\V20 as ResponseV20; +use Appwrite\Utopia\Response\Filters\V21 as ResponseV21; use Appwrite\Utopia\View; use Executor\Executor; use MaxMind\Db\Reader; @@ -1048,6 +1050,12 @@ App::init() if (version_compare($responseFormat, '1.7.0', '<')) { $response->addFilter(new ResponseV19()); } + if (version_compare($responseFormat, '1.8.0', '<')) { + $response->addFilter(new ResponseV20()); + } + if (version_compare($responseFormat, '1.9.0', '<')) { + $response->addFilter(new ResponseV21()); + } if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) { $warnings[] = "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is " . APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks"; } diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php index 0fec56efee..fd27bc1b59 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Create.php @@ -90,7 +90,6 @@ class Create extends Base System::getEnv('_APP_COMPUTE_CPUS', 0), System::getEnv('_APP_COMPUTE_MEMORY', 0) ), 'Runtime specification for the function SSR executions.', true, ['plan']) - // TODO: Request filter ->inject('response') ->inject('dbForProject') ->inject('project') diff --git a/src/Appwrite/Utopia/Request/Filters/V21.php b/src/Appwrite/Utopia/Request/Filters/V21.php index 3ef0becf1d..4feb8e1926 100644 --- a/src/Appwrite/Utopia/Request/Filters/V21.php +++ b/src/Appwrite/Utopia/Request/Filters/V21.php @@ -6,7 +6,7 @@ use Appwrite\Utopia\Request\Filter; class V21 extends Filter { - // Convert 1.8.0 params to 1.8.1 + // Convert 1.8.0 params to 1.9.0 public function parse(array $content, string $model): array { switch ($model) { @@ -14,6 +14,12 @@ class V21 extends Filter case 'sites.createTemplateDeployment': $content = $this->convertVersionToTypeAndReference($content); break; + case 'functions.create': + case 'sites.create': + case 'functions.update': + case 'sites.update': + $content = $this->convertSpecs($content); + break; } return $content; } @@ -31,4 +37,15 @@ class V21 extends Filter } return $content; } + + protected function convertSpecs(array $content): array + { + if (!empty($content['specification'])) { + $content['buildSpecification'] = $content['specification']; + $content['runtimeSpecification'] = $content['specification']; + unset($content['specification']); + } + + return $content; + } } diff --git a/src/Appwrite/Utopia/Response/Filters/V21.php b/src/Appwrite/Utopia/Response/Filters/V21.php new file mode 100644 index 0000000000..bba1aaa4ca --- /dev/null +++ b/src/Appwrite/Utopia/Response/Filters/V21.php @@ -0,0 +1,51 @@ + $this->parseSite($content), + Response::MODEL_SITE_LIST => $this->handleList( + $content, + "sites", + fn ($item) => $this->parseSite($item), + ), + Response::MODEL_FUNCTION => $this->parseFunction($content), + Response::MODEL_FUNCTION_LIST => $this->handleList( + $content, + "sites", + fn ($item) => $this->parseFunction($item), + ), + default => $parsedResponse, + }; + } + + protected function parseSite(array $content): array + { + $content = $this->parseSpecs($content); + return $content; + } + + protected function parseFunction(array $content): array + { + $content = $this->parseSpecs($content); + return $content; + } + + protected function parseSpecs(array $content): array + { + $content['specification'] = $content['buildSpecification'] ?? null; + unset($content['buildSpecification']); + unset($content['runtimeSpecification']); + return $content; + } +} diff --git a/src/Appwrite/Utopia/Response/Model/Site.php b/src/Appwrite/Utopia/Response/Model/Site.php index 8e46cd9043..f9a1298f6e 100644 --- a/src/Appwrite/Utopia/Response/Model/Site.php +++ b/src/Appwrite/Utopia/Response/Model/Site.php @@ -173,7 +173,6 @@ class Site extends Model 'default' => APP_COMPUTE_SPECIFICATION_DEFAULT, 'example' => APP_COMPUTE_SPECIFICATION_DEFAULT, ]) - // TODO: Response filter ->addRule('buildRuntime', [ 'type' => self::TYPE_STRING, 'description' => 'Site build runtime.', diff --git a/tests/e2e/Services/Sites/SitesCustomServerTest.php b/tests/e2e/Services/Sites/SitesCustomServerTest.php index a2ffed5e1a..f951a1205b 100644 --- a/tests/e2e/Services/Sites/SitesCustomServerTest.php +++ b/tests/e2e/Services/Sites/SitesCustomServerTest.php @@ -2977,12 +2977,11 @@ class SitesCustomServerTest extends Scope 'adapter' => 'ssr', 'buildRuntime' => 'node-22', 'outputDirectory' => './dist', - 'buildCommand' => 'npm run build', + 'buildCommand' => 'npm run build && echo $APPWRITE_SITE_MEMORY:$APPWRITE_SITE_CPUS', 'installCommand' => 'npm install', 'fallbackFile' => '', 'buildSpecification' => Specification::S_2VCPU_2GB, 'runtimeSpecification' => Specification::S_1VCPU_1GB, - 'commands' => 'echo $APPWRITE_FUNCTION_MEMORY:$APPWRITE_FUNCTION_CPUS', ]); $this->assertEquals(201, $site['headers']['status-code']); @@ -2992,6 +2991,8 @@ class SitesCustomServerTest extends Scope $siteId = $site['body']['$id'] ?? ''; + $domain = $this->setupSiteDomain($siteId); + $deploymentId = $this->setupDeployment($siteId, [ 'code' => $this->packageSite('astro'), 'activate' => true @@ -2999,19 +3000,20 @@ class SitesCustomServerTest extends Scope $this->assertEventually(function () use ($siteId, $deploymentId) { $deployment = $this->getDeployment($siteId, $deploymentId); - $this->assertTrue(str_contains($deployment['body']['buildLogs'], '2048:2')); + \var_dump($deployment['body']['buildLogs']); + $this->assertStringContainsString('2048:2', $deployment['body']['buildLogs']); }, 10000, 500); - // Check if the function specifications are correctly set in executions - // TODO: Finish - $execution = $this->createExecution($functionId); + // Check if the sites specifications are correctly set in executions + $proxyClient = new Client(); + $proxyClient->setEndpoint('http://' . $domain); - $this->assertEquals(201, $execution['headers']['status-code']); - $this->assertNotEmpty($execution['body']['$id']); + $response = $proxyClient->call(Client::METHOD_GET, '/specs'); - $executionResponse = json_decode($execution['body']['responseBody'], true); - $this->assertEquals('1024', $executionResponse['APPWRITE_FUNCTION_MEMORY']); - $this->assertEquals('1', $executionResponse['APPWRITE_FUNCTION_CPUS']); + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertNotEmpty($response['body']); + $this->assertEquals('1024', $response['body']['APPWRITE_SITE_MEMORY']); + $this->assertEquals('1', $response['body']['APPWRITE_SITE_CPUS']); $this->cleanupSite($siteId); } diff --git a/tests/resources/sites/astro/src/pages/specs.js b/tests/resources/sites/astro/src/pages/specs.js new file mode 100644 index 0000000000..adc2d6768f --- /dev/null +++ b/tests/resources/sites/astro/src/pages/specs.js @@ -0,0 +1,13 @@ +export async function GET(_context) { + return new Response( + JSON.stringify({ + APPWRITE_SITE_MEMORY: process.env.APPWRITE_SITE_MEMORY, + APPWRITE_SITE_CPUS: process.env.APPWRITE_SITE_CPUS, + }), + { + headers: { + "Content-Type": "application/json", + }, + }, + ); +} From cbb96f8b82771e2e17ac4c2f0d583cfa0f0c9155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 20 Nov 2025 17:40:56 +0100 Subject: [PATCH 3/6] AI review fixes --- .../Platform/Modules/Functions/Http/Functions/Update.php | 2 +- src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php index e7a19cb9fd..df5dd3adf5 100644 --- a/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php +++ b/src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php @@ -246,7 +246,7 @@ class Update extends Base $specsChanged = false; if ($function->getAttribute('runtimeSpecification') !== $runtimeSpecification) { $specsChanged = true; - } elseif ($function->getAttribute('buildbuildSpecification') !== $buildSpecification) { + } elseif ($function->getAttribute('buildSpecification') !== $buildSpecification) { $specsChanged = true; } diff --git a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php index 734c78385a..47fc29d041 100644 --- a/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php +++ b/src/Appwrite/Platform/Modules/Sites/Http/Sites/Update.php @@ -244,7 +244,7 @@ class Update extends Base $specsChanged = false; if ($site->getAttribute('runtimeSpecification') !== $runtimeSpecification) { $specsChanged = true; - } elseif ($site->getAttribute('buildbuildSpecification') !== $buildSpecification) { + } elseif ($site->getAttribute('buildSpecification') !== $buildSpecification) { $specsChanged = true; } From 7444f5cf6058689d9d4159d5fba5aba8e394f13f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 20 Nov 2025 17:50:15 +0100 Subject: [PATCH 4/6] leftover fix --- src/Appwrite/Utopia/Response/Filters/V21.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Utopia/Response/Filters/V21.php b/src/Appwrite/Utopia/Response/Filters/V21.php index bba1aaa4ca..c825b3df56 100644 --- a/src/Appwrite/Utopia/Response/Filters/V21.php +++ b/src/Appwrite/Utopia/Response/Filters/V21.php @@ -22,7 +22,7 @@ class V21 extends Filter Response::MODEL_FUNCTION => $this->parseFunction($content), Response::MODEL_FUNCTION_LIST => $this->handleList( $content, - "sites", + "functions", fn ($item) => $this->parseFunction($item), ), default => $parsedResponse, From 4bc624ea5c0d422f0fff0f6ec082c11b753cba75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Thu, 20 Nov 2025 18:05:32 +0100 Subject: [PATCH 5/6] Fix response filters order --- app/controllers/general.php | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index 709229241e..11a5f8271b 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -1038,23 +1038,23 @@ App::init() */ $responseFormat = $request->getHeader('x-appwrite-response-format', System::getEnv('_APP_SYSTEM_RESPONSE_FORMAT', '')); if ($responseFormat) { - if (version_compare($responseFormat, '1.4.0', '<')) { - $response->addFilter(new ResponseV16()); - } - if (version_compare($responseFormat, '1.5.0', '<')) { - $response->addFilter(new ResponseV17()); - } - if (version_compare($responseFormat, '1.6.0', '<')) { - $response->addFilter(new ResponseV18()); - } - if (version_compare($responseFormat, '1.7.0', '<')) { - $response->addFilter(new ResponseV19()); + if (version_compare($responseFormat, '1.9.0', '<')) { + $response->addFilter(new ResponseV21()); } if (version_compare($responseFormat, '1.8.0', '<')) { $response->addFilter(new ResponseV20()); } - if (version_compare($responseFormat, '1.9.0', '<')) { - $response->addFilter(new ResponseV21()); + if (version_compare($responseFormat, '1.7.0', '<')) { + $response->addFilter(new ResponseV19()); + } + if (version_compare($responseFormat, '1.6.0', '<')) { + $response->addFilter(new ResponseV18()); + } + if (version_compare($responseFormat, '1.5.0', '<')) { + $response->addFilter(new ResponseV17()); + } + if (version_compare($responseFormat, '1.4.0', '<')) { + $response->addFilter(new ResponseV16()); } if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) { $warnings[] = "The current SDK is built for Appwrite " . $responseFormat . ". However, the current Appwrite server version is " . APP_VERSION_STABLE . ". Please downgrade your SDK to match the Appwrite version: https://appwrite.io/docs/sdks"; From 5817aea2eefb9ee2e5288a4104a6ceb650737929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matej=20Ba=C4=8Do?= Date: Mon, 24 Nov 2025 14:30:45 +0100 Subject: [PATCH 6/6] Remove todo --- tests/e2e/General/UsageTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php index 0c93669198..bacdf6de57 100644 --- a/tests/e2e/General/UsageTest.php +++ b/tests/e2e/General/UsageTest.php @@ -940,7 +940,7 @@ class UsageTest extends Scope 'schedule' => '0 0 1 1 *', 'timeout' => 10, 'buildSpecification' => Specification::S_8VCPU_8GB, - 'runtimeSpecification' => Specification::S_8VCPU_8GB, // TODO: Test with different value to ensure it's use correctly + 'runtimeSpecification' => Specification::S_4VCPU_4GB, ] );