sync with 1.6.x

Activities batch writes

.env

@@ -18,12 +18,11 @@ _APP_SYSTEM_RESPONSE_FORMAT=
 _APP_OPTIONS_ABUSE=disabled
 _APP_OPTIONS_ROUTER_PROTECTION=disabled
 _APP_OPTIONS_FORCE_HTTPS=disabled
-_APP_OPTIONS_COMPUTE_FORCE_HTTPS=disabled
+_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS=disabled
 _APP_OPENSSL_KEY_V1=your-secret-key
 _APP_DOMAIN=traefik
 _APP_DOMAIN_FUNCTIONS=functions.localhost
-_APP_DOMAIN_SITES=sites.localhost
-_APP_DOMAIN_TARGET=test.appwrite.io
+_APP_DOMAIN_TARGET=localhost
 _APP_RULES_FORMAT=md5
 _APP_REDIS_HOST=redis
 _APP_REDIS_PORT=6379
@@ -70,19 +69,17 @@ _APP_SMS_FROM=+123456789
 _APP_SMS_PROJECTS_DENY_LIST=
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000
-_APP_COMPUTE_SIZE_LIMIT=30000000
-_APP_COMPUTE_TIMEOUT=900
-_APP_COMPUTE_BUILD_TIMEOUT=900
-_APP_COMPUTE_CPUS=8
-_APP_COMPUTE_MEMORY=8192
-_APP_COMPUTE_INACTIVE_THRESHOLD=600
-_APP_COMPUTE_MAINTENANCE_INTERVAL=600
-_APP_COMPUTE_RUNTIMES_NETWORK=runtimes
+_APP_FUNCTIONS_SIZE_LIMIT=30000000
+_APP_FUNCTIONS_TIMEOUT=900
+_APP_FUNCTIONS_BUILD_TIMEOUT=900
+_APP_FUNCTIONS_CPUS=8
+_APP_FUNCTIONS_MEMORY=8192
+_APP_FUNCTIONS_INACTIVE_THRESHOLD=600
+_APP_FUNCTIONS_MAINTENANCE_INTERVAL=600
+_APP_FUNCTIONS_RUNTIMES_NETWORK=runtimes
 _APP_EXECUTOR_SECRET=your-secret-key
-_APP_EXECUTOR_HOST=http://exc1/v1
+_APP_EXECUTOR_HOST=http://proxy/v1
 _APP_FUNCTIONS_RUNTIMES=php-8.0,node-18.0,python-3.9,ruby-3.1
-_APP_SITES_RUNTIMES=static-1,ssr-22,flutter-3.24
-_APP_SITES_FRAMEWORKS=sveltekit,nextjs,nuxt,astro,remix,flutter,other,react,vue # TODO: Angular
 _APP_MAINTENANCE_INTERVAL=86400
 _APP_MAINTENANCE_DELAY=
 _APP_MAINTENANCE_RETENTION_CACHE=2592000

.github/workflows/static-analysis.yml

@@ -1,16 +0,0 @@
-name: "Static code analysis"
-
-on: [pull_request]
-jobs:
-  lint:
-    name: CodeQL
-    runs-on: ubuntu-latest
-
-    steps:
-    - name: Check out the repo
-      uses: actions/checkout@v2
-
-    - name: Run CodeQL
-      run: |
-        docker run --rm -v $PWD:/app composer:2.6 sh -c \
-        "composer install --profile --ignore-platform-reqs && composer check"

.github/workflows/tests.yml

@@ -90,9 +90,6 @@ jobs:
           docker compose up -d
           sleep 10
 
-      - name: Logs
-        run: docker compose logs appwrite
-
       - name: Doctor
         run: docker compose exec -T appwrite doctor
 
@@ -145,8 +142,6 @@ jobs:
           Locale,
           Projects,
           Realtime,
-          Sites,
-          Proxy,
           Storage,
           Teams,
           Users,
@@ -172,14 +167,6 @@ jobs:
           docker compose up -d
           sleep 30
 
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
       - name: Run ${{ matrix.service }} tests with Project table mode
         run: |
           echo "Using project tables"
@@ -212,8 +199,6 @@ jobs:
             Locale,
             Projects,
             Realtime,
-            Sites,
-            Proxy,
             Storage,
             Teams,
             Users,
@@ -244,14 +229,6 @@ jobs:
           docker compose up -d
           sleep 30
 
-      - name: Wait for Open Runtimes
-        timeout-minutes: 3
-        run: |
-          while ! docker compose logs openruntimes-executor | grep -q "Executor is ready."; do
-            echo "Waiting for Executor to come online"
-            sleep 1
-          done
-
       - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
         run: |
           if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
@@ -263,7 +240,7 @@ jobs:
             export _APP_DATABASE_SHARED_TABLES=database_db_main
             export _APP_DATABASE_SHARED_TABLES_V1=
           fi
-      
+          
           docker compose exec -T \
             -e _APP_DATABASE_SHARED_TABLES \
             -e _APP_DATABASE_SHARED_TABLES_V1 \

.gitignore

@@ -3,7 +3,6 @@
 /node_modules/
 /tests/resources/storage/
 /tests/resources/functions/**/code.tar.gz
-/tests/resources/sites/**/code.tar.gz
 /app/sdks/*
 /.idea/
 !/.idea/workspace.xml

CONTRIBUTING.md

@@ -163,28 +163,6 @@ Other containes should be named the same as their service, for example `redis` s
 - [Encryption](https://medium.com/searchencrypt/what-is-encryption-how-does-it-work-e8f20e340537#:~:text=Encryption%20is%20a%20process%20that,%2C%20or%20decrypt%2C%20the%20information.)
 - [Hashing](https://searchsqlserver.techtarget.com/definition/hashing#:~:text=Hashing%20is%20the%20transformation%20of,it%20using%20the%20original%20value.)
 
-## Modules
-
-As Appwrite grows, we noticed approach of having all service endpoints in `app/controllers/api/[service].php` is not maintainable. Not only it creates massive files, it also doesnt contain all product's features such as workers or tasks. While there might still be some occurances of those controller files, we avoid it in all new development, and gradually migrate existing controllers to **HTTP modules**.
-
-### HTTP Endpoints
-
-Every endpoint file follows below structure, making it consistent with HTTP REST endpoint path:
-
-```
-src/Appwrite/Platform/Modules/[service]/Http/[resource]/[action].php
-```
-
-Tips and tricks:
-
-1. If endpoint doesn't have resource, use service name as resource name too
-> Example: `Modules/Sites/Http/Sites/Get.php`
-
-2. If there are multiple resources, use then all in folder structure
-> Example: `Modules/Sites/Http/Deployments/Builds/Create.php`
-
-3. Action can only be `Get`, `Create`, `Update`, `Delete` or `XList`
-
 ## Architecture
 
 Appwrite's current structure is a combination of both [Monolithic](https://en.wikipedia.org/wiki/Monolithic_application) and [Microservice](https://en.wikipedia.org/wiki/Microservices) architectures.

Dockerfile

@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
     --no-plugins --no-scripts --prefer-dist \
     `if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
 
-FROM appwrite/base:0.9.5 AS final
+FROM appwrite/base:0.10.1 AS final
 
 LABEL maintainer="team@appwrite.io"
 
@@ -88,9 +88,7 @@ RUN chmod +x /usr/local/bin/doctor && \
     chmod +x /usr/local/bin/worker-stats-usage && \
     chmod +x /usr/local/bin/worker-stats-usage-dump && \
     chmod +x /usr/local/bin/stats-resources && \
-    chmod +x /usr/local/bin/worker-stats-resources && \
-    chmod +x /usr/local/bin/worker-usage && \
-    chmod +x /usr/local/bin/worker-usage-dump
+    chmod +x /usr/local/bin/worker-stats-resources
 
 # Letsencrypt Permissions
 RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/

app/cli.php

@@ -26,7 +26,7 @@ use Utopia\Registry\Registry;
 use Utopia\System\System;
 
 // overwriting runtimes to be architectur agnostic for CLI
-Config::setParam('runtimes', (new Runtimes('v4rc'))->getAll(supported: false));
+Config::setParam('runtimes', (new Runtimes('v4'))->getAll(supported: false));
 
 // require controllers after overwriting runtimes
 require_once __DIR__ . '/controllers/general.php';

app/config/collections/platform.php

@@ -1013,10 +1013,10 @@ return [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('type'), // 'api', 'redirect', 'deployment' (site or function)
+                '$id' => ID::custom('resourceType'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 32,
+                'size' => 100,
                 'signed' => true,
                 'required' => true,
                 'default' => null,
@@ -1024,28 +1024,24 @@ return [
                 'filters' => [],
             ],
             [
-                // If 'api', then (empty)
-                // If 'redirect', then URL
-                // If 'deployment', then deployment ID
-                '$id' => ID::custom('value'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 512,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                // Examples: branch=main
-                '$id' => ID::custom('automation'),
+                '$id' => ID::custom('resourceInternalId'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
                 'signed' => true,
                 'required' => false,
-                'default' => '',
+                'default' => null,
+                'array' => false,
+                'filters' => [],
+            ],
+            [
+                '$id' => ID::custom('resourceId'),
+                'type' => Database::VAR_STRING,
+                'format' => '',
+                'size' => Database::LENGTH_KEY,
+                'signed' => true,
+                'required' => false,
+                'default' => null,
                 'array' => false,
                 'filters' => [],
             ],
@@ -1070,27 +1066,9 @@ return [
                 'default' => null,
                 'array' => false,
                 'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
+            ]
         ],
         'indexes' => [
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
             [
                 '$id' => ID::custom('_key_domain'),
                 'type' => Database::INDEX_UNIQUE,
@@ -1113,26 +1091,26 @@ return [
                 'orders' => [Database::ORDER_ASC],
             ],
             [
-                '$id' => '_key_type',
+                '$id' => '_key_resourceInternalId',
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['type'],
-                'lengths' => [32],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_value',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['value'],
-                'lengths' => [512],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => '_key_automation',
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['automation'],
+                'attributes' => ['resourceInternalId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
+            [
+                '$id' => '_key_resourceId',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceId'],
+                'lengths' => [Database::LENGTH_KEY],
+                'orders' => [Database::ORDER_ASC],
+            ],
+            [
+                '$id' => '_key_resourceType',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['resourceType'],
+                'lengths' => [],
+                'orders' => [Database::ORDER_ASC],
+            ],
         ],
     ],
 

app/config/collections/projects.php

@@ -708,7 +708,7 @@ return [
                 'size' => 128,
                 'signed' => false,
                 'required' => false,
-                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
+                'default' => APP_FUNCTION_SPECIFICATION_DEFAULT,
                 'filters' => [],
             ],
             [
@@ -797,364 +797,6 @@ return [
         ],
     ],
 
-    'sites' => [
-        '$collection' => ID::custom(Database::METADATA),
-        '$id' => ID::custom('sites'),
-        'name' => 'Sites',
-        'attributes' => [
-            [
-                '$id' => ID::custom('name'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 2048,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('enabled'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('live'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => true,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('installationId'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('installationInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('providerRepositoryId'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('repositoryId'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('repositoryInternalId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('providerBranch'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('providerRootDirectory'),
-                'type' => Database::VAR_STRING,
-                'signed' => true,
-                'size' => Database::LENGTH_KEY,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'array' => false,
-            ],
-            [
-                '$id' => ID::custom('providerSilentMode'),
-                'type' => Database::VAR_BOOLEAN,
-                'signed' => true,
-                'size' => 0,
-                'format' => '',
-                'filters' => [],
-                'required' => false,
-                'default' => false,
-                'array' => false,
-            ],
-            // [
-            //     '$id' => ID::custom('logging'),
-            //     'type' => Database::VAR_BOOLEAN,
-            //     'signed' => true,
-            //     'size' => 0,
-            //     'format' => '',
-            //     'filters' => [],
-            //     'required' => true,
-            //     'array' => false,
-            // ],
-            [
-                '$id' => ID::custom('framework'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 2048,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('outputDirectory'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('buildCommand'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('installCommand'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('fallbackFile'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                '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,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('vars'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['subQueryVariables'],
-            ],
-            [
-                '$id' => ID::custom('varsProject'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => ['subQueryProjectVariables'],
-            ],
-            [
-                '$id' => ID::custom('timeout'),
-                'type' => Database::VAR_INTEGER,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('search'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('specification'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 128,
-                'signed' => false,
-                'required' => false,
-                'default' => APP_COMPUTE_SPECIFICATION_DEFAULT,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('buildRuntime'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 2048,
-                'signed' => true,
-                'required' => true,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('adapter'), // ssr or static
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 128,
-                'signed' => true,
-                'required' => false,
-                'default' => '',
-                'array' => false,
-                'filters' => [],
-            ],
-        ],
-        'indexes' => [
-            [
-                '$id' => ID::custom('_key_search'),
-                'type' => Database::INDEX_FULLTEXT,
-                'attributes' => ['search'],
-                'lengths' => [],
-                'orders' => [],
-            ],
-            [
-                '$id' => ID::custom('_key_name'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['name'],
-                'lengths' => [256],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_enabled'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['enabled'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_installationId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['installationId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_installationInternalId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['installationInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_providerRepositoryId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['providerRepositoryId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_repositoryId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['repositoryId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_repositoryInternalId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['repositoryInternalId'],
-                'lengths' => [Database::LENGTH_KEY],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_framework'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['framework'],
-                'lengths' => [64],
-                'orders' => [Database::ORDER_ASC],
-            ],
-            [
-                '$id' => ID::custom('_key_deploymentId'),
-                'type' => Database::INDEX_KEY,
-                'attributes' => ['deploymentId'],
-                'lengths' => [],
-                'orders' => [Database::ORDER_ASC],
-            ]
-        ],
-    ],
-
     'deployments' => [
         '$collection' => ID::custom(Database::METADATA),
         '$id' => ID::custom('deployments'),
@@ -1237,39 +879,6 @@ return [
                 'default' => null,
                 'filters' => [],
             ],
-            [
-                'array' => false,
-                '$id' => ID::custom('buildCommand'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('installCommand'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
-            [
-                'array' => false,
-                '$id' => ID::custom('outputDirectory'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 16384,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'filters' => [],
-            ],
             [
                 '$id' => ID::custom('path'),
                 'type' => Database::VAR_STRING,
@@ -1528,29 +1137,7 @@ return [
                 'default' => false,
                 'array' => false,
                 'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('screenshotLight'), // File ID from 'screenshots' Console bucket
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('screenshotDark'), // File ID from 'screenshots' Console bucket
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => 32,
-                'signed' => false,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
+            ]
         ],
         'indexes' => [
             [
@@ -1753,7 +1340,7 @@ return [
         'name' => 'Executions',
         'attributes' => [
             [
-                '$id' => ID::custom('resourceInternalId'),
+                '$id' => ID::custom('functionInternalId'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -1764,18 +1351,7 @@ return [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('resourceId'),
-                'type' => Database::VAR_STRING,
-                'format' => '',
-                'size' => Database::LENGTH_KEY,
-                'signed' => true,
-                'required' => false,
-                'default' => null,
-                'array' => false,
-                'filters' => [],
-            ],
-            [
-                '$id' => ID::custom('resourceType'),
+                '$id' => ID::custom('functionId'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -1964,9 +1540,9 @@ return [
         ],
         'indexes' => [
             [
-                '$id' => ID::custom('_key_resource'),
+                '$id' => ID::custom('_key_function'),
                 'type' => Database::INDEX_KEY,
-                'attributes' => ['resourceInternalId', 'resourceType', 'resourceId'],
+                'attributes' => ['functionId'],
                 'lengths' => [Database::LENGTH_KEY],
                 'orders' => [Database::ORDER_ASC],
             ],
@@ -2089,17 +1665,6 @@ return [
                 'array' => false,
                 'filters' => ['encrypt']
             ],
-            [
-                '$id' => ID::custom('secret'),
-                'type' => Database::VAR_BOOLEAN,
-                'format' => '',
-                'size' => 0,
-                'signed' => true,
-                'required' => false,
-                'default' => false,
-                'array' => false,
-                'filters' => [],
-            ],
             [
                 '$id' => ID::custom('search'),
                 'type' => Database::VAR_STRING,

app/config/errors.php

@@ -375,13 +375,6 @@ return [
         'code' => 409,
     ],
 
-    /** Console */
-    Exception::RESOURCE_ALREADY_EXISTS => [
-        'name' => Exception::RESOURCE_ALREADY_EXISTS,
-        'description' => 'Resource with the requested ID already exists. Please choose a different ID and try again.',
-        'code' => 409,
-    ],
-
     /** Membership */
     Exception::MEMBERSHIP_NOT_FOUND => [
         'name' => Exception::MEMBERSHIP_NOT_FOUND,
@@ -542,23 +535,6 @@ return [
         'code' => 404,
     ],
 
-    /** Sites */
-    Exception::SITE_NOT_FOUND => [
-        'name' => Exception::SITE_NOT_FOUND,
-        'description' => 'Site with the requested ID could not be found.',
-        'code' => 404,
-    ],
-    Exception::SITE_FRAMEWORK_UNSUPPORTED => [
-        'name' => Exception::SITE_FRAMEWORK_UNSUPPORTED,
-        'description' => 'The requested framework is either inactive or unsupported. Please check the value of the _APP_SITES_FRAMEWORKS environment variable.',
-        'code' => 404,
-    ],
-    Exception::SITE_TEMPLATE_NOT_FOUND => [
-        'name' => Exception::SITE_TEMPLATE_NOT_FOUND,
-        'description' => 'Site Template with the requested ID could not be found.',
-        'code' => 404,
-    ],
-
     /** Builds  */
     Exception::BUILD_NOT_FOUND => [
         'name' => Exception::BUILD_NOT_FOUND,
@@ -601,13 +577,6 @@ return [
         'code' => 400,
     ],
 
-    /** Logs */
-    Exception::LOG_NOT_FOUND => [
-        'name' => Exception::LOG_NOT_FOUND,
-        'description' => 'Log with the requested ID could not be found.',
-        'code' => 404,
-    ],
-
     /** Databases */
     Exception::DATABASE_NOT_FOUND => [
         'name' => Exception::DATABASE_NOT_FOUND,
@@ -875,11 +844,6 @@ return [
         'description' => 'Variable with the same ID already exists in this project. Try again with a different ID.',
         'code' => 409,
     ],
-    Exception::VARIABLE_CANNOT_UNSET_SECRET => [
-        'name' => Exception::VARIABLE_CANNOT_UNSET_SECRET,
-        'description' => 'Secret variables cannot be marked as non-secret. Please re-create the variable if this is your intention.',
-        'code' => 400,
-    ],
     Exception::GRAPHQL_NO_QUERY => [
         'name' => Exception::GRAPHQL_NO_QUERY,
         'description' => 'Param "query" is not optional.',

app/config/events.php

@@ -217,34 +217,6 @@ return [
             ],
         ]
     ],
-    'sites' => [
-        '$model' => Response::MODEL_SITE,
-        '$resource' => true,
-        '$description' => 'This event triggers on any sites event.',
-        'deployments' => [
-            '$model' => Response::MODEL_DEPLOYMENT,
-            '$resource' => true,
-            '$description' => 'This event triggers on any deployments event.',
-            'create' => [
-                '$description' => 'This event triggers when a deployment is created.',
-            ],
-            'delete' => [
-                '$description' => 'This event triggers when a deployment is deleted.'
-            ],
-            'update' => [
-                '$description' => 'This event triggers when a deployment is updated.'
-            ],
-        ],
-        'create' => [
-            '$description' => 'This event triggers when a site is created.'
-        ],
-        'delete' => [
-            '$description' => 'This event triggers when a site is deleted.',
-        ],
-        'update' => [
-            '$description' => 'This event triggers when a site is updated.',
-        ]
-    ],
     'functions' => [
         '$model' => Response::MODEL_FUNCTION,
         '$resource' => true,

app/config/frameworks.php

@@ -1,221 +0,0 @@
-<?php
-
-/**
- * List of Appwrite Sites supported frameworks
- */
-
-// TODO: @Meldiron Angular
-
-use Utopia\Config\Config;
-
-$templateRuntimes = Config::getParam('template-runtimes');
-
-function getVersions(array $versions, string $prefix)
-{
-    return array_map(function ($version) use ($prefix) {
-        return $prefix . '-' . $version;
-    }, $versions);
-}
-
-return [
-    'nextjs' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.next',
-                'startCommand' => 'sh helpers/next-js/server.sh',
-                'bundleCommand' => 'sh /usr/local/server/helpers/next-js/bundle.sh',
-                'envCommand' => 'source /usr/local/server/helpers/next-js/env.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './out',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ]
-        ]
-    ],
-    'react' => [
-        'key' => 'react',
-        'name' => 'React',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'nuxt' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './.output',
-                'startCommand' => 'sh helpers/nuxt/server.sh',
-                'bundleCommand' => 'sh /usr/local/server/helpers/nuxt/bundle.sh',
-                'envCommand' => 'source /usr/local/server/helpers/nuxt/env.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run generate',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ]
-        ]
-    ],
-    'vue' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-                'fallbackFile' => 'index.html'
-            ]
-        ]
-    ],
-    'sveltekit' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/sveltekit/server.sh',
-                'bundleCommand' => 'sh /usr/local/server/helpers/sveltekit/bundle.sh',
-                'envCommand' => 'source /usr/local/server/helpers/sveltekit/env.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ]
-        ]
-    ],
-    'astro' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/astro/server.sh',
-                'bundleCommand' => 'sh /usr/local/server/helpers/astro/bundle.sh',
-                'envCommand' => 'source /usr/local/server/helpers/astro/env.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './dist',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ]
-        ]
-    ],
-    'remix' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'ssr' => [
-                'key' => 'ssr',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build',
-                'startCommand' => 'sh helpers/remix/server.sh',
-                'bundleCommand' => 'sh /usr/local/server/helpers/remix/bundle.sh',
-                'envCommand' => 'source /usr/local/server/helpers/remix/env.sh',
-            ],
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'npm run build',
-                'installCommand' => 'npm install',
-                'outputDirectory' => './build/client',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ]
-        ]
-    ],
-    'flutter' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'buildRuntime' => 'flutter-3.24',
-        'runtimes' => getVersions($templateRuntimes['FLUTTER']['versions'], 'flutter'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => 'flutter build web',
-                'installCommand' => '',
-                'outputDirectory' => './build/web',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ],
-        ],
-    ],
-    'other' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'buildRuntime' => 'ssr-22',
-        'runtimes' => getVersions($templateRuntimes['NODE']['versions'], 'node'),
-        'adapters' => [
-            'static' => [
-                'key' => 'static',
-                'buildCommand' => '',
-                'installCommand' => '',
-                'outputDirectory' => './',
-                'startCommand' => 'sh helpers/server.sh',
-                'bundleCommand' => '',
-                'envCommand' => '',
-            ],
-        ]
-    ],
-];

app/config/frameworks/specifications.php

@@ -1,51 +0,0 @@
-<?php
-
-use Appwrite\Sites\Specification;
-
-return [
-    Specification::S_05VCPU_512MB => [
-        'slug' => Specification::S_05VCPU_512MB,
-        'memory' => 512,
-        'cpus' => 0.5
-    ],
-    Specification::S_1VCPU_512MB => [
-        'slug' => Specification::S_1VCPU_512MB,
-        'memory' => 512,
-        'cpus' => 1
-    ],
-    Specification::S_1VCPU_1GB => [
-        'slug' => Specification::S_1VCPU_1GB,
-        'memory' => 1024,
-        'cpus' => 1
-    ],
-    Specification::S_2VCPU_2GB => [
-        'slug' => Specification::S_2VCPU_2GB,
-        'memory' => 2048,
-        'cpus' => 2
-    ],
-    Specification::S_2VCPU_4GB => [
-        'slug' => Specification::S_2VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 2
-    ],
-    Specification::S_4VCPU_4GB => [
-        'slug' => Specification::S_4VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 4
-    ],
-    Specification::S_4VCPU_8GB => [
-        'slug' => Specification::S_4VCPU_8GB,
-        'memory' => 8192,
-        'cpus' => 4
-    ],
-    Specification::S_8VCPU_4GB => [
-        'slug' => Specification::S_8VCPU_4GB,
-        'memory' => 4096,
-        'cpus' => 8
-    ],
-    Specification::S_8VCPU_8GB => [
-        'slug' => Specification::S_8VCPU_8GB,
-        'memory' => 8192,
-        'cpus' => 8
-    ]
-];

app/config/function-templates.php

@@ -1,8 +1,39 @@
 <?php
 
-use Utopia\Config\Config;
-
-$templateRuntimes = Config::getParam('template-runtimes');
+const TEMPLATE_RUNTIMES = [
+    'NODE' => [
+        'name' => 'node',
+        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
+    ],
+    'PYTHON' => [
+        'name' => 'python',
+        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
+    ],
+    'DART' => [
+        'name' => 'dart',
+        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
+    ],
+    'GO' => [
+        'name' => 'go',
+        'versions' => ['1.23']
+    ],
+    'PHP' => [
+        'name' => 'php',
+        'versions' => ['8.3', '8.2', '8.1', '8.0']
+    ],
+    'DENO' => [
+        'name' => 'deno',
+        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
+    ],
+    'BUN' => [
+        'name' => 'bun',
+        'versions' => ['1.1', '1.0']
+    ],
+    'RUBY' => [
+        'name' => 'ruby',
+        'versions' => ['3.3', '3.2', '3.1', '3.0']
+    ],
+];
 
 function getRuntimes($runtime, $commands, $entrypoint, $providerRootDirectory, $versionsDenyList = [])
 {
@@ -31,24 +62,24 @@ return [
         'timeout' => 15,
         'useCases' => ['starter'],
         'runtimes' => [
-            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/starter'),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/starter'
             ),
-            ...getRuntimes($templateRuntimes['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
-            ...getRuntimes($templateRuntimes['GO'], '', 'main.go', 'go/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['DART'], 'dart pub get', 'lib/main.dart', 'dart/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['GO'], '', 'main.go', 'go/starter'),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/starter'
             ),
-            ...getRuntimes($templateRuntimes['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
-            ...getRuntimes($templateRuntimes['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
-            ...getRuntimes($templateRuntimes['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
+            ...getRuntimes(TEMPLATE_RUNTIMES['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
         ],
         'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/starter">file</a>.',
         'vcsProvider' => 'github',
@@ -70,7 +101,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-upstash-vector'
@@ -114,7 +145,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-redis-labs'
@@ -157,7 +188,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-neo4j-auradb'
@@ -209,7 +240,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-mongo-atlas'
@@ -246,7 +277,7 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/query-neon-postgres'
@@ -313,25 +344,25 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/prompt-chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/prompt_chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/prompt-chatgpt'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/prompt_chatgpt'
@@ -374,19 +405,19 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/discord-command-bot'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt && python src/setup.py',
                 'src/main.py',
                 'python/discord_command_bot'
             ),
             ...getRuntimes(
-                $templateRuntimes['GO'],
+                TEMPLATE_RUNTIMES['GO'],
                 '',
                 'main.go',
                 'go/discord-command-bot'
@@ -437,7 +468,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/analyze-with-perspectiveapi'
@@ -473,19 +504,19 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/censor-with-redact'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/censor_with_redact'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/censor_with_redact'
@@ -519,7 +550,7 @@ return [
         'timeout' => 15,
         'useCases' => ['utilities'],
         'runtimes' => [
-            ...getRuntimes($templateRuntimes['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
+            ...getRuntimes(TEMPLATE_RUNTIMES['NODE'], 'npm install', 'src/main.js', 'node/generate-pdf')
         ],
         'instructions' => 'For documentation and instructions check out <a target="_blank" rel="noopener noreferrer" class="link" href="https://github.com/appwrite/templates/tree/main/node/generate-pdf">file</a>.',
         'vcsProvider' => 'github',
@@ -542,7 +573,7 @@ return [
         'useCases' => ['dev-tools'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/github-issue-bot'
@@ -585,7 +616,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/url-shortener'
@@ -636,19 +667,19 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-algolia'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/sync_with_algolia'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/sync-with-algolia'
@@ -717,31 +748,31 @@ return [
         'useCases' => ['databases'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['BUN'],
+                TEMPLATE_RUNTIMES['BUN'],
                 'bun install',
                 'src/main.ts',
                 'bun/sync-with-meilisearch'
             ),
             ...getRuntimes(
-                $templateRuntimes['RUBY'],
+                TEMPLATE_RUNTIMES['RUBY'],
                 'bundle install',
                 'lib/main.rb',
                 'ruby/sync-with-meilisearch'
@@ -810,37 +841,37 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/whatsapp_with_vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['DART'],
+                TEMPLATE_RUNTIMES['DART'],
                 'dart pub get',
                 'lib/main.dart',
                 'dart/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['BUN'],
+                TEMPLATE_RUNTIMES['BUN'],
                 'bun install',
                 'src/main.ts',
                 'bun/whatsapp-with-vonage'
             ),
             ...getRuntimes(
-                $templateRuntimes['RUBY'],
+                TEMPLATE_RUNTIMES['RUBY'],
                 'bundle install',
                 'lib/main.rb',
                 'ruby/whatsapp-with-vonage'
@@ -896,7 +927,7 @@ return [
         'useCases' => ['messaging'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/push-notification-with-fcm'
@@ -952,19 +983,19 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/email-contact-form'
             ),
             ...getRuntimes(
-                $templateRuntimes['PYTHON'],
+                TEMPLATE_RUNTIMES['PYTHON'],
                 'pip install -r requirements.txt',
                 'src/main.py',
                 'python/email_contact_form'
             ),
             ...getRuntimes(
-                $templateRuntimes['PHP'],
+                TEMPLATE_RUNTIMES['PHP'],
                 'composer install',
                 'src/index.php',
                 'php/email-contact-form'
@@ -1035,7 +1066,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/subscriptions-with-stripe'
@@ -1076,7 +1107,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/payments-with-stripe'
@@ -1133,7 +1164,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/text-generation-with-huggingface'
@@ -1167,7 +1198,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/language-translation-with-huggingface'
@@ -1201,7 +1232,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/image-classification-with-huggingface'
@@ -1259,7 +1290,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/object-detection-with-huggingface'
@@ -1317,7 +1348,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/speech-recognition-with-huggingface'
@@ -1375,7 +1406,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/text-to-speech-with-huggingface'
@@ -1433,7 +1464,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-replicate'
@@ -1468,7 +1499,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-together-ai'
@@ -1510,7 +1541,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/chat-with-perplexity-ai'
@@ -1551,7 +1582,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-replicate'
@@ -1586,7 +1617,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/sync-with-pinecone'
@@ -1649,7 +1680,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/rag-with-langchain'
@@ -1712,7 +1743,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/speak-with-elevenlabs'
@@ -1767,7 +1798,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/speak-with-lmnt'
@@ -1808,7 +1839,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/chat-with-anyscale'
@@ -1849,7 +1880,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install && npm run setup',
                 'src/main.js',
                 'node/music-generation-with-huggingface'
@@ -1891,7 +1922,7 @@ return [
         'useCases' => ['ai'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/generate-with-fal-ai'
@@ -1926,7 +1957,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/subscriptions-with-lemon-squeezy'
@@ -1981,7 +2012,7 @@ return [
         'useCases' => ['utilities'],
         'runtimes' => [
             ...getRuntimes(
-                $templateRuntimes['NODE'],
+                TEMPLATE_RUNTIMES['NODE'],
                 'npm install',
                 'src/main.js',
                 'node/payments-with-lemon-squeezy'

app/config/roles.php

@@ -26,7 +26,6 @@ $member = [
     'subscribers.write',
     'subscribers.read',
     'assistant.read',
-    'rules.read'
 ];
 
 $admins = [
@@ -59,10 +58,6 @@ $admins = [
     'health.read',
     'functions.read',
     'functions.write',
-    'sites.read',
-    'sites.write',
-    'log.read',
-    'log.write',
     'execution.read',
     'execution.write',
     'rules.read',

app/config/runtimes.php

@@ -6,4 +6,4 @@
 
 use Appwrite\Runtimes\Runtimes;
 
-return (new Runtimes('v4rc'))->getAll();
+return (new Runtimes('v4'))->getAll();

app/config/scopes.php

@@ -64,18 +64,6 @@ return [ // List of publicly visible scopes
     'functions.write' => [
         'description' => 'Access to create, update, and delete your project\'s functions and code deployments',
     ],
-    'sites.read' => [
-        'description' => 'Access to read your project\'s sites and deployments',
-    ],
-    'sites.write' => [
-        'description' => 'Access to create, update, and delete your project\'s sites and deployments',
-    ],
-    'log.read' => [
-        'description' => 'Access to read your site\'s logs',
-    ],
-    'log.write' => [
-        'description' => 'Access to update, and delete your site\'s logs',
-    ],
     'execution.read' => [
         'description' => 'Access to read your project\'s execution logs',
     ],

app/config/services.php

@@ -173,25 +173,12 @@ return [
         'optional' => false,
         'icon' => '',
     ],
-    'sites' => [
-        'key' => 'sites',
-        'name' => 'Sites',
-        'subtitle' => 'The Sites Service allows you view, create and manage your web applications.',
-        'description' => '/docs/services/sites.md',
-        'controller' => '', // Uses modules
-        'sdk' => true,
-        'docs' => true,
-        'docsUrl' => 'https://appwrite.io/docs/sites',
-        'tests' => false,
-        'optional' => true,
-        'icon' => '', // TODO: Update icon later
-    ],
     'functions' => [
         'key' => 'functions',
         'name' => 'Functions',
         'subtitle' => 'The Functions Service allows you view, create and manage your Cloud Functions.',
         'description' => '/docs/services/functions.md',
-        'controller' => '', // Uses modules
+        'controller' => 'api/functions.php',
         'sdk' => true,
         'docs' => true,
         'docsUrl' => 'https://appwrite.io/docs/functions',

app/config/site-templates.php

@@ -1,587 +0,0 @@
-<?php
-
-use Utopia\System\System;
-
-/**
- * List of Appwrite Sites templates
- */
-
-$protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-$hostname = System::getEnv('_APP_DOMAIN');
-
-// TODO: Development override
-if (System::getEnv('_APP_ENV') === 'development') {
-    $hostname = 'localhost';
-}
-
-$url = $protocol . '://' . $hostname;
-
-// TODO: @Meldiron Angular
-
-const TEMPLATE_FRAMEWORKS = [
-    'SVELTEKIT' => [
-        'key' => 'sveltekit',
-        'name' => 'SvelteKit',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './build',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => null,
-    ],
-    'NEXTJS' => [
-        'key' => 'nextjs',
-        'name' => 'Next.js',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './.next',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => null,
-    ],
-    'NUXT' => [
-        'key' => 'nuxt',
-        'name' => 'Nuxt',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './.output',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => null,
-    ],
-    'REMIX' => [
-        'key' => 'remix',
-        'name' => 'Remix',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './build',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => null,
-    ],
-    'ASTRO' => [
-        'key' => 'astro',
-        'name' => 'Astro',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'outputDirectory' => './dist',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'ssr',
-        'fallbackFile' => null,
-    ],
-    'FLUTTER' => [
-        'key' => 'flutter',
-        'name' => 'Flutter',
-        'installCommand' => '',
-        'buildCommand' => 'flutter build web',
-        'outputDirectory' => './build/web',
-        'buildRuntime' => 'flutter-3.24',
-        'adapter' => 'static',
-        'fallbackFile' => null,
-    ],
-    'OTHER' => [
-        'key' => 'other',
-        'name' => 'Other',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'static',
-        'fallbackFile' => 'index.html',
-    ],
-    'REACT' => [
-        'key' => 'react',
-        'name' => 'React',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist',
-        'fallbackFile' => 'index.html',
-    ],
-    'VUE' => [
-        'key' => 'vue',
-        'name' => 'Vue.js',
-        'installCommand' => 'npm install',
-        'buildCommand' => 'npm run build',
-        'buildRuntime' => 'ssr-22',
-        'adapter' => 'static',
-        'outputDirectory' => './dist',
-        'fallbackFile' => 'index.html',
-    ],
-];
-
-function getFramework(string $frameworkEnum, array $overrides)
-{
-    $settings = \array_merge(TEMPLATE_FRAMEWORKS[$frameworkEnum], $overrides);
-    return $settings;
-}
-
-return [
-    [
-        'key' => 'template-for-onelink',
-        'name' => 'Onelink template',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/template-for-onelink.png',
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './onelink',
-                'buildCommand' => 'npm run generate',
-                'outputDirectory' => './dist',
-                'adapter' => 'static',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'Meldiron',
-        'providerVersion' => '0.1.*',
-        'variables' => []
-    ],
-    [
-        'key' => 'starter-for-svelte',
-        'name' => 'Svelte starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-svelte.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-svelte',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-react',
-        'name' => 'React starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-react.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-react',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-vue',
-        'name' => 'Vue starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-vue.png',
-        'frameworks' => [
-            getFramework('VUE', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-vue',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'VITE_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'VITE_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-react-native',
-        'name' => 'React Native starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-react-native.png',
-        'frameworks' => [
-            getFramework('REACT', [
-                'providerRootDirectory' => './',
-                'fallbackFile' => '+not-found.html',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-react-native',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'EXPO_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-nextjs',
-        'name' => 'Next.js starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-nextjs.png',
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-nextjs',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'starter-for-nuxt',
-        'name' => 'Nuxt starter',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/starter-for-nuxt.png',
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'starter-for-nuxt',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NUXT_PUBLIC_APPWRITE_PROJECT_NAME',
-                'description' => 'Your Appwrite project name',
-                'value' => '{projectName}',
-                'placeholder' => '{projectName}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'template-for-event',
-        'name' => 'Event template',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/template-for-event.png',
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './',
-                'installCommand' => 'pnpm install',
-                'buildCommand' => 'npm run build',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'template-for-event',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_FUNCTION_PROJECT_ID',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'NEXT_PUBLIC_APPWRITE_FUNCTION_API_ENDPOINT',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'template-for-portfolio',
-        'name' => 'Portfolio template',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/template-for-portfolio.png',
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'template-for-portfolio',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => []
-    ],
-    [
-        'key' => 'template-for-store',
-        'name' => 'Store template',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/template-for-store.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'template-for-store',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => [
-            [
-                'name' => 'STRIPE_SECRET_KEY',
-                'description' => 'Your Stripe secret key',
-                'value' => 'disabled',
-                'placeholder' => 'sk_.....',
-                'required' => false,
-                'type' => 'password'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_ENDPOINT',
-                'description' => 'Endpoint of Appwrite server',
-                'value' => '{apiEndpoint}',
-                'placeholder' => '{apiEndpoint}',
-                'required' => true,
-                'type' => 'text'
-            ],
-            [
-                'name' => 'PUBLIC_APPWRITE_PROJECT_ID',
-                'description' => 'Your Appwrite project ID',
-                'value' => '{projectId}',
-                'placeholder' => '{projectId}',
-                'required' => true,
-                'type' => 'text'
-            ],
-        ]
-    ],
-    [
-        'key' => 'template-for-blog',
-        'name' => 'Blog template',
-        'useCases' => ['starter'],
-        'demoImage' => $url . '/console/images/sites/templates/template-for-blog.png',
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'template-for-blog',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.1.*',
-        'variables' => []
-    ],
-    [
-        'key' => 'astro-starter',
-        'name' => 'Astro starter',
-        'useCases' => ['starter'],
-        'demoImage' => '',
-        'frameworks' => [
-            getFramework('ASTRO', [
-                'providerRootDirectory' => './astro/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'remix-starter',
-        'name' => 'Remix starter',
-        'useCases' => ['starter'],
-        'demoImage' => '',
-        'frameworks' => [
-            getFramework('REMIX', [
-                'providerRootDirectory' => './remix/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'flutter-starter',
-        'name' => 'Flutter starter',
-        'useCases' => ['starter'],
-        'demoImage' => '',
-        'frameworks' => [
-            getFramework('FLUTTER', [
-                'providerRootDirectory' => './flutter/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'nextjs-starter',
-        'name' => 'Next.js starter website',
-        'useCases' => ['starter'],
-        'frameworks' => [
-            getFramework('NEXTJS', [
-                'providerRootDirectory' => './nextjs/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'nuxt-starter',
-        'name' => 'Nuxt starter website',
-        'useCases' => ['starter'],
-        'frameworks' => [
-            getFramework('NUXT', [
-                'providerRootDirectory' => './nuxt/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-    [
-        'key' => 'sveltekit-starter',
-        'name' => 'SvelteKit starter website',
-        'useCases' => ['starter'],
-        'frameworks' => [
-            getFramework('SVELTEKIT', [
-                'providerRootDirectory' => './sveltekit/starter',
-            ]),
-        ],
-        'vcsProvider' => 'github',
-        'providerRepositoryId' => 'templates-for-sites',
-        'providerOwner' => 'appwrite',
-        'providerVersion' => '0.2.*',
-        'variables' => [],
-    ],
-];

app/config/specs/open-api3-latest-client.json

@@ -1,7 +1,7 @@
 {
     "openapi": "3.0.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -4763,7 +4763,7 @@
                 },
                 "x-appwrite": {
                     "method": "listExecutions",
-                    "weight": 301,
+                    "weight": 306,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -4848,7 +4848,7 @@
                 },
                 "x-appwrite": {
                     "method": "createExecution",
-                    "weight": 300,
+                    "weight": 305,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -4962,7 +4962,7 @@
                 },
                 "x-appwrite": {
                     "method": "getExecution",
-                    "weight": 302,
+                    "weight": 307,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5035,7 +5035,7 @@
                 },
                 "x-appwrite": {
                     "method": "query",
-                    "weight": 325,
+                    "weight": 331,
                     "cookies": false,
                     "type": "graphql",
                     "deprecated": false,
@@ -5086,7 +5086,7 @@
                 },
                 "x-appwrite": {
                     "method": "mutation",
-                    "weight": 324,
+                    "weight": 330,
                     "cookies": false,
                     "type": "graphql",
                     "deprecated": false,
@@ -5545,7 +5545,7 @@
                 },
                 "x-appwrite": {
                     "method": "createSubscriber",
-                    "weight": 370,
+                    "weight": 376,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5627,7 +5627,7 @@
                 },
                 "x-appwrite": {
                     "method": "deleteSubscriber",
-                    "weight": 374,
+                    "weight": 380,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -7514,11 +7514,6 @@
             "description": "The Users service allows you to manage your project users.",
             "x-globalAttributes": []
         },
-        {
-            "name": "sites",
-            "description": "The Sites Service allows you view, create and manage your web applications.",
-            "x-globalAttributes": []
-        },
         {
             "name": "functions",
             "description": "The Functions Service allows you view, create and manage your Cloud Functions.",
@@ -9148,7 +9143,7 @@
                     },
                     "duration": {
                         "type": "number",
-                        "description": "Resource(function\/site) execution duration in seconds.",
+                        "description": "Function execution duration in seconds.",
                         "x-example": 0.4,
                         "format": "double"
                     },

app/config/specs/swagger2-latest-client.json

@@ -1,7 +1,7 @@
 {
     "swagger": "2.0",
     "info": {
-        "version": "1.7.0",
+        "version": "1.6.1",
         "title": "Appwrite",
         "description": "Appwrite backend as a service cuts up to 70% of the time and costs required for building a modern application. We abstract and simplify common development tasks behind a REST APIs, to help you develop your app in a fast and secure way. For full API documentation and tutorials go to [https:\/\/appwrite.io\/docs](https:\/\/appwrite.io\/docs)",
         "termsOfService": "https:\/\/appwrite.io\/policy\/terms",
@@ -4929,7 +4929,7 @@
                 },
                 "x-appwrite": {
                     "method": "listExecutions",
-                    "weight": 301,
+                    "weight": 306,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5011,7 +5011,7 @@
                 },
                 "x-appwrite": {
                     "method": "createExecution",
-                    "weight": 300,
+                    "weight": 305,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5129,7 +5129,7 @@
                 },
                 "x-appwrite": {
                     "method": "getExecution",
-                    "weight": 302,
+                    "weight": 307,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5200,7 +5200,7 @@
                 },
                 "x-appwrite": {
                     "method": "query",
-                    "weight": 325,
+                    "weight": 331,
                     "cookies": false,
                     "type": "graphql",
                     "deprecated": false,
@@ -5273,7 +5273,7 @@
                 },
                 "x-appwrite": {
                     "method": "mutation",
-                    "weight": 324,
+                    "weight": 330,
                     "cookies": false,
                     "type": "graphql",
                     "deprecated": false,
@@ -5770,7 +5770,7 @@
                 },
                 "x-appwrite": {
                     "method": "createSubscriber",
-                    "weight": 370,
+                    "weight": 376,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -5854,7 +5854,7 @@
                 },
                 "x-appwrite": {
                     "method": "deleteSubscriber",
-                    "weight": 374,
+                    "weight": 380,
                     "cookies": false,
                     "type": "",
                     "deprecated": false,
@@ -7717,11 +7717,6 @@
             "description": "The Users service allows you to manage your project users.",
             "x-globalAttributes": []
         },
-        {
-            "name": "sites",
-            "description": "The Sites Service allows you view, create and manage your web applications.",
-            "x-globalAttributes": []
-        },
         {
             "name": "functions",
             "description": "The Functions Service allows you view, create and manage your Cloud Functions.",
@@ -9337,7 +9332,7 @@
                 },
                 "duration": {
                     "type": "number",
-                    "description": "Resource(function\/site) execution duration in seconds.",
+                    "description": "Function execution duration in seconds.",
                     "x-example": 0.4,
                     "format": "double"
                 },

app/config/template-runtimes.php

@@ -1,40 +0,0 @@
-<?php
-
-return [
-    'NODE' => [
-        'name' => 'node',
-        'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
-    ],
-    'PYTHON' => [
-        'name' => 'python',
-        'versions' => ['3.12', '3.11', '3.10', '3.9', '3.8']
-    ],
-    'DART' => [
-        'name' => 'dart',
-        'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
-    ],
-    'GO' => [
-        'name' => 'go',
-        'versions' => ['1.23']
-    ],
-    'PHP' => [
-        'name' => 'php',
-        'versions' => ['8.3', '8.2', '8.1', '8.0']
-    ],
-    'DENO' => [
-        'name' => 'deno',
-        'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
-    ],
-    'BUN' => [
-        'name' => 'bun',
-        'versions' => ['1.1', '1.0']
-    ],
-    'RUBY' => [
-        'name' => 'ruby',
-        'versions' => ['3.3', '3.2', '3.1', '3.0']
-    ],
-    'FLUTTER' => [
-        'name' => 'flutter',
-        'versions' => ['3.24']
-    ],
-];

app/controllers/api/account.php

@@ -2400,7 +2400,7 @@ App::put('/v1/account/sessions/phone')
 App::post('/v1/account/tokens/phone')
     ->alias('/v1/account/sessions/phone')
     ->desc('Create phone token')
-    ->groups(['api', 'account'])
+    ->groups(['api', 'account', 'auth'])
     ->label('scope', 'sessions.write')
     ->label('auth.type', 'phone')
     ->label('audits.event', 'session.create')
@@ -2715,13 +2715,15 @@ App::get('/v1/account/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new EventAudit($dbForProject);
 
-        $logs = $audit->getLogsByUser($user->getInternalId(), $limit, $offset);
+        $logs = $audit->getLogsByUser($user->getInternalId(), $queries);
 
         $output = [];
 
@@ -2750,7 +2752,7 @@ App::get('/v1/account/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByUser($user->getInternalId()),
+            'total' => $audit->countLogsByUser($user->getInternalId(), $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });

app/controllers/api/console.php

@@ -56,14 +56,11 @@ App::get('/v1/console/variables')
         $variables = new Document([
             '_APP_DOMAIN_TARGET' => System::getEnv('_APP_DOMAIN_TARGET'),
             '_APP_STORAGE_LIMIT' => +System::getEnv('_APP_STORAGE_LIMIT'),
-            '_APP_COMPUTE_SIZE_LIMIT' => +System::getEnv('_APP_COMPUTE_SIZE_LIMIT'),
+            '_APP_FUNCTIONS_SIZE_LIMIT' => +System::getEnv('_APP_FUNCTIONS_SIZE_LIMIT'),
             '_APP_USAGE_STATS' => System::getEnv('_APP_USAGE_STATS'),
             '_APP_VCS_ENABLED' => $isVcsEnabled,
             '_APP_DOMAIN_ENABLED' => $isDomainEnabled,
-            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled,
-            '_APP_DOMAIN_SITES' => System::getEnv('_APP_DOMAIN_SITES'),
-            '_APP_OPTIONS_FORCE_HTTPS' => System::getEnv('_APP_OPTIONS_FORCE_HTTPS'),
-            '_APP_DOMAINS_NAMESERVERS' => System::getEnv('_APP_DOMAINS_NAMESERVERS'),
+            '_APP_ASSISTANT_ENABLED' => $isAssistantEnabled
         ]);
 
         $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);

app/controllers/api/databases.php

@@ -23,6 +23,7 @@ use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
+use Utopia\Database\DateTime;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Authorization as AuthorizationException;
 use Utopia\Database\Exception\Conflict as ConflictException;
@@ -242,8 +243,8 @@ function updateAttribute(
     string $filter = null,
     string|bool|int|float $default = null,
     bool $required = null,
-    int|float $min = null,
-    int|float $max = null,
+    int|float|null $min = null,
+    int|float|null $max = null,
     array $elements = null,
     array $options = [],
     string $newKey = null,
@@ -299,6 +300,9 @@ function updateAttribute(
     switch ($attribute->getAttribute('format')) {
         case APP_DATABASE_ATTRIBUTE_INT_RANGE:
         case APP_DATABASE_ATTRIBUTE_FLOAT_RANGE:
+            $min ??= $attribute->getAttribute('formatOptions')['min'];
+            $max ??= $attribute->getAttribute('formatOptions')['max'];
+
             if ($min > $max) {
                 throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
             }
@@ -669,13 +673,15 @@ App::get('/v1/databases/:databaseId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -723,7 +729,7 @@ App::get('/v1/databases/:databaseId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });
@@ -1057,14 +1063,21 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
             throw new Exception(Exception::COLLECTION_NOT_FOUND);
         }
 
-        $queries = Query::parseQueries($queries);
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        try {
+            $queries = Query::parseQueries($queries);
+        } catch (QueryException $e) {
+            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
+        }
+
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId . '/collection/' . $collectionId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -1112,7 +1125,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });
@@ -1550,8 +1563,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
 
         // Ensure attribute default is within range
-        $min = \is_null($min) ? PHP_INT_MIN : $min;
-        $max = \is_null($max) ? PHP_INT_MAX : $max;
+        $min ??= PHP_INT_MIN;
+        $max ??= PHP_INT_MAX;
 
         if ($min > $max) {
             throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -1627,8 +1640,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
     ->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
 
         // Ensure attribute default is within range
-        $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
-        $max = \is_null($max) ? PHP_FLOAT_MAX : $max;
+        $min ??= -PHP_FLOAT_MAX;
+        $max ??= PHP_FLOAT_MAX;
 
         if ($min > $max) {
             throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -2339,8 +2352,8 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
     ->param('key', '', new Key(), 'Attribute Key.')
     ->param('required', null, new Boolean(), 'Is attribute required?')
-    ->param('min', null, new Integer(), 'Minimum value to enforce on new documents')
-    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents')
+    ->param('min', null, new Integer(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new Integer(), 'Maximum value to enforce on new documents', true)
     ->param('default', null, new Nullable(new Integer()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
     ->param('newKey', null, new Key(), 'New attribute key.', true)
     ->inject('response')
@@ -2398,8 +2411,8 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
     ->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
     ->param('key', '', new Key(), 'Attribute Key.')
     ->param('required', null, new Boolean(), 'Is attribute required?')
-    ->param('min', null, new FloatValidator(), 'Minimum value to enforce on new documents')
-    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents')
+    ->param('min', null, new FloatValidator(), 'Minimum value to enforce on new documents', true)
+    ->param('max', null, new FloatValidator(), 'Maximum value to enforce on new documents', true)
     ->param('default', null, new Nullable(new FloatValidator()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
     ->param('newKey', null, new Key(), 'New attribute key.', true)
     ->inject('response')
@@ -3709,13 +3722,15 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'database/' . $databaseId . '/collection/' . $collectionId . '/document/' . $document->getId();
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -3763,7 +3778,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });

app/controllers/api/health.php

@@ -857,10 +857,9 @@ App::get('/v1/health/storage')
     ->inject('response')
     ->inject('deviceForFiles')
     ->inject('deviceForFunctions')
-    ->inject('deviceForSites')
     ->inject('deviceForBuilds')
-    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForSites, Device $deviceForBuilds) {
-        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForSites,  $deviceForBuilds];
+    ->action(function (Response $response, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds) {
+        $devices = [$deviceForFiles, $deviceForFunctions, $deviceForBuilds];
         $checkStart = \microtime(true);
 
         foreach ($devices as $device) {

app/controllers/api/messaging.php

@@ -994,13 +994,15 @@ App::get('/v1/messaging/providers/:providerId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'provider/' . $providerId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
         $output = [];
 
         foreach ($logs as $i => &$log) {
@@ -1047,7 +1049,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });
@@ -2222,13 +2224,15 @@ App::get('/v1/messaging/topics/:topicId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'topic/' . $topicId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -2276,7 +2280,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });
@@ -2632,13 +2636,15 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'subscriber/' . $subscriberId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -2686,7 +2692,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });
@@ -3397,13 +3403,15 @@ App::get('/v1/messaging/messages/:messageId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'message/' . $messageId;
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -3451,7 +3459,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });

app/controllers/api/project.php

@@ -17,7 +17,6 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Datetime as DateTimeValidator;
 use Utopia\Database\Validator\UID;
-use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
@@ -41,14 +40,18 @@ App::get('/v1/project/usage')
     ->param('endDate', '', new DateTimeValidator(), 'End date for the usage')
     ->param('period', '1d', new WhiteList(['1h', '1d']), 'Period used', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
+    ->inject('getLogsDB')
     ->inject('smsRates')
-    ->action(function (string $startDate, string $endDate, string $period, Response $response, Database $dbForProject, array $smsRates) {
+    ->action(function (string $startDate, string $endDate, string $period, Response $response, Document $project, Database $dbForProject, callable $getLogsDB, array $smsRates) {
         $stats = $total = $usage = [];
         $format = 'Y-m-d 00:00:00';
         $firstDay = (new DateTime($startDate))->format($format);
         $lastDay = (new DateTime($endDate))->format($format);
 
+        $dbForLogs = call_user_func($getLogsDB, $project);
+
         $metrics = [
             'total' => [
                 METRIC_EXECUTIONS,
@@ -64,6 +67,7 @@ App::get('/v1/project/usage')
                 METRIC_BUILDS_STORAGE,
                 METRIC_DATABASES_OPERATIONS_READS,
                 METRIC_DATABASES_OPERATIONS_WRITES,
+                METRIC_FILES_IMAGES_TRANSFORMED,
             ],
             'period' => [
                 METRIC_NETWORK_REQUESTS,
@@ -76,6 +80,7 @@ App::get('/v1/project/usage')
                 METRIC_BUILDS_MB_SECONDS,
                 METRIC_DATABASES_OPERATIONS_READS,
                 METRIC_DATABASES_OPERATIONS_WRITES,
+                METRIC_FILES_IMAGES_TRANSFORMED,
             ]
         ];
 
@@ -94,9 +99,11 @@ App::get('/v1/project/usage')
             '1d' => 'Y-m-d\T00:00:00.000P',
         };
 
-        Authorization::skip(function () use ($dbForProject, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
+        Authorization::skip(function () use ($dbForProject, $dbForLogs, $firstDay, $lastDay, $period, $metrics, $limit, &$total, &$stats) {
             foreach ($metrics['total'] as $metric) {
-                $result = $dbForProject->findOne('stats', [
+                $db = ($metric === METRIC_FILES_IMAGES_TRANSFORMED) ? $dbForLogs : $dbForProject;
+
+                $result = $db->findOne('stats', [
                     Query::equal('metric', [$metric]),
                     Query::equal('period', ['inf'])
                 ]);
@@ -104,7 +111,9 @@ App::get('/v1/project/usage')
             }
 
             foreach ($metrics['period'] as $metric) {
-                $results = $dbForProject->find('stats', [
+                $db = ($metric === METRIC_FILES_IMAGES_TRANSFORMED) ? $dbForLogs : $dbForProject;
+
+                $results = $db->find('stats', [
                     Query::equal('metric', [$metric]),
                     Query::equal('period', [$period]),
                     Query::greaterThanEqual('time', $firstDay),
@@ -364,6 +373,8 @@ App::get('/v1/project/usage')
             'authPhoneTotal' => $authPhoneTotal,
             'authPhoneEstimate' => $authPhoneEstimate,
             'authPhoneCountryBreakdown' => $authPhoneCountryBreakdown,
+            'imageTransformations' => $usage[METRIC_FILES_IMAGES_TRANSFORMED],
+            'imageTransformationsTotal' => $total[METRIC_FILES_IMAGES_TRANSFORMED],
         ]), Response::MODEL_USAGE_PROJECT);
     });
 
@@ -388,12 +399,11 @@ App::post('/v1/project/variables')
     ))
     ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
-    ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
     ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForPlatform')
-    ->action(function (string $key, string $value, bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $key, string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
         $variableId = ID::unique();
 
         $variable = new Document([
@@ -408,7 +418,6 @@ App::post('/v1/project/variables')
             'resourceType' => 'project',
             'key' => $key,
             'value' => $value,
-            'secret' => $secret,
             'search' => implode(' ', [$variableId, $key, 'project']),
         ]);
 
@@ -509,25 +518,19 @@ App::put('/v1/project/variables/:variableId')
     ->param('variableId', '', new UID(), 'Variable unique ID.', false)
     ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
     ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
-    ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only projects can read them during build and runtime.', true)
     ->inject('project')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('dbForPlatform')
-    ->action(function (string $variableId, string $key, ?string $value, ?bool $secret, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
+    ->action(function (string $variableId, string $key, ?string $value, Document $project, Response $response, Database $dbForProject, Database $dbForPlatform) {
         $variable = $dbForProject->getDocument('variables', $variableId);
         if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceType') !== 'project') {
             throw new Exception(Exception::VARIABLE_NOT_FOUND);
         }
 
-        if ($variable->getAttribute('secret') === true && $secret === false) {
-            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
-        }
-
         $variable
             ->setAttribute('key', $key)
             ->setAttribute('value', $value ?? $variable->getAttribute('value'))
-            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
             ->setAttribute('search', implode(' ', [$variableId, $key, 'project']));
 
         try {

app/controllers/api/proxy.php

@@ -15,13 +15,155 @@ use Utopia\App;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Exception\Query as QueryException;
+use Utopia\Database\Helpers\ID;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Query\Cursor;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
 use Utopia\Logger\Log;
 use Utopia\System\System;
+use Utopia\Validator\Domain as ValidatorDomain;
 use Utopia\Validator\Text;
+use Utopia\Validator\WhiteList;
+
+App::post('/v1/proxy/rules')
+    ->groups(['api', 'proxy'])
+    ->desc('Create rule')
+    ->label('scope', 'rules.write')
+    ->label('event', 'rules.[ruleId].create')
+    ->label('audits.event', 'rule.create')
+    ->label('audits.resource', 'rule/{response.$id}')
+    ->label('sdk', new Method(
+        namespace: 'proxy',
+        name: 'createRule',
+        description: '/docs/references/proxy/create-rule.md',
+        auth: [AuthType::ADMIN],
+        responses: [
+            new SDKResponse(
+                code: Response::STATUS_CODE_CREATED,
+                model: Response::MODEL_PROXY_RULE,
+            )
+        ]
+    ))
+    ->param('domain', null, new ValidatorDomain(), 'Domain name.')
+    ->param('resourceType', null, new WhiteList(['api', 'function']), 'Action definition for the rule. Possible values are "api", "function"')
+    ->param('resourceId', '', new UID(), 'ID of resource for the action type. If resourceType is "api", leave empty. If resourceType is "function", provide ID of the function.', true)
+    ->inject('response')
+    ->inject('project')
+    ->inject('queueForCertificates')
+    ->inject('queueForEvents')
+    ->inject('dbForPlatform')
+    ->inject('dbForProject')
+    ->action(function (string $domain, string $resourceType, string $resourceId, Response $response, Document $project, Certificate $queueForCertificates, Event $queueForEvents, Database $dbForPlatform, Database $dbForProject) {
+        $mainDomain = System::getEnv('_APP_DOMAIN', '');
+        if ($domain === $mainDomain) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your main domain to specific resource. Please use subdomain or a different domain.');
+        }
+
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
+        if ($functionsDomain != '' && str_ends_with($domain, $functionsDomain)) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'You cannot assign your functions domain or it\'s subdomain to specific resource. Please use different domain.');
+        }
+
+        if ($domain === 'localhost' || $domain === APP_HOSTNAME_INTERNAL) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please pick another one.');
+        }
+
+        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+        if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+            $document = $dbForPlatform->getDocument('rules', md5($domain));
+        } else {
+            $document = $dbForPlatform->findOne('rules', [
+                Query::equal('domain', [$domain]),
+            ]);
+        }
+
+
+        if (!$document->isEmpty()) {
+            if ($document->getAttribute('projectId') === $project->getId()) {
+                $resourceType = $document->getAttribute('resourceType');
+                $resourceId = $document->getAttribute('resourceId');
+                $message = "Domain already assigned to '{$resourceType}' service";
+                if (!empty($resourceId)) {
+                    $message .= " with ID '{$resourceId}'";
+                }
+
+                $message .= '.';
+            } else {
+                $message = 'Domain already assigned to different project.';
+            }
+
+            throw new Exception(Exception::RULE_ALREADY_EXISTS, $message);
+        }
+
+        $resourceInternalId = '';
+
+        if ($resourceType == 'function') {
+            if (empty($resourceId)) {
+                throw new Exception(Exception::FUNCTION_NOT_FOUND);
+            }
+
+            $function = $dbForProject->getDocument('functions', $resourceId);
+
+            if ($function->isEmpty()) {
+                throw new Exception(Exception::RULE_RESOURCE_NOT_FOUND);
+            }
+
+            $resourceInternalId = $function->getInternalId();
+        }
+
+        try {
+            $domain = new Domain($domain);
+        } catch (\Throwable) {
+            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Domain may not start with http:// or https://.');
+        }
+
+        // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
+
+        $rule = new Document([
+            '$id' => $ruleId,
+            'projectId' => $project->getId(),
+            'projectInternalId' => $project->getInternalId(),
+            'domain' => $domain->get(),
+            'resourceType' => $resourceType,
+            'resourceId' => $resourceId,
+            'resourceInternalId' => $resourceInternalId,
+            'certificateId' => '',
+        ]);
+
+        $status = 'created';
+        $functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS');
+        if (!empty($functionsDomain) && \str_ends_with($domain->get(), $functionsDomain)) {
+            $status = 'verified';
+        }
+
+        if ($status === 'created') {
+            $target = new Domain(System::getEnv('_APP_DOMAIN_TARGET', ''));
+            $validator = new CNAME($target->get()); // Verify Domain with DNS records
+
+            if ($validator->isValid($domain->get())) {
+                $status = 'verifying';
+
+                $queueForCertificates
+                    ->setDomain(new Document([
+                        'domain' => $rule->getAttribute('domain')
+                    ]))
+                    ->trigger();
+            }
+        }
+
+        $rule->setAttribute('status', $status);
+        $rule = $dbForPlatform->createDocument('rules', $rule);
+
+        $queueForEvents->setParam('ruleId', $rule->getId());
+
+        $rule->setAttribute('logs', '');
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($rule, Response::MODEL_PROXY_RULE);
+    });
 
 App::get('/v1/proxy/rules')
     ->groups(['api', 'proxy'])

app/controllers/api/storage.php

@@ -6,7 +6,6 @@ use Appwrite\Auth\Auth;
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
-use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\SDK\AuthType;
@@ -935,15 +934,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->param('rotation', 0, new Range(-360, 360), 'Preview image rotation in degrees. Pass an integer between -360 and 360.', true)
     ->param('background', '', new HexColor(), 'Preview image background color. Only works with transparent images (png). Use a valid HEX color, no # is needed for prefix.', true)
     ->param('output', '', new WhiteList(\array_keys(Config::getParam('storage-outputs')), true), 'Output format type (jpeg, jpg, png, gif and webp).', true)
-    ->inject('request')
     ->inject('response')
-    ->inject('project')
     ->inject('dbForProject')
-    ->inject('mode')
     ->inject('deviceForFiles')
     ->inject('deviceForLocal')
-    ->inject('queueForStatsUsage')
-    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Request $request, Response $response, Document $project, Database $dbForProject, string $mode, Device $deviceForFiles, Device $deviceForLocal, StatsUsage $queueForStatsUsage) {
+    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Response $response, Database $dbForProject, Device $deviceForFiles, Device $deviceForLocal) {
 
         if (!\extension_loaded('imagick')) {
             throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Imagick extension is missing');
@@ -1071,22 +1066,19 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
 
         $contentType = (\array_key_exists($output, $outputs)) ? $outputs[$output] : $outputs['jpg'];
 
-        $queueForStatsUsage
-            ->addMetric(METRIC_FILES_TRANSFORMATIONS, 1)
-            ->addMetric(str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_TRANSFORMATIONS), 1)
-        ;
-
-        $transformedAt = $file->getAttribute('transformedAt', '');
-        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
-            $file->setAttribute('transformedAt', DateTime::now());
-            Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' .  $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+        //Do not update transformedAt if it's a console user
+        if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
+            $transformedAt = $file->getAttribute('transformedAt', '');
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
+                $file->setAttribute('transformedAt', DateTime::now());
+                Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+            }
         }
 
         $response
             ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
             ->setContentType($contentType)
-            ->file($data)
-        ;
+            ->file($data);
 
         unset($image);
     });
@@ -1879,9 +1871,12 @@ App::get('/v1/storage/:bucketId/usage')
     ->param('bucketId', '', new UID(), 'Bucket ID.')
     ->param('range', '30d', new WhiteList(['24h', '30d', '90d'], true), 'Date range.', true)
     ->inject('response')
+    ->inject('project')
     ->inject('dbForProject')
-    ->action(function (string $bucketId, string $range, Response $response, Database $dbForProject) {
+    ->inject('getLogsDB')
+    ->action(function (string $bucketId, string $range, Response $response, Document $project, Database $dbForProject, callable $getLogsDB) {
 
+        $dbForLogs = call_user_func($getLogsDB, $project);
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
         if ($bucket->isEmpty()) {
@@ -1894,12 +1889,16 @@ App::get('/v1/storage/:bucketId/usage')
         $metrics = [
             str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES),
             str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_STORAGE),
+            str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED),
         ];
 
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats, &$total) {
+        Authorization::skip(function () use ($dbForProject, $dbForLogs, $bucket, $days, $metrics, &$stats) {
             foreach ($metrics as $metric) {
-                $result =  $dbForProject->findOne('stats', [
+                $db = ($metric === str_replace('{bucketInternalId}', $bucket->getInternalId(), METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED))
+                    ? $dbForLogs
+                    : $dbForProject;
+
+                $result =  $db->findOne('stats', [
                     Query::equal('metric', [$metric]),
                     Query::equal('period', ['inf'])
                 ]);
@@ -1907,7 +1906,7 @@ App::get('/v1/storage/:bucketId/usage')
                 $stats[$metric]['total'] = $result['value'] ?? 0;
                 $limit = $days['limit'];
                 $period = $days['period'];
-                $results = $dbForProject->find('stats', [
+                $results = $db->find('stats', [
                     Query::equal('metric', [$metric]),
                     Query::equal('period', [$period]),
                     Query::limit($limit),
@@ -1948,5 +1947,7 @@ App::get('/v1/storage/:bucketId/usage')
             'filesStorageTotal' => $usage[$metrics[1]]['total'],
             'files' => $usage[$metrics[0]]['data'],
             'storage' => $usage[$metrics[1]]['data'],
+            'imageTransformations' => $usage[$metrics[2]]['data'],
+            'imageTransformationsTotal' => $usage[$metrics[2]]['total'],
         ]), Response::MODEL_USAGE_BUCKETS);
     });

app/controllers/api/teams.php

@@ -488,7 +488,7 @@ App::post('/v1/teams/:teamId/memberships')
         }
 
         $email = \strtolower($email);
-        $name = (empty($name)) ? $email : $name;
+        $name = empty($name) ? $email : $name;
         $team = $dbForProject->getDocument('teams', $teamId);
 
         if ($team->isEmpty()) {
@@ -507,7 +507,7 @@ App::post('/v1/teams/:teamId/memberships')
             }
             $email = $invitee->getAttribute('email', '');
             $phone = $invitee->getAttribute('phone', '');
-            $name = empty($name) ? $invitee->getAttribute('name', '') : $name;
+            $name = $invitee->getAttribute('name', '') ?: $name;
         } elseif (!empty($email)) {
             $invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address
             if (!$invitee->isEmpty() && !empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
@@ -715,7 +715,7 @@ App::post('/v1/teams/:teamId/memberships')
                     ->setSubject($subject)
                     ->setBody($body)
                     ->setRecipient($invitee->getAttribute('email'))
-                    ->setName($invitee->getAttribute('name'))
+                    ->setName($invitee->getAttribute('name', ''))
                     ->setVariables($emailVariables)
                     ->trigger();
 
@@ -1362,13 +1362,15 @@ App::get('/v1/teams/:teamId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
         $resource = 'team/' . $team->getId();
-        $logs = $audit->getLogsByResource($resource, $limit, $offset);
+        $logs = $audit->getLogsByResource($resource, $queries);
 
         $output = [];
 
@@ -1415,7 +1417,7 @@ App::get('/v1/teams/:teamId/logs')
             }
         }
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource),
+            'total' => $audit->countLogsByResource($resource, $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });

app/controllers/api/users.php

@@ -862,13 +862,15 @@ App::get('/v1/users/:userId/logs')
             throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
         }
 
-        $grouped = Query::groupByType($queries);
-        $limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
-        $offset = $grouped['offset'] ?? 0;
+        // Temp fix for logs
+        $queries[] = Query::or([
+            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
+            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
+        ]);
 
         $audit = new Audit($dbForProject);
 
-        $logs = $audit->getLogsByUser($user->getInternalId(), $limit, $offset);
+        $logs = $audit->getLogsByUser($user->getInternalId(), $queries);
 
         $output = [];
 
@@ -915,7 +917,7 @@ App::get('/v1/users/:userId/logs')
         }
 
         $response->dynamic(new Document([
-            'total' => $audit->countLogsByUser($user->getInternalId()),
+            'total' => $audit->countLogsByUser($user->getInternalId(), $queries),
             'logs' => $output,
         ]), Response::MODEL_LOG_LIST);
     });

app/controllers/api/vcs.php

@@ -19,7 +19,6 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
 use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Exception\Query as QueryException;
 use Utopia\Database\Helpers\ID;
 use Utopia\Database\Helpers\Permission;
@@ -50,30 +49,29 @@ use function Swoole\Coroutine\batch;
 
 $createGitDeployments = function (GitHub $github, string $providerInstallationId, array $repositories, string $providerBranch, string $providerBranchUrl, string $providerRepositoryName, string $providerRepositoryUrl, string $providerRepositoryOwner, string $providerCommitHash, string $providerCommitAuthor, string $providerCommitAuthorUrl, string $providerCommitMessage, string $providerCommitUrl, string $providerPullRequestId, bool $external, Database $dbForPlatform, Build $queueForBuilds, callable $getProjectDB, Request $request) {
     $errors = [];
-    foreach ($repositories as $repository) {
+    foreach ($repositories as $resource) {
         try {
-            $resourceType = $repository->getAttribute('resourceType');
+            $resourceType = $resource->getAttribute('resourceType');
 
-            if ($resourceType !== "function" && $resourceType !== "site") {
+            if ($resourceType !== "function") {
                 continue;
             }
 
-            $projectId = $repository->getAttribute('projectId');
+            $projectId = $resource->getAttribute('projectId');
             $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
             $dbForProject = $getProjectDB($project);
 
-            $resourceCollection = $resourceType === "function" ? 'functions' : 'sites';
-            $resourceId = $repository->getAttribute('resourceId');
-            $resource = Authorization::skip(fn () => $dbForProject->getDocument($resourceCollection, $resourceId));
-            $resourceInternalId = $resource->getInternalId();
+            $functionId = $resource->getAttribute('resourceId');
+            $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+            $functionInternalId = $function->getInternalId();
 
             $deploymentId = ID::unique();
-            $repositoryId = $repository->getId();
-            $repositoryInternalId = $repository->getInternalId();
-            $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
-            $installationId = $repository->getAttribute('installationId');
-            $installationInternalId = $repository->getAttribute('installationInternalId');
-            $productionBranch = $resource->getAttribute('providerBranch');
+            $repositoryId = $resource->getId();
+            $repositoryInternalId = $resource->getInternalId();
+            $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
+            $installationId = $resource->getAttribute('installationId');
+            $installationInternalId = $resource->getAttribute('installationInternalId');
+            $productionBranch = $function->getAttribute('providerBranch');
             $activate = false;
 
             if ($providerBranch == $productionBranch && $external === false) {
@@ -97,7 +95,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
             $isAuthorized = !$external;
 
             if (!$isAuthorized && !empty($providerPullRequestId)) {
-                if (\in_array($providerPullRequestId, $repository->getAttribute('providerPullRequestIds', []))) {
+                if (\in_array($providerPullRequestId, $resource->getAttribute('providerPullRequestIds', []))) {
                     $isAuthorized = true;
                 }
             }
@@ -110,7 +108,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
             $latestCommentId = '';
 
-            if (!empty($providerPullRequestId) && $resource->getAttribute('providerSilentMode', false) === false) {
+            if (!empty($providerPullRequestId) && $function->getAttribute('providerSilentMode', false) === false) {
                 $latestComment = Authorization::skip(fn () => $dbForPlatform->findOne('vcsComments', [
                     Query::equal('providerRepositoryId', [$providerRepositoryId]),
                     Query::equal('providerPullRequestId', [$providerPullRequestId]),
@@ -119,15 +117,14 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
                 if (!$latestComment->isEmpty()) {
                     $latestCommentId = $latestComment->getAttribute('providerCommentId', '');
-
                     $comment = new Comment();
                     $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
 
                     $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                 } else {
                     $comment = new Comment();
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
                     $latestCommentId = \strval($github->createComment($owner, $repositoryName, $providerPullRequestId, $comment->generateComment()));
 
                     if (!empty($latestCommentId)) {
@@ -164,19 +161,19 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                     $latestCommentId = $comment->getAttribute('providerCommentId', '');
                     $comment = new Comment();
                     $comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
-                    $comment->addBuild($project, $resource, $resourceType, $commentStatus, $deploymentId, $action, '', '');
+                    $comment->addBuild($project, $function, $commentStatus, $deploymentId, $action);
 
                     $latestCommentId = \strval($github->updateComment($owner, $repositoryName, $latestCommentId, $comment->generateComment()));
                 }
             }
 
             if (!$isAuthorized) {
-                $resourceName = $resource->getAttribute('name');
+                $functionName = $function->getAttribute('name');
                 $projectName = $project->getAttribute('name');
-                $name = "{$resourceName} ({$projectName})";
+                $name = "{$functionName} ({$projectName})";
                 $message = 'Authorization required for external contributor.';
 
-                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
                 try {
                     $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                     if (empty($repositoryName)) {
@@ -203,14 +200,11 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                     Permission::update(Role::any()),
                     Permission::delete(Role::any()),
                 ],
-                'resourceId' => $resourceId,
-                'resourceInternalId' => $resourceInternalId,
-                'resourceType' => $resourceCollection,
-                'entrypoint' => $resource->getAttribute('entrypoint', ''),
-                'commands' => $resource->getAttribute('commands', ''),
-                'installCommand' => $resource->getAttribute('installCommand', ''),
-                'buildCommand' => $resource->getAttribute('buildCommand', ''),
-                'outputDirectory' => $resource->getAttribute('outputDirectory', ''),
+                'resourceId' => $functionId,
+                'resourceInternalId' => $functionInternalId,
+                'resourceType' => 'functions',
+                'entrypoint' => $function->getAttribute('entrypoint'),
+                'commands' => $function->getAttribute('commands'),
                 'type' => 'vcs',
                 'installationId' => $installationId,
                 'installationInternalId' => $installationInternalId,
@@ -224,91 +218,21 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 'providerCommitHash' => $providerCommitHash,
                 'providerCommitAuthorUrl' => $providerCommitAuthorUrl,
                 'providerCommitAuthor' => $providerCommitAuthor,
-                'providerCommitMessage' => mb_strimwidth($providerCommitMessage, 0, 255, '...'),
+                'providerCommitMessage' => $providerCommitMessage,
                 'providerCommitUrl' => $providerCommitUrl,
                 'providerCommentId' => \strval($latestCommentId),
                 'providerBranch' => $providerBranch,
-                'search' => implode(' ', [$deploymentId, $resource->getAttribute('entrypoint', '')]),
+                'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
                 'activate' => $activate,
             ]));
 
-            if ($resource->getCollection() === 'sites') {
-                $projectId = $project->getId();
-
-                // Deployment preview
-                $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-                $domain = ID::unique() . "." . $sitesDomain;
-                $ruleId = md5($domain);
-                Authorization::skip(
-                    fn () => $dbForPlatform->createDocument('rules', new Document([
-                        '$id' => $ruleId,
-                        'projectId' => $project->getId(),
-                        'projectInternalId' => $project->getInternalId(),
-                        'domain' => $domain,
-                        'type' => 'deployment',
-                        'value' => $deployment->getId(),
-                        'status' => 'verified',
-                        'certificateId' => '',
-                        'search' => implode(' ', [$ruleId, $domain]),
-                    ]))
-                );
-
-                // VCS branch preview
-                if (!empty($providerBranch)) {
-                    $domain = "branch-{$providerBranch}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'value' => $deployment->getId(),
-                                'automation' => 'branch=' . $providerBranch,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-
-                // VCS commit preview
-                if (!empty($providerCommitHash)) {
-                    $domain = "commit-{$providerCommitHash}-{$resource->getId()}-{$project->getId()}.{$sitesDomain}";
-                    $ruleId = md5($domain);
-                    try {
-                        Authorization::skip(
-                            fn () => $dbForPlatform->createDocument('rules', new Document([
-                                '$id' => $ruleId,
-                                'projectId' => $project->getId(),
-                                'projectInternalId' => $project->getInternalId(),
-                                'domain' => $domain,
-                                'type' => 'deployment',
-                                'value' => $deployment->getId(),
-                                'automation' => 'commit=' . $providerCommitHash,
-                                'status' => 'verified',
-                                'certificateId' => '',
-                                'search' => implode(' ', [$ruleId, $domain]),
-                            ]))
-                        );
-                    } catch (Duplicate $err) {
-                        // Ignore, rule already exists; will be updated by builds worker
-                    }
-                }
-            }
-
-            if (!empty($providerCommitHash) && $resource->getAttribute('providerSilentMode', false) === false) {
-                $resourceName = $resource->getAttribute('name');
+            if (!empty($providerCommitHash) && $function->getAttribute('providerSilentMode', false) === false) {
+                $functionName = $function->getAttribute('name');
                 $projectName = $project->getAttribute('name');
-                $name = "{$resourceName} ({$projectName})";
+                $name = "{$functionName} ({$projectName})";
                 $message = 'Starting...';
 
-                $providerRepositoryId = $repository->getAttribute('providerRepositoryId');
+                $providerRepositoryId = $resource->getAttribute('providerRepositoryId');
                 try {
                     $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
                     if (empty($repositoryName)) {
@@ -319,17 +243,17 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                 }
                 $owner = $github->getOwnerName($providerInstallationId);
 
-                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/$resourceCollection/$resourceType-$resourceId";
+                $providerTargetUrl = $request->getProtocol() . '://' . $request->getHostname() . "/console/project-$projectId/functions/function-$functionId";
                 $github->updateCommitStatus($repositoryName, $providerCommitHash, $owner, 'pending', $message, $providerTargetUrl, $name);
             }
 
             $queueForBuilds
                 ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($resource)
+                ->setResource($function)
                 ->setDeployment($deployment)
                 ->setProject($project); // set the project because it won't be set for git deployments
 
-            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function/site
+            $queueForBuilds->trigger(); // must trigger here so that we create a build for each function
 
             //TODO: Add event?
         } catch (Throwable $e) {
@@ -1033,7 +957,7 @@ App::post('/v1/vcs/github/events')
 
                 $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
 
-                //find resourceId from relevant resources table
+                //find functionId from functions table
                 $repositories = Authorization::skip(fn () => $dbForPlatform->find('repositories', [
                     Query::equal('providerRepositoryId', [$providerRepositoryId]),
                     Query::limit(100),
@@ -1045,7 +969,7 @@ App::post('/v1/vcs/github/events')
                 }
             } elseif ($event == $github::EVENT_INSTALLATION) {
                 if ($parsedPayload["action"] == "deleted") {
-                    // TODO: Use worker for this job instead (update function/site as well)
+                    // TODO: Use worker for this job instead (update function as well)
                     $providerInstallationId = $parsedPayload["installationId"];
 
                     $installations = $dbForPlatform->find('installations', [

app/controllers/general.php

@@ -4,17 +4,16 @@ require_once __DIR__ . '/../init.php';
 
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
-use Appwrite\Auth\Key;
 use Appwrite\Event\Certificate;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Extend\Exception as AppwriteException;
 use Appwrite\Network\Validator\Origin;
-use Appwrite\Platform\Appwrite;
+use Appwrite\SDK\AuthType;
+use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
-use Appwrite\Transformation\Adapter\Preview;
-use Appwrite\Transformation\Transformation;
+use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Request\Filters\V16 as RequestV16;
 use Appwrite\Utopia\Request\Filters\V17 as RequestV17;
@@ -43,7 +42,6 @@ use Utopia\Logger\Adapter\Sentry;
 use Utopia\Logger\Log;
 use Utopia\Logger\Log\User;
 use Utopia\Logger\Logger;
-use Utopia\Platform\Service;
 use Utopia\System\System;
 use Utopia\Validator\Hostname;
 use Utopia\Validator\Text;
@@ -52,7 +50,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey)
+function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
 {
     $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
 
@@ -63,9 +61,9 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
 
     // TODO: @christyjacob remove once we migrate the rules in 1.7.x
     if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-        $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
+        $route = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($host)));
     } else {
-        $rule = Authorization::skip(
+        $route = Authorization::skip(
             fn () => $dbForPlatform->find('rules', [
                 Query::equal('domain', [$host]),
                 Query::limit(1)
@@ -73,12 +71,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         )[0] ?? new Document();
     }
 
-    if ($rule->isEmpty()) {
-        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '') || $host === System::getEnv('_APP_DOMAIN_SITES', '')) {
+    if ($route->isEmpty()) {
+        if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
         }
 
-        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) || \str_ends_with($host, System::getEnv('_APP_DOMAIN_SITES', ''))) {
+        if (\str_ends_with($host, System::getEnv('_APP_DOMAIN_FUNCTIONS', ''))) {
             throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain is not connected to any Appwrite resource yet. Please configure custom domain or function domain to allow this request.');
         }
 
@@ -90,11 +88,10 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
 
         // Act as API - no Proxy logic
         $utopia->getRoute()?->label('error', '');
-
         return false;
     }
 
-    $projectId = $rule->getAttribute('projectId');
+    $projectId = $route->getAttribute('projectId');
     $project = Authorization::skip(
         fn () => $dbForPlatform->getDocument('projects', $projectId)
     );
@@ -120,34 +117,45 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         return false;
     }
 
-    $type = $rule->getAttribute('type', '');
+    $type = $route->getAttribute('resourceType');
 
-    if ($type === 'deployment') {
-        if (System::getEnv('_APP_OPTIONS_COMPUTE_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
-            if ($request->getProtocol() !== 'https' && $request->getHostname() !== APP_HOSTNAME_INTERNAL) {
+    if ($type === 'function') {
+        $method = $utopia->getRoute()?->getLabel('sdk', null);
+
+        if (empty($method)) {
+            $utopia->getRoute()?->label('sdk', new Method(
+                namespace: 'functions',
+                name: 'createExecution',
+                description: '/docs/references/functions/create-execution.md',
+                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
+                responses: [
+                    new SDKResponse(
+                        code: Response::STATUS_CODE_CREATED,
+                        model: Response::MODEL_EXECUTION,
+                    )
+                ],
+                contentType: ContentType::MULTIPART,
+                requestType: 'application/json',
+            ));
+        } else {
+            /** @var Method $method */
+            $method->setNamespace('functions');
+            $method->setMethodName('createExecution');
+            $utopia->getRoute()?->label('sdk', $method);
+        }
+
+        if (System::getEnv('_APP_OPTIONS_FUNCTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
+            if ($request->getProtocol() !== 'https') {
                 if ($request->getMethod() !== Request::METHOD_GET) {
                     throw new AppwriteException(AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED, 'Method unsupported over HTTP. Please use HTTPS instead.');
                 }
+
                 return $response->redirect('https://' . $request->getHostname() . $request->getURI());
             }
         }
 
-        /** @var Database $dbForProject */
-        $dbForProject = $getProjectDB($project);
-
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $rule->getAttribute('value')));
-
-        if ($deployment->getAttribute('resourceType', '') === 'functions') {
-            $type = 'function';
-        } elseif ($deployment->getAttribute('resourceType', '') === 'sites') {
-            $type = 'site';
-        }
-
-        $resource = $type === 'function' ?
-            Authorization::skip(fn () => $dbForProject->getDocument('functions', $deployment->getAttribute('resourceId', ''))) :
-            Authorization::skip(fn () => $dbForProject->getDocument('sites', $deployment->getAttribute('resourceId', '')));
-
-        $isPreview = $type === 'function' ? false : (!\str_starts_with($rule->getAttribute('automation', ''), 'site='));
+        $functionId = $route->getAttribute('resourceId');
+        $projectId = $route->getAttribute('projectId');
 
         $path = ($swooleRequest->server['request_uri'] ?? '/');
         $query = ($swooleRequest->server['query_string'] ?? '');
@@ -155,40 +163,44 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             $path .= '?' . $query;
         }
 
+
         $body = $swooleRequest->getContent() ?? '';
         $method = $swooleRequest->server['request_method'];
 
         $requestHeaders = $request->getHeaders();
 
-        if ($resource->isEmpty() || !$resource->getAttribute('enabled')) {
+        $project = Authorization::skip(fn () => $dbForPlatform->getDocument('projects', $projectId));
+
+        $dbForProject = $getProjectDB($project);
+
+        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+
+        if ($function->isEmpty() || !$function->getAttribute('enabled')) {
             throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
         }
 
-        if ($isResourceBlocked($project, $type === 'function' ? RESOURCE_TYPE_FUNCTIONS : RESOURCE_TYPE_SITES, $resource->getId())) {
+        if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $functionId)) {
             throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED);
         }
 
-        $version = match ($type) {
-            'function' => $resource->getAttribute('version', 'v2'),
-            'site' => 'v4',
-        };
-
+        $version = $function->getAttribute('version', 'v2');
         $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$resource->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
+        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
 
-        $runtime = match ($type) {
-            'function' => $runtimes[$resource->getAttribute('runtime')] ?? null,
-            'site' => $runtimes[$resource->getAttribute('buildRuntime')] ?? null,
-            default => null
-        };
-
-        // Static site enforced runtime
-        if ($resource->getAttribute('adapter', '') === 'static') {
-            $runtime = $runtimes['static-1'] ?? null;
-        }
+        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
 
         if (\is_null($runtime)) {
-            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $resource->getAttribute('runtime', '') . '" is not supported');
+            throw new AppwriteException(AppwriteException::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
+        }
+
+        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
+
+        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
+            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
+        }
+
+        if ($deployment->isEmpty()) {
+            throw new AppwriteException(AppwriteException::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
         }
 
         /** Check if build has completed */
@@ -201,29 +213,28 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             throw new AppwriteException(AppwriteException::BUILD_NOT_READY);
         }
 
-        if ($type === 'function') {
-            $permissions = $resource->getAttribute('execute');
-            if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
-                throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
-            }
+        $permissions = $function->getAttribute('execute');
+
+        if (!(\in_array('any', $permissions)) && !(\in_array('guests', $permissions))) {
+            throw new AppwriteException(AppwriteException::USER_UNAUTHORIZED, 'To execute function using domain, execute permissions must include "any" or "guests"');
         }
 
+        $jwtExpiry = $function->getAttribute('timeout', 900);
+        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+        $apiKey = $jwtObj->encode([
+            'projectId' => $project->getId(),
+            'scopes' => $function->getAttribute('scopes', [])
+        ]);
+
         $headers = \array_merge([], $requestHeaders);
+        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
+        $headers['x-appwrite-trigger'] = 'http';
         $headers['x-appwrite-user-id'] = '';
+        $headers['x-appwrite-user-jwt'] = '';
         $headers['x-appwrite-country-code'] = '';
         $headers['x-appwrite-continent-code'] = '';
         $headers['x-appwrite-continent-eu'] = 'false';
 
-        $jwtExpiry = $resource->getAttribute('timeout', 900);
-        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-        $jwtKey = $jwtObj->encode([
-            'projectId' => $project->getId(),
-            'scopes' => $resource->getAttribute('scopes', [])
-        ]);
-        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $jwtKey;
-        $headers['x-appwrite-trigger'] = 'http';
-        $headers['x-appwrite-user-jwt'] = '';
-
         $ip = $headers['x-real-ip'] ?? '';
         if (!empty($ip)) {
             $record = $geodb->get($ip);
@@ -249,10 +260,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         $execution = new Document([
             '$id' => $executionId,
             '$permissions' => [],
-            'resourceInternalId' => $resource->getInternalId(),
-            'resourceId' => $resource->getId(),
+            'functionInternalId' => $function->getInternalId(),
+            'functionId' => $function->getId(),
             'deploymentInternalId' => $deployment->getInternalId(),
             'deploymentId' => $deployment->getId(),
+            'trigger' => 'http', // http / schedule / event
+            'status' =>  'processing', // waiting / processing / completed / failed
             'responseStatusCode' => 0,
             'responseHeaders' => [],
             'requestPath' => $path,
@@ -261,26 +274,13 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             'errors' => '',
             'logs' => '',
             'duration' => 0.0,
-            'search' => implode(' ', [$resource->getId(), $executionId]),
+            'search' => implode(' ', [$functionId, $executionId]),
         ]);
 
-        if ($type === 'function') {
-            $execution->setAttribute('resourceType', 'functions');
-            $execution->setAttribute('trigger', 'http'); // http / schedule / event
-            $execution->setAttribute('status', 'processing'); // waiting / processing / completed / failed
-
-            $queueForEvents
-                ->setParam('functionId', $resource->getId())
-                ->setParam('executionId', $execution->getId())
-                ->setContext('function', $resource);
-        } elseif ($type === 'site') {
-            $execution->setAttribute('resourceType', 'sites');
-
-            $queueForEvents
-                ->setParam('siteId', $resource->getId())
-                ->setParam('executionId', $execution->getId())
-                ->setContext('site', $resource);
-        }
+        $queueForEvents
+            ->setParam('functionId', $function->getId())
+            ->setParam('executionId', $execution->getId())
+            ->setContext('function', $function);
 
         $durationStart = \microtime(true);
 
@@ -297,12 +297,12 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         }
 
         // Shared vars
-        foreach ($resource->getAttribute('varsProject', []) as $var) {
+        foreach ($function->getAttribute('varsProject', []) as $var) {
             $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
         }
 
         // Function vars
-        foreach ($resource->getAttribute('vars', []) as $var) {
+        foreach ($function->getAttribute('vars', []) as $var) {
             $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
         }
 
@@ -313,14 +313,14 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
         // Appwrite vars
         $vars = \array_merge($vars, [
             'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $resource->getId(),
-            'APPWRITE_FUNCTION_NAME' => $resource->getAttribute('name'),
+            'APPWRITE_FUNCTION_ID' => $functionId,
+            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
             'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
             'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
             'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
             'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
+            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
             'APPWRITE_VERSION' => APP_VERSION_STABLE,
             'APPWRITE_REGION' => $project->getAttribute('region'),
             'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
@@ -338,93 +338,32 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
         ]);
 
-        // SPA fallbackFile override
-        if ($resource->getAttribute('adapter', '') === 'static' && $resource->getAttribute('fallbackFile', '') !== '') {
-            $vars['OPEN_RUNTIMES_STATIC_FALLBACK'] = $resource->getAttribute('fallbackFile', '');
-        }
-
         /** Execute function */
         $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
         try {
-            $version = match ($type) {
-                'function' => $resource->getAttribute('version', 'v2'),
-                'site' => 'v4',
-            };
-            $entrypoint = match ($type) {
-                'function' => $deployment->getAttribute('entrypoint', ''),
-                'site' => '',
-            };
-
-            if ($type === 'function') {
-                $runtimeEntrypoint = match ($version) {
-                    'v2' => '',
-                    default => 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $runtime['startCommand'] . '"'
-                };
-            } elseif ($type === 'site') {
-                $frameworks = Config::getParam('frameworks', []);
-                $framework = $frameworks[$resource->getAttribute('framework', '')] ?? null;
-
-                $startCommand = $runtime['startCommand'];
-
-                if (!is_null($framework)) {
-                    $adapter = ($framework['adapters'] ?? [])[$resource->getAttribute('adapter', '')] ?? null;
-                    if (!is_null($adapter) && isset($adapter['startCommand'])) {
-                        $startCommand = $adapter['startCommand'];
-                    }
-                }
-
-                $runtimeEntrypoint = 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $startCommand . '"';
-            }
-
-            $entrypoint = match ($type) {
-                'function' => $deployment->getAttribute('entrypoint', ''),
-                'site' => '',
-            };
-
+            $version = $function->getAttribute('version', 'v2');
+            $command = $runtime['startCommand'];
+            $command = $version === 'v2' ? '' : 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $command . '"';
             $executionResponse = $executor->createExecution(
                 projectId: $project->getId(),
                 deploymentId: $deployment->getId(),
                 body: \strlen($body) > 0 ? $body : null,
                 variables: $vars,
-                timeout: $resource->getAttribute('timeout', 30),
+                timeout: $function->getAttribute('timeout', 0),
                 image: $runtime['image'],
                 source: $build->getAttribute('path', ''),
-                entrypoint: $entrypoint,
+                entrypoint: $deployment->getAttribute('entrypoint', ''),
                 version: $version,
                 path: $path,
                 method: $method,
                 headers: $headers,
-                runtimeEntrypoint: $runtimeEntrypoint,
-                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
-                logging: $resource->getAttribute('logging', true),
+                runtimeEntrypoint: $command,
+                cpus: $spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT,
+                memory: $spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT,
+                logging: $function->getAttribute('logging', true),
                 requestTimeout: 30
             );
 
-            // Branded 404 override
-            if ($executionResponse['statusCode'] === 404 && $resource->getAttribute('adapter', '') === 'static') {
-                $layout = new View(__DIR__ . '/../views/general/404.phtml');
-                $executionResponse['body'] = $layout->render();
-                $executionResponse['headers']['content-length'] = \strlen($executionResponse['body']);
-            }
-
-            // Branded banner for previews
-            if (\is_null($apiKey) || $apiKey->isBannerDisabled() === false) {
-                $transformation = new Transformation();
-                $transformation->addAdapter(new Preview());
-                $transformation->setInput($executionResponse['body']);
-                $transformation->setTraits($executionResponse['headers']);
-                if ($isPreview && $transformation->transform()) {
-                    $executionResponse['body'] = $transformation->getOutput();
-
-                    foreach ($executionResponse['headers'] as $key => $value) {
-                        if (\strtolower($key) === 'content-length') {
-                            $executionResponse['headers'][$key] = \strlen($executionResponse['body']);
-                        }
-                    }
-                }
-            }
-
             $headersFiltered = [];
             foreach ($executionResponse['headers'] as $key => $value) {
                 if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_RESPONSE)) {
@@ -435,38 +374,31 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             /** Update execution status */
             $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
             $execution->setAttribute('status', $status);
-            $execution->setAttribute('logs', $executionResponse['logs']);
-            $execution->setAttribute('errors', $executionResponse['errors']);
             $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
             $execution->setAttribute('responseHeaders', $headersFiltered);
+            $execution->setAttribute('logs', $executionResponse['logs']);
+            $execution->setAttribute('errors', $executionResponse['errors']);
             $execution->setAttribute('duration', $executionResponse['duration']);
+
         } catch (\Throwable $th) {
             $durationEnd = \microtime(true);
 
             $execution
                 ->setAttribute('duration', $durationEnd - $durationStart)
-                ->setAttribute('responseStatusCode', 500);
-
-            if ($type === 'function') {
-                $execution
-                    ->setAttribute('status', 'failed')
-                    ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
-            }
+                ->setAttribute('status', 'failed')
+                ->setAttribute('responseStatusCode', 500)
+                ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
             Console::error($th->getMessage());
 
             if ($th instanceof AppwriteException) {
                 throw $th;
             }
         } finally {
-            if ($type === 'function') {
-                $queueForFunctions
-                    ->setType(Func::TYPE_ASYNC_WRITE)
-                    ->setExecution($execution)
-                    ->setProject($project)
-                    ->trigger();
-            } elseif ($type === 'site') { // TODO: Move it to logs worker later
-                $dbForProject->createDocument('executions', $execution);
-            }
+            $queueForFunctions
+                ->setType(Func::TYPE_ASYNC_WRITE)
+                ->setExecution($execution)
+                ->setProject($project)
+                ->trigger();
         }
 
         $execution->setAttribute('logs', '');
@@ -488,11 +420,7 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
                 $contentType = $header['value'];
             }
 
-            if (\strtolower($header['name']) === 'transfer-encoding') {
-                continue;
-            }
-
-            $response->addHeader(\strtolower($header['name']), $header['value']);
+            $response->setHeader($header['name'], $header['value']);
         }
 
         $response
@@ -511,29 +439,19 @@ function router(App $utopia, Database $dbForPlatform, callable $getProjectDB, Sw
             ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
             ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
             ->addMetric(METRIC_EXECUTIONS, 1)
-            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
             ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
-            ->addMetric(str_replace('{functionInternalId}', $resource->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
+            ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+            ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
             ->setProject($project)
-            ->trigger();
+            ->trigger()
+        ;
 
         return true;
     } elseif ($type === 'api') {
         $utopia->getRoute()?->label('error', '');
         return false;
-    } elseif ($type === 'redirect') {
-        $path = ($swooleRequest->server['request_uri'] ?? '/');
-        $query = ($swooleRequest->server['query_string'] ?? '');
-        if (!empty($query)) {
-            $path .= '?' . $query;
-        }
-
-        $url = 'https://' . $rule->getAttribute('value', '') . $path;
-
-        $response->redirect($url);
-        return true;
     } else {
         throw new AppwriteException(AppwriteException::GENERAL_SERVER_ERROR, 'Unknown resource type ' . $type);
     }
@@ -555,7 +473,7 @@ App::init()
 */
 
 App::init()
-    ->groups(['database', 'functions', 'sites', 'messaging'])
+    ->groups(['database', 'functions', 'storage', 'messaging'])
     ->inject('project')
     ->inject('request')
     ->action(function (Document $project, Request $request) {
@@ -587,8 +505,7 @@ App::init()
     ->inject('queueForFunctions')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForPlatform, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, StatsUsage $queueForStatsUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
         /*
         * Appwrite Router
         */
@@ -596,8 +513,8 @@ App::init()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                return;
             }
         }
 
@@ -666,16 +583,14 @@ App::init()
                     }
 
                     if ($domainDocument->isEmpty()) {
-                        $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
                         $domainDocument = new Document([
                             // TODO: @christyjacob remove once we migrate the rules in 1.7.x
-                            '$id' => $ruleId,
+                            '$id' => System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique(),
                             'domain' => $domain->get(),
-                            'type' => 'api',
+                            'resourceType' => 'api',
                             'status' => 'verifying',
                             'projectId' => 'console',
-                            'projectInternalId' => 'console',
-                            'search' => implode(' ', [$ruleId, $domain->get()]),
+                            'projectInternalId' => 'console'
                         ]);
 
                         $domainDocument = $dbForPlatform->createDocument('rules', $domainDocument);
@@ -709,22 +624,6 @@ App::init()
         $validator = new Hostname($clients);
         if ($validator->isValid($origin)) {
             $refDomainOrigin = $origin;
-        } elseif (!empty($origin)) {
-            // Auto-allow domains with linked rule
-            if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
-                $rule = Authorization::skip(fn () => $dbForPlatform->getDocument('rules', md5($origin ?? '')));
-            } else {
-                $rule = Authorization::skip(
-                    fn () => $dbForPlatform->find('rules', [
-                        Query::equal('domain', [$origin]),
-                        Query::limit(1)
-                    ])
-                )[0] ?? new Document();
-            }
-
-            if (!$rule->isEmpty() && $rule->getAttribute('projectInternalId') === $project->getInternalId()) {
-                $refDomainOrigin = $origin;
-            }
         }
 
         $refDomain = (!empty($protocol) ? $protocol : $request->getProtocol()) . '://' . $refDomainOrigin . (!empty($port) ? ':' . $port : '');
@@ -774,7 +673,7 @@ App::init()
                 $response->addFilter(new ResponseV18());
             }
             if (version_compare($responseFormat, APP_VERSION_STABLE, '>')) {
-                $response->addHeader('X-Appwrite-Warning', "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");
+                $response->addHeader('X-Appwrite-Warning', "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");
             }
         }
 
@@ -838,8 +737,8 @@ App::options()
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->inject('project')
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, Document $project) {
         /*
         * Appwrite Router
         */
@@ -847,8 +746,8 @@ App::options()
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
         // Only run Router when external domain
         if ($host !== $mainDomain || !empty($previewHostname)) {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
+            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
+                return;
             }
         }
 
@@ -862,6 +761,16 @@ App::options()
             ->addHeader('Access-Control-Allow-Origin', $origin)
             ->addHeader('Access-Control-Allow-Credentials', 'true')
             ->noContent();
+
+        /** OPTIONS requests in utopia do not execute shutdown handlers, as a result we need to track the OPTIONS requests explicitly
+         * @see https://github.com/utopia-php/http/blob/0.33.16/src/App.php#L825-L855
+         */
+        $queueForStatsUsage
+            ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+            ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize())
+            ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
+            ->setProject($project)
+            ->trigger();
     });
 
 App::error()
@@ -976,7 +885,10 @@ App::error()
             }
         }
 
-        if ($publish && $project->getId() !== 'console') {
+        /**
+         * If its not a publishable error, track usage stats. Publishable errors are >= 500 or those explicitly marked as publish=true in errors.php
+         */
+        if (!$publish && $project->getId() !== 'console') {
             if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
                 $fileSize = 0;
                 $file = $request->getFiles('file');
@@ -1122,7 +1034,6 @@ App::error()
                 ->setParam('trace', $output['trace'] ?? []);
 
             $response->html($layout->render());
-            return;
         }
 
         $response->dynamic(
@@ -1147,8 +1058,7 @@ App::get('/robots.txt')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1156,9 +1066,7 @@ App::get('/robots.txt')
             $template = new View(__DIR__ . '/../views/general/robots.phtml');
             $response->text($template->render(false));
         } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
-            }
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
         }
     });
 
@@ -1178,8 +1086,7 @@ App::get('/humans.txt')
     ->inject('geodb')
     ->inject('isResourceBlocked')
     ->inject('previewHostname')
-    ->inject('apiKey')
-    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname, ?Key $apiKey) {
+    ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForPlatform, callable $getProjectDB, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
         $host = $request->getHostname() ?? '';
         $mainDomain = System::getEnv('_APP_DOMAIN', '');
 
@@ -1187,9 +1094,7 @@ App::get('/humans.txt')
             $template = new View(__DIR__ . '/../views/general/humans.phtml');
             $response->text($template->render(false));
         } else {
-            if (router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname, $apiKey)) {
-                $utopia->getRoute()?->label('router', true);
-            }
+            router($utopia, $dbForPlatform, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForStatsUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
         }
     });
 
@@ -1286,15 +1191,9 @@ App::wildcard()
     });
 
 foreach (Config::getParam('services', []) as $service) {
-    if (!empty($service['controller'])) {
-        include_once $service['controller'];
-    }
+    include_once $service['controller'];
 }
 
-// Modules
-$platform = new Appwrite();
-$platform->init(Service::TYPE_HTTP);
-
 // Check for any errors found while we were initialising the SDK Methods.
 if (!empty(Method::getErrors())) {
     throw new \Exception('Errors found during SDK initialization:' . PHP_EOL . implode(PHP_EOL, Method::getErrors()));

app/controllers/shared/api.php

@@ -157,15 +157,6 @@ $usageDatabaseListener = function (string $event, Document $document, StatsUsage
             $queueForStatsUsage
                 ->addMetric(METRIC_FUNCTIONS, $value); // per project
 
-            if ($event === Database::EVENT_DOCUMENT_DELETE) {
-                $queueForStatsUsage
-                    ->addReduce($document);
-            }
-            break;
-        case $document->getCollection() === 'sites':
-            $queueForStatsUsage
-                ->addMetric(METRIC_SITES, $value); // per project
-
             if ($event === Database::EVENT_DOCUMENT_DELETE) {
                 $queueForStatsUsage
                     ->addReduce($document);
@@ -543,7 +534,7 @@ App::init()
 
                 if ($type === 'bucket') {
                     $bucketId = $parts[1] ?? null;
-                    $bucket   = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
+                    $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
                     if ($bucket->isEmpty() || (!$bucket->getAttribute('enabled') && !$isAppUser && !$isPrivilegedUser)) {
                         throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
@@ -569,11 +560,13 @@ App::init()
                     if ($file->isEmpty()) {
                         throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
                     }
-
-                    $transformedAt = $file->getAttribute('transformedAt', '');
-                    if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
-                        $file->setAttribute('transformedAt', DateTime::now());
-                        Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+                    //Do not update transformedAt if it's a console user
+                    if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
+                        $transformedAt = $file->getAttribute('transformedAt', '');
+                        if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $transformedAt) {
+                            $file->setAttribute('transformedAt', DateTime::now());
+                            Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $file->getAttribute('bucketInternalId'), $file->getId(), $file));
+                        }
                     }
                 }
 

app/http.php

@@ -13,7 +13,6 @@ use Swoole\Table;
 use Utopia\App;
 use Utopia\Audit\Audit;
 use Utopia\CLI\Console;
-use Utopia\Compression\Compression;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\DateTime;
@@ -250,7 +249,8 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
                 $audit->setup();
             }
 
-            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty()) {
+            if ($dbForPlatform->getDocument('buckets', 'default')->isEmpty() &&
+                !$dbForPlatform->exists($dbForPlatform->getDatabase(), 'bucket_1')) {
                 Console::info("    └── Creating default bucket...");
                 $dbForPlatform->createDocument('buckets', new Document([
                     '$id' => ID::custom('default'),
@@ -302,55 +302,55 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
 
                 $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
             }
+        });
 
-            if (Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots')->isEmpty())) {
-                Console::info("    └── Creating screenshots bucket...");
-                Authorization::skip(fn () => $dbForPlatform->createDocument('buckets', new Document([
-                    '$id' => ID::custom('screenshots'),
-                    '$collection' => ID::custom('buckets'),
-                    'name' => 'Screenshots',
-                    'maximumFileSize' => 5000000, // ~5MB
-                    'allowedFileExtensions' => [ 'png' ],
-                    'enabled' => true,
-                    'compression' => Compression::GZIP,
-                    'encryption' => false,
-                    'antivirus' => false,
-                    'fileSecurity' => true,
-                    '$permissions' => [],
-                    'search' => 'buckets Screenshots',
-                ])));
+        $projectCollections = $collections['projects'];
+        $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+        $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+        $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
 
-                $bucket = Authorization::skip(fn () => $dbForPlatform->getDocument('buckets', 'screenshots'));
+        $cache = $app->getResource('cache');
 
-                Console::info("    └── Creating files collection for screenshots bucket...");
-                $files = $collections['buckets']['files'] ?? [];
-                if (empty($files)) {
-                    throw new Exception('Files collection is not configured.');
+        foreach ($sharedTablesV2 as $hostname) {
+            $adapter = $pools
+                ->get($hostname)
+                ->pop()
+                ->getResource();
+
+            $dbForProject = (new Database($adapter, $cache))
+                ->setDatabase('appwrite')
+                ->setSharedTables(true)
+                ->setTenant(null)
+                ->setNamespace(System::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
+
+            try {
+                Console::success('[Setup] - Creating project database: ' . $hostname . '...');
+                $dbForProject->create();
+            } catch (Duplicate) {
+                Console::success('[Setup] - Skip: metadata table already exists');
+            }
+
+            if ($dbForProject->getCollection(Audit::COLLECTION)->isEmpty()) {
+                $audit = new Audit($dbForProject);
+                $audit->setup();
+            }
+
+            foreach ($projectCollections as $key => $collection) {
+                if (($collection['$collection'] ?? '') !== Database::METADATA) {
+                    continue;
+                }
+                if (!$dbForProject->getCollection($key)->isEmpty()) {
+                    continue;
                 }
 
-                $attributes = array_map(fn ($attr) => new Document([
-                    '$id' => ID::custom($attr['$id']),
-                    'type' => $attr['type'],
-                    'size' => $attr['size'],
-                    'required' => $attr['required'],
-                    'signed' => $attr['signed'],
-                    'array' => $attr['array'],
-                    'filters' => $attr['filters'],
-                    'default' => $attr['default'] ?? null,
-                    'format' => $attr['format'] ?? ''
-                ]), $files['attributes']);
+                $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
+                $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);
 
-                $indexes = array_map(fn ($index) => new Document([
-                    '$id' => ID::custom($index['$id']),
-                    'type' => $index['type'],
-                    'attributes' => $index['attributes'],
-                    'lengths' => $index['lengths'],
-                    'orders' => $index['orders'],
-                ]), $files['indexes']);
+                Console::success('[Setup] - Creating project collection: ' . $collection['$id'] . '...');
 
-                Authorization::skip(fn () => $dbForPlatform->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes));
+                $dbForProject->createCollection($key, $attributes, $indexes);
             }
-        });
+        }
 
         $pools->reclaim();
         Console::success('[Setup] - Server database init completed...');
@@ -514,6 +514,7 @@ $http->on('Task', function () use ($register, $domains) {
                 if ($lastSyncUpdate != null) {
                     $queries[] = Query::greaterThanEqual('$updatedAt', $lastSyncUpdate);
                 }
+                $queries[] = Query::equal('resourceType', ['function']);
                 $results = [];
                 try {
                     $results = Authorization::skip(fn () =>  $dbForPlatform->find('rules', $queries));

app/init.php

@@ -125,7 +125,7 @@ const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_FILE_ACCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 4318;
-const APP_VERSION_STABLE = '1.7.0';
+const APP_VERSION_STABLE = '1.6.1';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -137,7 +137,6 @@ const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4
 const APP_DATABASE_TIMEOUT_MILLISECONDS = 15_000;
 const APP_DATABASE_QUERY_MAX_VALUES = 500;
 const APP_STORAGE_UPLOADS = '/storage/uploads';
-const APP_STORAGE_SITES = '/storage/sites';
 const APP_STORAGE_FUNCTIONS = '/storage/functions';
 const APP_STORAGE_BUILDS = '/storage/builds';
 const APP_STORAGE_CACHE = '/storage/cache';
@@ -156,9 +155,9 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
 const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
 const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
 const APP_HOSTNAME_INTERNAL = 'appwrite';
-const APP_COMPUTE_CPUS_DEFAULT = 0.5;
-const APP_COMPUTE_MEMORY_DEFAULT = 512;
-const APP_COMPUTE_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
+const APP_FUNCTION_CPUS_DEFAULT = 0.5;
+const APP_FUNCTION_MEMORY_DEFAULT = 512;
 const APP_PLATFORM_SERVER = 'server';
 const APP_PLATFORM_CLIENT = 'client';
 const APP_PLATFORM_CONSOLE = 'console';
@@ -184,7 +183,6 @@ const DELETE_TYPE_DATABASES = 'databases';
 const DELETE_TYPE_DOCUMENT = 'document';
 const DELETE_TYPE_COLLECTIONS = 'collections';
 const DELETE_TYPE_PROJECTS = 'projects';
-const DELETE_TYPE_SITES = 'sites';
 const DELETE_TYPE_FUNCTIONS = 'functions';
 const DELETE_TYPE_DEPLOYMENTS = 'deployments';
 const DELETE_TYPE_USERS = 'users';
@@ -274,7 +272,6 @@ const METRIC_FILES_IMAGES_TRANSFORMED = 'files.imagesTransformed';
 const METRIC_BUCKET_ID_FILES_IMAGES_TRANSFORMED = '{bucketInternalId}.files.imagesTransformed';
 const METRIC_BUCKET_ID_FILES = '{bucketInternalId}.files';
 const METRIC_BUCKET_ID_FILES_STORAGE  = '{bucketInternalId}.files.storage';
-const METRIC_SITES = 'sites';
 const METRIC_FUNCTIONS  = 'functions';
 const METRIC_DEPLOYMENTS  = 'deployments';
 const METRIC_DEPLOYMENTS_STORAGE  = 'deployments.storage';
@@ -293,29 +290,15 @@ const METRIC_FUNCTION_ID_BUILDS_STORAGE = '{functionInternalId}.builds.storage';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE  = '{functionInternalId}.builds.compute';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_SUCCESS  = '{functionInternalId}.builds.compute.success';
 const METRIC_FUNCTION_ID_BUILDS_COMPUTE_FAILED  = '{functionInternalId}.builds.compute.failed';
-const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
-const METRIC_SITES_ID_BUILDS  = 'sites.{siteInternalId}.builds';
-const METRIC_SITES_ID_BUILDS_SUCCESS  = 'sites.{siteInternalId}.builds.success';
-const METRIC_SITES_ID_BUILDS_FAILED  = 'sites.{siteInternalId}.builds.failed';
-const METRIC_SITES_ID_BUILDS_STORAGE = 'sites.{siteInternalId}.builds.storage';
-const METRIC_SITES_ID_BUILDS_COMPUTE  = 'sites.{siteInternalId}.builds.compute';
-const METRIC_SITES_ID_BUILDS_COMPUTE_SUCCESS  = 'sites.{siteInternalId}.builds.compute.success';
-const METRIC_SITES_ID_BUILDS_COMPUTE_FAILED  = 'sites.{siteInternalId}.builds.compute.failed';
-const METRIC_SITES_ID_BUILDS_MB_SECONDS = 'sites.{siteInternalId}.builds.mbSeconds';
 const METRIC_FUNCTION_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
 const METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceInternalId}.deployments.storage';
+const METRIC_FUNCTION_ID_BUILDS_MB_SECONDS = '{functionInternalId}.builds.mbSeconds';
 const METRIC_EXECUTIONS  = 'executions';
 const METRIC_EXECUTIONS_COMPUTE  = 'executions.compute';
 const METRIC_EXECUTIONS_MB_SECONDS = 'executions.mbSeconds';
 const METRIC_FUNCTION_ID_EXECUTIONS  = '{functionInternalId}.executions';
 const METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE  = '{functionInternalId}.executions.compute';
 const METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS = '{functionInternalId}.executions.mbSeconds';
-const METRIC_SITE_ID_DEPLOYMENTS  = '{resourceType}.{resourceInternalId}.deployments';
-const METRIC_SITE_ID_DEPLOYMENTS_STORAGE = '{resourceType}.{resourceInternalId}.deployments.storage';
-const METRIC_SITE_ID_BUILDS  = '{siteInternalId}.builds';
-const METRIC_SITE_ID_BUILDS_STORAGE = '{siteInternalId}.builds.storage';
-const METRIC_SITE_ID_BUILDS_COMPUTE  = '{siteInternalId}.builds.compute';
-const METRIC_SITE_ID_BUILDS_MB_SECONDS = '{siteInternalId}.builds.mbSeconds';
 const METRIC_NETWORK_REQUESTS  = 'network.requests';
 const METRIC_NETWORK_INBOUND  = 'network.inbound';
 const METRIC_NETWORK_OUTBOUND  = 'network.outbound';
@@ -326,6 +309,8 @@ const METRIC_WEBHOOKS = 'webhooks';
 const METRIC_PLATFORMS = 'platforms';
 const METRIC_PROVIDERS = 'providers';
 const METRIC_TOPICS = 'topics';
+const METRIC_TARGETS = 'targets';
+const METRIC_PROVIDER_TYPE_TARGETS = '{providerType}.targets';
 const METRIC_KEYS = 'keys';
 const METRIC_RESOURCE_TYPE_ID_BUILDS  = '{resourceType}.{resourceInternalId}.builds';
 const METRIC_RESOURCE_TYPE_ID_BUILDS_STORAGE = '{resourceType}.{resourceInternalId}.builds.storage';
@@ -336,7 +321,6 @@ const METRIC_RESOURCE_TYPE_ID_DEPLOYMENTS_STORAGE  = '{resourceType}.{resourceIn
 
 const RESOURCE_TYPE_PROJECTS = 'projects';
 const RESOURCE_TYPE_FUNCTIONS = 'functions';
-const RESOURCE_TYPE_SITES = 'sites';
 const RESOURCE_TYPE_DATABASES = 'databases';
 const RESOURCE_TYPE_BUCKETS = 'buckets';
 const RESOURCE_TYPE_PROVIDERS = 'providers';
@@ -357,7 +341,6 @@ if (!App::isProduction()) {
 /*
  * ENV vars
  */
-Config::load('template-runtimes', __DIR__ . '/config/template-runtimes.php');
 Config::load('events', __DIR__ . '/config/events.php');
 Config::load('auth', __DIR__ . '/config/auth.php');
 Config::load('apis', __DIR__ . '/config/apis.php');  // List of APIs
@@ -365,7 +348,6 @@ Config::load('errors', __DIR__ . '/config/errors.php');
 Config::load('oAuthProviders', __DIR__ . '/config/oAuthProviders.php');
 Config::load('platforms', __DIR__ . '/config/platforms.php');
 Config::load('collections', __DIR__ . '/config/collections.php');
-Config::load('frameworks', __DIR__ . '/config/frameworks.php');
 Config::load('runtimes', __DIR__ . '/config/runtimes.php');
 Config::load('runtimes-v2', __DIR__ . '/config/runtimes-v2.php');
 Config::load('usage', __DIR__ . '/config/usage.php');
@@ -390,9 +372,7 @@ Config::load('storage-mimes', __DIR__ . '/config/storage/mimes.php');
 Config::load('storage-inputs', __DIR__ . '/config/storage/inputs.php');
 Config::load('storage-outputs', __DIR__ . '/config/storage/outputs.php');
 Config::load('runtime-specifications', __DIR__ . '/config/runtimes/specifications.php');
-Config::load('framework-specifications', __DIR__ . '/config/frameworks/specifications.php');
 Config::load('function-templates', __DIR__ . '/config/function-templates.php');
-Config::load('site-templates', __DIR__ . '/config/site-templates.php');
 
 /**
  * New DB Filters
@@ -615,7 +595,7 @@ Database::addFilter(
         return $database
             ->find('variables', [
                 Query::equal('resourceInternalId', [$document->getInternalId()]),
-                Query::equal('resourceType', ['function', 'site']),
+                Query::equal('resourceType', ['function']),
                 Query::limit(APP_LIMIT_SUBQUERY),
             ]);
     }
@@ -1220,9 +1200,6 @@ App::setResource('queueForAudits', function (Queue\Publisher $publisher) {
 App::setResource('queueForFunctions', function (Queue\Publisher $publisher) {
     return new Func($publisher);
 }, ['publisher']);
-App::setResource('queueForUsage', function (Queue\Publisher $publisher) {
-    return new Usage($publisher);
-}, ['publisher']);
 App::setResource('queueForCertificates', function (Queue\Publisher $publisher) {
     return new Certificate($publisher);
 }, ['publisher']);
@@ -1661,10 +1638,6 @@ App::setResource('deviceForFiles', function ($project) {
     return getDevice(APP_STORAGE_UPLOADS . '/app-' . $project->getId());
 }, ['project']);
 
-App::setResource('deviceForSites', function ($project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-
 App::setResource('deviceForFunctions', function ($project) {
     return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);
@@ -1961,24 +1934,16 @@ App::setResource(
     fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
 );
 
-App::setResource('previewHostname', function (Request $request, ?Key $apiKey) {
-    $allowed = false;
-
+App::setResource('previewHostname', function (Request $request) {
     if (App::isDevelopment()) {
-        $allowed = true;
-    } elseif (!\is_null($apiKey) && $apiKey->getHostnameOverride() === true) {
-        $allowed = true;
-    }
-
-    if ($allowed) {
-        $host = $request->getQuery('appwrite-hostname', $request->getHeader('x-appwrite-hostname', ''));
+        $host = $request->getQuery('appwrite-hostname') ?? '';
         if (!empty($host)) {
             return $host;
         }
     }
 
     return '';
-}, ['request', 'apiKey']);
+}, ['request']);
 
 App::setResource('apiKey', function (Request $request, Document $project): ?Key {
     $key = $request->getHeader('x-appwrite-key');

app/views/general/404.phtml

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>404 Not Found</title>
-
-    <style>
-        * {
-            margin: 0;
-            padding: 0;
-        }
-
-        body {
-            background-color: #FFFFFF;
-        }
-
-        .main {
-            display: flex;
-            min-height: 100vh;
-            width: 100vw;
-            align-items: center;
-            justify-content: center;
-        }
-
-        .content {
-            margin-left: auto;
-            margin-right: auto;
-            max-width: 400px;
-        }
-
-        span {
-            padding: var(--space-1, 2px) var(--space-3, 6px);
-            border-radius: var(--border-radius-XS, 6px);
-            background: var(--color-overlay-on-neutral, rgba(0, 0, 0, 0.06));
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter);
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-        }
-
-        h1 {
-            color: var(--color-fgColor-neutral-primary, #2D2D31);
-            text-align: center;
-            font-family: var(--font-family-sansSerif, Inter);
-            font-size: var(--font-size-XXXL, 32px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 140%;
-            letter-spacing: -0.144px;
-            margin-top: 8px;
-            margin-bottom: 32px;
-        }
-
-        button {
-            border-radius: var(--border-radius-S, 8px);
-            font-family: var(--font-family-sansSerif, Inter);
-            font-size: var(--font-size-S, 14px);
-            font-style: normal;
-            font-weight: 500;
-            line-height: 140%;
-            letter-spacing: -0.063px;
-            padding: var(--space-3, 6px) var(--space-5, 10px);
-            cursor: pointer;
-            border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #D8D8DB);
-            background: var(--color-bgColor-neutral-primary, #FFF);
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .center {
-            display: flex;
-            justify-content: center;
-        }
-
-        .brand {
-            position: absolute;
-            width: 100%;
-            bottom: 32px;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            gap: 8px;
-        }
-
-        .brand p {
-            font-family: var(--font-family-monospace, "Aeonik Fono");
-            font-size: var(--font-size-XS, 12px);
-            font-style: normal;
-            font-weight: 400;
-            line-height: 130%;
-            letter-spacing: 0.96px;
-            text-transform: uppercase;
-            color: var(--color-fgColor-neutral-secondary, #56565C);
-        }
-
-        .brand svg {
-            height: 20px;
-        }
-
-        .logo-dark {
-            display: none;
-        }
-
-        @media (prefers-color-scheme: dark) {
-            body {
-                background-color: #1D1D21;
-            }
-
-            h1 {
-                color: var(--color-fgColor-neutral-primary, #EDEDF0);
-            }
-
-            button {
-                border: var(--border-width-S, 1px) solid var(--color-border-neutral-strong, #414146);
-                background: var(--color-bgColor-neutral-primary, #1D1D21);
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .brand p {
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            span {
-                background: var(--color-overlay-on-neutral, rgba(255, 255, 255, 0.20));
-                color: var(--color-fgColor-neutral-secondary, #C3C3C6);
-            }
-
-            .logo-light {
-                display: none;
-            }
-
-            .logo-dark {
-                display: block;
-            }
-        }
-    </style>
-</head>
-
-<body>
-    <div class="main">
-        <div class="content">
-            <div class="center"><span>Page not found</span></div>
-            <h1>The page you’re looking for doesn’t exist.</h1>
-            <div class="center"><a href="/"><button>Go to homepage</button></a></div>
-        </div>
-    </div>
-
-    <div class="brand">
-        <p>Powered by</p>
-        <svg class="logo-dark" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8649 16.2461C33.6492 16.2461 34.5511 15.3184 34.9433 14.6867H35.1197C35.1981 15.3578 35.6687 15.9895 36.5903 15.9895H38.3353V14.0156H37.8843C37.5706 14.0156 37.4138 13.838 37.4138 13.5617V5.64661H35.1001V6.90986H34.9236C34.4727 6.27823 33.5315 5.39001 31.8061 5.39001C29.0611 5.39001 27.022 7.67965 27.022 10.818C27.022 13.9564 29.1003 16.2461 31.8649 16.2461ZM32.2767 13.9959C30.6493 13.9959 29.3748 12.7919 29.3748 10.8378C29.3748 8.92316 30.6101 7.62044 32.2571 7.62044C33.8256 7.62044 35.1393 8.78499 35.1393 10.8378C35.1393 12.5945 34.0217 13.9959 32.2767 13.9959Z" fill="#EDEDF0" />
-            <path d="M39.7013 20H42.0149V14.6867H42.1914C42.6227 15.3184 43.5443 16.2461 45.3677 16.2461C48.1127 16.2461 50.1127 13.9169 50.1127 10.818C50.1127 7.69939 47.9755 5.39001 45.2109 5.39001C43.4462 5.39001 42.5835 6.35719 42.1718 6.89012H41.9953V5.64661H39.7013V20ZM44.8776 14.0551C43.2894 14.0551 41.9757 12.8708 41.9757 10.818C41.9757 9.06133 43.0933 7.58096 44.8383 7.58096C46.4657 7.58096 47.7402 8.86395 47.7402 10.818C47.7402 12.7326 46.5049 14.0551 44.8776 14.0551Z" fill="#EDEDF0" />
-            <path d="M51.3065 20H53.6202V14.6867H53.7966C54.228 15.3184 55.1495 16.2461 56.973 16.2461C59.718 16.2461 61.5273 13.9169 61.5273 10.818C61.5273 7.69939 59.5807 5.39001 56.8161 5.39001C55.0515 5.39001 54.1888 6.35719 53.777 6.89012H53.6005V5.64661H51.3065V20ZM56.4828 14.0551C54.8946 14.0551 53.5809 12.8708 53.5809 10.818C53.5809 9.06133 54.6985 7.58096 56.4436 7.58096C58.071 7.58096 59.3454 8.86395 59.3454 10.818C59.3454 12.7326 58.1102 14.0551 56.4828 14.0551Z" fill="#EDEDF0" />
-            <path d="M64.5857 16.2296H67.8601L69.7227 8.11721H69.8404L71.7031 16.2296H74.9579L77.5642 5.88678H75.2323L73.3697 14.0189H73.1932L71.3305 5.88678H68.2522L66.3699 14.0189H66.1935L64.3504 5.88678H61.8799L64.5857 16.2296Z" fill="#EDEDF0" />
-            <path d="M78.7363 16.2296H81.0499V11.1174C81.0499 9.16334 81.9519 7.9593 83.6381 7.9593H84.6576V5.63019H83.893C82.5793 5.63019 81.5793 6.53815 81.1872 7.40663H81.0303V5.88678H78.7363V16.2296Z" fill="#EDEDF0" />
-            <path d="M96.1391 16.2296H97.943V14.1571H96.1587C95.4529 14.1571 95.1588 13.8413 95.1588 13.111V7.93956H98.0606V5.88678H95.1588V2.98526H92.9628V5.88678H91.0413V7.93956H92.8255V13.1307C92.8255 15.3217 94.1392 16.2296 96.1391 16.2296Z" fill="#EDEDF0" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.17 15.1802 108.836 13.0287L106.719 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.327 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.915 7.58096 98.915 10.8378C98.915 13.9959 101.013 16.2461 104.15 16.2461ZM101.327 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.621 8.31128 106.738 9.71269H101.327Z" fill="#EDEDF0" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0125 16.2296H87.6989V7.93956H85.895V5.88678H90.0125V16.2296Z" fill="#EDEDF0" />
-            <path d="M88.6834 4.45145C89.5265 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5265 1.54993 88.6834 1.54993C87.8403 1.54993 87.2129 2.18155 87.2129 2.99082C87.2129 3.81983 87.8403 4.45145 88.6834 4.45145Z" fill="#EDEDF0" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2006 7.88412V12.4486H11.9414C12.8021 11.6166 13.3389 10.4373 13.3389 9.12899C13.3389 8.69744 13.2806 8.27999 13.1713 7.88412H20.2006Z" fill="#FD366E" />
-        </svg>
-        <svg class="logo-light" width="110" height="20" viewBox="0 0 110 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-            <path d="M31.8648 16.2461C33.649 16.2461 34.5509 15.3184 34.9431 14.6867H35.1195C35.198 15.3578 35.6685 15.9895 36.5901 15.9895H38.3351V14.0156H37.8841C37.5704 14.0156 37.4136 13.838 37.4136 13.5617V5.64661H35.0999V6.90986H34.9235C34.4725 6.27823 33.5314 5.39001 31.8059 5.39001C29.0609 5.39001 27.0218 7.67965 27.0218 10.818C27.0218 13.9564 29.1001 16.2461 31.8648 16.2461ZM32.2765 13.9959C30.6491 13.9959 29.3746 12.7919 29.3746 10.8378C29.3746 8.92316 30.6099 7.62044 32.2569 7.62044C33.8255 7.62044 35.1391 8.78499 35.1391 10.8378C35.1391 12.5945 34.0215 13.9959 32.2765 13.9959Z" fill="#2D2D31" />
-            <path d="M39.7011 20H42.0147V14.6867H42.1912C42.6226 15.3184 43.5441 16.2461 45.3676 16.2461C48.1126 16.2461 50.1125 13.9169 50.1125 10.818C50.1125 7.69939 47.9753 5.39001 45.2107 5.39001C43.4461 5.39001 42.5833 6.35719 42.1716 6.89012H41.9951V5.64661H39.7011V20ZM44.8774 14.0551C43.2892 14.0551 41.9755 12.8708 41.9755 10.818C41.9755 9.06133 43.0931 7.58096 44.8382 7.58096C46.4656 7.58096 47.74 8.86395 47.74 10.818C47.74 12.7326 46.5048 14.0551 44.8774 14.0551Z" fill="#2D2D31" />
-            <path d="M51.3063 20H53.62V14.6867H53.7964C54.2278 15.3184 55.1493 16.2461 56.9728 16.2461C59.7178 16.2461 61.5271 13.9169 61.5271 10.818C61.5271 7.69939 59.5805 5.39001 56.8159 5.39001C55.0513 5.39001 54.1886 6.35719 53.7768 6.89012H53.6004V5.64661H51.3063V20ZM56.4826 14.0551C54.8944 14.0551 53.5808 12.8708 53.5808 10.818C53.5808 9.06133 54.6984 7.58096 56.4434 7.58096C58.0708 7.58096 59.3453 8.86395 59.3453 10.818C59.3453 12.7326 58.11 14.0551 56.4826 14.0551Z" fill="#2D2D31" />
-            <path d="M64.5855 16.2296H67.8599L69.7226 8.11721H69.8402L71.7029 16.2296H74.9577L77.564 5.88678H75.2322L73.3695 14.0189H73.193L71.3303 5.88678H68.252L66.3697 14.0189H66.1933L64.3502 5.88678H61.8797L64.5855 16.2296Z" fill="#2D2D31" />
-            <path d="M78.7361 16.2296H81.0498V11.1174C81.0498 9.16334 81.9517 7.9593 83.6379 7.9593H84.6575V5.63019H83.8928C82.5791 5.63019 81.5791 6.53815 81.187 7.40663H81.0301V5.88678H78.7361V16.2296Z" fill="#2D2D31" />
-            <path d="M96.1389 16.2296H97.9428V14.1571H96.1585C95.4527 14.1571 95.1586 13.8413 95.1586 13.111V7.93956H98.0604V5.88678H95.1586V2.98526H92.9626V5.88678H91.0411V7.93956H92.8253V13.1307C92.8253 15.3217 94.139 16.2296 96.1389 16.2296Z" fill="#2D2D31" />
-            <path d="M104.15 16.2461C106.287 16.2461 108.169 15.1802 108.836 13.0287L106.718 12.5155C106.346 13.6603 105.268 14.2525 104.13 14.2525C102.444 14.2525 101.326 13.1472 101.307 11.4102H109.091V10.7588C109.091 7.67965 107.189 5.39001 104.052 5.39001C101.287 5.39001 98.9148 7.58096 98.9148 10.8378C98.9148 13.9959 101.013 16.2461 104.15 16.2461ZM101.326 9.71269C101.464 8.46918 102.581 7.42305 104.052 7.42305C105.464 7.42305 106.62 8.31128 106.738 9.71269H101.326Z" fill="#2D2D31" />
-            <path fill-rule="evenodd" clip-rule="evenodd" d="M90.0123 16.2296H87.6987V7.93956H85.8948V5.88678H90.0123V16.2296Z" fill="#2D2D31" />
-            <path d="M88.6835 4.45145C89.5266 4.45145 90.154 3.81983 90.154 2.99082C90.154 2.18155 89.5266 1.54993 88.6835 1.54993C87.8404 1.54993 87.213 2.18155 87.213 2.99082C87.213 3.81983 87.8404 4.45145 88.6835 4.45145Z" fill="#2D2D31" />
-            <path d="M20.2007 13.6935V18.258H8.88588C5.5894 18.258 2.71111 16.4222 1.17116 13.6935C0.947288 13.2968 0.751353 12.8806 0.586995 12.4486C0.26435 11.6021 0.0615332 10.6938 0 9.74603V8.51195C0.0133592 8.30074 0.03441 8.09119 0.0619381 7.88413C0.118209 7.45921 0.203222 7.04343 0.314953 6.63926C1.37195 2.80758 4.8089 0 8.88588 0C12.9629 0 16.3994 2.80758 17.4564 6.63926H12.6184C11.8241 5.39025 10.4493 4.5645 8.88588 4.5645C7.32245 4.5645 5.94767 5.39025 5.15341 6.63926C4.91132 7.01895 4.72349 7.43764 4.60042 7.88413C4.49112 8.27999 4.43282 8.69744 4.43282 9.12899C4.43282 10.4373 4.96962 11.6166 5.83027 12.4486C6.62778 13.2209 7.70299 13.6935 8.88588 13.6935H20.2007Z" fill="#FD366E" />
-            <path d="M20.2007 7.88412V12.4486H11.9415C12.8022 11.6166 13.339 10.4373 13.339 9.12899C13.339 8.69744 13.2807 8.27999 13.1714 7.88412H20.2007Z" fill="#FD366E" />
-        </svg>
-
-    </div>
-</body>
-
-</html>

app/views/install/compose.phtml

@@ -86,7 +86,7 @@ $image = $this->getParam('image', '');
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_ROUTER_PROTECTION
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -133,14 +133,12 @@ $image = $this->getParam('image', '');
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_COMPUTE_SIZE_LIMIT
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
-      - _APP_SITES_FRAMEWORKS
-      - _APP_SITES_RUNTIMES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
@@ -404,13 +402,13 @@ $image = $this->getParam('image', '');
       - _APP_VCS_GITHUB_APP_NAME
       - _APP_VCS_GITHUB_PRIVATE_KEY
       - _APP_VCS_GITHUB_APP_ID
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
@@ -495,10 +493,10 @@ $image = $this->getParam('image', '');
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
@@ -861,7 +859,7 @@ $image = $this->getParam('image', '');
     <<: *x-logging
     restart: unless-stopped
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.0
+    image: openruntimes/executor:0.6.11
     networks:
       - appwrite
       - runtimes
@@ -873,9 +871,9 @@ $image = $this->getParam('image', '');
       # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV

app/worker.php

@@ -13,12 +13,12 @@ use Appwrite\Event\Func;
 use Appwrite\Event\Mail;
 use Appwrite\Event\Messaging;
 use Appwrite\Event\Migration;
+use Appwrite\Event\Realtime;
 use Appwrite\Event\StatsUsage;
 use Appwrite\Event\StatsUsageDump;
 /** remove */
-use Appwrite\Event\Usage;
-use Appwrite\Event\UsageDump;
 /** /remove */
+use Appwrite\Event\Webhook;
 use Appwrite\Platform\Appwrite;
 use Swoole\Runtime;
 use Utopia\Abuse\Adapters\TimeLimit\Redis as TimeLimitRedis;
@@ -269,14 +269,6 @@ Server::setResource('consumer', function (Group $pools) {
     return $pools->get('consumer')->pop()->getResource();
 }, ['pools']);
 
-Server::setResource('queueForUsage', function (Publisher $publisher) {
-    return new Usage($publisher);
-}, ['publisher']);
-
-Server::setResource('queueForUsageDump', function (Publisher $publisher) {
-    return new UsageDump($publisher);
-}, ['publisher']);
-
 Server::setResource('queueForStatsUsage', function (Publisher $publisher) {
     return new StatsUsage($publisher);
 }, ['publisher']);
@@ -313,10 +305,18 @@ Server::setResource('queueForAudits', function (Publisher $publisher) {
     return new Audit($publisher);
 }, ['publisher']);
 
+Server::setResource('queueForWebhooks', function (Publisher $publisher) {
+    return new Webhook($publisher);
+}, ['publisher']);
+
 Server::setResource('queueForFunctions', function (Publisher $publisher) {
     return new Func($publisher);
 }, ['publisher']);
 
+Server::setResource('queueForRealtime', function () {
+    return new Realtime();
+}, []);
+
 Server::setResource('queueForCertificates', function (Publisher $publisher) {
     return new Certificate($publisher);
 }, ['publisher']);
@@ -333,10 +333,6 @@ Server::setResource('pools', function (Registry $register) {
     return $register->get('pools');
 }, ['register']);
 
-Server::setResource('deviceForSites', function (Document $project) {
-    return getDevice(APP_STORAGE_SITES . '/app-' . $project->getId());
-}, ['project']);
-
 Server::setResource('deviceForFunctions', function (Document $project) {
     return getDevice(APP_STORAGE_FUNCTIONS . '/app-' . $project->getId());
 }, ['project']);

bin/worker-usage

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php usage $@

bin/worker-usage-dump

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-php /usr/src/code/app/worker.php usage-dump $@

composer.json

@@ -14,8 +14,7 @@
         "test": "vendor/bin/phpunit",
         "lint": "vendor/bin/pint --test",
         "format": "vendor/bin/pint",
-        "bench": "vendor/bin/phpbench run --report=benchmark",
-        "check": "./vendor/bin/phpstan analyse -c phpstan.neon"
+        "bench": "vendor/bin/phpbench run --report=benchmark"
     },
     "autoload": {
         "psr-4": {
@@ -44,23 +43,23 @@
         "ext-openssl": "*",
         "ext-zlib": "*",
         "ext-sockets": "*",
-        "appwrite/php-runtimes": "0.17.*",
+        "appwrite/php-runtimes": "0.16.*",
         "appwrite/php-clamav": "2.0.*",
-        "utopia-php/abuse": "0.50.*",
+        "utopia-php/abuse": "0.51.*",
         "utopia-php/analytics": "0.10.*",
-        "utopia-php/audit": "0.51.*",
+        "utopia-php/audit": "0.54.0",
         "utopia-php/cache": "0.11.*",
         "utopia-php/cli": "0.15.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.59.0",
+        "utopia-php/database": "0.60.*",
         "utopia-php/domains": "0.5.*",
         "utopia-php/dsn": "0.2.1",
-        "utopia-php/framework": "0.33.*",
+        "utopia-php/framework": "0.33.17",
         "utopia-php/fetch": "0.3.*",
-        "utopia-php/image": "0.7.*",
+        "utopia-php/image": "0.8.*",
         "utopia-php/locale": "0.4.*",
         "utopia-php/logger": "0.6.*",
-        "utopia-php/messaging": "0.14.*",
+        "utopia-php/messaging": "0.16.*",
         "utopia-php/migration": "0.6.*",
         "utopia-php/orchestration": "0.9.*",
         "utopia-php/platform": "0.7.3",
@@ -86,12 +85,11 @@
     "require-dev": {
         "ext-fileinfo": "*",
         "appwrite/sdk-generator": "0.40.*",
-        "phpunit/phpunit": "9.5.20",
+        "phpunit/phpunit": "9.*",
         "swoole/ide-helper": "5.1.2",
-        "textalk/websocket": "1.5.7",
-        "laravel/pint": "^1.14",
-        "phpbench/phpbench": "^1.2",
-        "phpstan/phpstan": "1.8.*"
+        "textalk/websocket": "1.5.*",
+        "laravel/pint": "1.*",
+        "phpbench/phpbench": "1.*"
     },
     "provide": {
         "ext-phpiredis": "*"
@@ -101,8 +99,8 @@
             "php": "8.3"
         },
         "allow-plugins": {
-            "php-http/discovery": true,
-            "tbachert/spi": true
+            "php-http/discovery": false,
+            "tbachert/spi": false
         }
     }
 }

docker-compose.yml

@@ -76,8 +76,6 @@ services:
       - appwrite-config:/storage/config:rw
       - appwrite-certificates:/storage/certificates:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
-      - appwrite-builds:/storage/builds:rw
       - ./phpunit.xml:/usr/src/code/phpunit.xml
       - ./tests:/usr/src/code/tests
       - ./app:/usr/src/code/app
@@ -112,7 +110,7 @@ services:
       - _APP_OPTIONS_ABUSE
       - _APP_OPTIONS_ROUTER_PROTECTION
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_OPENSSL_KEY_V1
       - _APP_DOMAIN
       - _APP_DOMAIN_TARGET
@@ -159,15 +157,12 @@ services:
       - _APP_STORAGE_WASABI_SECRET
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
-      - _APP_COMPUTE_SIZE_LIMIT
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_FUNCTIONS_RUNTIMES
-      - _APP_SITES_RUNTIMES
-      - _APP_SITES_FRAMEWORKS
-      - _APP_DOMAIN_SITES
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_LOGGING_CONFIG
@@ -206,7 +201,7 @@ services:
   appwrite-console:
     <<: *x-logging
     container_name: appwrite-console
-    image: appwrite/console:5.3.0-sites-rc.16
+    image: appwrite/console:5.2.27
     restart: unless-stopped
     networks:
       - appwrite
@@ -349,7 +344,6 @@ services:
       - appwrite-uploads:/storage/uploads:rw
       - appwrite-cache:/storage/cache:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
       - appwrite-certificates:/storage/certificates:rw
       - ./app:/usr/src/code/app
@@ -436,9 +430,7 @@ services:
       - appwrite
     volumes:
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       - appwrite-builds:/storage/builds:rw
-      - appwrite-uploads:/storage/uploads:rw
       - ./app:/usr/src/code/app
       - ./src:/usr/src/code/src
     depends_on:
@@ -463,13 +455,13 @@ services:
       - _APP_VCS_GITHUB_APP_NAME
       - _APP_VCS_GITHUB_PRIVATE_KEY
       - _APP_VCS_GITHUB_APP_ID
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
-      - _APP_COMPUTE_SIZE_LIMIT
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
+      - _APP_FUNCTIONS_SIZE_LIMIT
       - _APP_OPTIONS_FORCE_HTTPS
-      - _APP_OPTIONS_COMPUTE_FORCE_HTTPS
+      - _APP_OPTIONS_FUNCTIONS_FORCE_HTTPS
       - _APP_DOMAIN
       - _APP_STORAGE_DEVICE
       - _APP_STORAGE_S3_ACCESS_KEY
@@ -494,7 +486,6 @@ services:
       - _APP_STORAGE_WASABI_REGION
       - _APP_STORAGE_WASABI_BUCKET
       - _APP_DATABASE_SHARED_TABLES
-      - _APP_DOMAIN_SITES
 
   appwrite-worker-certificates:
     entrypoint: worker-certificates
@@ -560,10 +551,10 @@ services:
       - _APP_DB_SCHEMA
       - _APP_DB_USER
       - _APP_DB_PASS
-      - _APP_COMPUTE_TIMEOUT
-      - _APP_COMPUTE_BUILD_TIMEOUT
-      - _APP_COMPUTE_CPUS
-      - _APP_COMPUTE_MEMORY
+      - _APP_FUNCTIONS_TIMEOUT
+      - _APP_FUNCTIONS_BUILD_TIMEOUT
+      - _APP_FUNCTIONS_CPUS
+      - _APP_FUNCTIONS_MEMORY
       - _APP_EXECUTOR_SECRET
       - _APP_EXECUTOR_HOST
       - _APP_USAGE_STATS
@@ -951,18 +942,12 @@ services:
     environment:
       - _APP_ASSISTANT_OPENAI_API_KEY
 
-  appwrite-browser:
-    container_name: appwrite-browser
-    image: appwrite/browser:0.2.0
-    networks:
-      - appwrite
-
   openruntimes-executor:
     container_name: openruntimes-executor
     hostname: exc1
     <<: *x-logging
     stop_signal: SIGINT
-    image: openruntimes/executor:0.7.6
+    image: openruntimes/executor:0.6.11
     restart: unless-stopped
     networks:
       - appwrite
@@ -971,21 +956,19 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - appwrite-builds:/storage/builds:rw
       - appwrite-functions:/storage/functions:rw
-      - appwrite-sites:/storage/sites:rw
       # Host mount nessessary to share files between executor and runtimes.
       # It's not possible to share mount file between 2 containers without host mount (copying is too slow)
       - /tmp:/tmp:rw
     environment:
-      - OPR_EXECUTOR_IMAGE_PULL=enabled
-      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_COMPUTE_INACTIVE_THRESHOLD
-      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_COMPUTE_MAINTENANCE_INTERVAL
-      - OPR_EXECUTOR_NETWORK=$_APP_COMPUTE_RUNTIMES_NETWORK
+      - OPR_EXECUTOR_INACTIVE_TRESHOLD=$_APP_FUNCTIONS_INACTIVE_THRESHOLD
+      - OPR_EXECUTOR_MAINTENANCE_INTERVAL=$_APP_FUNCTIONS_MAINTENANCE_INTERVAL
+      - OPR_EXECUTOR_NETWORK=$_APP_FUNCTIONS_RUNTIMES_NETWORK
       - OPR_EXECUTOR_DOCKER_HUB_USERNAME=$_APP_DOCKER_HUB_USERNAME
       - OPR_EXECUTOR_DOCKER_HUB_PASSWORD=$_APP_DOCKER_HUB_PASSWORD
       - OPR_EXECUTOR_ENV=$_APP_ENV
-      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES,$_APP_SITES_RUNTIMES
+      - OPR_EXECUTOR_RUNTIMES=$_APP_FUNCTIONS_RUNTIMES
       - OPR_EXECUTOR_SECRET=$_APP_EXECUTOR_SECRET
-      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4,v4rc
+      - OPR_EXECUTOR_RUNTIME_VERSIONS=v2,v4
       - OPR_EXECUTOR_LOGGING_CONFIG=$_APP_LOGGING_CONFIG
       - OPR_EXECUTOR_STORAGE_DEVICE=$_APP_STORAGE_DEVICE
       - OPR_EXECUTOR_STORAGE_S3_ACCESS_KEY=$_APP_STORAGE_S3_ACCESS_KEY
@@ -1143,6 +1126,5 @@ volumes:
   appwrite-uploads:
   appwrite-certificates:
   appwrite-functions:
-  appwrite-sites:
   appwrite-builds:
   appwrite-config:

docs/references/functions/create-build.md

@@ -1 +1 @@
-Create a new build for an existing function deployment. This endpoint allows you to rebuild a deployment with the updated function configuration, including its entrypoint and build commands if they have been modified. The build process will be queued and executed asynchronously. The original deployment's code will be preserved and used for the new build.
+Create a new build for an existing function deployment. This endpoint allows you to rebuild a deployment with the updated function configuration, including its entrypoint and build commands if they have been modified The build process will be queued and executed asynchronously. The original deployment's code will be preserved and used for the new build.

docs/references/functions/list-deployments.md

@@ -1 +1 @@
-Get a list of all the function's code deployments. You can use the query params to filter your results.
+Get a list of all the project's code deployments. You can use the query params to filter your results.

docs/references/proxy/create-rule.md

@@ -0,0 +1 @@
+Create a new proxy rule.

phpstan.neon

@@ -1,8 +0,0 @@
-parameters:
-  level: 8
-  paths:
-    - src/Appwrite/Transformation
-  scanDirectories:
-    - vendor/swoole/ide-helper
-  excludePaths:
-    - tests/resources

src/Appwrite/Auth/Key.php

@@ -20,9 +20,6 @@ class Key
         protected string $name,
         protected bool $expired = false,
         protected array $disabledMetrics = [],
-        protected bool $hostnameOverride = false,
-        protected bool $bannerDisabled = false,
-        protected bool $projectCheckDisabled = false,
     ) {
     }
 
@@ -61,23 +58,6 @@ class Key
         return $this->disabledMetrics;
     }
 
-
-    public function getHostnameOverride(): bool
-    {
-        return $this->hostnameOverride;
-    }
-
-
-    public function isBannerDisabled(): bool
-    {
-        return $this->bannerDisabled;
-    }
-
-    public function isProjectCheckDisabled(): bool
-    {
-        return $this->projectCheckDisabled;
-    }
-
     /**
      * Decode the given secret key into a Key object, containing the project ID, type, role, scopes, and name.
      * Can be a stored API key or a dynamic key (JWT).
@@ -129,12 +109,9 @@ class Key
                 $name = $payload['name'] ?? 'Dynamic Key';
                 $projectId = $payload['projectId'] ?? '';
                 $disabledMetrics = $payload['disabledMetrics'] ?? [];
-                $hostnameOverride = $payload['hostnameOverride'] ?? false;
-                $bannerDisabled = $payload['bannerDisabled'] ?? false;
-                $projectCheckDisabled = $payload['projectCheckDisabled'] ?? false;
                 $scopes = \array_merge($payload['scopes'] ?? [], $scopes);
 
-                if (!$projectCheckDisabled && $projectId !== $project->getId()) {
+                if ($projectId !== $project->getId()) {
                     return $guestKey;
                 }
 
@@ -145,10 +122,7 @@ class Key
                     $scopes,
                     $name,
                     $expired,
-                    $disabledMetrics,
-                    $hostnameOverride,
-                    $bannerDisabled,
-                    $projectCheckDisabled
+                    $disabledMetrics
                 );
             case API_KEY_STANDARD:
                 $key = $project->find(

src/Appwrite/Event/Event.php

@@ -24,9 +24,6 @@ class Event
     public const FUNCTIONS_QUEUE_NAME = 'v1-functions';
     public const FUNCTIONS_CLASS_NAME = 'FunctionsV1';
 
-    public const SITES_QUEUE_NAME = 'v1-sites';
-    public const SITES_CLASS_NAME = 'SitesV1';
-
     /** remove */
     public const USAGE_QUEUE_NAME = 'v1-usage';
     public const USAGE_CLASS_NAME = 'UsageV1';

src/Appwrite/Event/Realtime.php

@@ -7,10 +7,17 @@ use Utopia\Database\Document;
 
 class Realtime extends Event
 {
+    protected array $subscribers = [];
+
     public function __construct()
     {
     }
 
+    /**
+     * Get Realtime payload for this event.
+     *
+     * @return array
+     */
     public function getRealtimePayload(): array
     {
         $payload = [];
@@ -24,6 +31,28 @@ class Realtime extends Event
         return $payload;
     }
 
+    /**
+     * Set subscribers for this realtime event.
+     *
+     * @param array $subscribers
+     * @return array
+     */
+    public function setSubscribers(array $subscribers): self
+    {
+        $this->subscribers = $subscribers;
+        return $this;
+    }
+
+    /**
+     * Get subscribers for this realtime event.
+     *
+     * @return array
+     */
+    public function getSubscribers(): array
+    {
+        return $this->subscribers;
+    }
+
     /**
      * Execute Event.
      *
@@ -53,17 +82,23 @@ class Realtime extends Event
             bucket: $bucket,
         );
 
-        RealtimeAdapter::send(
-            projectId: $target['projectId'] ?? $this->getProject()->getId(),
-            payload: $this->getRealtimePayload(),
-            events: $allEvents,
-            channels: $target['channels'],
-            roles: $target['roles'],
-            options: [
-                'permissionsChanged' => $target['permissionsChanged'],
-                'userId' => $this->getParam('userId')
-            ]
-        );
+        $projectIds = !empty($this->getSubscribers())
+            ? $this->getSubscribers()
+            : [$target['projectId'] ?? $this->getProject()->getId()];
+
+        foreach ($projectIds as $projectId) {
+            RealtimeAdapter::send(
+                projectId: $projectId,
+                payload: $this->getRealtimePayload(),
+                events: $allEvents,
+                channels: $target['channels'],
+                roles: $target['roles'],
+                options: [
+                    'permissionsChanged' => $target['permissionsChanged'],
+                    'userId' => $this->getParam('userId')
+                ]
+            );
+        }
 
         return true;
     }

src/Appwrite/Event/Usage.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace Appwrite\Event;
-
-use Utopia\Database\Document;
-use Utopia\Queue\Publisher;
-
-class Usage extends Event
-{
-    protected array $metrics = [];
-    protected array $reduce  = [];
-
-    public function __construct(protected Publisher $publisher)
-    {
-        parent::__construct($publisher);
-
-        $this
-            ->setQueue(Event::USAGE_QUEUE_NAME)
-            ->setClass(Event::USAGE_CLASS_NAME);
-    }
-
-    /**
-     * Add reduce.
-     *
-     * @param Document $document
-     * @return self
-     */
-    public function addReduce(Document $document): self
-    {
-        $this->reduce[] = $document;
-
-        return $this;
-    }
-
-    /**
-     * Add metric.
-     *
-     * @param string $key
-     * @param int $value
-     * @return self
-     */
-    public function addMetric(string $key, int $value): self
-    {
-
-        $this->metrics[] = [
-            'key' => $key,
-            'value' => $value,
-        ];
-
-        return $this;
-    }
-
-    /**
-     * Prepare the payload for the usage event.
-     *
-     * @return array
-     */
-    protected function preparePayload(): array
-    {
-        return [
-            'project' => $this->project,
-            'reduce'  => $this->reduce,
-            'metrics' => $this->metrics,
-        ];
-    }
-
-    /**
-     * Sends metrics to the usage worker.
-     *
-     * @return string|bool
-     */
-    public function trigger(): string|bool
-    {
-        parent::trigger();
-        $this->metrics = [];
-        return true;
-    }
-}

src/Appwrite/Event/UsageDump.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace Appwrite\Event;
-
-use Utopia\Queue\Publisher;
-
-class UsageDump extends Event
-{
-    protected array $stats;
-
-    public function __construct(protected Publisher $publisher)
-    {
-        parent::__construct($publisher);
-
-        $this
-            ->setQueue(Event::USAGE_DUMP_QUEUE_NAME)
-            ->setClass(Event::USAGE_DUMP_CLASS_NAME);
-    }
-
-    /**
-     * Add Stats.
-     *
-     * @param array $stats
-     * @return self
-     */
-    public function setStats(array $stats): self
-    {
-        $this->stats = $stats;
-
-        return $this;
-    }
-
-    /**
-     * Prepare the payload for the usage dump event.
-     *
-     * @return array
-     */
-    protected function preparePayload(): array
-    {
-        return [
-            'stats' => $this->stats,
-        ];
-    }
-}

src/Appwrite/Extend/Exception.php

@@ -118,9 +118,6 @@ class Exception extends \Exception
     public const TEAM_INVITE_MISMATCH              = 'team_invite_mismatch';
     public const TEAM_ALREADY_EXISTS               = 'team_already_exists';
 
-    /** Console */
-    public const RESOURCE_ALREADY_EXISTS           = 'resource_already_exists';
-
     /** Membership */
     public const MEMBERSHIP_NOT_FOUND              = 'membership_not_found';
     public const MEMBERSHIP_ALREADY_CONFIRMED      = 'membership_already_confirmed';
@@ -154,11 +151,6 @@ class Exception extends \Exception
     public const PROVIDER_CONTRIBUTION_CONFLICT    = 'provider_contribution_conflict';
     public const GENERAL_PROVIDER_FAILURE          = 'general_provider_failure';
 
-    /** Sites */
-    public const SITE_NOT_FOUND                    = 'site_not_found';
-    public const SITE_FRAMEWORK_UNSUPPORTED        = 'site_framework_unsupported';
-    public const SITE_TEMPLATE_NOT_FOUND           = 'site_template_not_found';
-
     /** Functions */
     public const FUNCTION_NOT_FOUND                = 'function_not_found';
     public const FUNCTION_RUNTIME_UNSUPPORTED      = 'function_runtime_unsupported';
@@ -179,9 +171,6 @@ class Exception extends \Exception
     public const EXECUTION_NOT_FOUND               = 'execution_not_found';
     public const EXECUTION_IN_PROGRESS             = 'execution_in_progress';
 
-    /** Log */
-    public const LOG_NOT_FOUND                     = 'log_not_found';
-
     /** Databases */
     public const DATABASE_NOT_FOUND                = 'database_not_found';
     public const DATABASE_ALREADY_EXISTS           = 'database_already_exists';
@@ -258,7 +247,6 @@ class Exception extends \Exception
     /** Variables */
     public const VARIABLE_NOT_FOUND                = 'variable_not_found';
     public const VARIABLE_ALREADY_EXISTS           = 'variable_already_exists';
-    public const VARIABLE_CANNOT_UNSET_SECRET      = 'variable_cannot_unset_secret';
 
     /** Platform */
     public const PLATFORM_NOT_FOUND                = 'platform_not_found';

src/Appwrite/Messaging/Adapter/Realtime.php

@@ -349,16 +349,6 @@ class Realtime extends Adapter
                     $roles = [Role::team($project->getAttribute('teamId'))->toString()];
                 }
 
-                break;
-
-            case 'sites':
-                if ($parts[2] === 'deployments') {
-                    $channels[] = 'console';
-                    $channels[] = 'projects.' . $project->getId();
-                    $projectId = 'console';
-                    $roles = [Role::team($project->getAttribute('teamId'))->toString()];
-                }
-
                 break;
             case 'migrations':
                 $channels[] = 'console';

src/Appwrite/Migration/Version/V21.php

@@ -186,7 +186,7 @@ class V21 extends Migration
                 $document->setAttribute('scopes', []);
 
                 // Add size attribute
-                $document->setAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT);
+                $document->setAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT);
         }
 
         return $document;

src/Appwrite/Platform/Appwrite.php

@@ -2,11 +2,7 @@
 
 namespace Appwrite\Platform;
 
-use Appwrite\Platform\Modules\Console;
 use Appwrite\Platform\Modules\Core;
-use Appwrite\Platform\Modules\Functions;
-use Appwrite\Platform\Modules\Proxy;
-use Appwrite\Platform\Modules\Sites;
 use Utopia\Platform\Platform;
 
 class Appwrite extends Platform
@@ -14,9 +10,5 @@ class Appwrite extends Platform
     public function __construct()
     {
         parent::__construct(new Core());
-        $this->addModule(new Functions\Module());
-        $this->addModule(new Sites\Module());
-        $this->addModule(new Console\Module());
-        $this->addModule(new Proxy\Module());
     }
 }

src/Appwrite/Platform/Modules/Compute/Base.php

@@ -1,200 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Compute;
-
-use Appwrite\Event\Build;
-use Appwrite\Extend\Exception;
-use Utopia\CLI\Console;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Platform\Action;
-use Utopia\Swoole\Request;
-use Utopia\System\System;
-use Utopia\VCS\Adapter\Git\GitHub;
-use Utopia\VCS\Exception\RepositoryNotFound;
-
-class Base extends Action
-{
-    public function redeployVcsFunction(Request $request, Document $function, Document $project, Document $installation, Database $dbForProject, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document
-    {
-        $deploymentId = ID::unique();
-        $entrypoint = $function->getAttribute('entrypoint', '');
-        $providerInstallationId = $installation->getAttribute('providerInstallationId', '');
-        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
-        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
-        $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
-        $owner = $github->getOwnerName($providerInstallationId);
-        $providerRepositoryId = $function->getAttribute('providerRepositoryId', '');
-        try {
-            $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
-            if (empty($repositoryName)) {
-                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
-            }
-        } catch (RepositoryNotFound $e) {
-            throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
-        }
-
-        // TODO: Support tag and commit in future
-        if ($referenceType === 'branch') {
-            $providerBranch = empty($reference) ? $function->getAttribute('providerBranch', 'main') : $reference;
-        }
-
-        $authorUrl = "https://github.com/$owner";
-        $repositoryUrl = "https://github.com/$owner/$repositoryName";
-        $branchUrl = "https://github.com/$owner/$repositoryName/tree/$providerBranch";
-
-        $commitDetails = [];
-        if ($template->isEmpty()) {
-            try {
-                $commitDetails = $github->getLatestCommit($owner, $repositoryName, $providerBranch);
-            } catch (\Throwable $error) {
-                Console::warning('Failed to get latest commit details');
-                Console::warning($error->getMessage());
-                Console::warning($error->getTraceAsString());
-            }
-        }
-
-        $deployment = $dbForProject->createDocument('deployments', new Document([
-            '$id' => $deploymentId,
-            '$permissions' => [
-                Permission::read(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-            'resourceId' => $function->getId(),
-            'resourceInternalId' => $function->getInternalId(),
-            'resourceType' => 'functions',
-            'entrypoint' => $entrypoint,
-            'commands' => $function->getAttribute('commands', ''),
-            'type' => 'vcs',
-            'installationId' => $installation->getId(),
-            'installationInternalId' => $installation->getInternalId(),
-            'providerRepositoryId' => $providerRepositoryId,
-            'repositoryId' => $function->getAttribute('repositoryId', ''),
-            'repositoryInternalId' => $function->getAttribute('repositoryInternalId', ''),
-            'providerBranchUrl' => $branchUrl,
-            'providerRepositoryName' => $repositoryName,
-            'providerRepositoryOwner' => $owner,
-            'providerRepositoryUrl' => $repositoryUrl,
-            'providerCommitHash' => $commitDetails['commitHash'] ?? '',
-            'providerCommitAuthorUrl' => $authorUrl,
-            'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '',
-            'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 255, '...'),
-            'providerCommitUrl' => $commitDetails['commitUrl'] ?? '',
-            'providerBranch' => $providerBranch,
-            'providerRootDirectory' => $function->getAttribute('providerRootDirectory', ''),
-            'search' => implode(' ', [$deploymentId, $entrypoint]),
-            'activate' => $activate,
-        ]));
-
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($function)
-            ->setDeployment($deployment)
-            ->setTemplate($template);
-
-        return $deployment;
-    }
-
-    public function redeployVcsSite(Request $request, Document $site, Document $project, Document $installation, Database $dbForProject, Database $dbForPlatform, Build $queueForBuilds, Document $template, GitHub $github, bool $activate, string $referenceType = 'branch', string $reference = ''): Document
-    {
-        $deploymentId = ID::unique();
-        $providerInstallationId = $installation->getAttribute('providerInstallationId', '');
-        $privateKey = System::getEnv('_APP_VCS_GITHUB_PRIVATE_KEY');
-        $githubAppId = System::getEnv('_APP_VCS_GITHUB_APP_ID');
-        $github->initializeVariables($providerInstallationId, $privateKey, $githubAppId);
-        $owner = $github->getOwnerName($providerInstallationId);
-        $providerRepositoryId = $site->getAttribute('providerRepositoryId', '');
-        try {
-            $repositoryName = $github->getRepositoryName($providerRepositoryId) ?? '';
-            if (empty($repositoryName)) {
-                throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
-            }
-        } catch (RepositoryNotFound $e) {
-            throw new Exception(Exception::PROVIDER_REPOSITORY_NOT_FOUND);
-        }
-
-        // TODO: Support tag and commit in future
-        if ($referenceType === 'branch') {
-            $providerBranch = empty($reference) ? $site->getAttribute('providerBranch', 'main') : $reference;
-        }
-
-        $authorUrl = "https://github.com/$owner";
-        $repositoryUrl = "https://github.com/$owner/$repositoryName";
-        $branchUrl = "https://github.com/$owner/$repositoryName/tree/$providerBranch";
-
-        $commitDetails = [];
-        if ($template->isEmpty()) {
-            try {
-                $commitDetails = $github->getLatestCommit($owner, $repositoryName, $providerBranch);
-            } catch (\Throwable $error) {
-                Console::warning('Failed to get latest commit details');
-                Console::warning($error->getMessage());
-                Console::warning($error->getTraceAsString());
-            }
-        }
-
-        $deployment = $dbForProject->createDocument('deployments', new Document([
-            '$id' => $deploymentId,
-            '$permissions' => [
-                Permission::read(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-            'resourceId' => $site->getId(),
-            'resourceInternalId' => $site->getInternalId(),
-            'resourceType' => 'sites',
-            'buildCommand' => $site->getAttribute('buildCommand', ''),
-            'installCommand' => $site->getAttribute('installCommand', ''),
-            'outputDirectory' => $site->getAttribute('outputDirectory', ''),
-            'type' => 'vcs',
-            'installationId' => $installation->getId(),
-            'installationInternalId' => $installation->getInternalId(),
-            'providerRepositoryId' => $providerRepositoryId,
-            'repositoryId' => $site->getAttribute('repositoryId', ''),
-            'repositoryInternalId' => $site->getAttribute('repositoryInternalId', ''),
-            'providerBranchUrl' => $branchUrl,
-            'providerRepositoryName' => $repositoryName,
-            'providerRepositoryOwner' => $owner,
-            'providerRepositoryUrl' => $repositoryUrl,
-            'providerCommitHash' => $commitDetails['commitHash'] ?? '',
-            'providerCommitAuthorUrl' => $authorUrl,
-            'providerCommitAuthor' => $commitDetails['commitAuthor'] ?? '',
-            'providerCommitMessage' => mb_strimwidth($commitDetails['commitMessage'] ?? '', 0, 255, '...'),
-            'providerCommitUrl' => $commitDetails['commitUrl'] ?? '',
-            'providerBranch' => $providerBranch,
-            'providerRootDirectory' => $site->getAttribute('providerRootDirectory', ''),
-            'search' => implode(' ', [$deploymentId]),
-            'activate' => $activate,
-        ]));
-
-        $sitesDomain = System::getEnv('_APP_DOMAIN_SITES', '');
-        $domain = ID::unique() . "." . $sitesDomain;
-        $ruleId = md5($domain);
-        Authorization::skip(
-            fn () => $dbForPlatform->createDocument('rules', new Document([
-                '$id' => $ruleId,
-                'projectId' => $project->getId(),
-                'projectInternalId' => $project->getInternalId(),
-                'domain' => $domain,
-                'type' => 'deployment',
-                'value' => $deployment->getId(),
-                'status' => 'verified',
-                'certificateId' => '',
-                'search' => implode(' ', [$ruleId, $domain]),
-            ]))
-        );
-
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($site)
-            ->setDeployment($deployment)
-            ->setTemplate($template);
-
-        return $deployment;
-    }
-}

src/Appwrite/Platform/Modules/Console/Http/Resources/Get.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Console\Http\Resources;
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Domain;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getResource';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/console/resources')
-            ->desc('Check resource ID availability')
-            ->groups(['api', 'projects'])
-            ->label('scope', 'rules.read')
-            ->label('sdk', new Method(
-                namespace: 'console',
-                name: 'getResource',
-                description: <<<EOT
-                Check if a resource ID is available.
-                EOT,
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::NONE,
-            ))
-            ->label('abuse-limit', 10)
-            ->label('abuse-key', 'userId:{userId}, url:{url}')
-            ->label('abuse-time', 60)
-            ->param('value', '', new Text(256), 'Resource value.')
-            ->param('type', '', new WhiteList(['rules']), 'Resource type.')
-            ->inject('response')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $value, string $type, Response $response, Database $dbForPlatform)
-    {
-        if ($type === 'rules') {
-            $validator = new Domain($value);
-
-            if (!$validator->isValid($value)) {
-                throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, $validator->getDescription());
-            }
-
-            $document = Authorization::skip(fn () => $dbForPlatform->findOne('rules', [
-                Query::equal('domain', [$value]),
-            ]));
-
-            if (!$document->isEmpty()) {
-                throw new Exception(Exception::RESOURCE_ALREADY_EXISTS);
-            }
-
-            $response->noContent();
-        }
-
-        // Only occurs if type is added into whitelist, but not supported in action
-        throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Invalid type');
-    }
-}

src/Appwrite/Platform/Modules/Console/Module.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Console;
-
-use Appwrite\Platform\Modules\Console\Services\Http;
-use Utopia\Platform;
-
-class Module extends Platform\Module
-{
-    public function __construct()
-    {
-        $this->addService('http', new Http());
-    }
-}

src/Appwrite/Platform/Modules/Console/Services/Http.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Console\Services;
-
-use Appwrite\Platform\Modules\Console\Http\Resources\Get as GetResourceAvailability;
-use Utopia\Platform\Service;
-
-class Http extends Service
-{
-    public function __construct()
-    {
-        $this->type = Service::TYPE_HTTP;
-        // Resources
-        $this->addAction(GetResourceAvailability::getName(), new GetResourceAvailability());
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Builds/Create.php

@@ -1,112 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Builds;
-
-use Appwrite\Event\Build;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Storage\Device;
-
-class Create extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createDeploymentBuild';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId/build')
-            ->httpAlias('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
-            ->desc('Rebuild deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
-            ->label('audits.event', 'deployment.update')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createBuild',
-                description: <<<EOT
-                Create a new build for an existing function deployment. This endpoint allows you to rebuild a deployment with the updated function configuration, including its entrypoint and build commands if they have been modified. The build process will be queued and executed asynchronously. The original deployment's code will be preserved and used for the new build.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->param('buildId', '', new UID(), 'Build unique ID.', true) // added as optional param for backward compatibility
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForEvents')
-            ->inject('queueForBuilds')
-            ->inject('deviceForFunctions')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, string $buildId, Response $response, Database $dbForProject, Event $queueForEvents, Build $queueForBuilds, Device $deviceForFunctions)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $path = $deployment->getAttribute('path');
-        if (empty($path) || !$deviceForFunctions->exists($path)) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $deploymentId = ID::unique();
-
-        $destination = $deviceForFunctions->getPath($deploymentId . '.' . \pathinfo('code.tar.gz', PATHINFO_EXTENSION));
-        $deviceForFunctions->transfer($path, $destination, $deviceForFunctions);
-
-        $deployment->removeAttribute('$internalId');
-        $deployment = $dbForProject->createDocument('deployments', $deployment->setAttributes([
-            '$internalId' => '',
-            '$id' => $deploymentId,
-            'buildId' => '',
-            'buildInternalId' => '',
-            'path' => $destination,
-            'entrypoint' => $function->getAttribute('entrypoint'),
-            'commands' => $function->getAttribute('commands', ''),
-            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint')]),
-        ]));
-
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($function)
-            ->setDeployment($deployment);
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response->noContent();
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Builds/Download/Get.php

@@ -1,133 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Builds\Download;
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Storage\Device;
-use Utopia\Swoole\Request;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getDeploymentBuildDownload';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId/build/download')
-            ->desc('Download build')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getDeploymentBuildDownload',
-                description: <<<EOT
-                Get a function build content by its unique ID. The endpoint response return with a 'Content-Disposition: attachment' header that tells the browser to start downloading the file to user downloads directory.
-                EOT,
-                auth: [AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_NONE
-                    )
-                ],
-                type: MethodType::LOCATION,
-                contentType: ContentType::ANY,
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('request')
-            ->inject('dbForProject')
-            ->inject('deviceForBuilds')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Request $request, Database $dbForProject, Device $deviceForBuilds)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId'));
-        if ($build->isEmpty()) {
-            throw new Exception(Exception::BUILD_NOT_FOUND);
-        }
-
-        $path = $build->getAttribute('path', '');
-        if (!$deviceForBuilds->exists($path)) {
-            throw new Exception(Exception::BUILD_NOT_FOUND);
-        }
-
-        $response
-            ->setContentType('application/gzip')
-            ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-            ->addHeader('Content-Disposition', 'attachment; filename="' . $deploymentId . '.tar.gz"');
-
-        $size = $deviceForBuilds->getFileSize($path);
-        $rangeHeader = $request->getHeader('range');
-
-        if (!empty($rangeHeader)) {
-            $start = $request->getRangeStart();
-            $end = $request->getRangeEnd();
-            $unit = $request->getRangeUnit();
-
-            if ($end === null) {
-                $end = min(($start + MAX_OUTPUT_CHUNK_SIZE - 1), ($size - 1));
-            }
-
-            if ($unit !== 'bytes' || $start >= $end || $end >= $size) {
-                throw new Exception(Exception::STORAGE_INVALID_RANGE);
-            }
-
-            $response
-                ->addHeader('Accept-Ranges', 'bytes')
-                ->addHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $size)
-                ->addHeader('Content-Length', $end - $start + 1)
-                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
-
-            $response->send($deviceForBuilds->read($path, $start, ($end - $start + 1)));
-        }
-
-        if ($size > APP_STORAGE_READ_BUFFER) {
-            for ($i = 0; $i < ceil($size / MAX_OUTPUT_CHUNK_SIZE); $i++) {
-                $response->chunk(
-                    $deviceForBuilds->read(
-                        $path,
-                        ($i * MAX_OUTPUT_CHUNK_SIZE),
-                        min(MAX_OUTPUT_CHUNK_SIZE, $size - ($i * MAX_OUTPUT_CHUNK_SIZE))
-                    ),
-                    (($i + 1) * MAX_OUTPUT_CHUNK_SIZE) >= $size
-                );
-            }
-        } else {
-            $response->send($deviceForBuilds->read($path));
-        }
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Builds/Update.php

@@ -1,136 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Builds;
-
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Executor\Executor;
-use Utopia\App;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Update extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'updateDeploymentBuild';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId/build')
-            ->desc('Cancel deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'deployment.update')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'updateDeploymentBuild',
-                description: <<<EOT
-                Cancel an ongoing function deployment build. If the build is already in progress, it will be stopped and marked as canceled. If the build hasn't started yet, it will be marked as canceled without executing. You cannot cancel builds that have already completed (status 'ready') or failed. The response includes the final build status and details.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_BUILD,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('project')
-            ->inject('queueForEvents')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Database $dbForProject, Document $project, Event $queueForEvents)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
-
-        if ($build->isEmpty()) {
-            $buildId = ID::unique();
-            $build = $dbForProject->createDocument('builds', new Document([
-                '$id' => $buildId,
-                '$permissions' => [],
-                'startTime' => DateTime::now(),
-                'deploymentInternalId' => $deployment->getInternalId(),
-                'deploymentId' => $deployment->getId(),
-                'status' => 'canceled',
-                'path' => '',
-                'runtime' => $function->getAttribute('runtime'),
-                'source' => $deployment->getAttribute('path', ''),
-                'sourceType' => '',
-                'logs' => '',
-                'duration' => 0,
-                'size' => 0
-            ]));
-
-            $deployment->setAttribute('buildId', $build->getId());
-            $deployment->setAttribute('buildInternalId', $build->getInternalId());
-            $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
-        } else {
-            if (\in_array($build->getAttribute('status'), ['ready', 'failed'])) {
-                throw new Exception(Exception::BUILD_ALREADY_COMPLETED);
-            }
-
-            $startTime = new \DateTime($build->getAttribute('startTime'));
-            $endTime = new \DateTime('now');
-            $duration = $endTime->getTimestamp() - $startTime->getTimestamp();
-
-            $build = $dbForProject->updateDocument('builds', $build->getId(), $build->setAttributes([
-                'endTime' => DateTime::now(),
-                'duration' => $duration,
-                'status' => 'canceled'
-            ]));
-        }
-
-        $dbForProject->purgeCachedDocument('deployments', $deployment->getId());
-
-        try {
-            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
-            $executor->deleteRuntime($project->getId(), $deploymentId . "-build");
-        } catch (\Throwable $th) {
-            // Don't throw if the deployment doesn't exist
-            if ($th->getCode() !== 404) {
-                throw $th;
-            }
-        }
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response->dynamic($build, Response::MODEL_BUILD);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Create.php

@@ -1,278 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments;
-
-use Appwrite\Event\Build;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Storage\Device;
-use Utopia\Storage\Validator\File;
-use Utopia\Storage\Validator\FileExt;
-use Utopia\Storage\Validator\FileSize;
-use Utopia\Storage\Validator\Upload;
-use Utopia\Swoole\Request;
-use Utopia\System\System;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-
-class Create extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/deployments')
-            ->desc('Create deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].create')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'deployment.create')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createDeployment',
-                description: <<<EOT
-                Create a new function code deployment. Use this endpoint to upload a new version of your code function. To execute your newly uploaded code, you'll need to update the function's deployment to use your new deployment UID.
-
-                This endpoint accepts a tar.gz file compressed with your code. Make sure to include any dependencies your code has within the compressed file. You can learn more about code packaging in the [Appwrite Cloud Functions tutorial](https://appwrite.io/docs/functions).
-
-                Use the "command" param to set the entrypoint used to execute your code.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_ACCEPTED,
-                        model: Response::MODEL_DEPLOYMENT,
-                    )
-                ],
-                requestType: 'multipart/form-data',
-                type: MethodType::UPLOAD,
-                packaging: true,
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('entrypoint', null, new Text(1028), 'Entrypoint File.', true)
-            ->param('commands', null, new Text(8192, 0), 'Build Commands.', true)
-            ->param('code', [], new File(), 'Gzip file with your code package. When used with the Appwrite CLI, pass the path to your code directory, and the CLI will automatically package your code. Use a path that is within the current directory.', skipValidation: true)
-            ->param('activate', false, new Boolean(true), 'Automatically activate the deployment when it is finished building.')
-            ->inject('request')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForEvents')
-            ->inject('project')
-            ->inject('deviceForFunctions')
-            ->inject('deviceForLocal')
-            ->inject('queueForBuilds')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, ?string $entrypoint, ?string $commands, mixed $code, mixed $activate, Request $request, Response $response, Database $dbForProject, Event $queueForEvents, Document $project, Device $deviceForFunctions, Device $deviceForLocal, Build $queueForBuilds)
-    {
-        $activate = \strval($activate) === 'true' || \strval($activate) === '1';
-
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        if ($entrypoint === null) {
-            $entrypoint = $function->getAttribute('entrypoint', '');
-        }
-
-        if ($commands === null) {
-            $commands = $function->getAttribute('commands', '');
-        }
-
-        if (empty($entrypoint)) {
-            throw new Exception(Exception::FUNCTION_ENTRYPOINT_MISSING);
-        }
-
-        $file = $request->getFiles('code');
-
-        // GraphQL multipart spec adds files with index keys
-        if (empty($file)) {
-            $file = $request->getFiles(0);
-        }
-
-        if (empty($file)) {
-            throw new Exception(Exception::STORAGE_FILE_EMPTY, 'No file sent');
-        }
-
-        $fileExt = new FileExt([FileExt::TYPE_GZIP]);
-        $fileSizeValidator = new FileSize(System::getEnv('_APP_COMPUTE_SIZE_LIMIT', '30000000'));
-        $upload = new Upload();
-
-        // Make sure we handle a single file and multiple files the same way
-        $fileName = (\is_array($file['name']) && isset($file['name'][0])) ? $file['name'][0] : $file['name'];
-        $fileTmpName = (\is_array($file['tmp_name']) && isset($file['tmp_name'][0])) ? $file['tmp_name'][0] : $file['tmp_name'];
-        $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
-
-        if (!$fileExt->isValid($file['name'])) { // Check if file type is allowed
-            throw new Exception(Exception::STORAGE_FILE_TYPE_UNSUPPORTED);
-        }
-
-        $contentRange = $request->getHeader('content-range');
-        $deploymentId = ID::unique();
-        $chunk = 1;
-        $chunks = 1;
-
-        if (!empty($contentRange)) {
-            $start = $request->getContentRangeStart();
-            $end = $request->getContentRangeEnd();
-            $fileSize = $request->getContentRangeSize();
-            $deploymentId = $request->getHeader('x-appwrite-id', $deploymentId);
-            // TODO make `end >= $fileSize` in next breaking version
-            if (is_null($start) || is_null($end) || is_null($fileSize) || $end > $fileSize) {
-                throw new Exception(Exception::STORAGE_INVALID_CONTENT_RANGE);
-            }
-
-            // TODO remove the condition that checks `$end === $fileSize` in next breaking version
-            if ($end === $fileSize - 1 || $end === $fileSize) {
-                //if it's a last chunks the chunk size might differ, so we set the $chunks and $chunk to notify it's last chunk
-                $chunks = $chunk = -1;
-            } else {
-                // Calculate total number of chunks based on the chunk size i.e ($rangeEnd - $rangeStart)
-                $chunks = (int) ceil($fileSize / ($end + 1 - $start));
-                $chunk = (int) ($start / ($end + 1 - $start)) + 1;
-            }
-        }
-
-        if (!$fileSizeValidator->isValid($fileSize)) { // Check if file size is exceeding allowed limit
-            throw new Exception(Exception::STORAGE_INVALID_FILE_SIZE);
-        }
-
-        if (!$upload->isValid($fileTmpName)) {
-            throw new Exception(Exception::STORAGE_INVALID_FILE);
-        }
-
-        // Save to storage
-        $fileSize ??= $deviceForLocal->getFileSize($fileTmpName);
-        $path = $deviceForFunctions->getPath($deploymentId . '.' . \pathinfo($fileName, PATHINFO_EXTENSION));
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-
-        $metadata = ['content_type' => $deviceForLocal->getFileMimeType($fileTmpName)];
-        if (!$deployment->isEmpty()) {
-            $chunks = $deployment->getAttribute('chunksTotal', 1);
-            $metadata = $deployment->getAttribute('metadata', []);
-            if ($chunk === -1) {
-                $chunk = $chunks;
-            }
-        }
-
-        $chunksUploaded = $deviceForFunctions->upload($fileTmpName, $path, $chunk, $chunks, $metadata);
-
-        if (empty($chunksUploaded)) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed moving file');
-        }
-
-        $type = $request->getHeader('x-sdk-language') === 'cli' ? 'cli' : 'manual';
-
-        if ($chunksUploaded === $chunks) {
-            if ($activate) {
-                // Remove deploy for all other deployments.
-                $activeDeployments = $dbForProject->find('deployments', [
-                    Query::equal('activate', [true]),
-                    Query::equal('resourceId', [$functionId]),
-                    Query::equal('resourceType', ['functions'])
-                ]);
-
-                foreach ($activeDeployments as $activeDeployment) {
-                    $activeDeployment->setAttribute('activate', false);
-                    $dbForProject->updateDocument('deployments', $activeDeployment->getId(), $activeDeployment);
-                }
-            }
-
-            $fileSize = $deviceForFunctions->getFileSize($path);
-
-            if ($deployment->isEmpty()) {
-                $deployment = $dbForProject->createDocument('deployments', new Document([
-                    '$id' => $deploymentId,
-                    '$permissions' => [
-                        Permission::read(Role::any()),
-                        Permission::update(Role::any()),
-                        Permission::delete(Role::any()),
-                    ],
-                    'resourceInternalId' => $function->getInternalId(),
-                    'resourceId' => $function->getId(),
-                    'resourceType' => 'functions',
-                    'buildInternalId' => '',
-                    'entrypoint' => $entrypoint,
-                    'commands' => $commands,
-                    'path' => $path,
-                    'size' => $fileSize,
-                    'search' => implode(' ', [$deploymentId, $entrypoint]),
-                    'activate' => $activate,
-                    'metadata' => $metadata,
-                    'type' => $type
-                ]));
-            } else {
-                $deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('size', $fileSize)->setAttribute('metadata', $metadata));
-            }
-
-            // Start the build
-            $queueForBuilds
-                ->setType(BUILD_TYPE_DEPLOYMENT)
-                ->setResource($function)
-                ->setDeployment($deployment);
-        } else {
-            if ($deployment->isEmpty()) {
-                $deployment = $dbForProject->createDocument('deployments', new Document([
-                    '$id' => $deploymentId,
-                    '$permissions' => [
-                        Permission::read(Role::any()),
-                        Permission::update(Role::any()),
-                        Permission::delete(Role::any()),
-                    ],
-                    'resourceInternalId' => $function->getInternalId(),
-                    'resourceId' => $function->getId(),
-                    'resourceType' => 'functions',
-                    'buildInternalId' => '',
-                    'entrypoint' => $entrypoint,
-                    'commands' => $commands,
-                    'path' => $path,
-                    'size' => $fileSize,
-                    'chunksTotal' => $chunks,
-                    'chunksUploaded' => $chunksUploaded,
-                    'search' => implode(' ', [$deploymentId, $entrypoint]),
-                    'activate' => $activate,
-                    'metadata' => $metadata,
-                    'type' => $type
-                ]));
-            } else {
-                $deployment = $dbForProject->updateDocument('deployments', $deploymentId, $deployment->setAttribute('chunksUploaded', $chunksUploaded)->setAttribute('metadata', $metadata));
-            }
-        }
-
-        $metadata = null;
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Delete.php

@@ -1,109 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments;
-
-use Appwrite\Event\Delete as DeleteEvent;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Storage\Device;
-
-class Delete extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'deleteDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId')
-            ->desc('Delete deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].delete')
-            ->label('audits.event', 'deployment.delete')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'deleteDeployment',
-                description: <<<EOT
-                Delete a code deployment by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::NONE
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForDeletes')
-            ->inject('queueForEvents')
-            ->inject('deviceForFunctions')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Database $dbForProject, DeleteEvent $queueForDeletes, Event $queueForEvents, Device $deviceForFunctions)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if (!$dbForProject->deleteDocument('deployments', $deployment->getId())) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove deployment from DB');
-        }
-
-        if (!empty($deployment->getAttribute('path', ''))) {
-            if (!($deviceForFunctions->delete($deployment->getAttribute('path', '')))) {
-                throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove deployment from storage');
-            }
-        }
-
-        if ($function->getAttribute('deployment') === $deployment->getId()) { // Reset function deployment
-            $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
-                'deployment' => '',
-                'deploymentInternalId' => '',
-            ])));
-        }
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($deployment);
-
-        $response->noContent();
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Download/Get.php

@@ -1,129 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Download;
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\MethodType;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Storage\Device;
-use Utopia\Swoole\Request;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getDeploymentDownload';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId/download')
-            ->groups(['api', 'functions'])
-            ->desc('Download deployment')
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getDeploymentDownload',
-                description: <<<EOT
-                Get a function deployment content by its unique ID. The endpoint response return with a 'Content-Disposition: attachment' header that tells the browser to start downloading the file to user downloads directory.
-                EOT,
-                auth: [AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::ANY,
-                type: MethodType::LOCATION
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('request')
-            ->inject('dbForProject')
-            ->inject('deviceForFunctions')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Request $request, Database $dbForProject, Device $deviceForFunctions)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $path = $deployment->getAttribute('path', '');
-        if (!$deviceForFunctions->exists($path)) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $response
-            ->setContentType('application/gzip')
-            ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
-            ->addHeader('X-Peak', \memory_get_peak_usage())
-            ->addHeader('Content-Disposition', 'attachment; filename="' . $deploymentId . '.tar.gz"');
-
-        $size = $deviceForFunctions->getFileSize($path);
-        $rangeHeader = $request->getHeader('range');
-
-        if (!empty($rangeHeader)) {
-            $start = $request->getRangeStart();
-            $end = $request->getRangeEnd();
-            $unit = $request->getRangeUnit();
-
-            if ($end === null) {
-                $end = min(($start + MAX_OUTPUT_CHUNK_SIZE - 1), ($size - 1));
-            }
-
-            if ($unit !== 'bytes' || $start >= $end || $end >= $size) {
-                throw new Exception(Exception::STORAGE_INVALID_RANGE);
-            }
-
-            $response
-                ->addHeader('Accept-Ranges', 'bytes')
-                ->addHeader('Content-Range', 'bytes ' . $start . '-' . $end . '/' . $size)
-                ->addHeader('Content-Length', $end - $start + 1)
-                ->setStatusCode(Response::STATUS_CODE_PARTIALCONTENT);
-
-            $response->send($deviceForFunctions->read($path, $start, ($end - $start + 1)));
-        }
-
-        if ($size > APP_STORAGE_READ_BUFFER) {
-            for ($i = 0; $i < ceil($size / MAX_OUTPUT_CHUNK_SIZE); $i++) {
-                $response->chunk(
-                    $deviceForFunctions->read(
-                        $path,
-                        ($i * MAX_OUTPUT_CHUNK_SIZE),
-                        min(MAX_OUTPUT_CHUNK_SIZE, $size - ($i * MAX_OUTPUT_CHUNK_SIZE))
-                    ),
-                    (($i + 1) * MAX_OUTPUT_CHUNK_SIZE) >= $size
-                );
-            }
-        } else {
-            $response->send($deviceForFunctions->read($path));
-        }
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Get.php

@@ -1,81 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments;
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId')
-            ->desc('Get deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getDeployment',
-                description: <<<EOT
-                Get a function deployment by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_DEPLOYMENT,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', ''));
-        $deployment->setAttribute('status', $build->getAttribute('status', 'waiting'));
-        $deployment->setAttribute('buildLogs', $build->getAttribute('logs', ''));
-        $deployment->setAttribute('buildTime', $build->getAttribute('duration', 0));
-        $deployment->setAttribute('buildSize', $build->getAttribute('size', 0));
-        $deployment->setAttribute('size', $deployment->getAttribute('size', 0));
-
-        $response->dynamic($deployment, Response::MODEL_DEPLOYMENT);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Template/Create.php

@@ -1,153 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Template;
-
-use Appwrite\Event\Build;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Swoole\Request;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-use Utopia\VCS\Adapter\Git\GitHub;
-
-class Create extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createTemplateDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/deployments/template')
-            ->desc('Create template deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].create')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'deployment.create')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createTemplateDeployment',
-                description: <<<EOT
-                Create a deployment based on a template.
-                
-                Use this endpoint with combination of [listTemplates](https://appwrite.io/docs/server/functions#listTemplates) to find the template details.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_ACCEPTED,
-                        model: Response::MODEL_DEPLOYMENT,
-                    )
-                ],
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('repository', '', new Text(128, 0), 'Repository name of the template.')
-            ->param('owner', '', new Text(128, 0), 'The name of the owner of the template.')
-            ->param('rootDirectory', '', new Text(128, 0), 'Path to function code in the template repo.')
-            ->param('version', '', new Text(128, 0), 'Version (tag) for the repo linked to the function template.')
-            ->param('activate', false, new Boolean(), 'Automatically activate the deployment when it is finished building.', true)
-            ->inject('request')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->inject('queueForEvents')
-            ->inject('project')
-            ->inject('queueForBuilds')
-            ->inject('gitHub')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $repository, string $owner, string $rootDirectory, string $version, bool $activate, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Event $queueForEvents, Document $project, Build $queueForBuilds, GitHub $github)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $template = new Document([
-            'repositoryName' => $repository,
-            'ownerName' => $owner,
-            'rootDirectory' => $rootDirectory,
-            'version' => $version
-        ]);
-
-        if (!empty($function->getAttribute('providerRepositoryId'))) {
-            $installation = $dbForPlatform->getDocument('installations', $function->getAttribute('installationId'));
-
-            $deployment = $this->redeployVcsFunction(
-                request: $request,
-                function: $function,
-                project: $project,
-                installation: $installation,
-                dbForProject: $dbForProject,
-                queueForBuilds: $queueForBuilds,
-                template: $template,
-                github: $github,
-                activate: $activate
-            );
-
-            $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-            $response
-                ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-                ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
-
-            return;
-        }
-
-        $deploymentId = ID::unique();
-        $deployment = $dbForProject->createDocument('deployments', new Document([
-            '$id' => $deploymentId,
-            '$permissions' => [
-                Permission::read(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-            'resourceId' => $function->getId(),
-            'resourceInternalId' => $function->getInternalId(),
-            'resourceType' => 'functions',
-            'entrypoint' => $function->getAttribute('entrypoint', ''),
-            'commands' => $function->getAttribute('commands', ''),
-            'type' => 'manual',
-            'search' => implode(' ', [$deploymentId, $function->getAttribute('entrypoint', '')]),
-            'activate' => $activate,
-        ]));
-
-        $queueForBuilds
-            ->setType(BUILD_TYPE_DEPLOYMENT)
-            ->setResource($function)
-            ->setDeployment($deployment)
-            ->setTemplate($template);
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Update.php

@@ -1,103 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments;
-
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Update extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'updateDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PATCH)
-            ->setHttpPath('/v1/functions/:functionId/deployments/:deploymentId')
-            ->desc('Update deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
-            ->label('audits.event', 'deployment.update')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'updateDeployment',
-                description: <<<EOT
-                Update the function active deployment. Use this endpoint to switch the code deployment that should be used when visitor opens your function.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_FUNCTION,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('deploymentId', '', new UID(), 'Deployment ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForEvents')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $deploymentId, Response $response, Database $dbForProject, Event $queueForEvents, Database $dbForPlatform)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-        $deployment = $dbForProject->getDocument('deployments', $deploymentId);
-        $build = $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', ''));
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND);
-        }
-
-        if ($build->isEmpty()) {
-            throw new Exception(Exception::BUILD_NOT_FOUND);
-        }
-
-        if ($build->getAttribute('status') !== 'ready') {
-            throw new Exception(Exception::BUILD_NOT_READY);
-        }
-
-        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
-            'deploymentInternalId' => $deployment->getInternalId(),
-            'deployment' => $deployment->getId(),
-        ])));
-
-        // Inform scheduler if function is still active
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response->dynamic($function, Response::MODEL_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/Vcs/Create.php

@@ -1,110 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments\Vcs;
-
-use Appwrite\Event\Build;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Swoole\Request;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-use Utopia\VCS\Adapter\Git\GitHub;
-
-class Create extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createVcsDeployment';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/deployments/vcs')
-            ->desc('Create VCS deployment')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].deployments.[deploymentId].create')
-            ->label('audits.event', 'deployment.create')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createVcsDeployment',
-                description: <<<EOT
-                Create a deployment when a function is connected to VCS.
-
-                This endpoint lets you create deployment from a branch, commit, or a tag.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_ACCEPTED,
-                        model: Response::MODEL_DEPLOYMENT,
-                    )
-                ],
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            // TODO: Support tag and commit in future
-            ->param('type', '', new WhiteList(['branch']), 'Type of reference passed. Allowed values are: branch')
-            ->param('reference', '', new Text(255), 'VCS reference to create deployment from. Depending on type this can be: branch name')
-            ->param('activate', false, new Boolean(), 'Automatically activate the deployment when it is finished building.', true)
-            ->inject('request')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->inject('project')
-            ->inject('queueForEvents')
-            ->inject('queueForBuilds')
-            ->inject('gitHub')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $type, string $reference, bool $activate, Request $request, Response $response, Database $dbForProject, Database $dbForPlatform, Document $project, Event $queueForEvents, Build $queueForBuilds, GitHub $github)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $template = new Document();
-
-        $installation = $dbForPlatform->getDocument('installations', $function->getAttribute('installationId'));
-
-        $deployment = $this->redeployVcsFunction(
-            request: $request,
-            function: $function,
-            project: $project,
-            installation: $installation,
-            dbForProject: $dbForProject,
-            queueForBuilds: $queueForBuilds,
-            template: $template,
-            github: $github,
-            activate: $activate,
-            reference: $reference,
-            referenceType: $type
-        );
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('deploymentId', $deployment->getId());
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-            ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Deployments/XList.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Deployments;
-
-use Appwrite\Extend\Exception;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\Queries\Deployments;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Text;
-
-class XList extends Action
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listDeployments';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/deployments')
-            ->desc('List deployments')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listDeployments',
-                description: <<<EOT
-                Get a list of all the function's code deployments. You can use the query params to filter your results.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_DEPLOYMENT_LIST,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('queries', [], new Deployments(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Deployments::ALLOWED_ATTRIBUTES), true)
-            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, array $queries, string $search, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        if (!empty($search)) {
-            $queries[] = Query::search('search', $search);
-        }
-
-        // Set resource queries
-        $queries[] = Query::equal('resourceInternalId', [$function->getInternalId()]);
-        $queries[] = Query::equal('resourceType', ['functions']);
-
-        /**
-         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
-         */
-        $cursor = \array_filter($queries, function ($query) {
-            return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]);
-        });
-        $cursor = reset($cursor);
-        if ($cursor) {
-            /** @var Query $cursor */
-
-            $validator = new Cursor();
-            if (!$validator->isValid($cursor)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-
-            $deploymentId = $cursor->getValue();
-            $cursorDocument = $dbForProject->getDocument('deployments', $deploymentId);
-
-            if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Deployment '{$deploymentId}' for the 'cursor' value not found.");
-            }
-
-            $cursor->setValue($cursorDocument);
-        }
-
-        $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('deployments', $queries);
-        $total = $dbForProject->count('deployments', $filterQueries, APP_LIMIT_COUNT);
-
-        foreach ($results as $result) {
-            $build = $dbForProject->getDocument('builds', $result->getAttribute('buildId', ''));
-            $result->setAttribute('status', $build->getAttribute('status', 'processing'));
-            $result->setAttribute('buildLogs', $build->getAttribute('logs', ''));
-            $result->setAttribute('buildTime', $build->getAttribute('duration', 0));
-            $result->setAttribute('buildSize', $build->getAttribute('size', 0));
-            $result->setAttribute('size', $result->getAttribute('size', 0));
-        }
-
-        $response->dynamic(new Document([
-            'deployments' => $results,
-            'total' => $total,
-        ]), Response::MODEL_DEPLOYMENT_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Executions/Create.php

@@ -1,474 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Executions;
-
-use Ahc\Jwt\JWT;
-use Appwrite\Auth\Auth;
-use Appwrite\Event\Build;
-use Appwrite\Event\Delete;
-use Appwrite\Event\Event;
-use Appwrite\Event\Func;
-use Appwrite\Event\StatsUsage;
-use Appwrite\Extend\Exception;
-use Appwrite\Extend\Exception as AppwriteException;
-use Appwrite\Functions\Validator\Headers;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\Platform\Tasks\ScheduleExecutions;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Executor\Executor;
-use MaxMind\Db\Reader;
-use Utopia\CLI\Console;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Datetime as DatetimeValidator;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Swoole\Request;
-use Utopia\System\System;
-use Utopia\Validator\AnyOf;
-use Utopia\Validator\Assoc;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-
-class Create extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createExecution';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/executions')
-            ->desc('Create execution')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'execution.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('event', 'functions.[functionId].executions.[executionId].create')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createExecution',
-                description: <<<EOT
-                Trigger a function execution. The returned object will return you the current execution status. You can ping the `Get Execution` endpoint to get updates on the current execution status. Once this endpoint is called, your function execution process will start asynchronously.
-                EOT,
-                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_CREATED,
-                        model: Response::MODEL_EXECUTION,
-                    )
-                ],
-                contentType: ContentType::MULTIPART,
-                requestType: 'application/json',
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('body', '', new Text(10485760, 0), 'HTTP body of execution. Default value is empty string.', true)
-            ->param('async', false, new Boolean(true), 'Execute code in the background. Default value is false.', true)
-            ->param('path', '/', new Text(2048), 'HTTP path of execution. Path can include query params. Default value is /', true)
-            ->param('method', 'POST', new Whitelist(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], true), 'HTTP method of execution. Default value is GET.', true)
-            ->param('headers', [], new AnyOf([new Assoc(), new Text(65535)], AnyOf::TYPE_MIXED), 'HTTP headers of execution. Defaults to empty.', true)
-            ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true, precision: DateTimeValidator::PRECISION_MINUTES, offset: 60), 'Scheduled execution time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.', true)
-            ->inject('response')
-            ->inject('request')
-            ->inject('project')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->inject('user')
-            ->inject('queueForEvents')
-            ->inject('queueForStatsUsage')
-            ->inject('queueForFunctions')
-            ->inject('geodb')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $body, mixed $async, string $path, string $method, mixed $headers, ?string $scheduledAt, Response $response, Request $request, Document $project, Database $dbForProject, Database $dbForPlatform, Document $user, Event $queueForEvents, StatsUsage $queueForStatsUsage, Func $queueForFunctions, Reader $geodb)
-    {
-        $async = \strval($async) === 'true' || \strval($async) === '1';
-
-        if (!$async && !is_null($scheduledAt)) {
-            throw new Exception(Exception::GENERAL_BAD_REQUEST, 'Scheduled executions must run asynchronously. Set scheduledAt to a future date, or set async to true.');
-        }
-
-        /**
-         * @var array<string, mixed> $headers
-         */
-        $assocParams = ['headers'];
-        foreach ($assocParams as $assocParam) {
-            if (!empty('headers') && !is_array($$assocParam)) {
-                $$assocParam = \json_decode($$assocParam, true);
-            }
-        }
-
-        $booleanParams = ['async'];
-        foreach ($booleanParams as $booleamParam) {
-            if (!empty($$booleamParam) && !is_bool($$booleamParam)) {
-                $$booleamParam = $$booleamParam === "true" ? true : false;
-            }
-        }
-
-        // 'headers' validator
-        $validator = new Headers();
-        if (!$validator->isValid($headers)) {
-            throw new Exception($validator->getDescription(), 400);
-        }
-
-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-
-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-
-        if ($function->isEmpty() || (!$function->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $version = $function->getAttribute('version', 'v2');
-        $runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
-        $spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_COMPUTE_SPECIFICATION_DEFAULT)];
-
-        $runtime = (isset($runtimes[$function->getAttribute('runtime', '')])) ? $runtimes[$function->getAttribute('runtime', '')] : null;
-
-        if (\is_null($runtime)) {
-            throw new Exception(Exception::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $function->getAttribute('runtime', '') . '" is not supported');
-        }
-
-        $deployment = Authorization::skip(fn () => $dbForProject->getDocument('deployments', $function->getAttribute('deployment', '')));
-
-        if ($deployment->getAttribute('resourceId') !== $function->getId()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        if ($deployment->isEmpty()) {
-            throw new Exception(Exception::DEPLOYMENT_NOT_FOUND, 'Deployment not found. Create a deployment before trying to execute a function');
-        }
-
-        /** Check if build has completed */
-        $build = Authorization::skip(fn () => $dbForProject->getDocument('builds', $deployment->getAttribute('buildId', '')));
-        if ($build->isEmpty()) {
-            throw new Exception(Exception::BUILD_NOT_FOUND);
-        }
-
-        if ($build->getAttribute('status') !== 'ready') {
-            throw new Exception(Exception::BUILD_NOT_READY);
-        }
-
-        $validator = new Authorization('execute');
-
-        if (!$validator->isValid($function->getAttribute('execute'))) { // Check if user has write access to execute function
-            throw new Exception(Exception::USER_UNAUTHORIZED, $validator->getDescription());
-        }
-
-        $jwt = ''; // initialize
-        if (!$user->isEmpty()) { // If userId exists, generate a JWT for function
-            $sessions = $user->getAttribute('sessions', []);
-            $current = new Document();
-
-            foreach ($sessions as $session) {
-                /** @var Utopia\Database\Document $session */
-                if ($session->getAttribute('secret') == Auth::hash(Auth::$secret)) { // If current session delete the cookies too
-                    $current = $session;
-                }
-            }
-
-            if (!$current->isEmpty()) {
-                $jwtExpiry = $function->getAttribute('timeout', 900);
-                $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-                $jwt = $jwtObj->encode([
-                    'userId' => $user->getId(),
-                    'sessionId' => $current->getId(),
-                ]);
-            }
-        }
-
-        $jwtExpiry = $function->getAttribute('timeout', 900);
-        $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
-        $apiKey = $jwtObj->encode([
-            'projectId' => $project->getId(),
-            'scopes' => $function->getAttribute('scopes', [])
-        ]);
-
-        $headers['x-appwrite-key'] = API_KEY_DYNAMIC . '_' . $apiKey;
-        $headers['x-appwrite-trigger'] = 'http';
-        $headers['x-appwrite-user-id'] = $user->getId() ?? '';
-        $headers['x-appwrite-user-jwt'] = $jwt ?? '';
-        $headers['x-appwrite-country-code'] = '';
-        $headers['x-appwrite-continent-code'] = '';
-        $headers['x-appwrite-continent-eu'] = 'false';
-
-        $ip = $headers['x-real-ip'] ?? '';
-        if (!empty($ip)) {
-            $record = $geodb->get($ip);
-
-            if ($record) {
-                $eu = Config::getParam('locale-eu');
-
-                $headers['x-appwrite-country-code'] = $record['country']['iso_code'] ?? '';
-                $headers['x-appwrite-continent-code'] = $record['continent']['code'] ?? '';
-                $headers['x-appwrite-continent-eu'] = (\in_array($record['country']['iso_code'], $eu)) ? 'true' : 'false';
-            }
-        }
-
-        $headersFiltered = [];
-        foreach ($headers as $key => $value) {
-            if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_REQUEST)) {
-                $headersFiltered[] = ['name' => $key, 'value' => $value];
-            }
-        }
-
-        $executionId = ID::unique();
-
-        $status = $async ? 'waiting' : 'processing';
-
-        if (!is_null($scheduledAt)) {
-            $status = 'scheduled';
-        }
-
-        $execution = new Document([
-            '$id' => $executionId,
-            '$permissions' => !$user->isEmpty() ? [Permission::read(Role::user($user->getId()))] : [],
-            'resourceInternalId' => $function->getInternalId(),
-            'resourceId' => $function->getId(),
-            'resourceType' => 'functions',
-            'deploymentInternalId' => $deployment->getInternalId(),
-            'deploymentId' => $deployment->getId(),
-            'trigger' => (!is_null($scheduledAt)) ? 'schedule' : 'http',
-            'status' => $status, // waiting / processing / completed / failed / scheduled
-            'responseStatusCode' => 0,
-            'responseHeaders' => [],
-            'requestPath' => $path,
-            'requestMethod' => $method,
-            'requestHeaders' => $headersFiltered,
-            'errors' => '',
-            'logs' => '',
-            'duration' => 0.0,
-            'search' => implode(' ', [$functionId, $executionId]),
-        ]);
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('executionId', $execution->getId())
-            ->setContext('function', $function);
-
-        if ($async) {
-            if (is_null($scheduledAt)) {
-                $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
-                $queueForFunctions
-                    ->setType('http')
-                    ->setExecution($execution)
-                    ->setFunction($function)
-                    ->setBody($body)
-                    ->setHeaders($headers)
-                    ->setPath($path)
-                    ->setMethod($method)
-                    ->setJWT($jwt)
-                    ->setProject($project)
-                    ->setUser($user)
-                    ->setParam('functionId', $function->getId())
-                    ->setParam('executionId', $execution->getId())
-                    ->trigger();
-            } else {
-                $data = [
-                    'headers' => $headers,
-                    'path' => $path,
-                    'method' => $method,
-                    'body' => $body,
-                    'userId' => $user->getId()
-                ];
-
-                $schedule = $dbForPlatform->createDocument('schedules', new Document([
-                    'region' => System::getEnv('_APP_REGION', 'default'),
-                    'resourceType' => ScheduleExecutions::getSupportedResource(),
-                    'resourceId' => $execution->getId(),
-                    'resourceInternalId' => $execution->getInternalId(),
-                    'resourceUpdatedAt' => DateTime::now(),
-                    'projectId' => $project->getId(),
-                    'schedule' => $scheduledAt,
-                    'data' => $data,
-                    'active' => true,
-                ]));
-
-                $execution = $execution
-                    ->setAttribute('scheduleId', $schedule->getId())
-                    ->setAttribute('scheduleInternalId', $schedule->getInternalId())
-                    ->setAttribute('scheduledAt', $scheduledAt);
-
-                $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
-            }
-
-            return $response
-                ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
-                ->dynamic($execution, Response::MODEL_EXECUTION);
-        }
-
-        $durationStart = \microtime(true);
-
-        $vars = [];
-
-        // V2 vars
-        if ($version === 'v2') {
-            $vars = \array_merge($vars, [
-                'APPWRITE_FUNCTION_TRIGGER' => $headers['x-appwrite-trigger'] ?? '',
-                'APPWRITE_FUNCTION_DATA' => $body ?? '',
-                'APPWRITE_FUNCTION_USER_ID' => $headers['x-appwrite-user-id'] ?? '',
-                'APPWRITE_FUNCTION_JWT' => $headers['x-appwrite-user-jwt'] ?? ''
-            ]);
-        }
-
-        // Shared vars
-        foreach ($function->getAttribute('varsProject', []) as $var) {
-            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
-        }
-
-        // Function vars
-        foreach ($function->getAttribute('vars', []) as $var) {
-            $vars[$var->getAttribute('key')] = $var->getAttribute('value', '');
-        }
-
-        $protocol = System::getEnv('_APP_OPTIONS_FORCE_HTTPS') == 'disabled' ? 'http' : 'https';
-        $hostname = System::getEnv('_APP_DOMAIN');
-        $endpoint = $protocol . '://' . $hostname . "/v1";
-
-        // Appwrite vars
-        $vars = \array_merge($vars, [
-            'APPWRITE_FUNCTION_API_ENDPOINT' => $endpoint,
-            'APPWRITE_FUNCTION_ID' => $functionId,
-            'APPWRITE_FUNCTION_NAME' => $function->getAttribute('name'),
-            'APPWRITE_FUNCTION_DEPLOYMENT' => $deployment->getId(),
-            'APPWRITE_FUNCTION_PROJECT_ID' => $project->getId(),
-            'APPWRITE_FUNCTION_RUNTIME_NAME' => $runtime['name'] ?? '',
-            'APPWRITE_FUNCTION_RUNTIME_VERSION' => $runtime['version'] ?? '',
-            'APPWRITE_FUNCTION_CPUS' => $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-            'APPWRITE_FUNCTION_MEMORY' => $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
-            'APPWRITE_VERSION' => APP_VERSION_STABLE,
-            'APPWRITE_REGION' => $project->getAttribute('region'),
-            'APPWRITE_DEPLOYMENT_TYPE' => $deployment->getAttribute('type', ''),
-            'APPWRITE_VCS_REPOSITORY_ID' => $deployment->getAttribute('providerRepositoryId', ''),
-            'APPWRITE_VCS_REPOSITORY_NAME' => $deployment->getAttribute('providerRepositoryName', ''),
-            'APPWRITE_VCS_REPOSITORY_OWNER' => $deployment->getAttribute('providerRepositoryOwner', ''),
-            'APPWRITE_VCS_REPOSITORY_URL' => $deployment->getAttribute('providerRepositoryUrl', ''),
-            'APPWRITE_VCS_REPOSITORY_BRANCH' => $deployment->getAttribute('providerBranch', ''),
-            'APPWRITE_VCS_REPOSITORY_BRANCH_URL' => $deployment->getAttribute('providerBranchUrl', ''),
-            'APPWRITE_VCS_COMMIT_HASH' => $deployment->getAttribute('providerCommitHash', ''),
-            'APPWRITE_VCS_COMMIT_MESSAGE' => $deployment->getAttribute('providerCommitMessage', ''),
-            'APPWRITE_VCS_COMMIT_URL' => $deployment->getAttribute('providerCommitUrl', ''),
-            'APPWRITE_VCS_COMMIT_AUTHOR_NAME' => $deployment->getAttribute('providerCommitAuthor', ''),
-            'APPWRITE_VCS_COMMIT_AUTHOR_URL' => $deployment->getAttribute('providerCommitAuthorUrl', ''),
-            'APPWRITE_VCS_ROOT_DIRECTORY' => $deployment->getAttribute('providerRootDirectory', ''),
-        ]);
-
-        /** Execute function */
-        $executor = new Executor(System::getEnv('_APP_EXECUTOR_HOST'));
-        try {
-            $version = $function->getAttribute('version', 'v2');
-            $command = $runtime['startCommand'];
-            $command = $version === 'v2' ? '' : 'cp /tmp/code.tar.gz /mnt/code/code.tar.gz && nohup helpers/start.sh "' . $command . '"';
-            $executionResponse = $executor->createExecution(
-                projectId: $project->getId(),
-                deploymentId: $deployment->getId(),
-                body: \strlen($body) > 0 ? $body : null,
-                variables: $vars,
-                timeout: $function->getAttribute('timeout', 0),
-                image: $runtime['image'],
-                source: $build->getAttribute('path', ''),
-                entrypoint: $deployment->getAttribute('entrypoint', ''),
-                version: $version,
-                path: $path,
-                method: $method,
-                headers: $headers,
-                runtimeEntrypoint: $command,
-                cpus: $spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT,
-                memory: $spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT,
-                logging: $function->getAttribute('logging', true),
-                requestTimeout: 30
-            );
-
-            $headersFiltered = [];
-            foreach ($executionResponse['headers'] as $key => $value) {
-                if (\in_array(\strtolower($key), FUNCTION_ALLOWLIST_HEADERS_RESPONSE)) {
-                    $headersFiltered[] = ['name' => $key, 'value' => $value];
-                }
-            }
-
-            /** Update execution status */
-            $status = $executionResponse['statusCode'] >= 500 ? 'failed' : 'completed';
-            $execution->setAttribute('status', $status);
-            $execution->setAttribute('responseStatusCode', $executionResponse['statusCode']);
-            $execution->setAttribute('responseHeaders', $headersFiltered);
-            $execution->setAttribute('logs', $executionResponse['logs']);
-            $execution->setAttribute('errors', $executionResponse['errors']);
-            $execution->setAttribute('duration', $executionResponse['duration']);
-        } catch (\Throwable $th) {
-            $durationEnd = \microtime(true);
-
-            $execution
-                ->setAttribute('duration', $durationEnd - $durationStart)
-                ->setAttribute('status', 'failed')
-                ->setAttribute('responseStatusCode', 500)
-                ->setAttribute('errors', $th->getMessage() . '\nError Code: ' . $th->getCode());
-            Console::error($th->getMessage());
-
-            if ($th instanceof AppwriteException) {
-                throw $th;
-            }
-        } finally {
-            $queueForStatsUsage
-                ->addMetric(METRIC_EXECUTIONS, 1)
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
-                ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
-                ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
-                ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_COMPUTE_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_COMPUTE_CPUS_DEFAULT)))
-            ;
-
-            $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
-        }
-
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('logs', '');
-            $execution->setAttribute('errors', '');
-        }
-
-        $headers = [];
-        foreach (($executionResponse['headers'] ?? []) as $key => $value) {
-            $headers[] = ['name' => $key, 'value' => $value];
-        }
-
-        $execution->setAttribute('responseBody', $executionResponse['body'] ?? '');
-        $execution->setAttribute('responseHeaders', $headers);
-
-        $acceptTypes = \explode(', ', $request->getHeader('accept'));
-        foreach ($acceptTypes as $acceptType) {
-            if (\str_starts_with($acceptType, 'application/json') || \str_starts_with($acceptType, 'application/*')) {
-                $response->setContentType(Response::CONTENT_TYPE_JSON);
-                break;
-            } elseif (\str_starts_with($acceptType, 'multipart/form-data') || \str_starts_with($acceptType, 'multipart/*')) {
-                $response->setContentType(Response::CONTENT_TYPE_MULTIPART);
-                break;
-            }
-        }
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($execution, Response::MODEL_EXECUTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Executions/Delete.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Executions;
-
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\Platform\Tasks\ScheduleExecutions;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Delete extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'deleteExecution';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/functions/:functionId/executions/:executionId')
-            ->desc('Delete execution')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'execution.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('event', 'functions.[functionId].executions.[executionId].delete')
-            ->label('audits.event', 'executions.delete')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'deleteExecution',
-                description: <<<EOT
-                Delete a function execution by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::NONE
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('executionId', '', new UID(), 'Execution ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->inject('queueForEvents')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $executionId, Response $response, Database $dbForProject, Database $dbForPlatform, Event $queueForEvents)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $execution = $dbForProject->getDocument('executions', $executionId);
-        if ($execution->isEmpty()) {
-            throw new Exception(Exception::EXECUTION_NOT_FOUND);
-        }
-
-        if ($execution->getAttribute('resourceType') !== 'functions' && $execution->getAttribute('resourceInternalId') !== $function->getInternalId()) {
-            throw new Exception(Exception::EXECUTION_NOT_FOUND);
-        }
-        $status = $execution->getAttribute('status');
-
-        if (!in_array($status, ['completed', 'failed', 'scheduled'])) {
-            throw new Exception(Exception::EXECUTION_IN_PROGRESS);
-        }
-
-        if (!$dbForProject->deleteDocument('executions', $execution->getId())) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove execution from DB');
-        }
-
-        if ($status === 'scheduled') {
-            $schedule = $dbForPlatform->findOne('schedules', [
-                Query::equal('resourceId', [$execution->getId()]),
-                Query::equal('resourceType', [ScheduleExecutions::getSupportedResource()]),
-                Query::equal('active', [true]),
-            ]);
-
-            if (!$schedule->isEmpty()) {
-                $schedule
-                    ->setAttribute('resourceUpdatedAt', DateTime::now())
-                    ->setAttribute('active', false);
-
-                Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-            }
-        }
-
-        $queueForEvents
-            ->setParam('functionId', $function->getId())
-            ->setParam('executionId', $execution->getId())
-            ->setPayload($response->output($execution, Response::MODEL_EXECUTION));
-
-        $response->noContent();
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Executions/Get.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Executions;
-
-use Appwrite\Auth\Auth;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getExecution';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/executions/:executionId')
-            ->desc('Get execution')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'execution.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getExecution',
-                description: <<<EOT
-                Get a function execution log by its unique ID.
-                EOT,
-                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_EXECUTION,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('executionId', '', new UID(), 'Execution ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $executionId, Response $response, Database $dbForProject)
-    {
-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-
-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-
-        if ($function->isEmpty() || (!$function->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $execution = $dbForProject->getDocument('executions', $executionId);
-
-        if ($execution->getAttribute('resourceType') !== 'functions' && $execution->getAttribute('resourceInternalId') !== $function->getInternalId()) {
-            throw new Exception(Exception::EXECUTION_NOT_FOUND);
-        }
-
-        if ($execution->isEmpty()) {
-            throw new Exception(Exception::EXECUTION_NOT_FOUND);
-        }
-
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $execution->setAttribute('logs', '');
-            $execution->setAttribute('errors', '');
-        }
-
-        $response->dynamic($execution, Response::MODEL_EXECUTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Executions/XList.php

@@ -1,135 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Executions;
-
-use Appwrite\Auth\Auth;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\Queries\Executions;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Text;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listExecutions';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/executions')
-            ->desc('List executions')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'execution.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listExecutions',
-                description: <<<EOT
-                Get a list of all the current user function execution logs. You can use the query params to filter your results.
-                EOT,
-                auth: [AuthType::SESSION, AuthType::KEY, AuthType::JWT],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_EXECUTION_LIST,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('queries', [], new Executions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Executions::ALLOWED_ATTRIBUTES), true)
-            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, array $queries, string $search, Response $response, Database $dbForProject)
-    {
-        $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
-
-        $isAPIKey = Auth::isAppUser(Authorization::getRoles());
-        $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
-
-        if ($function->isEmpty() || (!$function->getAttribute('enabled') && !$isAPIKey && !$isPrivilegedUser)) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        if (!empty($search)) {
-            $queries[] = Query::search('search', $search);
-        }
-
-        // Set internal queries
-        $queries[] = Query::equal('resourceInternalId', [$function->getInternalId()]);
-        $queries[] = Query::equal('resourceType', ['functions']);
-
-        /**
-         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
-         */
-        $cursor = \array_filter($queries, function ($query) {
-            return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]);
-        });
-        $cursor = reset($cursor);
-        if ($cursor) {
-            /** @var Query $cursor */
-
-            $validator = new Cursor();
-            if (!$validator->isValid($cursor)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-
-            $executionId = $cursor->getValue();
-            $cursorDocument = $dbForProject->getDocument('executions', $executionId);
-
-            if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Execution '{$executionId}' for the 'cursor' value not found.");
-            }
-
-            $cursor->setValue($cursorDocument);
-        }
-
-        $filterQueries = Query::groupByType($queries)['filters'];
-
-        $results = $dbForProject->find('executions', $queries);
-        $total = $dbForProject->count('executions', $filterQueries, APP_LIMIT_COUNT);
-
-        $roles = Authorization::getRoles();
-        $isPrivilegedUser = Auth::isPrivilegedUser($roles);
-        $isAppUser = Auth::isAppUser($roles);
-        if (!$isPrivilegedUser && !$isAppUser) {
-            $results = array_map(function ($execution) {
-                $execution->setAttribute('logs', '');
-                $execution->setAttribute('errors', '');
-                return $execution;
-            }, $results);
-        }
-
-        $response->dynamic(new Document([
-            'executions' => $results,
-            'total' => $total,
-        ]), Response::MODEL_EXECUTION_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Functions/Create.php

@@ -1,236 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Functions;
-
-use Appwrite\Event\Event;
-use Appwrite\Event\Validator\FunctionEvent;
-use Appwrite\Extend\Exception;
-use Appwrite\Functions\Validator\RuntimeSpecification;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Task\Validator\Cron;
-use Appwrite\Utopia\Database\Validator\CustomId;
-use Appwrite\Utopia\Response;
-use Utopia\Abuse\Abuse;
-use Utopia\App;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Roles;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-
-class Create extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createFunction';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions')
-            ->desc('Create function')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].create')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'function.create')
-            ->label('audits.resource', 'function/{response.$id}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'create',
-                description: <<<EOT
-                Create a new function. You can pass a list of [permissions](https://appwrite.io/docs/permissions) to allow different project users or team with access to execute the function using the client API.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_CREATED,
-                        model: Response::MODEL_FUNCTION,
-                    )
-                ],
-            ))
-            ->param('functionId', '', new CustomId(), 'Function ID. Choose a custom ID or generate a random ID with `ID.unique()`. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
-            ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-            ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.')
-            ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of role strings with execution permissions. By default no user is granted with any execute permissions. [learn more about roles](https://appwrite.io/docs/permissions#permission-roles). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
-            ->param('events', [], new ArrayList(new FunctionEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
-            ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
-            ->param('timeout', 15, new Range(1, (int) System::getEnv('_APP_COMPUTE_TIMEOUT', 900)), 'Function maximum execution time in seconds.', true)
-            ->param('enabled', true, new Boolean(), 'Is function enabled? When set to \'disabled\', users cannot access the function but Server SDKs with and API key can still access the function. No data is lost when this is toggled.', true)
-            ->param('logging', true, new Boolean(), 'Whether executions will be logged. When set to false, executions will not be logged, but will reduce resource used by your Appwrite project.', true)
-            ->param('entrypoint', '', new Text(1028, 0), 'Entrypoint File. This path is relative to the "providerRootDirectory".', true)
-            ->param('commands', '', new Text(8192, 0), 'Build Commands.', true)
-            ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of scopes allowed for API key auto-generated for every execution. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.', true)
-            ->param('installationId', '', new Text(128, 0), 'Appwrite Installation ID for VCS (Version Control System) deployment.', true)
-            ->param('providerRepositoryId', '', new Text(128, 0), 'Repository ID of the repo linked to the function.', true)
-            ->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', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
-                $plan,
-                Config::getParam('runtime-specifications', []),
-                App::getEnv('_APP_COMPUTE_CPUS', APP_COMPUTE_CPUS_DEFAULT),
-                App::getEnv('_APP_COMPUTE_MEMORY', APP_COMPUTE_MEMORY_DEFAULT)
-            ), 'Runtime specification for the function and builds.', true, ['plan'])
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('timelimit')
-            ->inject('project')
-            ->inject('queueForEvents')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, array $scopes, string $installationId, string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $specification, Response $response, Database $dbForProject, callable $timelimit, Document $project, Event $queueForEvents, Database $dbForPlatform)
-    {
-
-        // Temporary abuse check
-        $abuseCheck = function () use ($project, $timelimit, $response) {
-            $abuseKey = "projectId:{projectId},url:{url}";
-            $abuseLimit = App::getEnv('_APP_FUNCTIONS_CREATION_ABUSE_LIMIT', 50);
-            $abuseTime = 86400; // 1 day
-
-            $timeLimit = $timelimit($abuseKey, $abuseLimit, $abuseTime);
-            $timeLimit
-                ->setParam('{projectId}', $project->getId())
-                ->setParam('{url}', '/v1/functions');
-
-            $abuse = new Abuse($timeLimit);
-            $remaining = $timeLimit->remaining();
-            $limit = $timeLimit->limit();
-            $time = $timeLimit->time() + $abuseTime;
-
-            $response
-                ->addHeader('X-RateLimit-Limit', $limit)
-                ->addHeader('X-RateLimit-Remaining', $remaining)
-                ->addHeader('X-RateLimit-Reset', $time);
-
-            $enabled = System::getEnv('_APP_OPTIONS_ABUSE', 'enabled') !== 'disabled';
-            if ($enabled && $abuse->check()) {
-                throw new Exception(Exception::GENERAL_RATE_LIMIT_EXCEEDED);
-            }
-        };
-
-        $abuseCheck();
-
-        $functionId = ($functionId == 'unique()') ? ID::unique() : $functionId;
-
-        $allowList = \array_filter(\explode(',', System::getEnv('_APP_FUNCTIONS_RUNTIMES', '')));
-
-        if (!empty($allowList) && !\in_array($runtime, $allowList)) {
-            throw new Exception(Exception::FUNCTION_RUNTIME_UNSUPPORTED, 'Runtime "' . $runtime . '" is not supported');
-        }
-
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
-
-        if (!empty($installationId) && $installation->isEmpty()) {
-            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
-        }
-
-        if (!empty($providerRepositoryId) && (empty($installationId) || empty($providerBranch))) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'When connecting to VCS (Version Control System), you need to provide "installationId" and "providerBranch".');
-        }
-
-        $function = $dbForProject->createDocument('functions', new Document([
-            '$id' => $functionId,
-            'execute' => $execute,
-            'enabled' => $enabled,
-            'live' => true,
-            'logging' => $logging,
-            'name' => $name,
-            'runtime' => $runtime,
-            'deploymentInternalId' => '',
-            'deployment' => '',
-            'events' => $events,
-            'schedule' => $schedule,
-            'scheduleInternalId' => '',
-            'scheduleId' => '',
-            'timeout' => $timeout,
-            'entrypoint' => $entrypoint,
-            'commands' => $commands,
-            'scopes' => $scopes,
-            'search' => implode(' ', [$functionId, $name, $runtime]),
-            'version' => 'v4',
-            'installationId' => $installation->getId(),
-            'installationInternalId' => $installation->getInternalId(),
-            'providerRepositoryId' => $providerRepositoryId,
-            'repositoryId' => '',
-            'repositoryInternalId' => '',
-            'providerBranch' => $providerBranch,
-            'providerRootDirectory' => $providerRootDirectory,
-            'providerSilentMode' => $providerSilentMode,
-            'specification' => $specification
-        ]));
-
-        $schedule = Authorization::skip(
-            fn () => $dbForPlatform->createDocument('schedules', new Document([
-                'region' => System::getEnv('_APP_REGION', 'default'), // Todo replace with projects region
-                'resourceType' => 'function',
-                'resourceId' => $function->getId(),
-                'resourceInternalId' => $function->getInternalId(),
-                'resourceUpdatedAt' => DateTime::now(),
-                'projectId' => $project->getId(),
-                'schedule'  => $function->getAttribute('schedule'),
-                'active' => false,
-            ]))
-        );
-
-        $function->setAttribute('scheduleId', $schedule->getId());
-        $function->setAttribute('scheduleInternalId', $schedule->getInternalId());
-
-        // Git connect logic
-        if (!empty($providerRepositoryId)) {
-            $teamId = $project->getAttribute('teamId', '');
-
-            $repository = $dbForPlatform->createDocument('repositories', new Document([
-                '$id' => ID::unique(),
-                '$permissions' => [
-                    Permission::read(Role::team(ID::custom($teamId))),
-                    Permission::update(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::update(Role::team(ID::custom($teamId), 'developer')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'developer')),
-                ],
-                'installationId' => $installation->getId(),
-                'installationInternalId' => $installation->getInternalId(),
-                'projectId' => $project->getId(),
-                'projectInternalId' => $project->getInternalId(),
-                'providerRepositoryId' => $providerRepositoryId,
-                'resourceId' => $function->getId(),
-                'resourceInternalId' => $function->getInternalId(),
-                'resourceType' => 'function',
-                'providerPullRequestIds' => []
-            ]));
-
-            $function->setAttribute('repositoryId', $repository->getId());
-            $function->setAttribute('repositoryInternalId', $repository->getInternalId());
-        }
-
-        $function = $dbForProject->updateDocument('functions', $function->getId(), $function);
-
-        $queueForEvents->setParam('functionId', $function->getId());
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($function, Response::MODEL_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Functions/Delete.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Functions;
-
-use Appwrite\Event\Delete as DeleteEvent;
-use Appwrite\Event\Event;
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Delete extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'deleteFunction';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/functions/:functionId')
-            ->desc('Delete function')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('event', 'functions.[functionId].delete')
-            ->label('audits.event', 'function.delete')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'delete',
-                description: <<<EOT
-                Delete a function by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::NONE
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('queueForDeletes')
-            ->inject('queueForEvents')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, Response $response, Database $dbForProject, DeleteEvent $queueForDeletes, Event $queueForEvents, Database $dbForPlatform)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        if (!$dbForProject->deleteDocument('functions', $function->getId())) {
-            throw new Exception(Exception::GENERAL_SERVER_ERROR, 'Failed to remove function from DB');
-        }
-
-        // Inform scheduler to no longer run function
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('active', false);
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $queueForDeletes
-            ->setType(DELETE_TYPE_DOCUMENT)
-            ->setDocument($function);
-
-        $queueForEvents->setParam('functionId', $function->getId());
-
-        $response->noContent();
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Functions/Get.php

@@ -1,64 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Functions;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getFunction';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId')
-            ->desc('Get function')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'get',
-                description: <<<EOT
-                Get a function by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_FUNCTION,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $response->dynamic($function, Response::MODEL_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Functions/Update.php

@@ -1,266 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Functions;
-
-use Appwrite\Event\Build;
-use Appwrite\Event\Event;
-use Appwrite\Event\Validator\FunctionEvent;
-use Appwrite\Extend\Exception;
-use Appwrite\Functions\Validator\RuntimeSpecification;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Task\Validator\Cron;
-use Appwrite\Utopia\Response;
-use Executor\Executor;
-use Utopia\App;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\Roles;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Swoole\Request;
-use Utopia\System\System;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Nullable;
-use Utopia\Validator\Range;
-use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
-use Utopia\VCS\Adapter\Git\GitHub;
-
-class Update extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'updateFunction';
-    }
-
-    public function __construct()
-    {
-        $this->setHttpMethod(Action::HTTP_REQUEST_METHOD_PUT)
-            ->setHttpPath('/v1/functions/:functionId')
-            ->desc('Update function')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('event', 'functions.[functionId].update')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'function.update')
-            ->label('audits.resource', 'function/{response.$id}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'update',
-                description: <<<EOT
-                Update function by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_FUNCTION,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
-            ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.', true)
-            ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of role strings with execution permissions. By default no user is granted with any execute permissions. [learn more about roles](https://appwrite.io/docs/permissions#permission-roles). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
-            ->param('events', [], new ArrayList(new FunctionEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
-            ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
-            ->param('timeout', 15, new Range(1, (int) System::getEnv('_APP_COMPUTE_TIMEOUT', 900)), 'Maximum execution time in seconds.', true)
-            ->param('enabled', true, new Boolean(), 'Is function enabled? When set to \'disabled\', users cannot access the function but Server SDKs with and API key can still access the function. No data is lost when this is toggled.', true)
-            ->param('logging', true, new Boolean(), 'Whether executions will be logged. When set to false, executions will not be logged, but will reduce resource used by your Appwrite project.', true)
-            ->param('entrypoint', '', new Text(1028, 0), 'Entrypoint File. This path is relative to the "providerRootDirectory".', true)
-            ->param('commands', '', new Text(8192, 0), 'Build Commands.', true)
-            ->param('scopes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of scopes allowed for API Key auto-generated for every execution. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' scopes are allowed.', true)
-            ->param('installationId', '', new Text(128, 0), 'Appwrite Installation ID for VCS (Version Controle System) deployment.', true)
-            ->param('providerRepositoryId', null, new Nullable(new Text(128, 0)), 'Repository ID of the repo linked to the function', true)
-            ->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', APP_COMPUTE_SPECIFICATION_DEFAULT, fn (array $plan) => new RuntimeSpecification(
-                $plan,
-                Config::getParam('runtime-specifications', []),
-                App::getEnv('_APP_COMPUTE_CPUS', APP_COMPUTE_CPUS_DEFAULT),
-                App::getEnv('_APP_COMPUTE_MEMORY', APP_COMPUTE_MEMORY_DEFAULT)
-            ), 'Runtime specification for the function and builds.', true, ['plan'])
-            ->inject('request')
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('project')
-            ->inject('queueForEvents')
-            ->inject('queueForBuilds')
-            ->inject('dbForPlatform')
-            ->inject('gitHub')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $name, string $runtime, array $execute, array $events, string $schedule, int $timeout, bool $enabled, bool $logging, string $entrypoint, string $commands, array $scopes, string $installationId, ?string $providerRepositoryId, string $providerBranch, bool $providerSilentMode, string $providerRootDirectory, string $specification, Request $request, Response $response, Database $dbForProject, Document $project, Event $queueForEvents, Build $queueForBuilds, Database $dbForPlatform, GitHub $github)
-    {
-        // TODO: If only branch changes, re-deploy
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $installation = $dbForPlatform->getDocument('installations', $installationId);
-
-        if (!empty($installationId) && $installation->isEmpty()) {
-            throw new Exception(Exception::INSTALLATION_NOT_FOUND);
-        }
-
-        if (!empty($providerRepositoryId) && (empty($installationId) || empty($providerBranch))) {
-            throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'When connecting to VCS (Version Control System), you need to provide "installationId" and "providerBranch".');
-        }
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        if (empty($runtime)) {
-            $runtime = $function->getAttribute('runtime');
-        }
-
-        $enabled ??= $function->getAttribute('enabled', true);
-
-        $repositoryId = $function->getAttribute('repositoryId', '');
-        $repositoryInternalId = $function->getAttribute('repositoryInternalId', '');
-
-        if (empty($entrypoint)) {
-            $entrypoint = $function->getAttribute('entrypoint', '');
-        }
-
-        $isConnected = !empty($function->getAttribute('providerRepositoryId', ''));
-
-        // Git disconnect logic. Disconnecting only when providerRepositoryId is empty, allowing for continue updates without disconnecting git
-        if ($isConnected && ($providerRepositoryId !== null && empty($providerRepositoryId))) {
-            $repositories = $dbForPlatform->find('repositories', [
-                Query::equal('projectInternalId', [$project->getInternalId()]),
-                Query::equal('resourceInternalId', [$function->getInternalId()]),
-                Query::equal('resourceType', ['function']),
-                Query::limit(100),
-            ]);
-
-            foreach ($repositories as $repository) {
-                $dbForPlatform->deleteDocument('repositories', $repository->getId());
-            }
-
-            $providerRepositoryId = '';
-            $installationId = '';
-            $providerBranch = '';
-            $providerRootDirectory = '';
-            $providerSilentMode = true;
-            $repositoryId = '';
-            $repositoryInternalId = '';
-        }
-
-        // Git connect logic
-        if (!$isConnected && !empty($providerRepositoryId)) {
-            $teamId = $project->getAttribute('teamId', '');
-
-            $repository = $dbForPlatform->createDocument('repositories', new Document([
-                '$id' => ID::unique(),
-                '$permissions' => [
-                    Permission::read(Role::team(ID::custom($teamId))),
-                    Permission::update(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::update(Role::team(ID::custom($teamId), 'developer')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'owner')),
-                    Permission::delete(Role::team(ID::custom($teamId), 'developer')),
-                ],
-                'installationId' => $installation->getId(),
-                'installationInternalId' => $installation->getInternalId(),
-                'projectId' => $project->getId(),
-                'projectInternalId' => $project->getInternalId(),
-                'providerRepositoryId' => $providerRepositoryId,
-                'resourceId' => $function->getId(),
-                'resourceInternalId' => $function->getInternalId(),
-                'resourceType' => 'function',
-                'providerPullRequestIds' => []
-            ]));
-
-            $repositoryId = $repository->getId();
-            $repositoryInternalId = $repository->getInternalId();
-        }
-
-        $live = true;
-
-        if (
-            $function->getAttribute('name') !== $name ||
-            $function->getAttribute('entrypoint') !== $entrypoint ||
-            $function->getAttribute('commands') !== $commands ||
-            $function->getAttribute('providerRootDirectory') !== $providerRootDirectory ||
-            $function->getAttribute('runtime') !== $runtime
-        ) {
-            $live = false;
-        }
-
-        $spec = Config::getParam('runtime-specifications')[$specification] ?? [];
-
-        // Enforce Cold Start if spec limits change.
-        if ($function->getAttribute('specification') !== $specification && !empty($function->getAttribute('deployment'))) {
-            $executor = new Executor(App::getEnv('_APP_EXECUTOR_HOST'));
-            try {
-                $executor->deleteRuntime($project->getId(), $function->getAttribute('deployment'));
-            } catch (\Throwable $th) {
-                // Don't throw if the deployment doesn't exist
-                if ($th->getCode() !== 404) {
-                    throw $th;
-                }
-            }
-        }
-
-        $function = $dbForProject->updateDocument('functions', $function->getId(), new Document(array_merge($function->getArrayCopy(), [
-            'execute' => $execute,
-            'name' => $name,
-            'runtime' => $runtime,
-            'events' => $events,
-            'schedule' => $schedule,
-            'timeout' => $timeout,
-            'enabled' => $enabled,
-            'live' => $live,
-            'logging' => $logging,
-            'entrypoint' => $entrypoint,
-            'commands' => $commands,
-            'scopes' => $scopes,
-            'installationId' => $installation->getId(),
-            'installationInternalId' => $installation->getInternalId(),
-            'providerRepositoryId' => $providerRepositoryId,
-            'repositoryId' => $repositoryId,
-            'repositoryInternalId' => $repositoryInternalId,
-            'providerBranch' => $providerBranch,
-            'providerRootDirectory' => $providerRootDirectory,
-            'providerSilentMode' => $providerSilentMode,
-            'specification' => $specification,
-            'search' => implode(' ', [$functionId, $name, $runtime]),
-        ])));
-
-        // Redeploy logic
-        if (!$isConnected && !empty($providerRepositoryId)) {
-            $this->redeployVcsFunction($request, $function, $project, $installation, $dbForProject, $queueForBuilds, new Document(), $github, true);
-        }
-
-        // Inform scheduler if function is still active
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $queueForEvents->setParam('functionId', $function->getId());
-
-        $response->dynamic($function, Response::MODEL_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Functions/XList.php

@@ -1,104 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Functions;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Database\Validator\Queries\Functions;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Query\Cursor;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Text;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listFunctions';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions')
-            ->groups(['api', 'functions'])
-            ->desc('List functions')
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'list',
-                description: <<<EOT
-                Get a list of all the project's functions. You can use the query params to filter your results.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_FUNCTION_LIST,
-                    )
-                ]
-            ))
-            ->param('queries', [], new Functions(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Functions::ALLOWED_ATTRIBUTES), true)
-            ->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(array $queries, string $search, Response $response, Database $dbForProject)
-    {
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        if (!empty($search)) {
-            $queries[] = Query::search('search', $search);
-        }
-
-        /**
-         * Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
-         */
-        $cursor = \array_filter($queries, function ($query) {
-            return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]);
-        });
-        $cursor = reset($cursor);
-        if ($cursor) {
-            /** @var Query $cursor */
-
-            $validator = new Cursor();
-            if (!$validator->isValid($cursor)) {
-                throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
-            }
-
-            $functionId = $cursor->getValue();
-            $cursorDocument = $dbForProject->getDocument('functions', $functionId);
-
-            if ($cursorDocument->isEmpty()) {
-                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Function '{$functionId}' for the 'cursor' value not found.");
-            }
-
-            $cursor->setValue($cursorDocument);
-        }
-
-        $filterQueries = Query::groupByType($queries)['filters'];
-
-        $response->dynamic(new Document([
-            'functions' => $dbForProject->find('functions', $queries),
-            'total' => $dbForProject->count('functions', $filterQueries, APP_LIMIT_COUNT),
-        ]), Response::MODEL_FUNCTION_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Runtimes/XList.php

@@ -1,73 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Runtimes;
-
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\System\System;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listRuntimes';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/runtimes')
-            ->groups(['api', 'functions'])
-            ->desc('List runtimes')
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listRuntimes',
-                description: <<<EOT
-                Get a list of all runtimes that are currently active on your instance.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_RUNTIME_LIST,
-                    )
-                ]
-            ))
-            ->inject('response')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(Response $response)
-    {
-        $runtimes = Config::getParam('runtimes');
-
-        $allowList = \array_filter(\explode(',', System::getEnv('_APP_FUNCTIONS_RUNTIMES', '')));
-
-        $allowed = [];
-        foreach ($runtimes as $id => $runtime) {
-            if (!empty($allowList) && !\in_array($id, $allowList)) {
-                continue;
-            }
-
-            $runtime['$id'] = $id;
-            $allowed[] = $runtime;
-        }
-
-        $response->dynamic(new Document([
-            'total' => count($allowed),
-            'runtimes' => $allowed
-        ]), Response::MODEL_RUNTIME_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Specifications/XList.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Specifications;
-
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\System\System;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listFunctionsSpecifications';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/specifications')
-            ->groups(['api', 'functions'])
-            ->desc('List available function runtime specifications')
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listSpecifications',
-                description: <<<EOT
-                List allowed function specifications for this instance.
-                EOT,
-                auth: [AuthType::KEY, AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_SPECIFICATION_LIST,
-                    )
-                ]
-            ))
-            ->inject('response')
-            ->inject('plan')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(Response $response, array $plan)
-    {
-        $allRuntimeSpecs = Config::getParam('runtime-specifications', []);
-
-        $runtimeSpecs = [];
-        foreach ($allRuntimeSpecs as $spec) {
-            $spec['enabled'] = true;
-
-            if (array_key_exists('runtimeSpecifications', $plan)) {
-                $spec['enabled'] = in_array($spec['slug'], $plan['runtimeSpecifications']);
-            }
-
-            // Only add specs that are within the limits set by environment variables
-            if ($spec['cpus'] <= System::getEnv('_APP_COMPUTE_CPUS', 1) && $spec['memory'] <= System::getEnv('_APP_COMPUTE_MEMORY', 512)) {
-                $runtimeSpecs[] = $spec;
-            }
-        }
-
-        $response->dynamic(new Document([
-            'specifications' => $runtimeSpecs,
-            'total' => count($runtimeSpecs)
-        ]), Response::MODEL_SPECIFICATION_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Templates/Get.php

@@ -1,69 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Templates;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Text;
-
-class Get extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getTemplate';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/templates/:templateId')
-            ->desc('Get function template')
-            ->label('scope', 'public')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getTemplate',
-                description: <<<EOT
-                Get a function template using ID. You can use template details in [createFunction](/docs/references/cloud/server-nodejs/functions#create) method.
-                EOT,
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_TEMPLATE_FUNCTION,
-                    )
-                ]
-            ))
-            ->param('templateId', '', new Text(128), 'Template ID.')
-            ->inject('response')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $templateId, Response $response)
-    {
-        $templates = Config::getParam('function-templates', []);
-
-        $filtered = \array_filter($templates, function ($template) use ($templateId) {
-            return $template['id'] === $templateId;
-        });
-
-        $template = array_shift($filtered);
-
-        if (empty($template)) {
-            throw new Exception(Exception::FUNCTION_TEMPLATE_NOT_FOUND);
-        }
-
-        $response->dynamic(new Document($template), Response::MODEL_TEMPLATE_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Templates/XList.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Templates;
-
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\ArrayList;
-use Utopia\Validator\Range;
-use Utopia\Validator\WhiteList;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listTemplates';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/templates')
-            ->desc('List templates')
-            ->label('scope', 'public')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listTemplates',
-                description: <<<EOT
-                List available function templates. You can use template details in [createFunction](/docs/references/cloud/server-nodejs/functions#create) method.
-                EOT,
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_TEMPLATE_FUNCTION_LIST,
-                    )
-                ]
-            ))
-            ->param('runtimes', [], new ArrayList(new WhiteList(array_keys(Config::getParam('runtimes')), true), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of runtimes allowed for filtering function templates. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' runtimes are allowed.', true)
-            ->param('useCases', [], new ArrayList(new WhiteList(['dev-tools','starter','databases','ai','messaging','utilities']), APP_LIMIT_ARRAY_PARAMS_SIZE), 'List of use cases allowed for filtering function templates. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' use cases are allowed.', true)
-            ->param('limit', 25, new Range(1, 5000), 'Limit the number of templates returned in the response. Default limit is 25, and maximum limit is 5000.', true)
-            ->param('offset', 0, new Range(0, 5000), 'Offset the list of returned templates. Maximum offset is 5000.', true)
-            ->inject('response')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(array $runtimes, array $usecases, int $limit, int $offset, Response $response)
-    {
-        $templates = Config::getParam('function-templates', []);
-
-        if (!empty($runtimes)) {
-            $templates = \array_filter($templates, function ($template) use ($runtimes) {
-                return \count(\array_intersect($runtimes, \array_column($template['runtimes'], 'name'))) > 0;
-            });
-        }
-
-        if (!empty($usecases)) {
-            $templates = \array_filter($templates, function ($template) use ($usecases) {
-                return \count(\array_intersect($usecases, $template['useCases'])) > 0;
-            });
-        }
-
-        $responseTemplates = \array_slice($templates, $offset, $limit);
-        $response->dynamic(new Document([
-            'templates' => $responseTemplates,
-            'total' => \count($responseTemplates),
-        ]), Response::MODEL_TEMPLATE_FUNCTION_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Usage/Get.php

@@ -1,149 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Usage;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\WhiteList;
-
-class Get extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getFunctionUsage';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/usage')
-            ->desc('Get function usage')
-            ->groups(['api', 'functions', 'usage'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'getUsage',
-                description: <<<EOT
-                Get usage metrics and statistics for a for a specific function. View statistics including total deployments, builds, executions, storage usage, and compute time. The response includes both current totals and historical data for each metric. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, defaults to 30 days.
-                EOT,
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_USAGE_FUNCTION,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function ID.')
-            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $range, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS),
-            str_replace(['{resourceType}', '{resourceInternalId}'], ['functions', $function->getInternalId()], METRIC_FUNCTION_ID_DEPLOYMENTS_STORAGE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_STORAGE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_COMPUTE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_BUILDS_MB_SECONDS),
-            str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS)
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $result =  $dbForProject->findOne('stats', [
-                    Query::equal('metric', [$metric]),
-                    Query::equal('period', ['inf'])
-                ]);
-
-                $stats[$metric]['total'] = $result['value'] ?? 0;
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('metric', [$metric]),
-                    Query::equal('period', [$period]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric]['data'] = [];
-                foreach ($results as $result) {
-                    $stats[$metric]['data'][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-        foreach ($metrics as $metric) {
-            $usage[$metric]['total'] =  $stats[$metric]['total'];
-            $usage[$metric]['data'] = [];
-            $leap = time() - ($days['limit'] * $days['factor']);
-            while ($leap < time()) {
-                $leap += $days['factor'];
-                $formatDate = date($format, $leap);
-                $usage[$metric]['data'][] = [
-                    'value' => $stats[$metric]['data'][$formatDate]['value'] ?? 0,
-                    'date' => $formatDate,
-                ];
-            }
-        }
-
-        $response->dynamic(new Document([
-            'range' => $range,
-            'deploymentsTotal' => $usage[$metrics[0]]['total'],
-            'deploymentsStorageTotal' => $usage[$metrics[1]]['total'],
-            'buildsTotal' => $usage[$metrics[2]]['total'],
-            'buildsStorageTotal' => $usage[$metrics[3]]['total'],
-            'buildsTimeTotal' => $usage[$metrics[4]]['total'],
-            'executionsTotal' => $usage[$metrics[5]]['total'],
-            'executionsTimeTotal' => $usage[$metrics[6]]['total'],
-            'deployments' => $usage[$metrics[0]]['data'],
-            'deploymentsStorage' => $usage[$metrics[1]]['data'],
-            'builds' => $usage[$metrics[2]]['data'],
-            'buildsStorage' => $usage[$metrics[3]]['data'],
-            'buildsTime' => $usage[$metrics[4]]['data'],
-            'executions' => $usage[$metrics[5]]['data'],
-            'executionsTime' => $usage[$metrics[6]]['data'],
-            'buildsMbSecondsTotal' => $usage[$metrics[7]]['total'],
-            'buildsMbSeconds' => $usage[$metrics[7]]['data'],
-            'executionsMbSeconds' => $usage[$metrics[8]]['data'],
-            'executionsMbSecondsTotal' => $usage[$metrics[8]]['total']
-        ]), Response::MODEL_USAGE_FUNCTION);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Usage/XList.php

@@ -1,142 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Usage;
-
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Config\Config;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\WhiteList;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getFunctionsUsage';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/usage')
-            ->desc('Get functions usage')
-            ->groups(['api', 'functions', 'usage'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'listUsage',
-                description: <<<EOT
-                Get usage metrics and statistics for all functions in the project. View statistics including total deployments, builds, logs, storage usage, and compute time. The response includes both current totals and historical data for each metric. Use the optional range parameter to specify the time window for historical data: 24h (last 24 hours), 30d (last 30 days), or 90d (last 90 days). If not specified, defaults to 30 days.
-                EOT,
-                auth: [AuthType::ADMIN],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_USAGE_FUNCTIONS,
-                    )
-                ]
-            ))
-            ->param('range', '30d', new WhiteList(['24h', '30d', '90d']), 'Date range.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $range, Response $response, Database $dbForProject)
-    {
-        $periods = Config::getParam('usage', []);
-        $stats = $usage = [];
-        $days = $periods[$range];
-        $metrics = [
-            METRIC_FUNCTIONS,
-            METRIC_DEPLOYMENTS,
-            METRIC_DEPLOYMENTS_STORAGE,
-            METRIC_BUILDS,
-            METRIC_BUILDS_STORAGE,
-            METRIC_BUILDS_COMPUTE,
-            METRIC_EXECUTIONS,
-            METRIC_EXECUTIONS_COMPUTE,
-            METRIC_BUILDS_MB_SECONDS,
-            METRIC_EXECUTIONS_MB_SECONDS,
-        ];
-
-        Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
-            foreach ($metrics as $metric) {
-                $result =  $dbForProject->findOne('stats', [
-                    Query::equal('metric', [$metric]),
-                    Query::equal('period', ['inf'])
-                ]);
-
-                $stats[$metric]['total'] = $result['value'] ?? 0;
-                $limit = $days['limit'];
-                $period = $days['period'];
-                $results = $dbForProject->find('stats', [
-                    Query::equal('metric', [$metric]),
-                    Query::equal('period', [$period]),
-                    Query::limit($limit),
-                    Query::orderDesc('time'),
-                ]);
-                $stats[$metric]['data'] = [];
-                foreach ($results as $result) {
-                    $stats[$metric]['data'][$result->getAttribute('time')] = [
-                        'value' => $result->getAttribute('value'),
-                    ];
-                }
-            }
-        });
-
-        $format = match ($days['period']) {
-            '1h' => 'Y-m-d\TH:00:00.000P',
-            '1d' => 'Y-m-d\T00:00:00.000P',
-        };
-
-        foreach ($metrics as $metric) {
-            $usage[$metric]['total'] =  $stats[$metric]['total'];
-            $usage[$metric]['data'] = [];
-            $leap = time() - ($days['limit'] * $days['factor']);
-            while ($leap < time()) {
-                $leap += $days['factor'];
-                $formatDate = date($format, $leap);
-                $usage[$metric]['data'][] = [
-                    'value' => $stats[$metric]['data'][$formatDate]['value'] ?? 0,
-                    'date' => $formatDate,
-                ];
-            }
-        }
-        $response->dynamic(new Document([
-            'range' => $range,
-            'functionsTotal' => $usage[$metrics[0]]['total'],
-            'deploymentsTotal' => $usage[$metrics[1]]['total'],
-            'deploymentsStorageTotal' => $usage[$metrics[2]]['total'],
-            'buildsTotal' => $usage[$metrics[3]]['total'],
-            'buildsStorageTotal' => $usage[$metrics[4]]['total'],
-            'buildsTimeTotal' => $usage[$metrics[5]]['total'],
-            'executionsTotal' => $usage[$metrics[6]]['total'],
-            'executionsTimeTotal' => $usage[$metrics[7]]['total'],
-            'functions' => $usage[$metrics[0]]['data'],
-            'deployments' => $usage[$metrics[1]]['data'],
-            'deploymentsStorage' => $usage[$metrics[2]]['data'],
-            'builds' => $usage[$metrics[3]]['data'],
-            'buildsStorage' => $usage[$metrics[4]]['data'],
-            'buildsTime' => $usage[$metrics[5]]['data'],
-            'executions' => $usage[$metrics[6]]['data'],
-            'executionsTime' => $usage[$metrics[7]]['data'],
-            'buildsMbSecondsTotal' => $usage[$metrics[8]]['total'],
-            'buildsMbSeconds' => $usage[$metrics[8]]['data'],
-            'executionsMbSeconds' => $usage[$metrics[9]]['data'],
-            'executionsMbSecondsTotal' => $usage[$metrics[9]]['total'],
-        ]), Response::MODEL_USAGE_FUNCTIONS);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Variables/Create.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Variables;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate as DuplicateException;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Helpers\Permission;
-use Utopia\Database\Helpers\Role;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-
-class Create extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'createVariable';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_POST)
-            ->setHttpPath('/v1/functions/:functionId/variables')
-            ->desc('Create variable')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'variable.create')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'createVariable',
-                description: <<<EOT
-                Create a new function environment variable. These variables can be accessed in the function at runtime as environment variables.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_CREATED,
-                        model: Response::MODEL_VARIABLE,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function unique ID.', false)
-            ->param('key', null, new Text(Database::LENGTH_KEY), 'Variable key. Max length: ' . Database::LENGTH_KEY  . ' chars.', false)
-            ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', false)
-            ->param('secret', true, new Boolean(), 'Secret variables can be updated or deleted, but only functions can read them during build and runtime.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $key, string $value, bool $secret, Response $response, Database $dbForProject, Database $dbForPlatform)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $variableId = ID::unique();
-
-        $variable = new Document([
-            '$id' => $variableId,
-            '$permissions' => [
-                Permission::read(Role::any()),
-                Permission::update(Role::any()),
-                Permission::delete(Role::any()),
-            ],
-            'resourceInternalId' => $function->getInternalId(),
-            'resourceId' => $function->getId(),
-            'resourceType' => 'function',
-            'key' => $key,
-            'value' => $value,
-            'secret' => $secret,
-            'search' => implode(' ', [$variableId, $function->getId(), $key, 'function']),
-        ]);
-
-        try {
-            $variable = $dbForProject->createDocument('variables', $variable);
-        } catch (DuplicateException $th) {
-            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
-        }
-
-        $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
-
-        // Inform scheduler to pull the latest changes
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $response
-            ->setStatusCode(Response::STATUS_CODE_CREATED)
-            ->dynamic($variable, Response::MODEL_VARIABLE);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Variables/Delete.php

@@ -1,93 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Variables;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\ContentType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Delete extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'deleteVariable';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_DELETE)
-            ->setHttpPath('/v1/functions/:functionId/variables/:variableId')
-            ->desc('Delete variable')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'variable.delete')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'deleteVariable',
-                description: <<<EOT
-                Delete a variable by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_NOCONTENT,
-                        model: Response::MODEL_NONE,
-                    )
-                ],
-                contentType: ContentType::NONE
-            ))
-            ->param('functionId', '', new UID(), 'Function unique ID.', false)
-            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $variableId, Response $response, Database $dbForProject, Database $dbForPlatform)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $variable = $dbForProject->getDocument('variables', $variableId);
-        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceInternalId') !== $function->getInternalId() || $variable->getAttribute('resourceType') !== 'function') {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        if ($variable === false || $variable->isEmpty()) {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        $dbForProject->deleteDocument('variables', $variable->getId());
-
-        $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
-
-        // Inform scheduler to pull the latest changes
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $response->noContent();
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Variables/Get.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Variables;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class Get extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'getVariable';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/variables/:variableId')
-            ->desc('Get variable')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label(
-                'sdk',
-                new Method(
-                    namespace: 'functions',
-                    name: 'getVariable',
-                    description: <<<EOT
-                    Get a variable by its unique ID.
-                    EOT,
-                    auth: [AuthType::KEY],
-                    responses: [
-                        new SDKResponse(
-                            code: Response::STATUS_CODE_OK,
-                            model: Response::MODEL_VARIABLE,
-                        )
-                    ],
-                )
-            )
-            ->param('functionId', '', new UID(), 'Function unique ID.', false)
-            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $variableId, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $variable = $dbForProject->getDocument('variables', $variableId);
-        if (
-            $variable === false ||
-            $variable->isEmpty() ||
-            $variable->getAttribute('resourceInternalId') !== $function->getInternalId() ||
-            $variable->getAttribute('resourceType') !== 'function'
-        ) {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        if ($variable === false || $variable->isEmpty()) {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        $response->dynamic($variable, Response::MODEL_VARIABLE);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Variables/Update.php

@@ -1,111 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Variables;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Exception\Duplicate as DuplicateException;
-use Utopia\Database\Validator\Authorization;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-use Utopia\Validator\Boolean;
-use Utopia\Validator\Text;
-
-class Update extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'updateVariable';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_PUT)
-            ->setHttpPath('/v1/functions/:functionId/variables/:variableId')
-            ->desc('Update variable')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.write')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label('audits.event', 'variable.update')
-            ->label('audits.resource', 'function/{request.functionId}')
-            ->label('sdk', new Method(
-                namespace: 'functions',
-                name: 'updateVariable',
-                description: <<<EOT
-                Update variable by its unique ID.
-                EOT,
-                auth: [AuthType::KEY],
-                responses: [
-                    new SDKResponse(
-                        code: Response::STATUS_CODE_OK,
-                        model: Response::MODEL_VARIABLE,
-                    )
-                ]
-            ))
-            ->param('functionId', '', new UID(), 'Function unique ID.', false)
-            ->param('variableId', '', new UID(), 'Variable unique ID.', false)
-            ->param('key', null, new Text(255), 'Variable key. Max length: 255 chars.', false)
-            ->param('value', null, new Text(8192, 0), 'Variable value. Max length: 8192 chars.', true)
-            ->param('secret', null, new Boolean(), 'Secret variables can be updated or deleted, but only functions can read them during build and runtime.', true)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->inject('dbForPlatform')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, string $variableId, string $key, ?string $value, ?bool $secret, Response $response, Database $dbForProject, Database $dbForPlatform)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $variable = $dbForProject->getDocument('variables', $variableId);
-        if ($variable === false || $variable->isEmpty() || $variable->getAttribute('resourceInternalId') !== $function->getInternalId() || $variable->getAttribute('resourceType') !== 'function') {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        if ($variable === false || $variable->isEmpty()) {
-            throw new Exception(Exception::VARIABLE_NOT_FOUND);
-        }
-
-        if ($variable->getAttribute('secret') === true && $secret === false) {
-            throw new Exception(Exception::VARIABLE_CANNOT_UNSET_SECRET);
-        }
-
-        $variable
-            ->setAttribute('key', $key)
-            ->setAttribute('value', $value ?? $variable->getAttribute('value'))
-            ->setAttribute('secret', $secret ?? $variable->getAttribute('secret'))
-            ->setAttribute('search', implode(' ', [$variableId, $function->getId(), $key, 'function']));
-
-        try {
-            $dbForProject->updateDocument('variables', $variable->getId(), $variable);
-        } catch (DuplicateException $th) {
-            throw new Exception(Exception::VARIABLE_ALREADY_EXISTS);
-        }
-
-        $dbForProject->updateDocument('functions', $function->getId(), $function->setAttribute('live', false));
-
-        // Inform scheduler to pull the latest changes
-        $schedule = $dbForPlatform->getDocument('schedules', $function->getAttribute('scheduleId'));
-        $schedule
-            ->setAttribute('resourceUpdatedAt', DateTime::now())
-            ->setAttribute('schedule', $function->getAttribute('schedule'))
-            ->setAttribute('active', !empty($function->getAttribute('schedule')) && !empty($function->getAttribute('deployment')));
-        Authorization::skip(fn () => $dbForPlatform->updateDocument('schedules', $schedule->getId(), $schedule));
-
-        $response->dynamic($variable, Response::MODEL_VARIABLE);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Http/Variables/XList.php

@@ -1,71 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Http\Variables;
-
-use Appwrite\Extend\Exception;
-use Appwrite\Platform\Modules\Compute\Base;
-use Appwrite\SDK\AuthType;
-use Appwrite\SDK\Method;
-use Appwrite\SDK\Response as SDKResponse;
-use Appwrite\Utopia\Response;
-use Utopia\Database\Database;
-use Utopia\Database\Document;
-use Utopia\Database\Validator\UID;
-use Utopia\Platform\Action;
-use Utopia\Platform\Scope\HTTP;
-
-class XList extends Base
-{
-    use HTTP;
-
-    public static function getName()
-    {
-        return 'listVariables';
-    }
-
-    public function __construct()
-    {
-        $this
-            ->setHttpMethod(Action::HTTP_REQUEST_METHOD_GET)
-            ->setHttpPath('/v1/functions/:functionId/variables')
-            ->desc('List variables')
-            ->groups(['api', 'functions'])
-            ->label('scope', 'functions.read')
-            ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
-            ->label(
-                'sdk',
-                new Method(
-                    namespace: 'functions',
-                    name: 'listVariables',
-                    description: <<<EOT
-                    Get a list of all variables of a specific function.
-                    EOT,
-                    auth: [AuthType::KEY],
-                    responses: [
-                        new SDKResponse(
-                            code: Response::STATUS_CODE_OK,
-                            model: Response::MODEL_VARIABLE_LIST,
-                        )
-                    ],
-                )
-            )
-            ->param('functionId', '', new UID(), 'Function unique ID.', false)
-            ->inject('response')
-            ->inject('dbForProject')
-            ->callback([$this, 'action']);
-    }
-
-    public function action(string $functionId, Response $response, Database $dbForProject)
-    {
-        $function = $dbForProject->getDocument('functions', $functionId);
-
-        if ($function->isEmpty()) {
-            throw new Exception(Exception::FUNCTION_NOT_FOUND);
-        }
-
-        $response->dynamic(new Document([
-            'variables' => $function->getAttribute('vars', []),
-            'total' => \count($function->getAttribute('vars', [])),
-        ]), Response::MODEL_VARIABLE_LIST);
-    }
-}

src/Appwrite/Platform/Modules/Functions/Module.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions;
-
-use Appwrite\Platform\Modules\Functions\Services\Http;
-use Appwrite\Platform\Modules\Functions\Services\Workers;
-use Utopia\Platform;
-
-class Module extends Platform\Module
-{
-    public function __construct()
-    {
-        $this->addService('http', new Http());
-        $this->addService('workers', new Workers());
-    }
-}

src/Appwrite/Platform/Modules/Functions/Services/Http.php

@@ -1,91 +0,0 @@
-<?php
-
-namespace Appwrite\Platform\Modules\Functions\Services;
-
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Builds\Create as CreateBuild;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Builds\Download\Get as DownloadBuild;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Builds\Update as UpdateBuild;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Create as CreateDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Delete as DeleteDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Download\Get as DownloadDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Get as GetDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Template\Create as CreateTemplateDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Update as UpdateDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\Vcs\Create as CreateVcsDeployment;
-use Appwrite\Platform\Modules\Functions\Http\Deployments\XList as ListDeployments;
-use Appwrite\Platform\Modules\Functions\Http\Executions\Create as CreateExecution;
-use Appwrite\Platform\Modules\Functions\Http\Executions\Delete as DeleteExecution;
-use Appwrite\Platform\Modules\Functions\Http\Executions\Get as GetExecution;
-use Appwrite\Platform\Modules\Functions\Http\Executions\XList as ListExecutions;
-use Appwrite\Platform\Modules\Functions\Http\Functions\Create as CreateFunction;
-use Appwrite\Platform\Modules\Functions\Http\Functions\Delete as DeleteFunction;
-use Appwrite\Platform\Modules\Functions\Http\Functions\Get as GetFunction;
-use Appwrite\Platform\Modules\Functions\Http\Functions\Update as UpdateFunction;
-use Appwrite\Platform\Modules\Functions\Http\Functions\XList as ListFunctions;
-use Appwrite\Platform\Modules\Functions\Http\Runtimes\XList as ListRuntimes;
-use Appwrite\Platform\Modules\Functions\Http\Specifications\XList as ListSpecifications;
-use Appwrite\Platform\Modules\Functions\Http\Templates\Get as GetTemplate;
-use Appwrite\Platform\Modules\Functions\Http\Templates\XList as ListTemplates;
-use Appwrite\Platform\Modules\Functions\Http\Usage\Get as GetUsage;
-use Appwrite\Platform\Modules\Functions\Http\Usage\XList as ListUsage;
-use Appwrite\Platform\Modules\Functions\Http\Variables\Create as CreateVariable;
-use Appwrite\Platform\Modules\Functions\Http\Variables\Delete as DeleteVariable;
-use Appwrite\Platform\Modules\Functions\Http\Variables\Get as GetVariable;
-use Appwrite\Platform\Modules\Functions\Http\Variables\Update as UpdateVariable;
-use Appwrite\Platform\Modules\Functions\Http\Variables\XList as ListVariables;
-use Utopia\Platform\Service;
-
-class Http extends Service
-{
-    public function __construct()
-    {
-        $this->type = Service::TYPE_HTTP;
-
-        // Functions
-        $this->addAction(CreateFunction::getName(), new CreateFunction());
-        $this->addAction(GetFunction::getName(), new GetFunction());
-        $this->addAction(UpdateFunction::getName(), new UpdateFunction());
-        $this->addAction(ListFunctions::getName(), new ListFunctions());
-        $this->addAction(DeleteFunction::getName(), new DeleteFunction());
-
-        // Runtimes
-        $this->addAction(ListRuntimes::getName(), new ListRuntimes());
-
-        // Specifications
-        $this->addAction(ListSpecifications::getName(), new ListSpecifications());
-
-        // Deployments
-        $this->addAction(CreateDeployment::getName(), new CreateDeployment());
-        $this->addAction(GetDeployment::getName(), new GetDeployment());
-        $this->addAction(UpdateDeployment::getName(), new UpdateDeployment());
-        $this->addAction(ListDeployments::getName(), new ListDeployments());
-        $this->addAction(DeleteDeployment::getName(), new DeleteDeployment());
-        $this->addAction(CreateTemplateDeployment::getName(), new CreateTemplateDeployment());
-        $this->addAction(CreateVcsDeployment::getName(), new CreateVcsDeployment());
-        $this->addAction(DownloadDeployment::getName(), new DownloadDeployment());
-        $this->addAction(CreateBuild::getName(), new CreateBuild());
-        $this->addAction(UpdateBuild::getName(), new UpdateBuild());
-        $this->addAction(DownloadBuild::getName(), new DownloadBuild());
-
-        // Executions
-        $this->addAction(CreateExecution::getName(), new CreateExecution());
-        $this->addAction(GetExecution::getName(), new GetExecution());
-        $this->addAction(ListExecutions::getName(), new ListExecutions());
-        $this->addAction(DeleteExecution::getName(), new DeleteExecution());
-
-        // Usage
-        $this->addAction(GetUsage::getName(), new GetUsage());
-        $this->addAction(ListUsage::getName(), new ListUsage());
-
-        // Variables
-        $this->addAction(CreateVariable::getName(), new CreateVariable());
-        $this->addAction(GetVariable::getName(), new GetVariable());
-        $this->addAction(ListVariables::getName(), new ListVariables());
-        $this->addAction(UpdateVariable::getName(), new UpdateVariable());
-        $this->addAction(DeleteVariable::getName(), new DeleteVariable());
-
-        // Templates
-        $this->addAction(GetTemplate::getName(), new GetTemplate());
-        $this->addAction(ListTemplates::getName(), new ListTemplates());
-    }
-}